alchemy_cms 5.2.0.rc1 → 6.0.0.b2

data/app/assets/stylesheets/alchemy/images.scss

@@ -0,0 +1,8 @@
+img {
+  opacity: 1;
+  transition: opacity $transition-duration;
+
+  &.loading {
+    opacity: 0;
+  }
+}

data/app/assets/stylesheets/alchemy/node-select.scss

@@ -8,12 +8,13 @@
 .node-select--node {
   display: flex;
   align-items: center;
+  height: 21px;
 
   .icon {
     margin: 0 8px 0 4px;
 
     .select2-highlighted & {
-      color: $white
+      color: $white;
     }
   }
 }
@@ -24,12 +25,12 @@
 
 .node-select--node-url {
   margin-left: auto;
-  padding: $default-padding 2*$default-padding;
+  padding: $default-padding 2 * $default-padding;
   color: $dark-gray;
   font-size: $small-font-size;
 
   .select2-highlighted & {
-    color: $white
+    color: $white;
   }
 }
 

data/app/assets/stylesheets/alchemy/page-select.scss

@@ -1,4 +1,5 @@
 .page-select--page,
+.page-select--page-name,
 .page-select--page-urlname {
   text-overflow: ellipsis;
   overflow: hidden;

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

@@ -8,6 +8,10 @@ module Alchemy
 
       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?
@@ -17,8 +21,8 @@ module Alchemy
           @attachments = @attachments.tagged_with(search_filter_params[:tagged_with])
         end
 
-        if search_filter_params[:file_type].present?
-          @attachments = @attachments.with_file_type(search_filter_params[:file_type])
+        if search_filter_params[:filter].present?
+          @attachments = apply_filters(@attachments)
         end
 
         @attachments = @attachments
@@ -73,9 +77,9 @@ module Alchemy
       def search_filter_params
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
-            :file_type,
+            :form_field_id,
             :content_id,
-          ],
+          ]
         )
       end
 

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

@@ -8,7 +8,7 @@ module Alchemy
 
       before_action :load_locked_pages
 
-      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
+      helper_method :clipboard_empty?, :get_clipboard, :is_admin?
 
       check_authorization
 
@@ -54,7 +54,10 @@ module Alchemy
         if request.xhr?
           render action: "error_notice"
         else
-          render "500", status: 500
+          respond_to do |format|
+            format.html { render "500", status: 500 }
+            format.json { render json: { message: @notice }, status: 500 }
+          end
         end
       end
 
@@ -69,11 +72,6 @@ module Alchemy
         get_clipboard(category).blank?
       end
 
-      def trash_empty?(category)
-        "alchemy/#{category.singularize}".classify.constantize.trashed.blank?
-      end
-      deprecate :trash_empty?, deprecator: Alchemy::Deprecation
-
       def set_stamper
         if Alchemy.user_class < ActiveRecord::Base
           Alchemy.user_class.stamper = current_alchemy_user

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

@@ -3,27 +3,31 @@
 module Alchemy
   module Admin
     class ElementsController < Alchemy::Admin::BaseController
-      before_action :load_element, only: [:update, :trash, :fold, :publish]
+      before_action :load_element, only: [:update, :destroy, :fold, :publish]
       authorize_resource class: Alchemy::Element
 
       def index
-        @page = Page.find(params[:page_id])
-        @elements = @page.all_elements.not_nested.unfixed.not_trashed.includes(*element_includes)
-        @fixed_elements = @page.all_elements.fixed.not_trashed.includes(*element_includes)
+        @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
       end
 
       def new
-        @page = Page.find(params[:page_id])
+        @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.elements.build
+        @element = @page_version.elements.build
         @clipboard = get_clipboard("elements")
         @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
       end
 
       # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
       def create
-        @page = Page.find(params[:element][:page_id])
+        @page_version = PageVersion.find(params[:element][:page_version_id])
+        @page = @page_version.page
         Element.transaction do
           if @paste_from_clipboard = params[:paste_from_clipboard].present?
             @element = paste_element_from_clipboard
@@ -38,7 +42,7 @@ module Alchemy
         if @element.valid?
           render :create
         else
-          @element.page = @page
+          @element.page_version = @page_version
           @elements = @page.available_element_definitions
           @clipboard = get_clipboard("elements")
           @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
