alchemy_cms 7.1.12 → 7.2.0.b

data/app/javascript/alchemy_admin/page_sorter.js

@@ -1,7 +1,9 @@
 import Sortable from "sortablejs"
+import { growl } from "alchemy_admin/growler"
 import { patch } from "alchemy_admin/utils/ajax"
+import pleaseWaitOverlay from "alchemy_admin/please_wait_overlay"
 
-function onFinishDragging(evt) {
+function onSort(evt) {
   const pageId = evt.item.dataset.pageId
   const url = Alchemy.routes.move_admin_page_path(pageId)
   const data = {
@@ -9,19 +11,26 @@ function onFinishDragging(evt) {
     new_position: evt.newIndex
   }
 
-  patch(url, data)
-    .then(async (response) => {
-      const pageData = await response.data
-      const pageEl = document.getElementById(`page_${pageId}`)
-      const urlPathEl = pageEl.querySelector(".sitemap_url")
+  if (evt.target === evt.to) {
+    pleaseWaitOverlay(true)
+    patch(url, data)
+      .then(async (response) => {
+        const pageData = await response.data
+        const pageEl = document.getElementById(`page_${pageId}`)
+        const urlPathEl = pageEl.querySelector(".sitemap_url")
 
-      Alchemy.growl(Alchemy.t("Successfully moved page"))
-      urlPathEl.textContent = pageData.url_path
-      displayPageFolders()
-    })
-    .catch((error) => {
-      Alchemy.growl(error.message || error, "error")
-    })
+        growl(Alchemy.t("Successfully moved page"))
+        urlPathEl.textContent = pageData.url_path
+        displayPageFolders()
+      })
+      .catch((error) => {
+        growl(error.message || error, "error")
+        Alchemy.currentSitemap.reload()
+      })
+      .finally(() => {
+        pleaseWaitOverlay(false)
+      })
+  }
 }
 
 export function displayPageFolders() {
@@ -50,7 +59,7 @@ export function createSortables(sortables) {
       fallbackOnBody: true,
       swapThreshold: 0.65,
       handle: ".handle",
-      onEnd: onFinishDragging
+      onSort
     })
   })
 }

data/app/javascript/alchemy_admin/picture_editors.js

@@ -1,13 +1,14 @@
 import debounce from "alchemy_admin/utils/debounce"
 import max from "alchemy_admin/utils/max"
 import { get } from "alchemy_admin/utils/ajax"
+import { growl } from "alchemy_admin/growler"
 import ImageLoader from "alchemy_admin/image_loader"
 
 const UPDATE_DELAY = 125
-const IMAGE_PLACEHOLDER = '<i class="icon ri-image-line ri-fw"></i>'
+const IMAGE_PLACEHOLDER = '<alchemy-icon name="image"></alchemy-icon>'
 const THUMBNAIL_SIZE = "160x120"
 
