Move logic from link dialog - Javascript onto the server #2756
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![codeclimate[bot]](https://avatars.githubusercontent.com/in/9403?s=60&v=4){kind=small}
sascha-karnatz
force-pushed
the
link-detail-improvements
branch
2 times, most recently
from
5d72127 to
2277f0f
Compare
tvdeyen
reviewed
Feb 29, 2024
Use our default page selector also in link dialog. Let the controller resolve the page url and prefill the page selector to reduce the amount of necessary Javascript.
sascha-karnatz
force-pushed
the
link-detail-improvements
branch
2 times, most recently
from
a66e49b to
51cff27
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
sascha-karnatz
force-pushed
the
link-detail-improvements
branch
3 times, most recently
from
e258364 to
856b036
Compare
Try to migrate the link dialog partials into view component to make it easier extendable and lesser repetitive. In a later commit it will be configurable to allow other plugins to add their own tabs.
sascha-karnatz
force-pushed
the
link-detail-improvements
branch
from
856b036 to
5eb35f8
Compare
Remove the custom logic to initialize and selecting the correct tab and instead pre-configer the link dialog template. The handling of the anchor is still tricky and will be resolved in the next commit.
sascha-karnatz
force-pushed
the
link-detail-improvements
branch
from
e094c8b to
fa0755b
Compare
add an anchor select component to fetch the anchors from the API or from the preview of the page editor. The selected anchor will be attached at the url.
sascha-karnatz
force-pushed
the
link-detail-improvements
branch
from
db50800 to
f83191d
Compare
sascha-karnatz
changed the title
tvdeyen
reviewed
Mar 1, 2024
|
|
||
| get pageId() { | ||
| return this.selection ? JSON.parse(this.selection)["id"] : undefined | ||
| } |
| raise ArgumentError, "The tab needs to have a title" | ||
| end | ||
|
|
||
| def type |
| <sl-tab-panel name="overlay_tab_file_link"> | ||
| <%= render partial: 'file_link' %> | ||
| </sl-tab-panel> | ||
| <% tabs = [Alchemy::Admin::Pages::InternalTab, Alchemy::Admin::Pages::AnchorTab, Alchemy::Admin::Pages::ExternalTab, Alchemy::Admin::Pages::FileTab] %> |
There was a problem hiding this comment.
Would be nice to have this configurable
| <%= render partial: 'file_link' %> | ||
| </sl-tab-panel> | ||
| <% tabs = [Alchemy::Admin::Pages::InternalTab, Alchemy::Admin::Pages::AnchorTab, Alchemy::Admin::Pages::ExternalTab, Alchemy::Admin::Pages::FileTab] %> | ||
| <% tabs.each do |tab| %> |
There was a problem hiding this comment.
Alchemy::Admin::LinkDialogTabs.each do |tab|| @@ -670,6 +670,7 @@ en: | |||
| delete_user: "Delete this user" | |||
| edit_user: "Edit the user´s properties." | |||
| "No users found": "No users found." | |||
| url: "Url" | |||
| @@ -95,7 +95,7 @@ | |||
|
|
|||
| within "[name='overlay_tab_external_link']" do | |||
| expect(page).to have_selector("#external_link") | |||
| fill_in("URL", with: "https://example.com") | |||
| fill_in("Url", with: "https://example.com") | |||
| @@ -48,64 +66,10 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog | |||
| target: $("##{@link_type}_link_target").val() | |||
| false | |||
|
|
|||
| # Initializes the select2 based Page select | |||
| initPageSelect: -> | |||
There was a problem hiding this comment.
This should maybe be its separate PR that builds on top of the remaining commits?
| @@ -164,6 +164,9 @@ def destroy | |||
|
|
|||
| def link | |||
| @url = params[:url] | |||
| @tab = params[:tab] | |||
| @title = params[:title] | |||
There was a problem hiding this comment.
@link_title = params[:link_title]| @@ -164,6 +164,9 @@ def destroy | |||
|
|
|||
| def link | |||
| @url = params[:url] | |||
| @tab = params[:tab] | |||
| @title = params[:title] | |||
| @target = params[:target] | |||
There was a problem hiding this comment.
@link_target = params[:link_target]| @@ -1,6 +1,6 @@ | |||
| <sl-tab-group id="overlay_tabs"> | |||
| <% tabs = [Alchemy::Admin::Pages::InternalTab, Alchemy::Admin::Pages::AnchorTab, Alchemy::Admin::Pages::ExternalTab, Alchemy::Admin::Pages::FileTab] %> | |||
| <% tabs.each do |tab| %> | |||
| <%= render tab.new(@url) %> | |||
| <%= render tab.new(@url, @tab, @title, @target) %> | |||
There was a problem hiding this comment.
tab.new(@url, selected: @tab, link_title: @link_title, link_target: @link_target)
|
I extracting part of these PR into multiple, smaller Pull Requests. |
3 tasks
|
Closed in favor of #2796 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this pull request for?
Checklist