alchemy_cms 8.1.9 → 8.2.0

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

@@ -20,20 +20,29 @@ module Alchemy
     #     link_to page.url
     #
     class UrlPath
-      def initialize(page)
+      def initialize(page, optional_params = {})
         @page = page
         @language = @page.language
         @site = @language.site
+        @optional_params = optional_params
       end
 
       def call
-        if @page.language_root?
+        path = if @page.language_root?
           language_root_path
         elsif @site.languages.count(&:public?) > 1
           page_path_with_language_prefix
         else
           page_path_with_leading_slash
         end
+
+        if @optional_params.present?
+          uri = URI(path)
+          uri.query = @optional_params.to_query
+          uri.to_s
+        else
+          path
+        end
       end
 
       private

data/app/models/alchemy/page.rb

@@ -135,6 +135,8 @@ module Alchemy
 
     has_many :page_ingredients, class_name: "Alchemy::Ingredients::Page", foreign_key: :related_object_id, dependent: :nullify
 
+    before_destroy :check_descendants_for_menu_nodes
+
     before_validation :set_language,
       if: -> { language.nil? }
 
@@ -303,8 +305,8 @@ module Alchemy
     # = The url_path for this page
     #
     # @see Alchemy::Page::UrlPath#call
-    def url_path
-      self.class.url_path_class.new(self).call
+    def url_path(optional_params = {})
+      self.class.url_path_class.new(self, optional_params).call
     end
 
     # The page's view partial is dependent from its page layout
@@ -611,5 +613,13 @@ module Alchemy
       ids = node_ids + nodes.flat_map { |n| n.ancestors.pluck(:id) }
       Node.where(id: ids).touch_all
     end
+
+    def check_descendants_for_menu_nodes
+      pages_with_nodes = descendants.joins(:nodes).reorder("alchemy_pages.lft").distinct
+      if pages_with_nodes.exists?
+        errors.add(:descendants, :still_attached_to_nodes, page_names: pages_with_nodes.map(&:name).to_sentence)
+        throw :abort
+      end
+    end
   end
 end

data/app/models/alchemy/page_version.rb

@@ -37,21 +37,21 @@ module Alchemy
     #
     # @param time [DateTime] (Time.current)
     # @returns Boolean
-    def public?(time = Time.current)
+    def public?(time = Current.preview_time)
       already_public_for?(time) && still_public_for?(time)
     end
 
     # Determines if this version is already public for given time
-    # @param time [DateTime] (Time.current)
+    # @param time [DateTime] (Current.preview_time)
     # @returns Boolean
-    def already_public_for?(time = Time.current)
+    def already_public_for?(time = Current.preview_time)
       !public_on.nil? && public_on <= time
     end
 
     # Determines if this version is still public for given time
-    # @param time [DateTime] (Time.current)
+    # @param time [DateTime] (Current.preview_time)
     # @returns Boolean
-    def still_public_for?(time = Time.current)
+    def still_public_for?(time = Current.preview_time)
       public_until.nil? || public_until >= time
     end
 

data/app/models/alchemy/picture.rb

@@ -133,6 +133,16 @@ module Alchemy
       def file_formats(scope = all)
         Alchemy.storage_adapter.file_formats(name, scope:)
       end
+
+      # Preload associations for element editor display
+      #
+      # @param pictures [Array<Picture>] Collection of pictures to preload for
+      def alchemy_element_preloads(pictures)
+        return if pictures.blank?
+
+        # Preload storage-specific associations to avoid N+1 when rendering thumbnails
+        Alchemy.storage_adapter.preload_picture_associations(pictures)
+      end
     end
 
     # Instance methods
@@ -183,8 +193,15 @@ module Alchemy
     end
 
     # Returns the picture description for a given language.
+    #
+    # @param language [Language] The language to get description for
+    # @return [String, nil] The description text or nil
     def description_for(language)