@@ -51,40 +55,38 @@ module Alchemy
       # And update all contents in the elements by calling update_contents.
       #
       def update
-        if @element.update_contents(contents_params)
-          @page = @element.page
-          @element_validated = @element.update(element_params)
+        @page = @element.page
+
+        if element_params.key?(:ingredients_attributes)
+          update_element_with_ingredients
         else
-          @element_validated = false
-          @notice = Alchemy.t("Validation failed")
-          @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:content_validations_headline)}</p>".html_safe
+          update_element_with_contents
         end
       end
 
-      def publish
-        @element.update(public: !@element.public?)
+      def destroy
+        @element.destroy
+        @notice = Alchemy.t("Successfully deleted element") % { element: @element.display_name }
       end
 
-      # Trashes the Element instead of deleting it.
-      def trash
-        @page = @element.page
-        @element.trash!
+      def publish
+        @element.update(public: !@element.public?)
       end
 
       def order
-        @trashed_element_ids = Element.trashed.where(id: params[:element_ids]).pluck(:id)
         @parent_element = Element.find_by(id: params[:parent_element_id])
         Element.transaction do
-          params.fetch(:element_ids, []).each_with_index do |element_id, idx|
-            # Ensure to set page_id and parent_element_id to the current
-            # because of trashed elements could still have old values
-            Element.where(id: element_id).update_all(
-              page_id: params[:page_id],
+          params.fetch(:element_ids, []).each.with_index(1) do |element_id, position|
+            # We need to set the parent_element_id, because we might have dragged the
+            # element over from another nestable element
+            Element.find_by(id: element_id).update_columns(
               parent_element_id: params[:parent_element_id],
-              position: idx + 1,
+              position: position,
             )
           end
-          @parent_element.try!(:touch)
+          # Need to manually touch the parent because Rails does not do it
+          # with the update_columns above
+          @parent_element&.touch
         end
       end
 
@@ -102,6 +104,7 @@ module Alchemy
             contents: {
               essence: :ingredient_association,
             },
+            ingredients: :related_object,
           },
           :tags,
           {
@@ -110,6 +113,7 @@ module Alchemy
                 contents: {
                   essence: :ingredient_association,
                 },
+                ingredients: :related_object,
               },
               :tags,
             ],
@@ -132,7 +136,7 @@ module Alchemy
         @source_element = Element.find(element_from_clipboard["id"])
         element = Element.copy(@source_element, {
           parent_element_id: create_element_params[:parent_element_id],
-          page_id: @page.id,
+          page_version_id: @page_version.id,
         })
         if element_from_clipboard["action"] == "cut"
           @cut_element_id = @source_element.id
@@ -147,15 +151,35 @@ module Alchemy
       end
 
       def element_params
-        if @element.taggable?
-          params.fetch(:element, {}).permit(:tag_list)
+        params.fetch(:element, {}).permit(:tag_list, ingredients_attributes: {})
+      end
+
+      def create_element_params
+        params.require(:element).permit(:name, :page_version_id, :parent_element_id)
+      end
+
+      def update_element_with_ingredients
+        if @element.update(element_params)
+          @element_validated = true
         else
-          params.fetch(:element, {})
+          element_update_error
+          @error_messages = @element.ingredient_error_messages
         end
       end
 
-      def create_element_params
-        params.require(:element).permit(:name, :page_id, :parent_element_id)
+      def update_element_with_contents
+        if @element.update_contents(contents_params)
+          @element_validated = @element.update(element_params)
+        else
+          element_update_error
+          @error_messages = @element.essence_error_messages
+        end
+      end
+
+      def element_update_error
+        @element_validated = false
+        @notice = Alchemy.t("Validation failed")
+        @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:content_validations_headline)}</p>".html_safe
       end
     end
   end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    class EssenceAudiosController < Alchemy::Admin::BaseController
+      authorize_resource class: Alchemy::EssenceAudio
+      before_action :load_essence
+
+      def update
+        @essence_audio.update(essence_audio_params)
+      end
+
+      private
+
+      def load_essence
+        @essence_audio = EssenceAudio.find(params[:id])
+      end
+
+      def essence_audio_params
+        params.require(:essence_audio).permit(
+          :autoplay,
+          :controls,
+          :loop,
+          :muted,
+          :attachment_id
+        )
+      end
+    end
+  end
+end

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

