alchemy_cms 7.2.9 → 7.3.0

data/app/components/alchemy/admin/resource/cell.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module Resource
+      # Renders a table cell with the given css classes
+      #
+      # @param [String, nil] :css_classes
+      #   css classes that are show at the table cell
+      # @param [Lambda] :block
+      #   a block to include a button or a link
+      #
+      class Cell < ViewComponent::Base
+        attr_reader :block, :css_classes
+
+        erb_template <<~ERB
+          <td class="<%= css_classes %>">
+            <%= view_context.capture(@resource, &block) %>
+          </td>
+        ERB
+
+        def initialize(css_classes, &block)
+          @css_classes = css_classes
+          @block = block
+        end
+
+        def with_resource(resource)
+          @resource = resource
+          self
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/resource/header.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module Resource
+      # Renders a table header tag
+      # the component is an internal component of the Table component
+      #
+      # @param [String] :name
+      #   name of the sortable link or the text if not additional text is given
+      # @param [String] :query
+      #   Ransack query
+      # @param [String] :css_classes ("")
+      #   css class of the th - tag
+      # @param [String, nil] :text (nil)
+      #  optional text of the header
+      # @param [Symbol] :type (:string)
+      #  type of the column will be used to inverse the sorting order for data/time - objects
+      # @param [Boolean] :sortable (false)
+      #  enable a sortable link
+      #
+      class Header < ViewComponent::Base
+        delegate :sort_link, to: :helpers
+
+        erb_template <<~ERB
+          <th class="<%= @css_classes %>">
+            <% if @sortable %>
+              <%= sort_link @query, @name, @text, default_order: @default_order %>
+            <% else %>
+              <%= @text %>
+            <% end %>
+          </th>
+        ERB
+
+        def initialize(name, query, css_classes: "", text: nil, type: :string, sortable: false)
+          @name = name
+          @query = query
+          @text = text || name
+          @css_classes = css_classes
+          @default_order = /date|time/.match?(type.to_s) ? "desc" : "asc"
+          @sortable = sortable
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/resource/table.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module Resource
+      # Renders a resource table with columns and buttons
+      #
+      # == Example
+      #
+      #   <%= render Alchemy::Admin::Resource::Table.new(@languages, query: @query) do |table| %>
+      #     <% table.icon_column "translate-2", style: false %>
+      #     <% table.column :name, sortable: true %>
+      #     <% table.column :language_code, sortable: true %>
+      #     <% table.column :page_layout do |language| %>
+      #       <%= Alchemy::Page.human_layout_name(language.page_layout) %>
+      #     <% end %>
+      #     <% table.delete_button %>
+      #     <% table.edit_button %>
+      #   <% end %>
+      #
+      # @param [ActiveRecord::Relation] :collection
+      #   a collection of Alchemy::Resource objects that are shown in the table
+      # @param [Ransack::Search] :query
+      #   The ransack search object to allow sortable table columns
+      # @param [String] :nothing_found_label (Alchemy.t("Nothing found"))
+      #   The message that will be shown, if the collection is empty
+      # @param [Hash] :search_filter_params ({})
+      #   An additional hash that will attached to the delete and edit button to redirect back to
+      #   the same page of the table
+      # @param [String] :icon (nil)
+      #   a default icon, if the table is auto generated
+      class Table < ViewComponent::Base
+        delegate :render_attribute,
+          :resource_path,
+          :render_icon,
+          :edit_resource_path,
+          :resource_handler,
+          :resource_window_size,
+          to: :helpers
+
+        attr_reader :collection,
+          :nothing_found_label,
+          :search_filter_params
+
+        renders_many :headers, Header
+
+        renders_many :cells, ->(css_classes, &block) do
+          Cell.new(css_classes, &block)
+        end
+
+        renders_many :actions, ->(name, tooltip = nil, &block) do
+          Action.new(name, tooltip, &block)
+        end
+
+        erb_template <<~ERB
+          <% if collection.any? %>
+            <table class="list">
+              <thead>
+                <tr>
+                  <% headers.each do |header| %>
+                    <%= header %>
+                  <% end %>
+                  <% if actions? %>
+                    <th class="tools"></th>
+                  <% end %>
+                </tr>
+              </thead>
+              <tbody>
+                <% collection.each do |resource| %>
+                  <tr class="<%= cycle('even', 'odd') %>">
+                    <% cells.each do |cell| %>
+                       <%= render cell.with_resource(resource) %>
+                    <% end %>
+                    <% if actions? %>
+                      <td class="tools">
+                        <% actions.each do |action| %>
+                          <%= render action.with_resource(resource) %>
+                        <% end %>
+                      </td>
+                    <% end %>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+          <% else %>
+            <alchemy-message type="info">
+              <%= nothing_found_label %>
+            </alchemy-message>
+          <% end %>
+        ERB
+
+        def initialize(collection, query: nil, nothing_found_label: Alchemy.t("Nothing found"), search_filter_params: {}, icon: nil)
+          @collection = collection
+          @query = query
+          @nothing_found_label = nothing_found_label
+          @search_filter_params = search_filter_params
+          @icon = icon
+        end
+
+        def column(name, header: nil, sortable: false, type: nil, class_name: nil, &block)
+          header ||= resource_handler.model.human_attribute_name(name)
+          type ||= resource_handler.model.columns_hash[name.to_s]&.type
+          attribute = resource_handler.attributes.find { |item| item[:name] == name.to_s } || {name: name, type: type}
+          block ||= lambda { |item| render_attribute(item, attribute) }
+
+          css_classes = [name, type, class_name].compact.join(" ")
+          with_header(name, @query, css_classes: css_classes, text: header, type: type, sortable: sortable)
+          with_cell(css_classes, &block)
+        end
+
+        def icon_column(icon = nil, style: nil)
+          column(:icon, header: "") do |resource|
+            render_icon(icon || yield(resource), size: "xl", style: style)
+          end
+        end
+
+        def delete_button(tooltip: Alchemy.t("Delete"), confirm_message: Alchemy.t("Are you sure?"))
+          with_action(:destroy, tooltip) do |row|
+            helpers.delete_button(resource_path(row, search_filter_params), {message: confirm_message})
+          end
+        end
+
+        def edit_button(tooltip: Alchemy.t("Edit"), dialog_title: tooltip, dialog_size: resource_window_size)
+          with_action(:edit, tooltip) do |row|
+            helpers.link_to_dialog render_icon(:edit),
+              edit_resource_path(row, search_filter_params),
+              {
+                size: dialog_size,
+                title: dialog_title
+              },
+              class: "icon_button"
+          end
+        end
+
+        private
+
+        ##
+        # if no cells are available the resource_helper will be used, to generate the
+        # default attributes of the given resource
+        def before_render
+          unless cells?
+            icon_column(@icon) if @icon.present?
+            resource_handler.sorted_attributes.each do |attribute|
+              column(attribute[:name], sortable: true)
+            end
+            delete_button
+            edit_button
+          end
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/ingredients/datetime_view.rb