-      descriptions.find_by(language: language)&.text
+      if descriptions.loaded?
+        descriptions.detect { _1.language == language }&.text
+      else
+        descriptions.find_by(language: language)&.text
+      end
     end
 
     # Returns an uri escaped name.
@@ -236,7 +253,7 @@ module Alchemy
     # even if it is also assigned on a restricted page.
     #
     def restricted?
-      pages.any? && pages.not_restricted.blank?
+      related_pages.any? && related_pages.not_restricted.blank?
     end
 
     def image_file_name

data/app/models/alchemy/storage_adapter/active_storage.rb

@@ -188,6 +188,15 @@ module Alchemy
         pictures.with_attached_image_file
       end
 
+      # Preload picture associations on already-loaded records
+      # @param [Array<Alchemy::Picture>] pictures
+      def preload_picture_associations(pictures)
+        ActiveRecord::Associations::Preloader.new(
+          records: pictures,
+          associations: {image_file_attachment: :blob}
+        ).call
+      end
+
       # @param [Alchemy::Attachment]
       # @return [TrueClass, FalseClass]
       def set_attachment_name?(attachment)

data/app/models/alchemy/storage_adapter/dragonfly.rb

@@ -213,6 +213,15 @@ module Alchemy
         pictures.includes(:thumbs)
       end
 
+      # Preload picture associations on already-loaded records
+      # @param [Array<Alchemy::Picture>] pictures
+      def preload_picture_associations(pictures)
+        ActiveRecord::Associations::Preloader.new(
+          records: pictures,
+          associations: :thumbs
+        ).call
+      end
+
       # @param [Alchemy::Attachment]
       # @return [TrueClass, FalseClass]
       def set_attachment_name?(attachment)

data/app/models/alchemy/storage_adapter.rb

@@ -25,6 +25,7 @@ module Alchemy
       :image_file_size,
       :image_file_width,
       :picture_url_class,
+      :preload_picture_associations,
       :preloaded_pictures,
       :preprocessor_class,
       :ransackable_associations,

data/app/models/concerns/alchemy/publishable.rb

@@ -6,13 +6,21 @@ module Alchemy
       scope :draft, -> { where(public_on: nil) }
       scope :scheduled, -> { where.not(public_on: nil) }
 
