alchemy_cms 8.0.6 → 8.1.0

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

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class PictureEditor < BaseEditor
+      delegate :allow_image_cropping?,
+        :css_class,
+        :image_file_width,
+        :image_file_height,
+        :picture,
+        :thumbnail_url_options,
+        to: :ingredient
+
+      def input_field
+        content_tag("alchemy-picture-editor") do
+          concat(
+            tag.div(class: "picture_thumbnail",
+              data: {
+                target_size: settings[:size] || [
+                  image_file_width.to_i,
+                  image_file_height.to_i
+                ].join("x"),
+                image_cropper: thumbnail_url_options[:crop]
+              }) do
+              if editable?
+                concat tag.button(
+                  render_icon("close"),
+                  type: "button",
+                  class: "picture_tool delete"
+                )
+              end
+              concat(
+                tag.div(class: "picture_image") do
+                  render Alchemy::Admin::PictureThumbnail.new(
+                    ingredient,
+                    css_class: "img_paddingtop",
+                    placeholder: render_icon(:image, size: "xl")
+                  )
+                end
+              )
+              if css_class.present?
+                concat render(
+                  "alchemy/ingredients/shared/picture_css_class",
+                  css_class: css_class
+                )
+              end
+              concat(
+                tag.div(class: "edit_images_bottom") do
+                  render(
+                    "alchemy/ingredients/shared/picture_tools",
+                    picture_editor: self
+                  )
+                end
+              )
+            end
+          )
+          concat hidden_field_tag(form_field_name(:picture_id),
+            picture&.id,
+            id: form_field_id(:picture_id),
+            data: {
+              picture_id: true,
+              image_file_width: image_file_width,
+              image_file_height: image_file_height
+            })
+          concat hidden_field_tag(form_field_name(:link), ingredient.link, data: {link_value: true}, id: nil)
+          concat hidden_field_tag(form_field_name(:link_title), ingredient.link_title, data: {link_title: true}, id: nil)
+          concat hidden_field_tag(form_field_name(:link_class_name), ingredient.link_class_name, data: {link_class: true}, id: nil)
+          concat hidden_field_tag(form_field_name(:link_target), ingredient.link_target, data: {link_target: true}, id: nil)
+          concat hidden_field_tag(form_field_name(:crop_from), ingredient.crop_from, data: {crop_from: true}, id: form_field_id(:crop_from))
+          concat hidden_field_tag(form_field_name(:crop_size), ingredient.crop_size, data: {crop_size: true}, id: form_field_id(:crop_size))
+        end
+      end
+
+      private
+
+      def ingredient_label(*)
+        super(:picture_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class RichtextEditor < BaseEditor
+      def input_field
+        content_tag("alchemy-tinymce", tinymce_config) do
+          text_area_tag form_field_name,
+            value,
+            minlength: length_validation&.fetch(:minimum, nil),
+            maxlength: length_validation&.fetch(:maximum, nil),
+            id: form_field_id(:value)
+        end
+      end
+
+      private
+
+      def tinymce_config
+        config = custom_tinymce_config
+        config["readonly"] = true.to_json if !editable?
+        config
+      end
+
+      def custom_tinymce_config
+        ingredient.custom_tinymce_config.each_with_object({}) do |(k, v), obj|
+          obj[k.to_s.dasherize] = v.to_json
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class SelectEditor < BaseEditor
+      def input_field
+        if select_values.nil?
+          warning(":select_values is nil",
+            <<-MSG.strip_heredoc
+              <strong>No select values given.</strong>
+              <br>Please provide <code>select_values</code> on the
+              ingredient definition <code>settings</code> in
+              <code>elements.yml</code>.
+            MSG
+          )
+        else
+          options_tags = if select_values.is_a?(Hash)
+            grouped_options_for_select(select_values, value)
+          else
+            options_for_select(select_values, value)
+          end
+          select_tag form_field_name, options_tags, {
+            id: form_field_id,
+            class: ["ingredient-editor-select"],
+            is: "alchemy-select",
+            multiple: settings[:multiple],
+            disabled: !editable?
+          }
+        end
+      end
+
+      private
+
+      def select_values = settings[:select_values]
+    end
+  end
+end

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

@@ -1,6 +1,13 @@
 module Alchemy
   module Ingredients
     class SelectView < BaseView
+      def call
+        if ingredient.multiple? && value.is_a?(Array)
+          value.to_sentence
+        else
+          super
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class TextEditor < BaseEditor
+      def input_field
+        tag.div(class: "input-field") do
+          concat text_field_tag(form_field_name,
+            value,
+            class: settings[:linkable] ? "text_with_icon" : "",
+            id: form_field_id,
+            minlength: length_validation&.fetch(:minimum, nil),
+            maxlength: length_validation&.fetch(:maximum, nil),
+            required: presence_validation?,
+            pattern: format_validation,
+            readonly: !editable?,
+            type: settings[:input_type] || "text")
+
+          if settings[:anchor]
+            concat render(
+              "alchemy/ingredients/shared/anchor",
+              ingredient:
+            )
+          end
+
+          if settings[:linkable]
+            concat hidden_field_tag(form_field_name(:link), ingredient.link, "data-link-value": true, id: nil)
+            concat hidden_field_tag(form_field_name(:link_title), ingredient.link_title, "data-link-title": true, id: nil)
+            concat hidden_field_tag(form_field_name(:link_class_name), ingredient.link_class_name, "data-link-class": true, id: nil)
+            concat hidden_field_tag(form_field_name(:link_target), ingredient.link_target, "data-link-target": true, id: nil)
+            concat render(
+              "alchemy/ingredients/shared/link_tools",
+              ingredient:,
+              wrapper_class: "ingredient_link_buttons"
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Ingredients
+    class VideoEditor < FileEditor
+    end
+  end
+end

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

@@ -22,15 +22,13 @@ module Alchemy
       add_alchemy_filter :without_tag, type: :checkbox
       add_alchemy_filter :deletable, type: :checkbox
 
-      helper "alchemy/admin/tags"
-
       before_action(only: :assign) do
         @attachment = Attachment.find(params[:id])
       end
 
       def index
         @query = Attachment.ransack(search_filter_params[:q])
-        @query.sorts = "name asc" if @query.sorts.empty?
+        @query.sorts = default_sort_order if @query.sorts.empty?
         @attachments = @query.result
 
         if search_filter_params[:tagged_with].present?
@@ -48,19 +46,19 @@ module Alchemy
 
       # The resources controller renders the edit form as default for show actions.
       def show
-        @assignments = @attachment.related_ingredients.joins(element: :page).merge(PageVersion.drafts)
+        @assignments = @attachment.related_ingredients.joins(element: :page).merge(PageVersion.draft)
         render :show
       end
 
       def create
         @attachment = Attachment.create(attachment_attributes)
-        handle_uploader_response(status: :created)
+        handle_uploader_response(status: 201)
       end
 
       def update
         @attachment.update(attachment_attributes)
         if attachment_attributes["file"].present?
-          handle_uploader_response(status: :accepted)
+          handle_uploader_response(status: 202)
         else
           render_errors_or_redirect(
             @attachment,
@@ -78,6 +76,10 @@ module Alchemy
 
       private
 
+      def default_sort_order
+        "created_at desc"
+      end
+
       def search_filter_params
         @_search_filter_params ||= begin
           params[:q] ||= ActionController::Parameters.new

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

@@ -8,7 +8,7 @@ module Alchemy
 
       before_action :load_locked_pages
 
-      helper_method :clipboard_empty?, :get_clipboard, :is_admin?
+      helper_method :is_admin?
 
       check_authorization
 
@@ -79,26 +79,15 @@ module Alchemy
         end
       end
 
-      # Returns clipboard items for given category
-      def get_clipboard(category)
-        session[:alchemy_clipboard] ||= {}
-        session[:alchemy_clipboard][category.to_s] ||= []
-      end
-
-      # Checks if clipboard for given category is blank
-      def clipboard_empty?(category)
-        get_clipboard(category).blank?
-      end
-
       def set_stamper
-        if Alchemy.user_class < ActiveRecord::Base
-          Alchemy.user_class.stamper = current_alchemy_user
+        if Alchemy.config.user_class.respond_to?(:stamper=)
+          Alchemy.config.user_class.stamper = current_alchemy_user
         end
       end
 
       def reset_stamper
-        if Alchemy.user_class < ActiveRecord::Base
-          Alchemy.user_class.reset_stamper
+        if Alchemy.config.user_class.respond_to?(:reset_stamper)
+          Alchemy.config.user_class.reset_stamper
         end
       end
 
@@ -122,7 +111,7 @@ module Alchemy
           do_redirect_to redirect_url
         else
           render action: ((params[:action] == "update") ? "edit" : "new"),
-            status: :unprocessable_entity
+            status: 422
         end
       end
 
@@ -178,7 +167,7 @@ module Alchemy
         if ::Alchemy::ErrorTracking.notification_handler.respond_to?(:call)
           ::Alchemy::ErrorTracking.notification_handler.call(exception)
         else
-          Rails.logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
+          Logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
         end
       end
     end

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

@@ -3,15 +3,19 @@
 module Alchemy
   module Admin
     class ClipboardController < Alchemy::Admin::BaseController
-      REMARKABLE_TYPES = %w[elements pages]
+      include Alchemy::Admin::Clipboard
+
+      REMARKABLE_TYPES = %w[elements pages nodes]
 
       authorize_resource class: :alchemy_admin_clipboard
-      before_action :set_clipboard
 
       helper_method :remarkable_type
 
       def index
-        @clipboard_items = model_class.all_from_clipboard(@clipboard)
+        raise ActionController::BadRequest unless remarkable_type
+
+        @clipboard_items = clipboard_items
+
         respond_to do |format|
           format.html
         end
@@ -19,8 +23,8 @@ module Alchemy
 
       def insert
         @item = model_class.find(remarkable_params[:remarkable_id])
-        unless @clipboard.detect { |item| item["id"] == remarkable_params[:remarkable_id] }
-          @clipboard << {
+        unless clipboard.detect { |item| item["id"] == remarkable_params[:remarkable_id] }
+          clipboard << {
             "id" => remarkable_params[:remarkable_id],
             "action" => params[:remove] ? "cut" : "copy"
           }
@@ -29,25 +33,25 @@ module Alchemy
 
       def remove
         @item = model_class.find(remarkable_params[:remarkable_id])
-        @clipboard.delete_if { |item| item["id"] == remarkable_params[:remarkable_id] }
+        remove_resource_from_clipboard(@item)
       end
 
       def clear
-        @clipboard.clear
+        clipboard.clear
       end
 
       private
 
-      def set_clipboard
-        @clipboard = get_clipboard(remarkable_type)
-      end
-
       def model_class
         raise ActionController::BadRequest unless remarkable_type
 
         "alchemy/#{remarkable_type}".classify.constantize
       end
 
+      def clipboard_type
+        remarkable_type
+      end
+
       def remarkable_params
         params.permit(:remarkable_type, :remarkable_id)
       end

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

@@ -11,8 +11,8 @@ module Alchemy
       def index
         @last_edited_pages = Page.all_last_edited_from(current_alchemy_user)
         @all_locked_pages = Page.locked
-        if Alchemy.user_class.respond_to?(:logged_in)
-          @online_users = Alchemy.user_class.logged_in.to_a - [current_alchemy_user]
+        if Alchemy.config.user_class.respond_to?(:logged_in)
+          @online_users = Alchemy.config.user_class.logged_in.to_a - [current_alchemy_user]
         end
         if current_alchemy_user.respond_to?(:sign_in_count) && current_alchemy_user.respond_to?(:last_sign_in_at)
           @last_sign_at = current_alchemy_user.last_sign_in_at

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

@@ -5,25 +5,23 @@ module Alchemy
     class ElementsController < Alchemy::Admin::BaseController
       helper Alchemy::Admin::IngredientsHelper
 
+      before_action :load_page_and_version, only: [:index, :new]
+      include Alchemy::Admin::Clipboard
+
       before_action :load_element, only: [:update, :destroy, :collapse, :expand, :publish]
       authorize_resource class: Alchemy::Element
 
       def index
-        @page_version = PageVersion.find(params[:page_version_id])
-        @page = @page_version.page
         elements = @page_version.elements.order(:position).includes(*element_includes)
         @elements = elements.not_nested.unfixed
         @fixed_elements = elements.not_nested.fixed
-        load_clipboard_items
       end
 
       def new
-        @page_version = PageVersion.find(params[:page_version_id])
-        @page = @page_version.page
         @parent_element = Element.find_by(id: params[:parent_element_id])
         @elements = @page.available_elements_within_current_scope(@parent_element)
         @element = @page_version.elements.build
-        load_clipboard_items
+        clipboard_items
       end
 
       # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
@@ -43,12 +41,11 @@ module Alchemy
           end
         end
         if @element.save
-          render :create, status: :created
+          render :create, status: 201
         else
           @element.page_version = @page_version
           @elements = @page.available_element_definitions
-          load_clipboard_items
-          render :new, status: :unprocessable_entity
+          render :new, status: 422
         end
       end
 
@@ -59,13 +56,15 @@ module Alchemy
           render json: {
             notice: Alchemy.t(:element_saved),
             previewText: Rails::Html::SafeListSanitizer.new.sanitize(@element.preview_text),
-            ingredientAnchors: @element.ingredients.select { |i| i.settings[:anchor] }.map do |ingredient|
-              {
-                ingredientId: ingredient.id,
-                active: ingredient.dom_id.present?
-              }
+            ingredientAnchors: @element.ingredients.filter_map do |ingredient|
+              if ingredient.settings[:anchor]
+                {
+                  ingredientId: ingredient.id,
+                  active: ingredient.dom_id.present?
+                }
+              end
             end
-          }
+          }.merge(pagePublicationData(@element.page))
         else
           @warning = Alchemy.t("Validation failed")
           render json: {
@@ -77,7 +76,7 @@ module Alchemy
                 errorMessage: ingredient.errors.messages[:value].to_sentence
               }
             end
-          }, status: :unprocessable_entity
+          }, status: 422
         end
       end
 
@@ -86,7 +85,7 @@ module Alchemy
 
         render json: {
           message: Alchemy.t("Successfully deleted element") % {element: @element.display_name}
-        }
+        }.merge(pagePublicationData(@element.page))
       end
 
       def publish