@@ -4,8 +4,8 @@ module Alchemy
       attr_reader :date_format
 
       # @param ingredient [Alchemy::Ingredient]
-      # @param date_format [String] The date format to use. Use either a strftime format string, a I18n format symbol or "rfc822".
-      def initialize(ingredient, date_format: nil, html_options: {})
+      # @param date_format [String] The date format to use. Use either a strftime format string, a I18n format symbol or "rfc822". Defaults to "time.formats.alchemy.default".
+      def initialize(ingredient, date_format: :"alchemy.default", html_options: {})
         super(ingredient)
         @date_format = settings_value(:date_format, value: date_format)
       end

data/app/components/alchemy/ingredients/link_view.rb

@@ -1,8 +1,6 @@
 module Alchemy
   module Ingredients
     class LinkView < BaseView
-      include LinkTarget
-
       attr_reader :link_text
 
       # @param ingredient [Alchemy::Ingredient]
@@ -14,11 +12,7 @@ module Alchemy
       end
 
       def call
-        target = ingredient.link_target.presence
-        link_to(link_text, value, {
-          target: link_target_value(target),
-          rel: link_rel_value(target)
-        }.merge(html_options)).html_safe
+        link_to(link_text, value, {target: ingredient.link_target.presence}.merge(html_options)).html_safe
       end
     end
   end