-export class PictureEditor {
+class PictureEditor {
   constructor(container) {
     this.container = container
     this.cropFromField = container.querySelector("[data-crop-from]")
@@ -77,7 +78,7 @@ export class PictureEditor {
       })
       .catch((error) => {
         console.error(error.message || error)
-        Alchemy.growl(error.message || error, "error")
+        growl(error.message || error, "error")
       })
   }
 
@@ -131,10 +132,10 @@ export class PictureEditor {
     if (!this.imageCropperEnabled) return []
 
     const mask = this.targetSize.split("x").map((n) => parseInt(n))
-    const zoom = max(
+    const zoom = max([
       mask[0] / this.imageFileWidth,
       mask[1] / this.imageFileHeight
-    )
+    ])
 
     return [Math.round(mask[0] / zoom), Math.round(mask[1] / zoom)]
   }

data/app/javascript/alchemy_admin/shoelace_theme.js

@@ -0,0 +1,60 @@
+import { registerIconLibrary, setDefaultAnimation } from "shoelace"
+
+// Change the default animation for all tooltips
+setDefaultAnimation("tooltip.show", {
+  keyframes: [
+    { transform: "translateY(10px)", opacity: "0" },
+    { transform: "translateY(0)", opacity: "1" }
+  ],
+  options: {
+    duration: 100
+  }
+})
+
+setDefaultAnimation("tooltip.hide", {
+  keyframes: [
+    { transform: "translateY(0)", opacity: "1" },
+    { transform: "translateY(10px)", opacity: "0" }
+  ],
+  options: {
+    duration: 100
+  }
+})
+
+// Change the default animation for all dialogs
+setDefaultAnimation("dialog.show", {
+  keyframes: [
+    { transform: "scale(0.98)", opacity: "0" },
+    { transform: "scale(1)", opacity: "1" }
+  ],
+  options: {
+    duration: 150
+  }
+})
+
+setDefaultAnimation("dialog.hide", {
+  keyframes: [
+    { transform: "scale(1)", opacity: "1" },
+    { transform: "scale(0.98)", opacity: "0" }
+  ],
+  options: {
+    duration: 150
+  }
+})
+
+const spriteUrl = document
+  .querySelector('meta[name="alchemy-icon-sprite"]')
+  .getAttribute("content")
+
+const iconMap = {
+  "x-lg": "close"
+}
+
+const options = {
+  resolver: (name) => `${spriteUrl}#ri-${iconMap[name] || name}-line`,
+  mutator: (svg) => svg.setAttribute("fill", "currentColor"),
+  spriteSheet: true
+}
+
+registerIconLibrary("default", options)
+registerIconLibrary("system", options)

data/app/javascript/alchemy_admin/sitemap.js

@@ -2,6 +2,7 @@
 import PageSorter from "alchemy_admin/page_sorter"
 import { on } from "alchemy_admin/utils/events"
 import { get, patch } from "alchemy_admin/utils/ajax"
+import { growl } from "alchemy_admin/growler"
 import { createSortables, displayPageFolders } from "alchemy_admin/page_sorter"
 
 export default class Sitemap {
@@ -40,6 +41,11 @@ export default class Sitemap {
       .catch(this.errorHandler)
   }
 
+  // Reloads the sitemap
+  reload() {
+    this.load(this.options.page_root_id)
+  }
+
   // Watch page folder clicks and re-render the page branch
   handlePageFolders() {
     on(
@@ -103,7 +109,6 @@ export default class Sitemap {
         item.classList.remove("highlight")
       }
     })
-    this.filter_field_clear.style.display = "inline-block"
     const { length } = results
 
     if (length === 1) {
@@ -123,7 +128,6 @@ export default class Sitemap {
         left: 0,
         behavior: "smooth"
       })
-      this.filter_field_clear.style.display = "none"
     }
   }
 
