alchemy_cms 7.1.9 → 7.2.0.b

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/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

data/app/models/alchemy/page.rb

@@ -200,17 +200,19 @@ module Alchemy
         %w[name urlname title]
       end
 
-      # Used to store the current page id previewed in the edit page template.
-      #
+      # Used to store the current page previewed in the edit page template.
+      # @deprecated Use {Alchemy::Current#preview_page=} instead.
       def current_preview=(page)
-        RequestStore.store[:alchemy_current_preview] = page&.id
+        Current.preview_page = page
       end
+      deprecate "current_preview=": :"Alchemy::Current.preview_page=", deprecator: Alchemy::Deprecation
 
-      # Returns the current page id previewed in the edit page template.
-      #
+      # Returns the current page previewed in the edit page template.
+      # @deprecated Use {Alchemy::Current#preview_page} instead.
       def current_preview
-        RequestStore.store[:alchemy_current_preview]
+        Current.preview_page
       end
+      deprecate current_preview: :"Alchemy::Current.preview_page", deprecator: Alchemy::Deprecation
 
       # @return the language root page for given language id.
       # @param language_id [Fixnum]
@@ -271,8 +273,10 @@ module Alchemy
         options = [[Alchemy.t(:default, scope: "link_target_options"), ""]]
         link_target_options = Config.get(:link_target_options)
         link_target_options.each do |option|
+          # add an underscore to the options to provide the default syntax
+          # @link https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#target
           options << [Alchemy.t(option, scope: "link_target_options",
-            default: option.to_s.humanize), option]
+            default: option.to_s.humanize), "_#{option}"]
         end
         options
       end
@@ -375,7 +379,7 @@ module Alchemy
     #
     def unlock!
       if update_columns(locked_at: nil, locked_by: nil)
-        Page.current_preview = nil
+        Current.preview_page = nil
       end
     end
 
@@ -444,25 +448,6 @@ module Alchemy
 
     delegate :public_until=, to: :public_version, allow_nil: true
 
-    # Updates an Alchemy::Page based on a new ordering to be applied to it
-    #
-    # Note: Page's urls should not be updated (and a legacy URL created) if nesting is OFF
-    # or if the URL is the same
-    #
-    # @param [TreeNode]
-    #   A tree node with new lft, rgt, depth, url, parent_id and restricted indexes to be updated
-    #
-    def update_node!(node)
-      hash = {lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted}
-
-      if urlname != node.url
-        LegacyPageUrl.create(page_id: id, urlname: urlname)
-        hash[:urlname] = node.url
-      end
-
-      update_columns(hash)
-    end
-
     # Holds an instance of +FixedAttributes+
     def fixed_attributes
       @_fixed_attributes ||= FixedAttributes.new(self)
@@ -555,7 +540,7 @@ module Alchemy
     end
 
     def set_language
-      self.language = parent&.language || Language.current
+      self.language = parent&.language || Current.language
       set_language_code
     end
 

data/app/models/alchemy/picture.rb

@@ -55,6 +55,9 @@ module Alchemy
     has_many :elements, through: :picture_ingredients
     has_many :pages, through: :elements
     has_many :thumbs, class_name: "Alchemy::PictureThumb", dependent: :destroy
+    has_many :descriptions, class_name: "Alchemy::PictureDescription", dependent: :destroy
+
+    accepts_nested_attributes_for :descriptions, allow_destroy: true, reject_if: ->(attr) { attr[:text].blank? }
 
     # Raise error, if picture is in use (aka. assigned to an Picture ingredient)
     #
@@ -231,6 +234,11 @@ module Alchemy
       }
     end
 
+    # Returns the picture description for a given language.
+    def description_for(language)
+      descriptions.find_by(language: language)&.text
+    end
+
     # Returns an uri escaped name.
     #
     def urlname

data/app/models/alchemy/picture_description.rb

@@ -0,0 +1,8 @@
+module Alchemy
+  class PictureDescription < ActiveRecord::Base
+    belongs_to :picture, class_name: "Alchemy::Picture"
+    belongs_to :language, class_name: "Alchemy::Language"
+
+    validates_uniqueness_of :picture_id, scope: :language_id
+  end
+end

data/app/models/alchemy/picture_variant.rb

@@ -43,7 +43,7 @@ module Alchemy
 
       @picture = picture
       @options = options
-      @render_format = options[:format] || picture.default_render_format
+      @render_format = (options[:format] || picture.default_render_format).to_s
     end
 
     # Process a variant of picture

data/app/models/alchemy/site.rb

@@ -35,7 +35,7 @@ module Alchemy
 
     # Returns true if this site is the current site
     def current?
-      self.class.current == self
+      Current.site == self
     end
 
     # Returns the path to site's view partial.
@@ -57,23 +57,26 @@ module Alchemy
     end
 
     class << self
+      # @deprecated Use {Alchemy::Current#site=} instead.
       def current=(site)
-        RequestStore.store[:alchemy_current_site] = site
+        Current.site = site
       end
+      deprecate "current=": :"Alchemy::Current.site=", deprecator: Alchemy::Deprecation
 
+      # @deprecated Use {Alchemy::Current#site} instead.
       def current
-        RequestStore.store[:alchemy_current_site] || default
+        Current.site
       end
+      deprecate current: :"Alchemy::Current.site", deprecator: Alchemy::Deprecation
 
-      def default
-        Site.first
-      end
+      alias_method :default, :first
+      deprecate default: :first, deprecator: Alchemy::Deprecation
 
       def find_for_host(host)
         # These are split up into two separate queries in order to run the
         # fastest query first (selecting the domain by its primary host name).
         #
-        find_by(host: host) || find_in_aliases(host) || default
+        find_by(host: host) || find_in_aliases(host) || first
       end
 
       def find_in_aliases(host)

data/app/serializers/alchemy/attachment_serializer.rb

@@ -7,8 +7,16 @@ module Alchemy
       :file_name,
       :file_mime_type,
       :file_size,
+      :icon_css_class,
       :tag_list,
       :created_at,
       :updated_at
+
+    attribute :url do
+      Alchemy::Engine.routes.url_helpers.download_attachment_path(
+        id: object.id,
+        name: object.file_name
+      )
+    end
   end
 end

data/app/serializers/alchemy/page_node_serializer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PageNodeSerializer < ActiveModel::Serializer
+    attributes :id,
+      :url_path,
+      :parent_id
+  end
+end

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

@@ -1,4 +1,4 @@
-<% if !@preview_mode && @page && can?(:edit_content, @page) %>
+<% if !Alchemy::Current.preview_page? && @page && can?(:edit_content, @page) %>
   <alchemy-menubar>
     <template>
       <%= stylesheet_link_tag("alchemy/menubar") %>

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

@@ -1,4 +1,4 @@
-<% if @preview_mode %>
+<% if Alchemy::Current.preview_page? %>
   <script type="text/javascript">
     Alchemy = { locale: "<%= session[:alchemy_locale] %>" };
   </script>