data/app/components/alchemy/ingredients/picture_view.rb

@@ -4,8 +4,6 @@ module Alchemy
   module Ingredients
     # Renders a picture ingredient view
     class PictureView < BaseView
-      include LinkTarget
-
       attr_reader :ingredient,
         :show_caption,
         :disable_link,
@@ -48,11 +46,10 @@ module Alchemy
         output = caption ? img_tag + caption : img_tag
 
         if is_linked?
-          target = ingredient.link_target.presence
           output = link_to(output, url_for(ingredient.link), {
             title: ingredient.link_title.presence,
-            rel: link_rel_value(target),
-            target: link_target_value(target)
+            target: (ingredient.link_target == "blank") ? "_blank" : nil,
+            data: {link_target: ingredient.link_target.presence}
           })
         end
 

data/app/components/alchemy/ingredients/text_view.rb

@@ -1,8 +1,6 @@
 module Alchemy
   module Ingredients
     class TextView < BaseView
-      include LinkTarget
-
       attr_reader :disable_link
 
       delegate :dom_id, :link, :link_title, :link_target,
@@ -23,8 +21,7 @@ module Alchemy
           link_to(value, url_for(link), {
             id: dom_id.presence,
             title: link_title,
-            target: link_target_value(link_target),
-            rel: link_rel_value(link_target)
+            target: link_target
           }.merge(html_options))
         end.html_safe
       end

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

@@ -31,27 +31,6 @@ module Alchemy
 
       private
 
-      def safe_redirect_path(path = params[:redirect_to], fallback: admin_path)
-        if is_safe_redirect_path?(path)
-          path
-        elsif is_safe_redirect_path?(fallback)
-          fallback
-        else
-          admin_path
-        end
-      end
-
-      def is_safe_redirect_path?(path)
-        mount_path = alchemy.root_path
-        path.to_s.match? %r{^#{mount_path}admin/}
-      end
-
-      def relative_referer_path(referer = request.referer)
-        return unless referer
-
-        URI(referer).path
-      end
-
       # Disable layout rendering for xhr requests.
       def set_layout
         (request.xhr? || turbo_frame_request?) ? false : "alchemy/admin"
@@ -121,22 +100,20 @@ module Alchemy
           flash[:notice] = Alchemy.t(flash_notice)
           do_redirect_to redirect_url
         else
-          render action: ((params[:action] == "update") ? "edit" : "new")
+          render action: ((params[:action] == "update") ? "edit" : "new"),
+            status: :unprocessable_entity
         end
       end
 
       # Does redirects for html and js requests
       #
-      # Makes sure that the redirect path is safe.
-      #
       def do_redirect_to(url_or_path)
-        redirect_path = safe_redirect_path(url_or_path)
         respond_to do |format|
           format.js {
-            @redirect_url = redirect_path
+            @redirect_url = url_or_path
             render :redirect
           }
-          format.html { redirect_to redirect_path }
+          format.html { redirect_to url_or_path }
         end
       end
 

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

@@ -69,9 +69,13 @@ module Alchemy
           render json: {
             warning: @warning,
             errorMessage: Alchemy.t(:ingredient_validations_headline),
-            ingredientsWithErrors: @element.ingredients_with_errors.map(&:id),
-            errors: @element.ingredient_error_messages
-          }
+            ingredientsWithErrors: @element.ingredients_with_errors.map do |ingredient|
+              {
+                id: ingredient.id,
+                errorMessage: ingredient.errors.messages[:value].to_sentence
+              }
+            end
+          }, status: :unprocessable_entity
         end
       end
 

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

