alchemy_cms 8.0.11 → 8.1.0

data/app/javascript/alchemy_admin/templates/compiled.js

@@ -1 +1 @@
-(()=>{var n=Handlebars.template,e=Handlebars.templates=Handlebars.templates||{};e["node_folder.hbs"]=n({1:function(n,e,l,a,r){return"right"},3:function(n,e,l,a,r){return"down"},compiler:[8,">= 4.3.0"],main:function(n,e,l,a,r){var o,t=n.lambda,u=n.escapeExpression,c=n.lookupProperty||function(n,e){if(Object.prototype.hasOwnProperty.call(n,e))return n[e]};return'<a class="node_folder" data-record-id="'+u(t(null!=(o=null!=e?c(e,"node"):e)?c(o,"id"):o,e))+'" data-record-type="'+u(t(null!=(o=null!=e?c(e,"node"):e)?c(o,"type"):o,e))+'">\n  <alchemy-icon name="arrow-'+(null!=(o=c(l,"if").call(null!=e?e:n.nullContext||{},null!=(o=null!=e?c(e,"node"):e)?c(o,"folded"):o,{name:"if",hash:{},fn:n.program(1,r,0),inverse:n.program(3,r,0),data:r,loc:{start:{line:2,column:28},end:{line:2,column:72}}}))?o:"")+'-s"></alchemy-icon>\n</a>\n'},useData:!0}),e["page_folder.hbs"]=n({1:function(n,e,l,a,r){return"right"},3:function(n,e,l,a,r){return"down"},compiler:[8,">= 4.3.0"],main:function(n,e,l,a,r){var o,t=n.lookupProperty||function(n,e){if(Object.prototype.hasOwnProperty.call(n,e))return n[e]};return'<a class="page_folder icon_button" data-page-id="'+n.escapeExpression(n.lambda(null!=(o=null!=e?t(e,"page"):e)?t(o,"id"):o,e))+'">\n  <alchemy-icon name="arrow-'+(null!=(o=t(l,"if").call(null!=e?e:n.nullContext||{},null!=(o=null!=e?t(e,"page"):e)?t(o,"folded"):o,{name:"if",hash:{},fn:n.program(1,r,0),inverse:n.program(3,r,0),data:r,loc:{start:{line:2,column:28},end:{line:2,column:72}}}))?o:"")+'-s"></alchemy-icon>\n</a>\n'},useData:!0})})();
+(()=>{var n=Handlebars.template;(Handlebars.templates=Handlebars.templates||{})["node_folder.hbs"]=n({1:function(n,e,l,a,r){return"right"},3:function(n,e,l,a,r){return"down"},compiler:[8,">= 4.3.0"],main:function(n,e,l,a,r){var o,t=n.lambda,d=n.escapeExpression,u=n.lookupProperty||function(n,e){if(Object.prototype.hasOwnProperty.call(n,e))return n[e]};return'<a class="node_folder" data-record-id="'+d(t(null!=(o=null!=e?u(e,"node"):e)?u(o,"id"):o,e))+'" data-record-type="'+d(t(null!=(o=null!=e?u(e,"node"):e)?u(o,"type"):o,e))+'">\n  <alchemy-icon name="arrow-'+(null!=(o=u(l,"if").call(null!=e?e:n.nullContext||{},null!=(o=null!=e?u(e,"node"):e)?u(o,"folded"):o,{name:"if",hash:{},fn:n.program(1,r,0),inverse:n.program(3,r,0),data:r,loc:{start:{line:2,column:28},end:{line:2,column:72}}}))?o:"")+'-s"></alchemy-icon>\n</a>\n'},useData:!0})})();

data/app/javascript/alchemy_admin/utils/ajax.js

@@ -1,4 +1,5 @@
 const JSON_CONTENT_TYPE = "application/json"
