alchemy_cms 7.2.0.b → 7.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ad1126eb844c56fb3b6259da82715a8c414a8d52c6864ee37bedc6e4ee41823
-  data.tar.gz: 4c06518d41d2b6b55b75b6a39df2754d9b32d05ed781d68eccfe8685d1bd7a03
+  metadata.gz: f25f82412085150403ec2bc51c9c5ad2ec0f81f82a05b44789f496d9be86b52c
+  data.tar.gz: 748944b05a82eb3166a2320e00107262c59dff8c796c995a2875c4d45507a876
 SHA512:
-  metadata.gz: b83b7b9326660aaea585e0f7edfb1b7c627e519e8dc2d586c2c469afa728bbc1a1adf0e3437f82a0b02833080136c4388cbe02c01c0d79daa74b63deb26937f5
-  data.tar.gz: 5cabdfca80aa27c1722f6291546fb25cd2253f12d3d3ac337b27edac74e3a44a454d30a09f6caf8cb6a76194df421499ab5835cdb31a007440aac2c398700f7b
+  metadata.gz: 46a28dc0a6d45859c6d58ee85b8ddedf667320618ce30a5c76db2e66b316031cec19db2b9c82c137cdf779f7f62ab29e489f1a94e89f0677f122620d3ac718e8
+  data.tar.gz: 81bb5104dc546f1c261f1d75eb2945109a6e9fd098f521748c22f2e0829e66669cf4854e329b8a1e2d3a025fd7c32a67f62bda7ab04f9a0a9383d1b24bf0f752

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 7.2.0.rc1 (2024-05-24)
+
+- Deprecate float positioning in File and Picture ingredients [#2894](https://github.com/AlchemyCMS/alchemy_cms/pull/2894) ([tvdeyen](https://github.com/tvdeyen))
+- Use inline styles for menubar component [#2893](https://github.com/AlchemyCMS/alchemy_cms/pull/2893) ([tvdeyen](https://github.com/tvdeyen))
+- Fix link selection of internal root or locale urls [#2892](https://github.com/AlchemyCMS/alchemy_cms/pull/2892) ([tvdeyen](https://github.com/tvdeyen))
+- Switch ingredient update response from Javascript to Turob Stream [#2891](https://github.com/AlchemyCMS/alchemy_cms/pull/2891) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Prevent jumping of toggle button in element window [#2888](https://github.com/AlchemyCMS/alchemy_cms/pull/2888) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Fix preview window width for smaller viewports [#2887](https://github.com/AlchemyCMS/alchemy_cms/pull/2887) ([tvdeyen](https://github.com/tvdeyen))
+- fix(alchemy_link.plugin): Avoid getting an absolute URL [#2885](https://github.com/AlchemyCMS/alchemy_cms/pull/2885) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to add to Alchemy's importmap from Rails application [#2884](https://github.com/AlchemyCMS/alchemy_cms/pull/2884) ([tvdeyen](https://github.com/tvdeyen))
+- Only set url on attachment select if attachment found [#2882](https://github.com/AlchemyCMS/alchemy_cms/pull/2882) ([tvdeyen](https://github.com/tvdeyen))
+- Fix Preview Window width [#2879](https://github.com/AlchemyCMS/alchemy_cms/pull/2879) ([tvdeyen](https://github.com/tvdeyen))
+- Allow engine importmaps [#2878](https://github.com/AlchemyCMS/alchemy_cms/pull/2878) ([tvdeyen](https://github.com/tvdeyen))
+- fix(node-select): Display order and seperator style [#2877](https://github.com/AlchemyCMS/alchemy_cms/pull/2877) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.2.0.b (2024-05-16)
 
 - fix language scope in picture description field [#2876](https://github.com/AlchemyCMS/alchemy_cms/pull/2876) ([tvdeyen](https://github.com/tvdeyen))

data/app/assets/config/alchemy_manifest.js

@@ -1,7 +1,6 @@
 //= link alchemy/admin/all.css
 //= link alchemy/admin/all.js
 //= link alchemy/preview.js
-//= link alchemy/menubar.css
 //= link alchemy/print.css
 //= link alchemy/welcome.css
 //= link tinymce/plugins/alchemy_link/plugin.min.js

data/app/assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js

@@ -10,7 +10,7 @@ tinymce.PluginManager.add("alchemy_link", function (editor) {
     const anchor = getAnchor(editor.selection.getNode())
     if (anchor) {
       link = {
-        url: anchor.href,
+        url: anchor.getAttribute("href"), // avoid getting an absolute URL
         title: anchor.title,
         target: anchor.target,
         type: anchor.className

data/app/assets/stylesheets/alchemy/elements.scss

@@ -78,7 +78,7 @@ alchemy-tinymce {
   line-height: 1;
   max-width: 85%;
 
-  .element-hidden & {
+  .element-hidden > & {
     max-width: 65%;
   }
 
@@ -114,10 +114,6 @@ alchemy-tinymce {
   padding: 0;
   margin: 0 0 0 auto;
 
-  .element-hidden & {
-    margin-left: unset;
-  }
-
   &:hover {
     &:not(:focus):not(:active) {
       background-color: $default-border-color;

data/app/assets/stylesheets/alchemy/node-select.scss

@@ -10,15 +10,23 @@
   align-items: center;
   height: 21px;
 
-  .icon {
+  > alchemy-icon {
     margin: 0 8px 0 4px;
+  }
 
+  .icon {
     .select2-highlighted & {
       fill: $white;
     }
   }
 }
 
+.node-select--node-display_name,
+.node-select--node-ancestors {
+  display: inline-flex;
+  align-items: center;
+}
+
 .node-select--node-name {
   font-weight: bold;
 }

data/app/assets/stylesheets/alchemy/preview_window.scss

@@ -16,12 +16,12 @@
 
   .collapsed-menu.elements-window-visible & {
     width: calc(
-      100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width}
+      100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width}
     );
 
-    @media screen and (min-width: $large-screen-break-point) {
+    @media screen and (min-width: 1777px) {
       width: calc(
-        100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width}
+        100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width}
       );
     }
   }

data/app/components/alchemy/admin/link_dialog/file_tab.rb

@@ -35,7 +35,7 @@ module Alchemy
 
         def attachment_select
           label = label_tag("file_link", Alchemy.t(:file), class: "control-label")
-          input = text_field_tag("file_link", url, id: "file_link")
+          input = text_field_tag("file_link", attachment && url, id: "file_link")
           select = render Alchemy::Admin::AttachmentSelect.new(attachment).with_content(input)
           content_tag("div", label + select, class: "input select")
         end

data/app/components/alchemy/admin/link_dialog/internal_tab.rb

@@ -4,6 +4,8 @@ module Alchemy
   module Admin
     module LinkDialog
       class InternalTab < BaseTab
+        PAGE_URL_PATTERN = /\/(?<locale>[a-z]{2})?(?<slash>\/)?(?<urlname>.*)/
+
         def title
           Alchemy.t("link_overlay_tab_label.internal")
         end
@@ -39,12 +41,28 @@ module Alchemy
         end
 
         def page
-          @_page ||= uri ? Alchemy::Page.find_by(urlname: uri.path[1..]) : nil
+          @_page ||= if uri&.path == "/"
+            Alchemy::Current.site.default_language.root_page
+          elsif uri
+            Alchemy::Page.find_by(page_attributes)
+          end
+        end
+
+        def page_attributes
+          locale, _slash, urlname = uri.path.match(PAGE_URL_PATTERN)&.captures
+
+          if locale && urlname.present?
+            {language_code: locale, urlname: urlname}
+          elsif locale
+            {language_code: locale, language_root: true}
+          else
+            {urlname: urlname}
+          end
         end
 
         def page_select
           label = label_tag("internal_link", Alchemy.t(:page), class: "control-label")
-          input = text_field_tag("internal_link", is_selected? ? uri : "", id: "internal_link")
+          input = text_field_tag("internal_link", page && uri, id: "internal_link")
           page_select = render Alchemy::Admin::PageSelect.new(page, allow_clear: true).with_content(input)
           content_tag("div", label + page_select, class: "input select")
         end
@@ -53,7 +71,7 @@ module Alchemy
           fragment = "##{uri.fragment}" if uri&.fragment
           label = label_tag("element_anchor", Alchemy.t(:anchor), class: "control-label")
           options = [[page.nil? ? Alchemy.t("Select a page first") : Alchemy.t("None"), ""]]
-          options += [[fragment, fragment]] if is_selected? && fragment
+          options += [[fragment, fragment]] if page && fragment
 
           select = select_tag("element_anchor", options_for_select(options, fragment), is: "alchemy-select", disabled: page.nil?)
           select_component = content_tag("alchemy-dom-id-api-select", select, {page: page&.id})

data/app/controllers/alchemy/api/nodes_controller.rb

@@ -9,7 +9,7 @@ module Alchemy
       @nodes = Node.all
       @nodes = @nodes.includes(:parent)
       @nodes = @nodes.where(language_id: params[:language_id]) if params[:language_id]
-      @nodes = @nodes.ransack(params[:filter]).result
+      @nodes = @nodes.ransack(params[:filter]).result.order(:lft)
 
       if params[:page]
         @nodes = @nodes.page(params[:page]).per(params[:per_page])

data/app/javascript/alchemy_admin/components/action.js

@@ -0,0 +1,41 @@
+import { reloadPreview } from "alchemy_admin/components/preview_window"
+import IngredientAnchorLink from "alchemy_admin/ingredient_anchor_link"
+
+class Action extends HTMLElement {
+  constructor() {
+    super()
+
+    // map action names with Javascript functions
+    this.actions = {
+      // add a intermediate closeCurrentDialog - action
+      // this will be gone, if all dialogs are working with a promise and
+      // we don't have to implicitly close the dialog
+      closeCurrentDialog: Alchemy.closeCurrentDialog,
+      reloadPreview,
+      updateAnchorIcon: IngredientAnchorLink.updateIcon
+    }
+  }
+
+  connectedCallback() {
+    const func = this.actions[this.name]
+
+    if (func) {
+      func(...this.params)
+    } else {
+      console.error(`Unknown Alchemy action: ${this.name}`)
+    }
+  }
+
+  get name() {
+    return this.getAttribute("name")
+  }
+
+  get params() {
+    if (this.hasAttribute("params")) {
+      return JSON.parse(this.getAttribute("params"))
+    }
+    return []
+  }
+}
+
+customElements.define("alchemy-action", Action)

data/app/javascript/alchemy_admin/components/index.js

@@ -1,3 +1,4 @@
+import "alchemy_admin/components/action"
 import "alchemy_admin/components/attachment_select"
 import "alchemy_admin/components/button"
 import "alchemy_admin/components/char_counter"

data/app/javascript/alchemy_admin/components/node_select.js

@@ -23,12 +23,14 @@ class NodeSelect extends RemoteSelect {
    */
   _renderListEntry(node) {
     const ancestors = node.ancestors.map((a) => a.name)
+    const seperator = `<alchemy-icon name="arrow-right-s"></alchemy-icon>`
+
     return `
       <div class="node-select--node">
         <alchemy-icon name="menu-2"></alchemy-icon>
         <div class="node-select--node-display_name">
           <span class="node-select--node-ancestors">
-            ${ancestors.join(" /&nbsp;")}
+            ${ancestors.length > 0 ? ancestors.join(seperator) + seperator : ""}
           </span>
           <span class="node-select--node-name">
             ${node.name}

data/app/javascript/alchemy_admin.js

@@ -8,7 +8,6 @@ import { translate } from "alchemy_admin/i18n"
 import Dirty from "alchemy_admin/dirty"
 import * as FixedElements from "alchemy_admin/fixed_elements"
 import { growl } from "alchemy_admin/growler"
-import IngredientAnchorLink from "alchemy_admin/ingredient_anchor_link"
 import ImageLoader from "alchemy_admin/image_loader"
 import ImageCropper from "alchemy_admin/image_cropper"
 import Initializer from "alchemy_admin/initializer"
@@ -44,7 +43,6 @@ Object.assign(Alchemy, {
   growl,
   ImageLoader: ImageLoader.init,
   ImageCropper,
-  IngredientAnchorLink,
   LinkDialog,
   pictureSelector,
   pleaseWaitOverlay,

data/app/views/alchemy/_menubar.html.erb

@@ -1,20 +1,133 @@
 <% if !Alchemy::Current.preview_page? && @page && can?(:edit_content, @page) %>
   <alchemy-menubar>
     <template>
-      <%= stylesheet_link_tag("alchemy/menubar") %>
-      <div id="alchemy_menubar" data-turbo="false">
-        <ul>
-          <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>
-          <li><%= link_to Alchemy.t(:edit_page), alchemy.edit_admin_page_url(@page) %></li>
-          <li>
-            <%= form_tag Alchemy.logout_path, method: Alchemy.logout_method do %>
-              <%= button_tag Alchemy.t(:logout) %>
-            <% end %>
-          </li>
-        </ul>
+      <style>
+        .menubar {
+          --icon-size: 24px;
+          --panel-width: 525px;
+          --border-radius: 3px;
+          --left-offset: 0px;
+          display: flex;
+          position: fixed;
+          top: 0;
+          left: calc(-1 * (var(--panel-width) - var(--left-offset)));
+          z-index: 10000;
+          background: #214166;
+          transition: left 0.25s cubic-bezier(0.23, 1, 0.32, 1);
+          box-shadow: 0 0 0 1px #fff;
+          box-sizing: border-box;
+          border-bottom-right-radius: var(--border-radius);
+          padding: 12px 16px 12px;
+          gap: 12px;
+          justify-content: space-between;
+          align-items: center;
+          flex-wrap: nowrap;
+          overflow: hidden;
+          font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode",
+            "Lucida Sans", Verdana, Tahoma, sans-serif;
+          font-size: 13px;
+        }
+
+        .menubar * {
+          box-sizing: border-box;
+          margin: 0;
+          padding: 0;
+        }
+
+        .menubar:hover,
+        .menubar:focus-within {
+          left: 0;
+        }
+
+        .menubar > svg {
+          width: var(--icon-size);
+          height: var(--icon-size);
+          flex-shrink: 0;
+          margin-left: 4px;
+        }
+
+        .menubar .button {
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+          gap: 8px;
+          font-size: inherit;
+          font-weight: 700;
+          cursor: pointer;
+          border-radius: var(--border-radius);
+          background-color: transparent;
+          border: 1px solid rgba(255, 255, 255, 0.5);
+          color: #fff;
+          margin: 0;
+          padding: 0.75em 1.5em;
+          appearance: none;
+          transition: all 250ms;
+          -webkit-font-smoothing: antialiased;
+          -moz-osx-font-smoothing: grayscale;
+          text-decoration: none;
+          white-space: nowrap;
+        }
+
+        .menubar .button:hover {
+          text-decoration: none;
+          background-color: rgba(0, 0, 0, 0.25);
+          border-color: rgba(255, 255, 255, 0.75)
+        }
+
+        .menubar .button:active {
+          box-shadow: inset 0px 1px 1px -1px #333;
+        }
+
+        .menubar .button:focus {
+          outline: solid 2px #eca96e;
+          outline-offset: 2px;
+        }
+      </style>
+
+      <div class="menubar" data-turbo="false">
+        <%= link_to alchemy.admin_dashboard_url, class: "button" do %>
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" fill="currentColor">
+            <path d="M7.82843 10.9999H20V12.9999H7.82843L13.1924 18.3638L11.7782 19.778L4 11.9999L11.7782 4.22168L13.1924 5.63589L7.82843 10.9999Z"></path>
+          </svg>
+          <%= Alchemy.t(:to_alchemy) %>
+        <% end %>
+        <%= link_to alchemy.edit_admin_page_url(@page), class: "button" do %>
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" fill="currentColor">
+            <path d="M6.41421 15.89L16.5563 5.74785L15.1421 4.33363L5 14.4758V15.89H6.41421ZM7.24264 17.89H3V13.6473L14.435 2.21231C14.8256 1.82179 15.4587 1.82179 15.8492 2.21231L18.6777 5.04074C19.0682 5.43126 19.0682 6.06443 18.6777 6.45495L7.24264 17.89ZM3 19.89H21V21.89H3V19.89Z"></path>
+          </svg>
+          <%= Alchemy.t(:edit_page) %>
+        <% end %>
+        <%= form_tag Alchemy.logout_path, method: Alchemy.logout_method do %>
+          <%= button_tag class: "button" do %>
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" fill="currentColor">
+              <path d="M5 22C4.44772 22 4 21.5523 4 21V3C4 2.44772 4.44772 2 5 2H19C19.5523 2 20 2.44772 20 3V6H18V4H6V20H18V18H20V21C20 21.5523 19.5523 22 19 22H5ZM18 16V13H11V11H18V8L23 12L18 16Z"></path>
+            </svg>
+            <%= Alchemy.t(:logout) %>
+          <% end %>
+        <% end %>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+          <path fill="#fff" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/>
+        </svg>
       </div>
     </template>
-  </alchemy-menubar>
 
-  <%= javascript_include_tag('menubar', type: "module") %>
+    <script type="module">
+      class Menubar extends HTMLElement {
+        constructor() {
+          super()
+          const template = this.querySelector("template")
+          const attachedShadowRoot = this.attachShadow({ mode: "open" })
+          attachedShadowRoot.appendChild(template.content.cloneNode(true))
+        }
+
+        connectedCallback() {
+          const bar = this.shadowRoot.querySelector(".menubar")
+          const width = bar.offsetWidth
+          bar.style = `--panel-width: ${width}px; --left-offset: calc(var(--icon-size) + 32px);`
+        }
+      }
+
+      customElements.define("alchemy-menubar", Menubar)
+    </script>
+  </alchemy-menubar>
 <% end %>

data/app/views/alchemy/admin/ingredients/_file_fields.html.erb

@@ -7,6 +7,7 @@
     collection: css_classes,
     include_blank: Alchemy.t('None') %>
 <%- else -%>
+  <% Alchemy::Deprecation.warn %(Float positioning in File ingredients is deprecated. If you rely on them, please use `css_classes` in your "#{ingredient.role}" settings instead.) %>
   <%= f.input :css_class,
     label: Alchemy.t(:position_in_text),
     collection: [

data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb

@@ -13,6 +13,7 @@
     collection: ingredient.settings[:css_classes],
     include_blank: Alchemy.t('None') %>
 <%- else -%>
+  <% Alchemy::Deprecation.warn %(Float positioning in Picture ingredients is deprecated. If you rely on them, please use `css_classes` in your "#{ingredient.role}" settings instead.) %>
   <%= f.input :css_class,
     label: Alchemy.t(:position_in_text),
     collection: [

data/app/views/alchemy/admin/ingredients/update.turbo_stream.erb

@@ -0,0 +1,5 @@
+<alchemy-action name="closeCurrentDialog"></alchemy-action>
+<alchemy-action name="reloadPreview"></alchemy-action>
+<% if @ingredient.settings[:anchor] %>
+<alchemy-action name="updateAnchorIcon" params="<%= [@ingredient.id, @ingredient.dom_id.present?].to_json %>"></alchemy-action>
+<% end %>

data/app/views/alchemy/admin/nodes/_page_nodes.html.erb

@@ -7,10 +7,11 @@
       <th class="tools"></th>
     </tr>
     <% nodes = @page.nodes.select(&:persisted?) %>
+    <% seperator = '<alchemy-icon name="arrow-right-s" style="vertical-align: text-bottom"></alchemy-icon>' %>
     <% if nodes.length > 0 %>
       <% nodes.each do |node| %>
         <tr class="even">
-          <td><%= "#{node.ancestors.map(&:name).join(" / ")} / #{node.name}" %></td>
+          <td><%== "#{node.ancestors.map(&:name).join(seperator)}#{seperator}<strong>#{node.name}</strong>" %></td>
           <td class="tools">
             <sl-tooltip content="<%= Alchemy.t("delete_node") %>">
               <%= link_to render_icon(:minus),

data/app/views/layouts/alchemy/admin.html.erb

@@ -21,11 +21,9 @@
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbo-track' => true) %>
     <%= javascript_importmap_tags("alchemy_admin", importmap: Alchemy.importmap) %>
-    <% if Alchemy.admin_js_imports.any? %>
+    <% Alchemy.admin_js_imports.each do |path| %>
       <script type="module">
-        <% Alchemy.admin_js_imports.each do |path| %>
-          import "<%= path %>"
-        <% end %>
+        import "<%= path %>"
       </script>
     <% end %>
     <%= yield :javascript_includes %>

data/lib/alchemy/engine.rb

@@ -21,14 +21,19 @@ module Alchemy
     end
 
     initializer "alchemy.importmap" do |app|
-      Alchemy.importmap.draw(Engine.root.join("config", "importmap.rb"))
+      watch_paths = []
 
-      package_path = Engine.root.join("app/javascript")
-      vendor_packages_path = Engine.root.join("vendor/javascript")
-      app.config.assets.paths += [package_path, vendor_packages_path]
+      Alchemy.admin_importmaps.each do |admin_import|
+        Alchemy.importmap.draw admin_import[:importmap_path]
+        watch_paths += admin_import[:source_paths]
+        app.config.assets.paths += admin_import[:source_paths]
+        if admin_import[:name] != "alchemy_admin"
+          Alchemy.admin_js_imports.add(admin_import[:name])
+        end
+      end
 
       if app.config.importmap.sweep_cache
-        Alchemy.importmap.cache_sweeper(watches: package_path)
+        Alchemy.importmap.cache_sweeper(watches: watch_paths)
         ActiveSupport.on_load(:action_controller_base) do
           before_action { Alchemy.importmap.cache_sweeper.execute_if_updated }
         end

data/lib/alchemy/test_support/shared_link_tab_examples.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.shared_examples_for "a link dialog tab" do |name, title|
+  context "default configuration" do
+    it "should render a tab with a panel" do
+      expect(page).to have_selector("sl-tab[panel='overlay_tab_#{name}_link']")
+      expect(page).to have_selector("sl-tab-panel[name='overlay_tab_#{name}_link']")
+    end
+
+    it "should have a title" do
+      expect(page).to have_text(title)
+    end
+
+    it "should allow to add title input" do
+      expect(page).to have_selector("input[name=#{name}_link_title]", text: "")
+    end
+
+    it "is not active" do
+      expect(page).to_not have_selector("sl-tab[active]")
+    end
+  end
+
+  context "active tab" do
+    let(:is_selected) { true }
+
+    it "is active" do
+      expect(page).to have_selector("sl-tab[active]")
+    end
+  end
+
+  context "title input" do
+    let(:link_title) { "test" }
+
+    it "should have a pre-filled value" do
+      expect(page.find(:css, "input[name=#{name}_link_title]").value).to eq(link_title)
+    end
+  end
+end
+
+shared_examples_for "a link dialog - target select" do |name|
+  context "target select" do
+    context "without content" do
+      it "should allow to add target select" do
+        expect(page).to have_selector("select[name=#{name}_link_target]")
+      end
+    end
+
+    context "with content"
+    let(:link_target) { "_blank" }
+
+    it "should have a pre-filled value" do
+      expect(page.find(:css, "select[name=#{name}_link_target]").value).to eq(link_target)
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.2.0.b"
+  VERSION = "7.2.0.rc1"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -62,6 +62,42 @@ module Alchemy
     @_admin_js_imports = Set[sources]
   end
 
+  # Additional importmaps to be included in the Alchemy admin UI
+  #
+  # Be sure to also pin modules with +Alchemy.importmap+.
+  #
+  # == Example
+  #
+  #    # config/alchemy/importmap.rb
+  #    Alchemy.importmap.pin "alchemy_solidus", to: "alchemy_solidus.js", preload: true
+  #    Alchemy.importmap.pin_all_from Alchemy::Solidus::Engine.root.join("app/javascript/alchemy_solidus"),
+  #      under: "alchemy_solidus",
+  #      preload: true
+  #
+  #    # lib/alchemy/solidus/engine.rb
+  #    initializer "alchemy_solidus.assets", before: "alchemy.importmap" do |app|
+  #      Alchemy.admin_importmaps.add({
+  #        importmap_path: root.join("config/importmap.rb"),
+  #        source_paths: [
+  #          root.join("app/javascript")
+  #        ],
+  #        name: "alchemy_solidus"
+  #      })
+  #      app.config.assets.precompile << "alchemy_solidus/manifest.js"
+  #    end
+  #
+  # @return [Set<Hash>]
+  def self.admin_importmaps
+    @_admin_importmaps ||= Set.new([{
+      importmap_path: Engine.root.join("config/importmap.rb"),
+      source_paths: [
+        Engine.root.join("app/javascript"),
+        Engine.root.join("vendor/javascript")
+      ],
+      name: "alchemy_admin"
+    }])
+  end
+
   # Define page publish targets
   #
   # A publish target is a ActiveJob that gets performed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.2.0.b
+  version: 7.2.0.rc1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -766,7 +766,6 @@ files:
 - app/assets/stylesheets/alchemy/labels.scss
 - app/assets/stylesheets/alchemy/list_filter.scss
 - app/assets/stylesheets/alchemy/lists.scss
-- app/assets/stylesheets/alchemy/menubar.scss
 - app/assets/stylesheets/alchemy/navigation.scss
 - app/assets/stylesheets/alchemy/node-select.scss
 - app/assets/stylesheets/alchemy/nodes.scss
@@ -879,6 +878,7 @@ files:
 - app/helpers/alchemy/pages_helper.rb
 - app/helpers/alchemy/url_helper.rb
 - app/javascript/alchemy_admin.js
+- app/javascript/alchemy_admin/components/action.js
 - app/javascript/alchemy_admin/components/alchemy_html_element.js
 - app/javascript/alchemy_admin/components/attachment_select.js
 - app/javascript/alchemy_admin/components/button.js
@@ -943,7 +943,6 @@ files:
 - app/javascript/alchemy_admin/utils/format.js
 - app/javascript/alchemy_admin/utils/max.js
 - app/javascript/alchemy_admin/utils/string_conversions.js
-- app/javascript/menubar.js
 - app/jobs/alchemy/base_job.rb
 - app/jobs/alchemy/publish_page_job.rb
 - app/mailers/alchemy/base_mailer.rb
@@ -1070,7 +1069,7 @@ files:
 - app/views/alchemy/admin/ingredients/_text_fields.html.erb
 - app/views/alchemy/admin/ingredients/_video_fields.html.erb
 - app/views/alchemy/admin/ingredients/edit.html.erb
-- app/views/alchemy/admin/ingredients/update.js.erb
+- app/views/alchemy/admin/ingredients/update.turbo_stream.erb
 - app/views/alchemy/admin/languages/_form.html.erb
 - app/views/alchemy/admin/languages/_language.html.erb
 - app/views/alchemy/admin/languages/_table.html.erb
@@ -1335,6 +1334,7 @@ files:
 - lib/alchemy/test_support/shared_dom_ids_examples.rb
 - lib/alchemy/test_support/shared_ingredient_editor_examples.rb
 - lib/alchemy/test_support/shared_ingredient_examples.rb
+- lib/alchemy/test_support/shared_link_tab_examples.rb
 - lib/alchemy/test_support/shared_uploader_examples.rb
 - lib/alchemy/tinymce.rb
 - lib/alchemy/upgrader.rb

data/app/assets/stylesheets/alchemy/menubar.scss

@@ -1,81 +0,0 @@
-/*
- *= require_self
- */
-
-@import "alchemy/variables";
-@import "alchemy/mixins";
-
-#alchemy_menubar {
-  position: fixed;
-  top: 0;
-  left: -358px;
-  width: 400px;
-  z-index: 10000;
-  background: $main-menu-bg-color;
-  transition: left 0.25s cubic-bezier(0.23, 1, 0.32, 1);
-  box-shadow: 0 0 0 1px $white;
-  box-sizing: border-box;
-  height: auto;
-  padding: 8px 40px 8px 8px;
-  overflow: hidden;
-  font-family: $default-font-family;
-  font-size: $base-font-size;
-
-  * {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-  }
-
-  &:hover {
-    left: 0;
-  }
-
-  &:after {
-    content: "";
-    width: 24px;
-    height: 24px;
-    position: absolute;
-    right: 10px;
-    top: 50%;
-    background: image-url("alchemy/icon-white.svg") 1px 1px no-repeat;
-    background-size: 24px 24px;
-    transform: translateY(-50%);
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-    height: 100%;
-
-    li {
-      width: 33.333%;
-      height: 100%;
-      margin: 0;
-      padding: 0 $default-padding;
-      float: left;
-      list-style-type: none;
-      text-align: center;
-
-      a,
-      button {
-        @include button-defaults(
-          $background-color: $main-menu-bg-color,
-          $hover-color: $blue,
-          $hover-border-color: $white,
-          $border: 1px solid $white,
-          $box-shadow: none,
-          $padding: 0.5em 0,
-          $margin: 0,
-          $color: $white
-        );
-        width: 100%;
-        text-decoration: none !important;
-
-        &:after {
-          display: none;
-        }
-      }
-    }
-  }
-}

data/app/javascript/menubar.js

@@ -1,10 +0,0 @@
-class Menubar extends HTMLElement {
-  constructor() {
-    super()
-    const template = this.querySelector("template")
-    const attachedShadowRoot = this.attachShadow({ mode: "open" })
-    attachedShadowRoot.appendChild(template.content.cloneNode(true))
-  }
-}
-
-customElements.define("alchemy-menubar", Menubar)

data/app/views/alchemy/admin/ingredients/update.js.erb

@@ -1,7 +0,0 @@
-Alchemy.closeCurrentDialog(
-<% if @ingredient.settings[:anchor] %>
-  function() {
-    Alchemy.IngredientAnchorLink.updateIcon(<%= @ingredient.id %>, <%= @ingredient.dom_id.present? %>);
-  }
-<% end %>
-);