-      scope :published, ->(at: Time.current) {
+      scope :published, ->(at: Current.preview_time) {
         scheduled
           .where("#{table_name}.public_on <= :at", at:)
           .where(public_until: nil).or(
             where("#{table_name}.public_until > :at", at:)
           )
       }
+
+      validate do
+        if public_on.present? && public_until.present?
+          if public_until <= public_on
+            errors.add(:public_until, :must_be_after_public_on)
+          end
+        end
+      end
     end
 
     # Determines if this record is public
@@ -21,15 +29,15 @@ module Alchemy
     # and returns true if the time given (+Time.current+ per default)
     # is in this timespan.
     #
-    # @param time [DateTime] (Time.current)
+    # @param at [DateTime] (Time.current)
     # @returns Boolean
-    def public?(time = Time.current)
-      already_public_for?(time) && still_public_for?(time)
+    def public?(at: Current.preview_time)
+      already_public_for?(at:) && still_public_for?(at:)
     end
     alias_method :public, :public?
 
-    def scheduled?
-      public_on&.future? || public_until&.future?
+    def scheduled?(at: Current.preview_time)
+      (public_on.present? && public_on > at) || (public_until.present? && public_until > at)
     end
 
     # Determines if this record is publishable
@@ -42,17 +50,17 @@ module Alchemy
     end
 
     # Determines if this record is already public for given time
-    # @param time [DateTime] (Time.current)
+    # @param at [DateTime] (Time.current)
     # @returns Boolean
-    def already_public_for?(time = Time.current)
-      !public_on.nil? && public_on <= time
+    def already_public_for?(at: Current.preview_time)
+      !public_on.nil? && public_on <= at
     end
 
     # Determines if this record is still public for given time
-    # @param time [DateTime] (Time.current)
+    # @param at [DateTime] (Time.current)
     # @returns Boolean
-    def still_public_for?(time = Time.current)
-      public_until.nil? || public_until >= time
+    def still_public_for?(at: Current.preview_time)
+      public_until.nil? || public_until > at
     end
   end
 end

data/app/models/concerns/alchemy/relatable_resource.rb

@@ -2,6 +2,20 @@ module Alchemy
   module RelatableResource
     extend ActiveSupport::Concern
 
+    class_methods do
+      # Preload associations for element editor display
+      #
+      # Override this method in models that need custom preloading
+      # when displayed in the element editor (e.g., preloading
+      # picture thumbnails or products).
+      #
+      # @param records [Array] Collection of records to preload for
+      def alchemy_element_preloads(records)
+        # Default implementation does nothing
+        # Override in subclasses that need preloading
+      end
+    end
+
     included do
       scope :deletable, -> do
         where(
@@ -15,8 +29,8 @@ module Alchemy
         foreign_key: "related_object_id",
         as: :related_object
 
-      has_many :elements, through: :related_ingredients
-      has_many :pages, through: :elements
+      has_many :related_elements, through: :related_ingredients, source: :element
+      has_many :related_pages, through: :related_elements, source: :page
     end
 
     # Returns true if object is not assigned to any ingredient.

data/app/models/concerns/alchemy/touch_elements.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  # If the model has a +elements+ association,
+  # If the model has a +related_elements+ association,
   # it updates all their timestamps after save.
   #
   # Should only be used on bottom to top relations,
@@ -16,9 +16,9 @@ module Alchemy
     private
 
     def touch_elements
-      return unless respond_to?(:elements)
+      return unless respond_to?(:related_elements)
 
-      elements.touch_all
+      related_elements.touch_all
     end
   end
 end

data/app/services/alchemy/element_preloader.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Alchemy
+  # Preloads element trees with all associations and nested elements
+  #
+  # This service efficiently loads element trees to avoid N+1 queries.
+  # It recursively preloads all nested elements to unlimited depth.
+  #
+  # @example Preload elements for a page version
+  #   preloader = Alchemy::ElementPreloader.new(page_version: page_version)
+  #   preloaded_elements = preloader.call
+  #
+  class ElementPreloader
+    # @param page_version [PageVersion] The page version to preload elements for
+    def initialize(page_version:)
+      @page_version = page_version
+      ActiveRecord::Associations::Preloader.new(
+        records: [page_version],
+        associations: {page: :language}
+      ).call
+    end
+
+    # Preloads and returns the element tree with all associations loaded
+    #
+    # @return [Array<Element>] Elements with preloaded nested elements
+    def call
+      # Load all elements for the page version with associations
+      all_elements = load_all_elements
+      return [] if all_elements.empty?
+
+      # Build parent -> children lookup and populate associations
+      populate_nested_associations(all_elements)
+
+      # Root elements are those without a parent
+      root_elements = all_elements.values
+        .select { |e| e.parent_element_id.nil? }
+        .sort_by(&:position)
+      return [] if root_elements.empty?
+
+      preload_related_objects(root_elements)
+
+      root_elements
+    end
+
+    private
+
+    attr_reader :page_version
+
+    # Load all elements for the page version and preload their associations
+    def load_all_elements
+      Element
+        .where(page_version_id: page_version.id)
+        .includes(*element_includes)
+        .index_by(&:id)
+    end
+
+    # Populate the all_nested_elements association for each element
+    def populate_nested_associations(elements_by_id)
+      # Group elements by parent_id
+      elements_by_parent = elements_by_id.values.group_by(&:parent_element_id)
+
+      elements_by_id.each_value do |element|
+        children = elements_by_parent[element.id] || []
+        children = children.sort_by(&:position)
+
+        # Manually set the association target
+        element.association(:all_nested_elements).target = children
+        element.association(:all_nested_elements).loaded!
+      end
+    end
+
+    # Associations to preload for element rendering
+    def element_includes
+      [
+        {ingredients: :related_object},
+        :tags
+      ]
+    end
+
+    # Preload related objects for all ingredients in elements
+    # Allows related objects to preload their associations (e.g., picture thumbnails)
+    def preload_related_objects(root_elements)
+      related_objects_by_class = collect_related_objects(root_elements)
+      return if related_objects_by_class.empty?
+
+      related_objects_by_class.each do |klass, objects|
+        if klass.respond_to?(:alchemy_element_preloads)
+          klass.alchemy_element_preloads(objects)
+        end
+      end
+    end
+
+    # Collect unique related objects from element tree, grouped by class
+    def collect_related_objects(elements, collected = Hash.new { |h, k| h[k] = {} })
+      elements.each do |element|
+        element.ingredients.each do |ingredient|
+          obj = ingredient.related_object
+          collected[obj.class][obj.id] = obj if obj
+        end
+        if element.association(:all_nested_elements).loaded?
+          collect_related_objects(element.all_nested_elements, collected)
+        end
+      end
+      collected.transform_values(&:values)
+    end
+  end
+end

data/app/stylesheets/alchemy/_custom-properties.scss

@@ -155,6 +155,7 @@
   /* Select */
   --select-medium-width: 90px;
   --select-large-width: 120px;
+  --select-x-large-width: 180px;
 
   /* Sidebar */
   --sidebar-width: 232px;

data/app/stylesheets/alchemy/_mixins.scss

@@ -6,7 +6,7 @@
   border-color: $border-color;
   border-radius: $border-radius;
   box-shadow: $box-shadow;
-  outline: none;
+  outline: 0 none;
 
   &::-moz-focus-inner {
     border: none !important;

data/app/stylesheets/alchemy/_themes.scss

@@ -24,6 +24,7 @@
   --button-secondary-hover-bg-color: var(--a-dark-grey);
   --button-secondary-hover-border-color: var(--a-grey);
   --button-secondary-text-color: var(--color-white);
+  --button-primary-text-color: var(--a-darker-grey);
 
   --code-background-color: var(--a-darkest-grey);
   --code-border-color: var(--a-grey);
@@ -309,6 +310,7 @@
   --button-secondary-hover-bg-color: var(--color-white);
   --button-secondary-hover-border-color: var(--color-grey_medium);
   --button-secondary-text-color: var(--text-color);
+  --button-primary-text-color: var(--color-white);
 
   --code-background-color: var(--color-grey_light);
   --code-border-color: var(--border-color);

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

@@ -177,7 +177,8 @@ a img {
   width: 100%;
 }
 
-.hidden {
+.hidden,
+[hidden] {
   display: none !important;
 }
 

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

@@ -237,21 +237,17 @@ button.element-toggle {
       .element-toggle {
         margin-left: 0;
       }
-
-      .element-hidden-icon {
-        display: inline-flex;
-        align-items: center;
-        gap: var(--spacing-1);
-        margin-left: auto;
-      }
-
-      .element-hidden-label {
-        line-height: 1;
-        font-size: var(--font-size_small);
-      }
     }
   }
 
+  .element-status-icons {
+    display: inline-flex;
+    align-items: center;
+    gap: var(--spacing-1);
+    margin-left: auto;
+    font-size: var(--font-size_small);
+  }
+
   &.is-fixed {
     border-width: 0;
     border-radius: 0;
@@ -355,10 +351,6 @@ button.element-toggle {
   }
 
   &.compact {
-    .element-hidden-label {
-      display: none;
-    }
-
     .element-toolbar {
       visibility: hidden;
       position: absolute;
@@ -437,6 +429,16 @@ button.element-toggle {
       transform 1s ease-in;
   }
 
+  .alchemy-popover {
+    width: 360px;
+    padding-bottom: var(--spacing-0);
+
+    label {
+      margin-bottom: var(--spacing-1);
+      font-size: var(--font-size_small);
+    }
+  }
+
   .element-body {
     margin: var(--spacing-2);
   }
@@ -449,7 +451,7 @@ button.element-toggle {
     text-align: left;
   }
 
-  alchemy-message {
+  > alchemy-message {
     margin: var(--spacing-2);
   }
 
@@ -538,7 +540,7 @@ button.element-toggle {
   }
 }
 
-.element-hidden-icon {
+.element-status-icons {
   display: none;
   white-space: nowrap;
   flex-shrink: 0;
@@ -1075,7 +1077,8 @@ select.long {
     .picture_thumbnail,
     .select2-container,
     .tinymce_container {
-      outline: 1px solid var(--element-dirty-border-color);
+      box-shadow: 0 0 0 1px var(--element-dirty-border-color);
+      border-color: var(--element-dirty-border-color);
     }
   }
 

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

@@ -8,6 +8,9 @@ input[type="text"],
 input[type="email"],
 input[type="password"],
 input[type="search"],
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
 .thin_border,
 .input_field {
   @extend %default-input-style;

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

@@ -260,11 +260,24 @@ form {
   }
 
   .submit {
+    display: flex;
     padding: var(--spacing-1) 0;
-    text-align: right;
+    justify-content: space-between;
+
+    > button:last-of-type {
+      margin-left: auto;
+    }
+  }
+
+  &.simple_form {
+    .buttons {
+      margin-top: var(--spacing-1);
+      margin-left: var(--form-left-column-width);
+    }
   }
 
   .input-column {
+    width: 50%;
     padding: 0 var(--spacing-1);
 
     input[type] {

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

@@ -112,22 +112,23 @@ div#overlay_text_box {
   border-left: var(--border-default);
   white-space: nowrap;
   background-color: var(--toolbar-bg-color);
-
-  select {
-    background-color: transparent;
-    border: none;
-    border-radius: 0;
-    border-left: var(--border-default);
-  }
+  gap: var(--spacing-1);
 
   .current-user-name {
     display: flex;
     align-items: center;
     gap: var(--spacing-1);
-    padding: 0 var(--spacing-3);
+    padding-left: var(--spacing-3);
 
     @media screen and (max-width: vars.$large-screen-break-point) {
       display: none;
     }
   }
 }
+
+#admin_locale {
+  background-color: transparent;
+  border: none;
+  border-radius: 0;
+  border-left: var(--border-default);
+}

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

@@ -11,7 +11,7 @@ alchemy-message {
   word-break: break-word;
   line-height: 1.5;
 
-  turbo-frame & {
+  turbo-frame > & {
     margin: var(--spacing-2);
   }
 

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

@@ -0,0 +1,37 @@
+.alchemy-popover {
+  position: relative;
+  padding: var(--spacing-2);
+
+  alchemy-message {
+    margin-left: 0;
+    margin-right: 0;
+    margin-bottom: var(--spacing-3);
+  }
+
+  .timezone-select {
+    display: flex;
+    gap: var(--spacing-2);
+    align-items: center;
+
+    .alchemy_selectbox {
+      min-width: var(--select-x-large-width);
+    }
+  }
+
+  span.error {
+    display: block;
+    background-color: var(--notice-error-background-color);
+    color: var(--notice-error-text-color);
+    padding: var(--spacing-2);
+    border-radius: var(--border-radius_medium);
+    font-size: var(--font-size_small);
+  }
+
+  .submit {
+    gap: var(--spacing-2);
+
+    button {
+      width: 50%;
+    }
+  }
+}

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

@@ -38,6 +38,10 @@ select {
   &.large {
     width: var(--select-large-width);
   }
+
+  &.x-large {
+    width: var(--select-x-large-width);
+  }
 }
 
 .select2-container {