+const TURBO_STREAM_CONTENT_TYPE = "text/vnd.turbo-stream.html"
 
 function isGetRequest(method) {
   return method.toLowerCase() === "get"
@@ -43,8 +44,8 @@ export function get(url, params) {
   return ajax("GET", url, params)
 }
 
-export function patch(url, data) {
-  return ajax("PATCH", url, data)
+export function patch(url, data, accept) {
+  return ajax("PATCH", url, data, accept)
 }
 
 export function post(url, data, accept = JSON_CONTENT_TYPE) {
@@ -63,7 +64,18 @@ export default async function ajax(
   )
   const contentType = response.headers.get("content-type")
   const isJson = contentType?.includes(JSON_CONTENT_TYPE)
-  const responseData = isJson ? await response.json() : null
+  const isTurboStream = contentType?.includes(TURBO_STREAM_CONTENT_TYPE)
+
+  let responseData = null
+  if (isJson) {
+    responseData = await response.json()
+  } else if (isTurboStream) {
+    responseData = await response.text()
+    // Automatically render Turbo Stream if Turbo is available
+    if (typeof Turbo !== "undefined") {
+      Turbo.renderStreamMessage(responseData)
+    }
+  }
 
   if (response.ok) {
     return { data: responseData, status: response.status }

data/app/javascript/alchemy_admin.js

@@ -12,13 +12,10 @@ import { currentDialog, closeCurrentDialog } from "alchemy_admin/dialog"
 import Dirty from "alchemy_admin/dirty"
 import * as FixedElements from "alchemy_admin/fixed_elements"
 import { growl } from "alchemy_admin/growler"
-import ImageLoader from "alchemy_admin/image_loader"
 import Initializer from "alchemy_admin/initializer"
 import { LinkDialog } from "alchemy_admin/link_dialog"
 import pleaseWaitOverlay from "alchemy_admin/please_wait_overlay"
-import Sitemap from "alchemy_admin/sitemap"
 import Spinner from "alchemy_admin/spinner"
-import PagePublicationFields from "alchemy_admin/page_publication_fields"
 import { reloadPreview } from "alchemy_admin/components/preview_window"
 import { openConfirmDialog } from "alchemy_admin/confirm_dialog"
 
@@ -44,12 +41,9 @@ Object.assign(Alchemy, {
   t: translate, // Global utility method for translating a given string
   FixedElements,
   growl,
-  ImageLoader: ImageLoader.init,
   LinkDialog,
   pleaseWaitOverlay,
-  Sitemap,
   Spinner,
-  PagePublicationFields,
   reloadPreview
 })
 

data/app/models/alchemy/attachment.rb

@@ -25,9 +25,11 @@ module Alchemy
     include Alchemy::TouchElements
     include Alchemy::RelatableResource
 
+    before_save :set_name, if: -> { Alchemy.storage_adapter.set_attachment_name?(self) }
+
     include Alchemy.storage_adapter.attachment_class_methods
 
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.config.user_class_name
 
     scope :by_file_type, ->(*file_type) do
       Alchemy.storage_adapter.by_file_type_scope(file_type)
@@ -97,8 +99,6 @@ module Alchemy
     validate :file_type_allowed,
       unless: -> { self.class.allowed_filetypes.include?("*") }
 
-    before_save :set_name, if: -> { Alchemy.storage_adapter.set_attachment_name?(self) }
-
     scope :with_file_type, ->(file_type) { where(file_mime_type: file_type) }
 
     # Instance methods
@@ -179,7 +179,7 @@ module Alchemy
     end
 
     def set_name
-      self.name ||= convert_to_humanized_name(file_name, extension)
+      self.name ||= Alchemy.storage_adapter.file_basename(self).humanize
     end
   end
 end

data/app/models/alchemy/element/definitions.rb

@@ -44,8 +44,7 @@ module Alchemy
         if (definition = self.class.definition_by_name(name))
           definition
         else
-          log_warning "Could not find element definition for #{name}. " \
-                      "Please check your elements.yml file!"
+          Logger.warn "Could not find element definition for '#{name}'! Please check your element definitions."
           ElementDefinition.new
         end
       end

data/app/models/alchemy/element/element_ingredients.rb

@@ -61,8 +61,12 @@ module Alchemy
         if ingredient_definitions.blank?
           nil
         else
-          ingredient_definitions.find { _1.role == role.to_s } ||
-            log_warning("Element #{name} is missing the ingredient definition for #{role}")
+          definition = ingredient_definitions.find { _1.role == role.to_s }
+          return definition if definition.present?
+
+          Logger.warn <<-WARN.strip_heredoc
+            Element '#{name}' is missing the ingredient definition for '#{role}'! Please check your element definitions.
+          WARN
         end
       end
 

data/app/models/alchemy/element.rb

@@ -8,7 +8,8 @@
 #  name              :string
 #  position          :integer
 #  page_version_id   :integer          not null
-#  public            :boolean          default(TRUE)
+#  public_on         :timestamp
+#  public_until      :timestamp
 #  fixed             :boolean          default(FALSE)
 #  folded            :boolean          default(FALSE)
 #  unique            :boolean          default(FALSE)
@@ -28,8 +29,13 @@ module Alchemy
   class Element < BaseRecord
     NAME_REGEXP = /\A[a-z0-9_-]+\z/
 
-    include Alchemy::Logger
+    # These columns are deprecated in favor of publication time stamps
+    self.ignored_columns += [
+      "public"
+    ]
+
     include Alchemy::Taggable
+    include Publishable
 
     FORBIDDEN_DEFINITION_ATTRIBUTES = [
       "amount",
@@ -56,7 +62,7 @@ module Alchemy
     #
     acts_as_list scope: [:page_version_id, :fixed, :parent_element_id]
 
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.config.user_class_name
 
     before_destroy :delete_all_nested_elements
 
@@ -91,13 +97,13 @@ module Alchemy
     validates_presence_of :name, on: :create
     validates_format_of :name, on: :create, with: NAME_REGEXP
 
+    after_initialize :set_default_public_on, if: :new_record?
+
     attr_accessor :autogenerate_nested_elements
     after_create :generate_nested_elements, unless: -> { autogenerate_nested_elements == false }
 
     after_update :touch_touchable_pages
 
-    scope :published, -> { where(public: true) }
-    scope :hidden, -> { where(public: false) }
     scope :not_restricted, -> { joins(:page).merge(Page.not_restricted) }
     scope :named, ->(names) { where(name: names) }
     scope :excluded, ->(names) { where.not(name: names) }
@@ -118,6 +124,9 @@ module Alchemy
 
     # class methods
     class << self
+      alias_method :hidden, :draft
+      deprecate hidden: :draft, deprecator: Alchemy::Deprecation
+
       # Builds a new element as described in +/config/alchemy/elements.yml+
       #
       # - Returns a new Alchemy::Element object if no name is given in attributes,
@@ -174,13 +183,21 @@ module Alchemy
       end
     end
 
-    # Heavily unoptimized naive way to get all parent ids
-    def parent_element_ids
-      ids ||= []
-      parent = parent_element
-      while parent
-        ids.push parent.id
-        parent = parent.parent_element
+    # Returns IDs of all folded parent elements from immediate parent up to root
+    #
+    # Walks up the ancestor chain and collects only the ones that are folded,
+    # skipping already expanded parents.
+    #
+    # @return [Array<Integer>] Folded parent element IDs from immediate parent to root
+    def folded_parent_element_ids
+      return [] unless parent_element_id
+
+      ids = []
+      current_id = parent_element_id
+      while current_id
+        folded, parent_id = self.class.where(id: current_id).pick(:folded, :parent_element_id)
+        ids << current_id if folded
+        current_id = parent_id
       end
       ids
     end
@@ -212,6 +229,25 @@ module Alchemy
       end
     end
 
+    # Convenience setter to set public_on attribute
+    # when setting public to true or false.
+    def public=(value)
+      @public_on_explicitely_set = true
+      if ActiveModel::Type::Boolean.new.cast(value)
+        self.public_on ||= Time.current
+      else
+        self.public_on = nil
+      end
+    end
+
+    # Override setter to track if public_on was already set
+    # in order to not override it with default value if someone
+    # explicitly set it to nil.
+    def public_on=(value)
+      @public_on_explicitely_set = true
+      super
+    end
+
     # Returns true if the definition of this element has a taggable true value.
     def taggable?
       definition.taggable == true
@@ -284,12 +320,17 @@ module Alchemy
 
     private
 
+    def set_default_public_on
+      return if @public_on_explicitely_set
+      self.public_on ||= Time.current
+    end
+
     def generate_nested_elements
       definition.autogenerate.each do |nestable_element|
         if nestable_elements.include?(nestable_element)
           Element.create(page_version: page_version, parent_element_id: id, name: nestable_element)
         else
-          log_warning("Element '#{nestable_element}' not a nestable element for '#{name}'. Skipping!")
+          Logger.warn("Element '#{nestable_element}' not a nestable element for '#{name}'. Skipping!")
         end
       end
     end

data/app/models/alchemy/element_definition.rb

@@ -4,7 +4,6 @@ module Alchemy
   class ElementDefinition
     include ActiveModel::Model
     include ActiveModel::Attributes
-    include Alchemy::Hints
 
     extend ActiveModel::Translation
 
@@ -24,6 +23,10 @@ module Alchemy
     attribute :icon
     attribute :searchable, :boolean, default: true
 
+    # Needs to be down here in order to have the attribute reader
+    # available after the attribute is defined.
+    include Alchemy::Hints
+
     validates :name,
       presence: true,
       format: {

data/app/models/alchemy/elements_repository.rb

@@ -22,6 +22,12 @@ module Alchemy
       self.class.new select(&:public)
     end
 
+    # All publishable elements
+    # @return [Alchemy::ElementRepository]
+    def publishable
+      self.class.new select(&:publishable?)
+    end
+
     # All not fixed elements
     # @return [Alchemy::ElementRepository]
     def hidden

data/app/models/alchemy/folded_page.rb

@@ -13,10 +13,10 @@
 module Alchemy
   class FoldedPage < BaseRecord
     belongs_to :page, inverse_of: :folded_pages
-    belongs_to :user, inverse_of: :folded_pages, class_name: Alchemy.user_class_name
+    belongs_to :user, inverse_of: :folded_pages, class_name: Alchemy.config.user_class_name
 
     def self.folded_for_user(user)
-      return none unless Alchemy.user_class < ActiveRecord::Base
+      return none unless Alchemy.config.user_class.respond_to?(:where)
 
       where(user: user, folded: true)
     end

data/app/models/alchemy/ingredient.rb

@@ -110,6 +110,25 @@ module Alchemy
       element.ingredient_definition_for(role) || IngredientDefinition.new
     end
 
+    # Returns the translated role for displaying in labels
+    #
+    # Translate it in your locale yml file:
+    #
+    #   alchemy:
+    #     ingredient_roles:
+    #       foo: Bar
+    #
+    # Optionally you can scope your ingredient role to an element:
+    #
+    #   alchemy:
+    #     ingredient_roles:
+    #       article:
+    #         foo: Baz
+    #
+    def translated_role
+      self.class.translated_label_for(role, element&.name)
+    end
+
     # The first 30 characters of the value
     #
     # Used by the Element#preview_text method.
@@ -141,6 +160,10 @@ module Alchemy
       false
     end
 
+    def linked?
+      link.try(:present?)
+    end
+
     # @return [Boolean]
     def preview_ingredient?
       !!definition.as_element_title
@@ -154,10 +177,24 @@ module Alchemy
       view_component_class.new(self, **options, html_options: html_options)
     end
 
+    # The editor component of the ingredient.
+    #
+    def as_editor_component
+      editor_component_class.new(self)
+    end
+
     private
 
     def view_component_class
-      @_view_component_class ||= "#{self.class.name}View".constantize
+      @_view_component_class ||= component_class_name(part: "View").constantize
+    end
+
+    def editor_component_class
+      @_editor_component_class ||= component_class_name(part: "Editor").constantize
+    end
+
+    def component_class_name(part:)
+      "#{self.class.name}#{part}"
     end
 
     def set_default_value

data/app/models/alchemy/ingredient_definition.rb

@@ -4,7 +4,6 @@ module Alchemy
   class IngredientDefinition
     include ActiveModel::Model
     include ActiveModel::Attributes
-    include Alchemy::Hints
 
     extend ActiveModel::Translation
 
@@ -19,6 +18,10 @@ module Alchemy
     attribute :hint
     attribute :searchable, :boolean, default: true
 
+    # Needs to be down here in order to have the attribute reader
+    # available after the attribute is defined.
+    include Alchemy::Hints
+
     validates :role,
       presence: true,
       format: {

data/app/models/alchemy/ingredient_validator.rb

@@ -80,6 +80,8 @@ module Alchemy
     end
 
     def validate_format(format)
+      return if ingredient.value.blank?
+
       matcher = if format.is_a?(String) || format.is_a?(Symbol)
         Alchemy.config.format_matchers.get(format)
       else
@@ -91,6 +93,8 @@ module Alchemy
     end
 
     def validate_length(opts = {})
+      return if ingredient.value.blank?
+
       value_length = ingredient.value.to_s.length
       if value_length < opts[:minimum]
         ingredient.errors.add(:value, :too_short, count: opts[:minimum])
@@ -103,10 +107,10 @@ module Alchemy
     def duplicates
       ingredient.class
         .joins(:element, :page_version, :language)
-        .merge(Alchemy::PageVersion.drafts)
+        .merge(Alchemy::PageVersion.draft)
         .merge(Alchemy::Language.where(id: ingredient.language.id))
         .where(Alchemy::Element.table_name => {name: ingredient.element.name})
-        .where(value: ingredient.value)
+        .where(ingredient.class.arel_table[:value].eq(ingredient.value_before_type_cast))
         .where.not(id: ingredient.id)
     end
   end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    # A Color value
+    #
+    class Color < Alchemy::Ingredient
+    end
+  end
+end

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

@@ -24,23 +24,6 @@ module Alchemy
         "H#{level}: #{value}"[0..maxlength - 1]
       end
 
-      def level_options
-        levels.map { |level| ["H#{level}", level] }
-      end
-
-      def size_options
-        sizes.map do |size|
-          case size
-          when Array
-            size
-          else
-            [".h#{size}", size]
-          end
-        end
-      end
-
-      private
-
       def levels
         settings.fetch(:levels, 1..6)
       end
@@ -49,6 +32,8 @@ module Alchemy
         settings.fetch(:sizes, [])
       end
 
+      private
+
       def set_level_and_size
         self.level ||= levels.first
         self.size ||= sizes.first

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

@@ -38,10 +38,10 @@ module Alchemy
         upsample
       ]
 
+      delegate :description_for, :name, to: :picture, allow_nil: true
+
       def alt_text(language: Alchemy::Current.language)
-        alt_tag.presence ||
-          picture&.description_for(language) ||
-          picture&.name&.humanize
+        alt_tag.presence || description_for(language) || name&.humanize
       end
 
       # The first 30 characters of the pictures name
@@ -51,7 +51,7 @@ module Alchemy
       # @param [Integer] max_length (30)
       #
       def preview_text(max_length = 30)
-        picture&.name.to_s[0..max_length - 1]
+        name.to_s[0..max_length - 1]
       end
 
       # The picture view component with mapped options.

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

@@ -6,6 +6,25 @@ module Alchemy
     #
     class Select < Alchemy::Ingredient
       allow_settings %i[display_inline select_values]
+      allow_settings %i[display_inline select_values multiple]
+
+      serialize :value, coder: JSON
+
+      # Override value getter to handle multiple selection
+      def value
+        val = self[:value] || []
+        multiple? ? val : val.first
+      end
+
+      # Override value setter to handle multiple selection
+      def value=(new_value)
+        super(Array(new_value).compact_blank)
+      end
+
+      # Check if multiple selection is enabled in settings
+      def multiple?
+        settings[:multiple] == true
+      end
     end
   end
 end

data/app/models/alchemy/language/code.rb

@@ -13,7 +13,6 @@ module Alchemy::Language::Code
 
   module ClassMethods
     def find_by_code(code)
-      return unless code.respond_to?(:split)
       codes = code.split("-")
       codes << "" if codes.length == 1
       on_current_site.find_by(

data/app/models/alchemy/node.rb

@@ -3,11 +3,12 @@
 module Alchemy
   class Node < BaseRecord
     VALID_URL_REGEX = /\A(\/|\D[a-z+\d.-]+:)/
+    SKIPPED_ATTRIBUTES_ON_COPY = %w[id created_at updated_at creator_id updater_id lft rgt depth parent_id]
 
     before_destroy :check_if_related_node_ingredients_present
 
     acts_as_nested_set scope: "language_id", touch: true
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.config.user_class_name
 
     belongs_to :language, class_name: "Alchemy::Language"
     belongs_to :page, class_name: "Alchemy::Page", optional: true, inverse_of: :nodes
@@ -46,6 +47,32 @@ module Alchemy
         read_definitions_file
       end
 
+      def all_from_clipboard(clipboard)
+        return [] if clipboard.blank?
+
+        where(id: clipboard.collect { |n| n["id"] })
+      end
+
+      def copy_and_paste(source, new_parent, new_name)
+        # Prevent pasting a node as a child of itself or any of its descendants
+        return if new_parent && source.is_or_is_ancestor_of?(new_parent)
+
+        attributes = source.attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY).merge(
+          name: new_name,
+          parent: new_parent,
+          language: new_parent&.language || source.language
+        )
+
+        node = create!(attributes)
+
+        # Copy all descendants
+        source.children.each do |child|
+          copy_and_paste(child, node, child.name)
+        end
+
+        node
+      end
+
       private
 
       def searchable_alchemy_resource_associations

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

@@ -19,9 +19,6 @@ module Alchemy
           uniqueness: {scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false},
           exclusion: {in: RESERVED_URLNAMES}
 
-        before_save :set_title,
-          if: -> { title.blank? }
-
         after_update :update_descendants_urlnames,
           if: :saved_change_to_urlname?
 
@@ -69,10 +66,6 @@ module Alchemy
         self[:urlname] = nested_url_name
       end
 
-      def set_title
-        self[:title] = name
-      end
-
       # Returns the full nested urlname.
       #
       def nested_url_name

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

@@ -35,9 +35,13 @@ module Alchemy
       end
 
       def folded?(user_id)
-        return unless Alchemy.user_class < ActiveRecord::Base
+        return unless Alchemy.config.user_class < ActiveRecord::Base
 
-        folded_pages.where(user_id: user_id, folded: true).any?
+        if folded_pages.loaded?
+          folded_pages.any? { |p| p.folded && p.user_id == user_id }
+        else
+          folded_pages.where(user_id: user_id, folded: true).any?
+        end
       end
 
       # Returns an Array of Alchemy roles which are able to edit this template
@@ -95,7 +99,7 @@ module Alchemy
       def definition
         definition = PageDefinition.get(page_layout)
         if definition.nil?
-          log_warning "Page definition for `#{page_layout}` not found. Please check `page_layouts.yml` file."
+          Logger.warn "Page definition for '#{page_layout}' not found. Please check page_layouts.yml file."
           return PageDefinition.new
         end
         definition

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

@@ -51,7 +51,7 @@ module Alchemy
           -> {
             joins(:language, :versions)
               .merge(Language.published)
-              .merge(PageVersion.public_on(Time.current))
+              .merge(PageVersion.published)
           }
 
         # All pages that are a published language root
@@ -78,6 +78,18 @@ module Alchemy
         #
         scope :contentpages, -> { where(layoutpage: [false, nil]) }
 
+        # Returns all public contentpages that are not locked.
+        #
+        # Used for flushing all pages caches at once.
+        #
+        scope :flushables, -> { not_locked.published.contentpages }
+
+        # Returns all layoutpages that are not locked.
+        #
+        # Used for flushing all pages caches at once.
+        #
+        scope :flushable_layoutpages, -> { not_locked.layoutpages }
+
         # All searchable pages
         #
         scope :searchables, -> { not_restricted.published.contentpages }