@@ -95,7 +94,7 @@ module Alchemy
         render json: {
           public: @element.public?,
           label: @element.public? ? Alchemy.t(:hide_element) : Alchemy.t(:show_element)
-        }
+        }.merge(pagePublicationData(@element.page))
       end
 
       def order
@@ -112,7 +111,7 @@ module Alchemy
         render json: {
           message: Alchemy.t(:successfully_saved_element_position),
           preview_text: @element.preview_text
-        }
+        }.merge(pagePublicationData(@element.page))
       end
 
       # Collapses the element, all nested elements and persists the state in the db
@@ -137,7 +136,7 @@ module Alchemy
         @element.update_columns(folded: false)
         # We want to expand the upper most parent first in order to prevent
         # re-painting issues in the browser
-        parent_element_ids = @element.parent_element_ids.reverse
+        parent_element_ids = @element.folded_parent_element_ids.reverse
         Alchemy::Element.where(id: parent_element_ids).update_all(folded: false)
 
         render json: {
@@ -148,6 +147,11 @@ module Alchemy
 
       private
 
+      def load_page_and_version
+        @page_version = PageVersion.find(params[:page_version_id])
+        @page = @page_version.page
+      end
+
       def collapse_nested_elements_ids(element)
         ids = []
         element.all_nested_elements.includes(:all_nested_elements).reject(&:compact?).each do |nested_element|
@@ -178,20 +182,19 @@ module Alchemy
         @element = Element.find(params[:id])
       end
 
-      def load_clipboard_items
-        @clipboard = get_clipboard("elements")
-        @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
+      def clipboard_items
+        @clipboard_items = Element.all_from_clipboard_for_page(clipboard, @page)
       end
 
-      def element_from_clipboard
-        @element_from_clipboard ||= begin
-          @clipboard = get_clipboard("elements")
-          @clipboard.detect { |item| item["id"].to_i == params[:paste_from_clipboard].to_i }
-        end
+      def pagePublicationData(page)
+        {
+          pageHasUnpublishedChanges: page.has_unpublished_changes?,
+          publishButtonTooltip: Alchemy.t(:explain_publishing)
+        }
       end
 
       def paste_element_from_clipboard
-        @source_element = Element.find(element_from_clipboard["id"])
+        @source_element = Element.find(item_from_clipboard["id"])
         element = Element.copy(
           @source_element,
           {
@@ -199,10 +202,9 @@ module Alchemy
             page_version_id: @page_version.id
           }
         )
-        if element_from_clipboard["action"] == "cut"
+        if item_from_clipboard["action"] == "cut"
           @cut_element_id = @source_element.id
-          @clipboard.delete_if { |item| item["id"] == @source_element.id.to_s }
-          @source_element.destroy
+          remove_resource_from_clipboard(@source_element)
         end
         element
       end

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

@@ -15,6 +15,7 @@ module Alchemy
       end
 
       def update
+        @page = @ingredient.page # necessary to a render picture ingredient component
         @ingredient.update(ingredient_params)
       end
 

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

@@ -6,6 +6,7 @@ module Alchemy
       authorize_resource class: :alchemy_admin_layoutpages
 
       include Alchemy::Admin::CurrentLanguage
+      include Alchemy::Admin::Clipboard
 
       helper Alchemy::Admin::PagesHelper
 
@@ -25,7 +26,7 @@ module Alchemy
           @while_page_edit = request.referer.include?("edit")
           render "alchemy/admin/pages/update"
         else
-          render :edit, status: :unprocessable_entity
+          render :edit, status: 422
         end
       end
 

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, status: :unprocessable_entity
+        render :edit, status: 422
       end
     end
 

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

@@ -4,6 +4,7 @@ module Alchemy
   module Admin
     class NodesController < Admin::ResourcesController
       include Alchemy::Admin::CurrentLanguage
+      include Alchemy::Admin::Clipboard
 
       def index
         @root_nodes = Node.language_root_nodes
@@ -26,8 +27,28 @@ module Alchemy
           else
             flash[:error] = @node.errors.full_messages.join(", ")
           end
+        elsif params[:paste_from_clipboard]
+          begin
+            @node = paste_from_clipboard
+            if @node&.persisted?
+              flash_notice_for_resource_action(:create)
+              do_redirect_to(admin_nodes_path)
+            else
+              render :new, status: 422
+            end
+          rescue => e
+            flash[:error] = e.message
+            new  # Reinitialize instance variables like @node
+            render :new, status: 422
+          end
         else
-          super
+          @node = Node.new(resource_params)
+          if @node.save
+            flash_notice_for_resource_action(:create)
+            do_redirect_to(admin_nodes_path)
+          else
+            render :new, status: 422
+          end
         end
       end
 
@@ -36,6 +57,8 @@ module Alchemy
           @node = Alchemy::Node.find(params[:id])
           @page = @node.page
           @page.nodes.destroy(@node)
+          # Remove node from clipboard
+          remove_resource_from_clipboard(@node)
           flash_notice_for_resource_action(:destroy)
         else
           super