@@ -40,7 +40,7 @@ module Alchemy
       def switch
         @language = set_alchemy_language(params[:language_id])
         session[:alchemy_language_id] = @language.id
-        do_redirect_to relative_referer_path || alchemy.admin_dashboard_path
+        do_redirect_to request.referer || alchemy.admin_dashboard_path
       end
 
       private

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

@@ -22,7 +22,7 @@ module Alchemy
         @message = message_for_resource_action
         render :update
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 

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

@@ -135,7 +135,7 @@ module Alchemy
             @tree = serialized_page_tree
           end
         else
-          render :configure
+          render :configure, status: :unprocessable_entity
         end
       end
 
@@ -189,7 +189,11 @@ module Alchemy
       end
 
       def unlock_redirect_path
-        safe_redirect_path(fallback: admin_pages_path)
+        if params[:redirect_to].to_s.match?(/\A\/admin\/(layout_)?pages/)
+          params[:redirect_to]
+        else
+          admin_pages_path
+        end
       end
 
       # Sets the page public and updates the published_at attribute that is used as cache_key

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

@@ -12,7 +12,7 @@ module Alchemy
       before_action :load_resource,
         only: [:show, :edit, :update, :url, :destroy]
 
-      before_action :set_size, only: [:index, :show, :edit_multiple]
+      before_action :set_size, only: [:index, :show, :edit_multiple, :update]
 
       authorize_resource class: Alchemy::Picture
 
@@ -79,7 +79,7 @@ module Alchemy
             type: "error"
           }
         end
-        render :update
+        render :update, status: (@message[:type] == "notice") ? :ok : :unprocessable_entity
       end
 
       def update_multiple

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

@@ -78,7 +78,7 @@ module Alchemy
           flash[:error] = resource_instance_variable.errors.full_messages.join(", ")
         end
         flash_notice_for_resource_action
-        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: "index", only_path: true))
+        do_redirect_to resource_url_proxy.url_for(search_filter_params.merge(action: "index"))
       end
 
       def resource_handler
@@ -138,7 +138,7 @@ module Alchemy
       end
 
       def eligible_resource_filter_values
-        resource_filters.map(&:values).flatten!.map!(&:to_s)
+        resource_filters.map(&:values).flatten
       end
 
       # Returns a translated +flash[:notice]+ for current controller action.
@@ -170,7 +170,7 @@ module Alchemy
       end
 
       def alchemy_module
-        @alchemy_module ||= module_definition_for(controller: params[:controller], action: "index")
+        @alchemy_module ||= module_definition_for(controller: controller_path, action: "index")
       end
 
       def load_resource

data/app/controllers/alchemy/base_controller.rb

@@ -82,6 +82,8 @@ module Alchemy
               locals: {message: flash[:warning], flash_type: "warning"}
           end
         end
+      elsif turbo_frame_request?
+        render "403", status: 403
       else
         redirect_to(alchemy.admin_dashboard_path)
       end

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

@@ -11,7 +11,7 @@ module Alchemy
           name: file.name)
 
         {
-          json: uploader_response(file: file, message: message),
+          json: {message: message},
           status: status
         }
       end
@@ -23,19 +23,10 @@ module Alchemy
           name: file.name)
 
         {
-          json: uploader_response(file: file, message: message),
+          json: {message: message},
           status: :unprocessable_entity
         }
       end
-
-      private
-
-      def uploader_response(file:, message:)
-        {
-          files: [file.to_jq_upload],
-          message: message
-        }
-      end
     end
   end
 end

data/app/decorators/alchemy/ingredient_editor.rb

