alchemy_cms 8.0.12 → 8.0.14

data/app/assets/builds/alchemy/preview.min.js

@@ -1 +1 @@
-window.Alchemy=Alchemy||{},Object.assign(Alchemy,{ElementSelector:{styles:{reset:{outline:"","outline-offset":"",cursor:""},hover:{outline:"2px dashed #f0b437","outline-offset":"4px",cursor:"pointer"},selected:{outline:"2px dashed #90b9d0","outline-offset":"4px"}},init(){window.addEventListener("message",(e=>{switch(e.data.message){case"Alchemy.blurElements":this.blurElements();break;case"Alchemy.focusElement":this.focusElement(e.data);break;default:console.info("Received unknown message!",e.data)}})),this.elements=Array.from(document.querySelectorAll("[data-alchemy-element]")),this.elements.forEach((e=>{e.addEventListener("mouseover",(()=>{e.classList.contains("selected")||Object.assign(e.style,this.getStyle("hover"))})),e.addEventListener("mouseout",(()=>{e.classList.contains("selected")||Object.assign(e.style,this.getStyle("reset"))})),e.addEventListener("click",(t=>{t.stopPropagation(),t.preventDefault(),this.selectElement(e),this.focusElementEditor(e)}))}))},selectElement(e){this.blurElements(e),e.classList.add("selected"),Object.assign(e.style,this.getStyle("selected")),e.scrollIntoView({behavior:"smooth",block:"start"})},blurElements(e){this.elements.forEach((t=>{t!==e&&(t.classList.remove("selected"),Object.assign(t.style,this.getStyle("reset")))}))},focusElement(e){const t=this.getElement(e.element_id);return t?this.selectElement(t):console.warn("Could not focus element with id",e.element_id)},getElement(e){return this.elements.find((t=>t.dataset.alchemyElement===e.toString()))},focusElementEditor(e){const t=e.dataset.alchemyElement;window.parent.postMessage({message:"Alchemy.focusElementEditor",element_id:t},window.location.origin)},getStyle(e){return"reset"===e?this.styles.reset:this.styles[e]}}}),Alchemy.ElementSelector.init();
+window.Alchemy=Alchemy||{},Object.assign(Alchemy,{ElementSelector:{styles:{reset:{outline:"","outline-offset":"",cursor:""},hover:{outline:"2px dashed #f0b437","outline-offset":"4px",cursor:"pointer"},selected:{outline:"2px dashed #90b9d0","outline-offset":"4px"}},init(){window.addEventListener("message",(e=>{switch(e.data.message){case"Alchemy.blurElements":this.blurElements();break;case"Alchemy.focusElement":this.focusElement(e.data);break;default:console.info("Received unknown message!",e.data)}})),this.elements=Array.from(document.querySelectorAll("[data-alchemy-element]")),this.elements.forEach((e=>{e.addEventListener("mouseover",(()=>{e.classList.contains("selected")||Object.assign(e.style,this.getStyle("hover"))})),e.addEventListener("mouseout",(()=>{e.classList.contains("selected")||Object.assign(e.style,this.getStyle("reset"))})),e.addEventListener("click",(t=>{t.stopPropagation(),t.preventDefault(),this.selectElement(e),this.focusElementEditor(e)}))}))},selectElement(e){this.blurElements(e),e.classList.add("selected"),Object.assign(e.style,this.getStyle("selected")),e.scrollIntoView({behavior:"smooth",block:"start"})},blurElements(e){this.elements.forEach((t=>{t!==e&&(t.classList.remove("selected"),Object.assign(t.style,this.getStyle("reset")))}))},focusElement(e){const t=this.getElement(e.element_id);return t?this.selectElement(t):console.warn("Could not focus element with id",e.element_id)},getElement(e){return this.elements.find((t=>t.dataset.alchemyElement===e.toString()))},focusElementEditor(e){const t=e.dataset.alchemyElement;window.parent.postMessage({message:"Alchemy.focusElementEditor",element_id:t},window.location.origin)},getStyle(e){return"reset"===e?this.styles.reset:this.styles[e]}}}),Alchemy.ElementSelector.init(),window.parent.postMessage({message:"Alchemy.previewReady"},window.location.origin);

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