@@ -17,20 +17,6 @@ module Alchemy
         @essence_file.update(essence_file_params)
       end
 
-      # Assigns file, but does not saves it.
-      #
-      # When the user saves the element the content gets updated as well.
-      #
-      def assign
-        @content = Content.find_by(id: params[:content_id])
-        @attachment = Attachment.find_by(id: params[:attachment_id])
-        @content.essence.attachment = @attachment
-
-        # We need to update timestamp here because we don't save yet,
-        # but the cache needs to be get invalid.
-        @content.touch
-      end
-
       private
 
       def essence_file_params

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

@@ -3,11 +3,12 @@
 module Alchemy
   module Admin
     class EssencePicturesController < Alchemy::Admin::BaseController
-      FLOAT_REGEX = /\A\d+(\.\d+)?\z/
+      include CropAction
+
       authorize_resource class: Alchemy::EssencePicture
 
-      before_action :load_essence_picture, only: [:edit, :crop, :update]
-      before_action :load_content, only: [:edit, :update, :assign]
+      before_action :load_essence_picture, only: [:edit, :update]
+      before_action :load_content, only: [:edit, :update]
 
       helper "alchemy/admin/contents"
       helper "alchemy/admin/essences"
@@ -16,94 +17,22 @@ module Alchemy
       def edit
       end
 
-      def crop
-        if @picture = @essence_picture.picture
-          @content = @essence_picture.content
-          @min_size = sizes_from_essence_or_params
-          @ratio = ratio_from_size_or_settings
-          infer_width_or_height_from_ratio
-
-          @default_box = @essence_picture.default_mask(@min_size)
-          @initial_box = @essence_picture.cropping_mask || @default_box
-        else
-          @no_image_notice = Alchemy.t(:no_image_for_cropper_found)
-        end
-      end
-
       def update
         @essence_picture.update(essence_picture_params)
       end
 
-      # Assigns picture, but does not save it.
-      #
-      # When the user saves the element the content gets updated as well.
-      #
-      def assign
-        @picture = Picture.find_by(id: params[:picture_id])
-        @content.essence.picture = @picture
-        @element = @content.element
-
-        # We need to update timestamp here because we don't save yet,
-        # but the cache needs to be get invalid.
-        @content.touch
-      end
-
-      def destroy
-        @content = Content.find_by(id: params[:id])
-        @element = @content.element
-        @content_id = @content.id
-        @content.destroy
-        @essence_pictures = @element.contents.essence_pictures
-      end
-
       private
 
       def load_essence_picture
         @essence_picture = EssencePicture.find(params[:id])
       end
 
-      def load_content
-        @content = Content.find(params[:content_id])
+      def load_croppable_resource
+        @croppable_resource = EssencePicture.find(params[:id])
       end
 
-      # Gets the minimum size of the image to be rendered.
-      #
-      # The +render_size+ attribute has preference over the contents +size+ setting.
-      #
-      def sizes_from_essence_or_params
-        if @essence_picture.render_size?
-          @essence_picture.sizes_from_string(@essence_picture.render_size)
-        elsif @essence_picture.content.settings[:size]
-          @essence_picture.sizes_from_string(@essence_picture.content.settings[:size])
-        else
-          { width: 0, height: 0 }
-        end
-      end
-
-      # Infers the aspect ratio from size or contents settings. If you don't want a fixed
-      # aspect ratio, don't specify a size or only width or height.
-      #
-      def ratio_from_size_or_settings
-        if @min_size.value?(0) && @essence_picture.content.settings[:fixed_ratio].to_s =~ FLOAT_REGEX
-          @essence_picture.content.settings[:fixed_ratio].to_f
-        elsif !@min_size[:width].zero? && !@min_size[:height].zero?
-          @min_size[:width].to_f / @min_size[:height]
-        else
-          false
-        end
-      end
-
-      # Infers the minimum width or height
-      # if the aspect ratio and one dimension is specified.
-      #
-      def infer_width_or_height_from_ratio
-        return unless @ratio
-
-        if @min_size[:height].zero?
-          @min_size[:height] = (@min_size[:width] / @ratio).to_i
-        else
-          @min_size[:width] = (@min_size[:height] * @ratio).to_i
-        end
+      def load_content
+        @content = Content.find(params[:content_id])
       end
 
       def essence_picture_params