@@ -153,6 +153,23 @@ module Alchemy
       end
     end
 
+    def validations
+      definition.fetch(:validate, [])
+    end
+
+    def format_validation
+      validations.select { _1.is_a?(Hash) }.find { _1[:format] }&.fetch(:format)
+    end
+
+    def length_validation
+      validations.select { _1.is_a?(Hash) }.find { _1[:length] }&.fetch(:length)
+    end
+
+    def presence_validation?
+      validations.include?("presence") ||
+        validations.any? { _1.is_a?(Hash) && _1[:presence] == true }
+    end
+
     private
 
     def form_field_counter

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

@@ -5,18 +5,14 @@ module Alchemy
     module PagesHelper
       include Alchemy::Admin::BaseHelper
 
-      # Returns options tags for the screen sizes select in page edit view.
+      # Returns screen sizes for the preview size select in page edit view.
+      #
+      # You can configure the screen sizes in your +config/alchemy/config.yml+.
       #
       def preview_sizes_for_select
-        options_for_select([
-          "auto",
-          [Alchemy.t("240", scope: "preview_sizes"), 240],
-          [Alchemy.t("320", scope: "preview_sizes"), 320],
-          [Alchemy.t("480", scope: "preview_sizes"), 480],
-          [Alchemy.t("768", scope: "preview_sizes"), 768],
-          [Alchemy.t("1024", scope: "preview_sizes"), 1024],
-          [Alchemy.t("1280", scope: "preview_sizes"), 1280]
-        ])
+        Alchemy::Config.get(:page_preview_sizes).map do |size|
+          [Alchemy.t(size, scope: "preview_sizes"), size]
+        end
       end
 
       # Renders a label for page's page layout

data/app/helpers/alchemy/base_helper.rb

@@ -42,8 +42,8 @@ module Alchemy
     #     <p>Caution! This is a warning!</p>
     #   <% end %>
     #
-    def render_message(type = :info, msg = nil, &blk)
-      render Alchemy::Admin::Message.new(msg || capture(&blk), type: type)
+    def render_message(type = :info, msg = nil, &)
+      render Alchemy::Admin::Message.new(msg || capture(&), type: type)
     end
 
     # Checks if the given argument is a String or a Page object.

data/app/helpers/alchemy/elements_block_helper.rb

@@ -100,9 +100,21 @@ module Alchemy
     #   A lambda used for formatting the element's tags (see Alchemy::ElementsHelper::element_tags_attributes). Set to +false+ to not include tags in the wrapper element.
     #
     def element_view_for(element, options = {})
+      if options[:id].nil?
+        Alchemy::Deprecation.warn <<~WARN
+          Relying on an implicit DOM id in `element_view_for` is deprecated. Please provide an explicit `id` if you actually want to render an `id` attribute on the #{element.name} element wrapper tag.
+        WARN
+      end
+
+      if options[:class].nil?
+        Alchemy::Deprecation.warn <<~WARN
+          Relying on an implicit CSS class in `element_view_for` is deprecated. Please provide an explicit `class` for the #{element.name} element wrapper tag.
+        WARN
+      end
+
       options = {
         tag: :div,
-        id: element.dom_id,
+        id: (!!options[:id]) ? options[:id] : element.dom_id,
         class: element.name,
         tags_formatter: ->(tags) { tags.join(" ") }
       }.merge(options)

data/app/helpers/alchemy/pages_helper.rb

@@ -62,8 +62,8 @@ module Alchemy
     #
     # renders +app/views/alchemy/site_layouts/_default_site.html.erb+ for the site named "Default Site".
     #
-    def render_site_layout(&block)
-      render current_alchemy_site, &block
+    def render_site_layout(&)
+      render(current_alchemy_site, &)
     rescue ActionView::MissingTemplate => error
       error_or_warning(error, "Site layout for #{current_alchemy_site.try(:name)} not found. Please run `rails g alchemy:site_layouts`")
     end