@@ -131,6 +135,8 @@ export default class Sitemap {
   _observe() {
     this.search_field.addEventListener("keyup", (evt) => {
       const term = evt.target.value
+      this.filter_field_clear.style.visibility =
+        term == "" ? "hidden" : "visible"
       this.filter(term.toLowerCase())
     })
     this.search_field.addEventListener("focus", () => key.setScope("search"))
@@ -142,7 +148,7 @@ export default class Sitemap {
   }
 
   errorHandler(error) {
-    Alchemy.growl(error.message || error, "error")
+    growl(error.message || error, "error")
     console.error(error)
   }
 }

data/app/javascript/alchemy_admin/sortable_elements.js

@@ -1,5 +1,7 @@
 import Sortable from "sortablejs"
+import { growl } from "alchemy_admin/growler"
 import { post } from "alchemy_admin/utils/ajax"
+import { reloadPreview } from "alchemy_admin/components/preview_window"
 
 const SORTABLE_OPTIONS = {
   draggable: ".element-editor",
@@ -35,8 +37,8 @@ function onSort(event) {
   if (event.target === event.to) {
     post(Alchemy.routes.order_admin_elements_path, params).then((response) => {
       const data = response.data
-      Alchemy.growl(data.message)
-      Alchemy.PreviewWindow.refresh()
+      growl(data.message)
+      reloadPreview()
       item.updateTitle(data.preview_text)
     })
   }
@@ -76,8 +78,4 @@ export default function SortableElements(selector) {
   })
 
   sortable_areas.forEach((element) => createSortable(element))
-
-  document.querySelectorAll(".nested-elements").forEach((nestedElement) => {
-    createSortable(nestedElement)
-  })
 }

data/app/javascript/alchemy_admin.js

@@ -1,62 +1,34 @@
 import "@ungap/custom-elements"
 import "@hotwired/turbo-rails"
-import "keymaster"
 
 import Rails from "@rails/ujs"
 
 import GUI from "alchemy_admin/gui"
 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"
+import { LinkDialog } from "alchemy_admin/link_dialog"
 import pictureSelector from "alchemy_admin/picture_selector"
 import pleaseWaitOverlay from "alchemy_admin/please_wait_overlay"
 import Sitemap from "alchemy_admin/sitemap"
-import SortableElements from "alchemy_admin/sortable_elements"
 import Spinner from "alchemy_admin/spinner"
 import PagePublicationFields from "alchemy_admin/page_publication_fields"
+import { reloadPreview } from "alchemy_admin/components/preview_window"
+import {
+  openConfirmDialog,
+  confirmToDeleteDialog
+} from "alchemy_admin/confirm_dialog"
 
 // Web Components
-import "alchemy_admin/components/button"
-import "alchemy_admin/components/char_counter"
-import "alchemy_admin/components/clipboard_button"
-import "alchemy_admin/components/datepicker"
-import "alchemy_admin/components/dialog_link"
-import "alchemy_admin/components/element_editor"
-import "alchemy_admin/components/ingredient_group"
-import "alchemy_admin/components/link_buttons"
-import "alchemy_admin/components/node_select"
-import "alchemy_admin/components/uploader"
-import "alchemy_admin/components/overlay"
-import "alchemy_admin/components/page_select"
-import "alchemy_admin/components/select"
-import "alchemy_admin/components/spinner"
-import "alchemy_admin/components/tinymce"
+import "alchemy_admin/components"
 
-import { setDefaultAnimation } from "shoelace"
-
-// Change the default animation for all dialogs
-setDefaultAnimation("tooltip.show", {
-  keyframes: [
-    { transform: "translateY(10px)", opacity: "0" },
-    { transform: "translateY(0)", opacity: "1" }
-  ],
-  options: {
-    duration: 100
-  }
-})
-
-setDefaultAnimation("tooltip.hide", {
-  keyframes: [
-    { transform: "translateY(0)", opacity: "1" },
-    { transform: "translateY(10px)", opacity: "0" }
-  ],
-  options: {
-    duration: 100
-  }
-})
+// Shoelace Setup
+import "alchemy_admin/shoelace_theme"
 
 // Global Alchemy object
 if (typeof window.Alchemy === "undefined") {
@@ -68,16 +40,20 @@ Object.assign(Alchemy, {
   ...Dirty,
   GUI,
   t: translate, // Global utility method for translating a given string
+  FixedElements,
+  growl,
   ImageLoader: ImageLoader.init,
   ImageCropper,
-  Initializer,
   IngredientAnchorLink,
+  LinkDialog,
   pictureSelector,
   pleaseWaitOverlay,
   Sitemap,
-  SortableElements,
   Spinner,
-  PagePublicationFields
+  PagePublicationFields,
+  reloadPreview,
+  openConfirmDialog,
+  confirmToDeleteDialog
 })
 
 Rails.start()

data/app/models/alchemy/current.rb

@@ -0,0 +1,26 @@
+module Alchemy
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :preview_page, :page, :language, :site
+
+    def language
+      super || Language.default
+    end
+
+    def site
+      super || Site.first
+    end
+
+    def preview_page=(page)
+      super
+
+      self.page = page
+      self.language = page&.language
+      self.site = page&.site
+    end
+
+    def preview_page?(page = Current.page)
+      return false if preview_page.nil?
+      preview_page == page
+    end
+  end
+end

data/app/models/alchemy/element.rb

@@ -101,7 +101,7 @@ module Alchemy
     scope :excluded, ->(names) { where.not(name: names) }
     scope :fixed, -> { where(fixed: true) }
     scope :unfixed, -> { where(fixed: false) }
-    scope :from_current_site, -> { where(Language.table_name => {site_id: Site.current || Site.default}).joins(page: "language") }
+    scope :from_current_site, -> { where(Language.table_name => {site_id: Current.site}).joins(page: "language") }
     scope :folded, -> { where(folded: true) }
     scope :expanded, -> { where(folded: false) }
     scope :not_nested, -> { where(parent_element_id: nil) }

data/app/models/alchemy/ingredients/audio.rb

@@ -26,17 +26,6 @@ module Alchemy
       def preview_text(max_length = 30)
         name.to_s[0..max_length - 1]
       end
-
-      %i[
-        autoplay
-        controls
-        loop
-        muted
-      ].each do |method|
-        define_method(:"#{method}=") do |value|
-          super(ActiveModel::Type::Boolean.new.cast(value))
-        end
-      end
     end
   end
 end

data/app/models/alchemy/ingredients/datetime.rb

@@ -5,7 +5,7 @@ module Alchemy
     # A datetime value
     #
     class Datetime < Alchemy::Ingredient
-      allow_settings %i[date_format input_type]
+      allow_settings %i[date_format]
 
       def value
         ActiveRecord::Type::DateTime.new.cast(self[:value])

data/app/models/alchemy/ingredients/headline.rb

@@ -29,7 +29,14 @@ module Alchemy
       end
 
       def size_options
-        sizes.map { |size| [".h#{size}", size] }
+        sizes.map do |size|
+          case size
+          when Array
+            size
+          else
+            [".h#{size}", size]
+          end
+        end
       end
 
       private

data/app/models/alchemy/ingredients/picture.rb

@@ -38,6 +38,12 @@ module Alchemy
         upsample
       ]
 
+      def alt_text(language: Alchemy::Current.language)
+        alt_tag.presence ||
+          picture&.description_for(language) ||
+          picture&.name&.humanize
+      end
+
       # The first 30 characters of the pictures name
       #
       # Used by the Element#preview_text method.

data/app/models/alchemy/ingredients/video.rb

@@ -31,18 +31,6 @@ module Alchemy
       def preview_text(max_length = 30)
         name.to_s[0..max_length - 1]
       end
-
-      %i[
-        autoplay
-        controls
-        loop
-        muted
-        playsinline
-      ].each do |method|
-        define_method(:"#{method}=") do |value|
-          super(ActiveModel::Type::Boolean.new.cast(value))
-        end
-      end
     end
   end
 end

data/app/models/alchemy/language.rb

@@ -68,24 +68,26 @@ module Alchemy
       end
 
       def on_current_site
-        on_site(Site.current)
+        on_site(Current.site)
       end
 
       # Store the current language in the current thread.
+      # @deprecated Use {Alchemy::Current#language=} instead.
       def current=(language)
-        RequestStore.store[:alchemy_current_language] = language
+        Current.language = language
       end
+      deprecate "current=": :"Alchemy::Current.language=", deprecator: Alchemy::Deprecation
 
       # Current language from current thread or default.
+      # @deprecated Use {Alchemy::Current#language} instead.
       def current
-        RequestStore.store[:alchemy_current_language] || default
+        Current.language
       end
+      deprecate current: :"Alchemy::Current.language", deprecator: Alchemy::Deprecation
 
       # The root page of the current language.
       def current_root_page
-        return unless current
-
-        current.pages.language_roots.first
+        Current.language&.pages&.language_roots&.first
       end
 
       # Default language for current site

data/app/models/alchemy/node.rb

@@ -37,9 +37,9 @@ module Alchemy
     class << self
       # Returns all root nodes for current language
       def language_root_nodes
-        raise "No language found" if Language.current.nil?
+        raise "No language found" if Current.language.nil?
 
-        roots.where(language_id: Language.current.id)
+        roots.where(language_id: Current.language.id)
       end
 
       def available_menu_names

data/app/models/alchemy/page/page_elements.rb

@@ -80,21 +80,21 @@ module Alchemy
       #       type: Richtext
       #
       def available_element_definitions(only_element_named = nil)
-        @_element_definitions ||= if only_element_named
+        @_available_element_definitions ||= if only_element_named
           definition = Element.definition_by_name(only_element_named)
           element_definitions_by_name(definition["nestable_elements"])
         else
-          element_definitions
+          element_definitions.dup
         end
 
-        return [] if @_element_definitions.blank?
+        return [] if @_available_element_definitions.blank?
 
         existing_elements = draft_version.elements.not_nested
         @_existing_element_names = existing_elements.pluck(:name)
         delete_unique_element_definitions!
         delete_outnumbered_element_definitions!
 
-        @_element_definitions
+        @_available_element_definitions
       end
 
       # All names of elements that can actually be placed on current page.
@@ -186,18 +186,18 @@ module Alchemy
         end
       end
 
-      # Deletes unique and already present definitions from @_element_definitions.
+      # Deletes unique and already present definitions from @_available_element_definitions.
       #
       def delete_unique_element_definitions!
-        @_element_definitions.delete_if do |element|
+        @_available_element_definitions.delete_if do |element|
           element["unique"] && @_existing_element_names.include?(element["name"])
         end
       end
 
-      # Deletes limited and outnumbered definitions from @_element_definitions.
+      # Deletes limited and outnumbered definitions from @_available_element_definitions.
       #
       def delete_outnumbered_element_definitions!
-        @_element_definitions.delete_if do |element|
+        @_available_element_definitions.delete_if do |element|
           outnumbered = @_existing_element_names.select { |name| name == element["name"] }
           element["amount"] && outnumbered.count >= element["amount"].to_i
         end

data/app/models/alchemy/page/page_layouts.rb

@@ -103,10 +103,10 @@ module Alchemy
         #     page_layouts: [default_intro]
         #
         def available_on_site?(layout)
-          return false unless Alchemy::Site.current
+          return false unless Alchemy::Current.site
 
-          Alchemy::Site.current.definition.blank? ||
-            Alchemy::Site.current.definition.fetch("page_layouts", []).include?(layout["name"])
+          Alchemy::Current.site.definition.blank? ||
+            Alchemy::Current.site.definition.fetch("page_layouts", []).include?(layout["name"])
         end
       end
     end

data/app/models/alchemy/page/page_natures.rb

@@ -101,18 +101,22 @@ module Alchemy
         page_layout.parameterize.underscore
       end
 
-      # Returns the version that's taken for Rails' recycable cache key.
+      # Returns the version string that's taken for Rails' recycable cache key.
       #
-      # Uses the +published_at+ value that's updated when the user publishes the page.
+      def cache_version
+        last_modified_at&.to_s
+      end
+
+      # Returns the timestamp that the page was last modified at, regardless of through
+      # publishing or editing page, or through a change of related objects through ingredients.
+      # Respects the public version not changing if editing a preview.
       #
-      # If the page is the current preview it uses the +updated_at+ value as cache key.
+      # In preview mode, it will take the draft version's updated_at timestamp.
+      # In public mode, it will take the public version's updated_at timestamp.
       #
-      def cache_version
-        if Page.current_preview == id
-          updated_at.to_s
-        else
-          published_at.to_s
-        end
+      def last_modified_at
+        relevant_page_version = (Current.preview_page == self) ? draft_version : public_version
+        relevant_page_version&.updated_at
       end
 
       # Returns true if the page cache control headers should be set.

data/app/models/alchemy/page/page_scopes.rb

@@ -94,11 +94,11 @@ module Alchemy
         #
         scope :searchables, -> { not_restricted.published.contentpages }
 
-        # All pages from +Alchemy::Site.current+
+        # All pages from +Alchemy::Current.site+
         #
         scope :from_current_site,
           -> {
-            where(Language.table_name => {site_id: Site.current || Site.default}).joins(:language)
+            where(Language.table_name => {site_id: Current.site}).joins(:language)
           }
 
         # All pages for xml sitemap

data/app/models/alchemy/page/publisher.rb

@@ -35,6 +35,7 @@ module Alchemy
                 end
               end
             end
+            version.update(updated_at: public_on)
             page.update(published_at: public_on)
           end
         end