@@ -14,6 +14,12 @@ export class RemoteSelect extends AlchemyHTMLElement {
     url: { default: "" }
   }
 
+  // Select2 manages its own DOM after initialization, so attribute changes
+  // must not trigger the default re-render which would destroy the widget.
+  static get observedAttributes() {
+    return []
+  }
+
   async connected() {
     await setupSelectLocale()
 
@@ -34,6 +40,11 @@ export class RemoteSelect extends AlchemyHTMLElement {
    * @param {Event} event
    */
   onChange(event) {
+    // Update selection attribute so re-attaching the select2 component to
+    // the same input (e.g. after dragndrop) does not reset the selection.
+    if (event.added) {
+      this.setAttribute("selection", JSON.stringify(event.added))
+    }
     this.dispatchCustomEvent("RemoteSelect.Change", {
       removed: event.removed,
       added: event.added

data/app/models/alchemy/attachment.rb

@@ -47,24 +47,16 @@ module Alchemy
     # not tracked via the polymorphic +related_object+ association, so the
     # base scope cannot see them.
     #
-    # Uses a correlated +NOT EXISTS+ subquery that builds the per-row LIKE
-    # pattern with +Arel::Nodes::Concat+, which compiles to +||+ on
-    # SQLite/PostgreSQL and +CONCAT()+ on MySQL.
+    # Extracts referenced attachment IDs from ingredient values via Ruby
+    # regex to stay database-agnostic.
     scope :deletable, -> do
-      ingredients = Alchemy::Ingredient.arel_table
-      pattern = Arel::Nodes::Concat.new(
-        Arel::Nodes::Concat.new(
-          Arel::Nodes.build_quoted("%/attachment/"),
-          arel_table[:id]
-        ),
-        Arel::Nodes.build_quoted("/download%")
-      )
-      referenced = ingredients
-        .project(1)
-        .where(ingredients[:value].matches(pattern))
-
-      where("#{table_name}.id NOT IN (#{RelatableResource::RELATED_INGREDIENTS_SUBQUERY})", type: name)
-        .where.not(referenced.exists)
+      referenced_ids = Alchemy::Ingredient
+        .where("value LIKE '%/attachment/%/download%'")
+        .pluck(:value)
+        .flat_map { |v| v.scan(%r{/attachment/(\d+)/download}).flatten.map(&:to_i) }
+
+      scope = where("#{table_name}.id NOT IN (#{RelatableResource::RELATED_INGREDIENTS_SUBQUERY})", type: name)
+      referenced_ids.any? ? scope.where.not(id: referenced_ids) : scope
     end
 
     # We need to define this method here to have it available in the validations below.

data/app/stylesheets/alchemy/admin/notices.scss

@@ -74,6 +74,15 @@ alchemy-message {
     margin-top: 0;
   }
 
+  h1,
+  h2,
+  h3,
+  p {
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
   a[href] {
     text-decoration-color: inherit;
     text-decoration-thickness: 1px;

data/app/views/alchemy/admin/pages/_table.html.erb

@@ -6,7 +6,7 @@
           <%= render_icon "file-edit", size: "xl" %>
         </sl-tooltip>
       <% else %>
-        <%= render_icon "file-edit", size: "xl" %>
+        <%= render_icon "file", size: "xl" %>
       <% end %>
     <% else %>
       <sl-tooltip class="like-hint-tooltip" content="<%= Alchemy.t("Your user role does not allow you to edit this page") %>" placement="bottom-start">

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "8.0.12"
+  VERSION = "8.0.14"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.0.12
+  version: 8.0.14
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -646,6 +646,8 @@ files:
 - app/assets/builds/alchemy/admin.css
 - app/assets/builds/alchemy/admin/page-select.css
 - app/assets/builds/alchemy/admin/print.css
+- app/assets/builds/alchemy/alchemy_admin.min.js
+- app/assets/builds/alchemy/alchemy_admin.min.js.map
 - app/assets/builds/alchemy/dark-theme.css
 - app/assets/builds/alchemy/light-theme.css
 - app/assets/builds/alchemy/preview.min.js
@@ -1436,7 +1438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []