alchemy_cms 8.0.11 → 8.1.0

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -4,10 +4,11 @@ module Alchemy
   module Admin
     class PagesController < ResourcesController
       include OnPageLayout::CallbacksRunner
+      include Alchemy::Admin::Clipboard
 
       helper "alchemy/pages"
 
-      before_action :load_resource, except: [:index, :flush, :new, :create, :copy_language_tree, :link]
+      before_action :load_resource, except: [:index, :flush, :new, :create, :copy_language_tree, :link, :tree]
 
       authorize_resource class: Alchemy::Page, except: [:index]
 
@@ -20,13 +21,9 @@ module Alchemy
       before_action :set_translation,
         except: [:show]
 
-      before_action :set_root_page,
-        only: [:index, :show]
-
       before_action :set_preview_mode, only: [:show]
 
       before_action :load_languages_and_layouts,
-        unless: -> { @page_root },
         only: [:index]
 
       before_action :set_view, only: [:index, :update]
@@ -62,13 +59,17 @@ module Alchemy
 
           items = items.page(params[:page] || 1).per(items_per_page)
           @pages = items
+        elsif @current_language.root_page
+          @root_page = @current_language.root_page
         end
       end
 
-      # Returns all pages as a tree from the root given by the id parameter
-      #
       def tree
-        render json: serialized_page_tree
+        @root_page = Alchemy::PageTreePreloader.new(
+          page: @current_language.root_page,
+          user: current_alchemy_user,
+          admin_includes: true
+        ).call
       end
 
       # Used by page preview iframe in Page#edit view.
@@ -89,8 +90,6 @@ module Alchemy
       def new
         @page ||= Page.new(layoutpage: params[:layoutpage] == "true", parent_id: params[:parent_id])
         @page_layouts = Page.layouts_for_select(@current_language.id, layoutpages: @page.layoutpage?)
-        @clipboard = get_clipboard("pages")
-        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, @current_language.id, layoutpages: @page.layoutpage?)
       end
 
       def create
@@ -144,12 +143,8 @@ module Alchemy
           if @view == "list"
             flash[:notice] = @notice
           end
-
-          unless @while_page_edit
-            @tree = serialized_page_tree
-          end
         else
-          render :configure, status: :unprocessable_entity
+          render :configure, status: 422
         end
       end
 
@@ -159,8 +154,7 @@ module Alchemy
           flash[:notice] = Alchemy.t("Page deleted", name: @page.name)
 
           # Remove page from clipboard
-          clipboard = get_clipboard("pages")
-          clipboard.delete_if { |item| item["id"] == @page.id.to_s }
+          remove_resource_from_clipboard(@page)
         else
           flash[:warning] = @page.errors.full_messages.to_sentence
         end
@@ -178,8 +172,22 @@ module Alchemy
 
       def fold
         # @page is fetched via before filter
-        @page.fold!(current_alchemy_user.id, !@page.folded?(current_alchemy_user.id))
-        render json: serialized_page_tree
+        was_folded = @page.folded?(current_alchemy_user.id)
+        @page.fold!(current_alchemy_user.id, !was_folded)
+
+        respond_to do |format|
+          format.turbo_stream do
+            if was_folded
+              @page = PageTreePreloader.new(
+                page: @page,
+                user: current_alchemy_user,
+                admin_includes: true
+              ).call
+            else
+              head 200
+            end
+          end
+        end
       end
 
       # Leaves the page editing mode and unlocks the page for other users
@@ -205,9 +213,6 @@ module Alchemy
       def publish
         # fetching page via before filter
         @page.publish!
-
-        flash[:notice] = Alchemy.t(:page_published, name: @page.name)
-        redirect_back(fallback_location: admin_pages_path)
       end
 
       def copy_language_tree
@@ -217,8 +222,12 @@ module Alchemy
       end
 
       def flush
-        PageVersion.where(page_id: @current_language.pages.select(:id)).published.touch_all
-        respond_to { |format| format.js }
+        @current_language.pages.flushables.update_all(published_at: Time.current)
+        # We need to ensure, that also all layoutpages get the +published_at+ timestamp set,
+        # but not set to public true, because the cache_key for an element is +published_at+
+        # and we don't want the layout pages to be present in +Page.published+ scope.
+        @current_language.pages.flushable_layoutpages.update_all(published_at: Time.current)
+        respond_to { |format| format.turbo_stream }
       end
 
       private
@@ -309,30 +318,15 @@ module Alchemy
         @page.locker.try!(:id) != current_alchemy_user.try!(:id)
       end
 
-      def paste_from_clipboard
-        if params[:paste_from_clipboard]
-          source = Page.find(params[:paste_from_clipboard])
-          parent = Page.find_by(id: params[:page][:parent_id])
-          Page.copy_and_paste(source, parent, params[:page][:name])
-        end
-      end
-
-      def set_root_page
-        @page_root = @current_language.root_page
+      # Overridden from Alchemy::Admin::Clipboard concern
+      def clipboard_items
+        @clipboard_items ||= Page.all_from_clipboard_for_select(clipboard, @current_language.id, layoutpages: @page.layoutpage?)
       end
 
       def set_page_version
         @page_version = @page.draft_version
       end
 
-      def serialized_page_tree
-        PageTreeSerializer.new(
-          @page,
-          ability: current_ability,
-          user: current_alchemy_user
-        )
-      end
-
       def load_languages_and_layouts
         @language = @current_language
         @languages_with_page_tree = Language.on_current_site.with_root_page

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -8,8 +8,6 @@ module Alchemy
       include CurrentLanguage
       include PictureDescriptionsFormHelper
 
-      helper "alchemy/admin/tags"
-
       before_action :load_resource,
         only: [:edit, :update, :url, :destroy]
 
@@ -45,7 +43,7 @@ module Alchemy
         @previous = @pictures.prev_page
         @next = @pictures.next_page
 
-        @assignments = @picture.related_ingredients.joins(element: :page).merge(PageVersion.drafts)
+        @assignments = @picture.related_ingredients.joins(element: :page).merge(PageVersion.draft)
         @picture_description = @picture.descriptions.find_or_initialize_by(
           language_id: Alchemy::Current.language.id
         )
@@ -66,7 +64,6 @@ module Alchemy
 
       def create
         @picture = Picture.new(picture_params)
-        @picture.name = @picture.humanized_name
         if @picture.save
           render successful_uploader_response(file: @picture)
         else
@@ -91,7 +88,7 @@ module Alchemy
             type: "error"
           }
         end
-        render :update, status: (@message[:type] == "notice") ? :ok : :unprocessable_entity
+        render :update, status: (@message[:type] == "notice") ? 200 : 422
       end
 
       def update_multiple

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -9,7 +9,7 @@ module Alchemy
       extend Alchemy::Admin::ResourceName
       include Alchemy::Admin::ResourceFilter
 
-      helper Alchemy::ResourcesHelper, TagsHelper
+      helper Alchemy::ResourcesHelper
       helper_method :resource_handler, :items_per_page, :items_per_page_options
 
       before_action :load_resource,

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

@@ -12,7 +12,7 @@ module Alchemy
       if params[:page_id].present?
         @ingredients = @ingredients
           .where(alchemy_page_versions: {page_id: params[:page_id]})
-          .merge(Alchemy::PageVersion.drafts)
+          .merge(Alchemy::PageVersion.draft)
           .joins(element: :page_version)
       end
 

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

@@ -28,12 +28,14 @@ module Alchemy
     def nested
       @page = Page.find_by(id: params[:page_id]) || Language.current_root_page
 
+      # Preload the full tree from this page
+      preloaded_page = PageTreePreloader.new(page: @page, user: current_alchemy_user).call
+
       render json: PageTreeSerializer.new(
-        @page,
+        preloaded_page,
         ability: current_ability,
         user: current_alchemy_user,
-        elements: params[:elements],
-        full: true
+        elements: params[:elements]
       )
     end
 

data/app/controllers/alchemy/base_controller.rb

@@ -48,13 +48,13 @@ module Alchemy
 
     def permission_denied(exception = nil)
       if exception
-        Rails.logger.debug <<-WARN.strip_heredoc
+        Logger.debug <<-WARN.strip_heredoc
           /!\\ Failed to permit #{exception.action} on #{exception.subject.inspect} for:
           #{current_alchemy_user.inspect}
         WARN
       end
       if request.format.json?
-        render json: {message: Alchemy.t("You are not authorized")}, status: :unauthorized
+        render json: {message: Alchemy.t("You are not authorized")}, status: 401
       elsif current_alchemy_user
         handle_redirect_for_user
       else
@@ -67,7 +67,7 @@ module Alchemy
       if can?(:index, :alchemy_admin_dashboard)
         redirect_or_render_notice
       else
-        redirect_to Alchemy.unauthorized_path
+        redirect_to Alchemy.config.unauthorized_path
       end
     end
 
@@ -95,14 +95,14 @@ module Alchemy
         render :permission_denied
       else
         store_location
-        redirect_to Alchemy.login_path
+        redirect_to Alchemy.config.login_path
       end
     end
 
     # Logs the current exception to the error log.
     def exception_logger(error)
-      Rails.logger.error("\n#{error.class} #{error.message} in #{error.backtrace.first}")
-      Rails.logger.error(error.backtrace[1..50].each { |line|
+      Logger.error("\n#{error.class} #{error.message} in #{error.backtrace.first}")
+      Logger.error(error.backtrace[1..50].each { |line|
         line.gsub(/#{Rails.root}/, "")
       }.join("\n"))
     end

data/app/controllers/alchemy/pages_controller.rb

@@ -157,7 +157,7 @@ module Alchemy
 
     # Redirects to given url with 301 status
     def redirect_permanently_to(url)
-      redirect_to url, status: :moved_permanently
+      redirect_to url, status: 301
     end
 
     # Returns url parameters that are not internal show page params.
@@ -208,14 +208,20 @@ module Alchemy
     end
 
     def signup_required?
-      if Alchemy.user_class.respond_to?(:admins)
-        Alchemy.user_class.admins.empty?
+      if Alchemy.config.user_class.respond_to?(:admins)
+        Alchemy.config.user_class.admins.empty?
       end
     end
 
     # Returns the etag used for response headers.
     #
-    # If a user is logged in, we append theirs etag to prevent caching of user related content.
+    # The etag is composed of:
+    # - The page's cache key (includes updated_at timestamp)
+    # - Published element IDs (changes when elements enter/leave the published scope)
+    # - The current user's cache key (for user-specific content)
+    #
+    # This ensures HTTP caches invalidate when scheduled elements become visible
+    # or hidden, even though the page's updated_at hasn't changed.
     #
     # IMPORTANT:
     #
@@ -224,7 +230,8 @@ module Alchemy
     # Otherwise all users will see the same cached page, regardless of user's state.
     #
     def page_etag
-      [@page, current_alchemy_user]
+      elements_cache_key = @page.public_version&.elements&.published&.order(:id)&.pluck(:id)
+      [@page, elements_cache_key, current_alchemy_user]
     end
 
     # We only render the page if either the cache is disabled for this page
@@ -233,7 +240,6 @@ module Alchemy
     def render_fresh_page?
       must_not_cache? || stale?(
         etag: page_etag,
-        last_modified: @page.last_modified_at,
         public: !@page.restricted,
         template: "pages/show"
       )

data/app/controllers/concerns/alchemy/admin/archive_overlay.rb

@@ -24,7 +24,6 @@ module Alchemy
 
         respond_to do |format|
           format.html { render partial: "archive_overlay" }
-          format.js { render action: "archive_overlay" }
         end
       end
     end

data/app/controllers/concerns/alchemy/admin/clipboard.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# Clipboard functionality for Alchemy admin controllers.
+module Alchemy::Admin::Clipboard
+  extend ActiveSupport::Concern
+
+  included do
+    helper_method :clipboard, :clipboard_empty?, :clipboard_items
+  end
+
+  # Checks if clipboard for given category is blank
+  def clipboard_empty?(category)
+    clipboard.blank?
+  end
+
+  private
+
+  # Returns clipboard items for given category
+  def get_clipboard(category)
+    session[:alchemy_clipboard] ||= {}
+    session[:alchemy_clipboard][category.to_s] ||= []
+  end
+
+  def clipboard_type
+    controller_name
+  end
+
+  def clipboard
+    @clipboard ||= get_clipboard(clipboard_type)
+  end
+
+  # Overridden in some controllers which use a different scope/parameters
+  def clipboard_items
+    @clipboard_items ||= model_class.all_from_clipboard(clipboard)
+  end
+
+  def item_from_clipboard
+    @item_from_clipboard ||= clipboard.detect { |item| item["id"].to_i == params[:paste_from_clipboard].to_i }
+  end
+
+  def paste_from_clipboard
+    if params[:paste_from_clipboard]
+      source = model_class.find(params[:paste_from_clipboard])
+      parent = model_class.find_by(id: resource_params[:parent_id]) if resource_params[:parent_id]
+      model_class.copy_and_paste(source, parent, params.dig(clipboard_type.singularize.to_sym, :name))
+    end
+  end
+
+  def model_class
+    "alchemy/#{clipboard_type.singularize}".classify.constantize
+  end
+
+  def remove_resource_from_clipboard(resource)
+    clipboard = get_clipboard(clipboard_type)
+    clipboard.delete_if { |item| item["id"] == resource.id.to_s }
+  end
+end

data/app/controllers/concerns/alchemy/admin/uploader_responses.rb

@@ -5,7 +5,7 @@ module Alchemy
     module UploaderResponses
       extend ActiveSupport::Concern
 
-      def successful_uploader_response(file:, status: :created)
+      def successful_uploader_response(file:, status: 201)
         message = Alchemy.t(:upload_success,
           scope: [:uploader, file.class.model_name.i18n_key],
           name: file.name)
@@ -24,7 +24,7 @@ module Alchemy
 
         {
           json: {message: message},
-          status: :unprocessable_entity
+          status: 422
         }
       end
     end

data/app/controllers/concerns/alchemy/site_redirects.rb

@@ -12,7 +12,7 @@ module Alchemy
     private
 
     def enforce_primary_host_for_site
-      redirect_to url_for(host: current_alchemy_site.host), status: :moved_permanently, allow_other_host: true
+      redirect_to url_for(host: current_alchemy_site.host), status: 301, allow_other_host: true
     end
 
     def needs_redirect_to_primary_host?

data/app/decorators/alchemy/ingredient_editor.rb

@@ -4,9 +4,11 @@ module Alchemy
   class IngredientEditor < SimpleDelegator
     alias_method :ingredient, :__getobj__
 
+    # @deprecated
     def to_partial_path
       "alchemy/ingredients/#{partial_name}_editor"
     end
+    deprecate :to_partial_path, deprecator: Alchemy::Deprecation
 
     # Returns the translated role for displaying in labels
     #
@@ -23,6 +25,7 @@ module Alchemy
     #       article:
     #         foo: Baz
     #
+    # @deprecated
     def translated_role
       Alchemy.t(
         role,
@@ -30,7 +33,9 @@ module Alchemy
         default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize)
       )
     end
+    deprecate translated_role: "Use Ingredient#translated_role instead", deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def css_classes
       [
         "ingredient-editor",
@@ -42,13 +47,16 @@ module Alchemy
         settings[:anchor] ? "with-anchor" : nil
       ].compact
     end
+    deprecate :css_classes, deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def data_attributes
       {
         ingredient_id: id,
         ingredient_role: role
       }
     end
+    deprecate :data_attributes, deprecator: Alchemy::Deprecation
 
     # Returns a string to be passed to Rails form field tags to ensure it can be used with Rails' nested attributes.
     #
@@ -64,17 +72,20 @@ module Alchemy
     #
     #   <%= text_field_tag text_editor.form_field_name(:link), text_editor.value %>
     #
+    # @deprecated
     def form_field_name(column = "value")
       "element[ingredients_attributes][#{form_field_counter}][#{column}]"
     end
+    deprecate :form_field_name, deprecator: Alchemy::Deprecation
 
     # Returns a unique string to be passed to a form field id.
     #
     # @param column [String] A Ingredient column_name. Default is 'value'
-    #
+    # @deprecated
     def form_field_id(column = "value")
       "element_#{element.id}_ingredient_#{id}_#{column}"
     end
+    deprecate :form_field_id, deprecator: Alchemy::Deprecation
 
     # Fixes Rails partial renderer calling to_model on the object
     # which reveals the delegated ingredient instead of this decorator.
@@ -84,29 +95,38 @@ module Alchemy
       super
     end
 
+    # @deprecated
     def has_warnings?
       definition.blank? || deprecated?
     end
+    deprecate :has_warnings?, deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def linked?
       link.try(:present?)
     end
+    deprecate :linked?, deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def warnings
       return unless has_warnings?
 
       if definition.blank?
-        Logger.warn("ingredient #{role} is missing its definition", caller(1..1))
+        Logger.warn("ingredient '#{role}' is missing its definition! Please check your element definitions.")
         Alchemy.t(:ingredient_definition_missing)
       else
         definition.deprecation_notice(element_name: element&.name)
       end
     end
+    deprecate :warnings, deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def validations
       definition.validate
     end
+    deprecate :validations, deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def format_validation
       format = validations.select { _1.is_a?(Hash) }.find { _1[:format] }&.fetch(:format)
       return nil unless format
@@ -118,15 +138,28 @@ module Alchemy
         format
       end
     end
+    deprecate :format_validation, deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def length_validation
       validations.select { _1.is_a?(Hash) }.find { _1[:length] }&.fetch(:length)
     end
+    deprecate :length_validation, deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def presence_validation?
-      validations.include?("presence") ||
-        validations.any? { _1.is_a?(Hash) && _1[:presence] == true }
+      validations.any? do |validation|
+        case validation
+        when :presence, "presence"
+          true
+        when Hash
+          validation[:presence] == true || validation["presence"] == true
+        else
+          false
+        end
+      end
     end
+    deprecate :presence_validation?, deprecator: Alchemy::Deprecation
 
     private
 

data/app/helpers/alchemy/admin/base_helper.rb

@@ -57,10 +57,14 @@ module Alchemy
         if html_options[:title]
           tooltip = html_options.delete(:title)
         end
-        anchor = link_to(content, url, html_options.merge(
-          "data-dialog-options" => options.to_json,
-          :is => "alchemy-dialog-link"
-        ))
+        anchor = if url.nil?
+          tag.a(content, class: "disabled #{html_options[:class]}".strip, tabindex: "-1")
+        else
+          link_to(content, url, html_options.merge(
+            "data-dialog-options" => options.to_json,
+            :is => "alchemy-dialog-link"
+          ))
+        end
         if tooltip
           content_tag("sl-tooltip", anchor, content: tooltip)
         else
@@ -285,9 +289,9 @@ module Alchemy
       # @param icon: 'alert' [String] - Icon name
       #
       # @return [String]
-      def hint_with_tooltip(text, icon: "alert")
+      def hint_with_tooltip(text, icon: "alert", icon_class: nil)
         content_tag :"sl-tooltip", class: "like-hint-tooltip", content: text, placement: "bottom" do
-          render_icon(icon)
+          render_icon(icon, class: icon_class)
         end
       end
 

data/app/helpers/alchemy/admin/ingredients_helper.rb

@@ -9,8 +9,8 @@ module Alchemy
       #
       # Displays a warning icon if ingredient is missing its definition.
       #
-      # Displays a mandatory field indicator, if the ingredient has validations.
-      #
+      # Displays a mandatory field indicator, if the ingredient has a presence validation.
+      # @deprecated
       def render_ingredient_role(ingredient)
         if ingredient.blank?
           warning("Ingredient is nil")
@@ -24,14 +24,16 @@ module Alchemy
           content = "#{icon} #{content}".html_safe
         end
 
-        if ingredient.has_validations?
+        if ingredient.presence_validation?
           "#{content}<span class='validation_indicator'>*</span>".html_safe
         else
           content
         end
       end
+      deprecate :render_ingredient_role, deprecator: Alchemy::Deprecation
 
       # Renders the label and hint for a ingredient.
+      # @deprecated
       def ingredient_label(ingredient, column = :value, html_options = {})
         label_tag ingredient.form_field_id(column), html_options do
           [
@@ -40,6 +42,7 @@ module Alchemy
           ].compact.join("&nbsp;").html_safe
         end
       end
+      deprecate :ingredient_label, deprecator: Alchemy::Deprecation
     end
   end
 end

data/app/helpers/alchemy/base_helper.rb

@@ -5,7 +5,7 @@ module Alchemy
     # Logs a message in the Rails logger (warn level)
     # and optionally displays an error message to the user.
     def warning(message, text = nil)
-      Logger.warn(message, caller(1..1))
+      Logger.warn(message)
       unless text.nil?
         render_message(:warning) do
           text.html_safe

data/app/helpers/alchemy/pages_helper.rb

@@ -172,7 +172,7 @@ module Alchemy
       if Rails.application.config.consider_all_requests_local?
         raise error, message
       else
-        Rails.logger.error message
+        Logger.error message
         ""
       end
     end

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

@@ -2,6 +2,7 @@ import { reloadPreview } from "alchemy_admin/components/preview_window"
 import { removeTab } from "alchemy_admin/fixed_elements"
 import { closeCurrentDialog } from "alchemy_admin/dialog"
 import IngredientAnchorLink from "alchemy_admin/ingredient_anchor_link"
+import pleaseWaitOverlay from "alchemy_admin/please_wait_overlay"
 
 class Action extends HTMLElement {
   constructor() {
@@ -15,7 +16,10 @@ class Action extends HTMLElement {
       closeCurrentDialog,
       reloadPreview,
       removeFixedElement: removeTab,
-      updateAnchorIcon: IngredientAnchorLink.updateIcon
+      updateAnchorIcon: IngredientAnchorLink.updateIcon,
+      hidePleaseWaitOverlay() {
+        pleaseWaitOverlay(false)
+      }
     }
   }