alchemy_cms 7.0.16 → 7.1.0.pre.b1

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

@@ -57,7 +57,7 @@ module Alchemy
           content_tag(:figure, output, {class: ingredient.css_class.presence}.merge(html_options))
         else
           output
-        end.html_safe
+        end
       end
 
       private

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

@@ -15,7 +15,7 @@ module Alchemy
           ingredient.stripped_body
         else
           value.to_s.html_safe
-        end.html_safe
+        end
       end
     end
   end

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

@@ -24,7 +24,7 @@ module Alchemy
             target: ((link_target == "blank") ? "_blank" : nil),
             data: {link_target: link_target}
           }.merge(html_options))
-        end.html_safe
+        end
       end
 
       private

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

@@ -6,7 +6,7 @@ module Alchemy
       def call
         content_tag(:video, html_options) do
           tag(:source, src: src, type: attachment.file_mime_type)
-        end.html_safe
+        end
       end
 
       def render?

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? ? false : "alchemy/admin"
@@ -69,14 +48,13 @@ module Alchemy
         @error = error
         # truncate the message, because very long error messages (i.e from mysql2) causes cookie overflow errors
         @notice = error.message[0..255]
-        @trace = error.backtrace[0..50]
-        if request.xhr?
+        if request.format.json?
+          render json: {message: @notice}, status: 500
+        elsif request.xhr?
           render action: "error_notice"
         else
-          respond_to do |format|
-            format.html { render "500", status: 500 }
-            format.json { render json: {message: @notice}, status: 500 }
-          end
+          @trace = error.backtrace[0..50]
+          render "500", status: 500
         end
       end
 
@@ -128,16 +106,13 @@ module Alchemy
 
       # 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

@@ -3,7 +3,7 @@
 module Alchemy
   module Admin
     class ElementsController < Alchemy::Admin::BaseController
-      before_action :load_element, only: [:update, :destroy, :fold, :publish]
+      before_action :load_element, only: [:update, :destroy, :collapse, :expand, :publish]
       authorize_resource class: Alchemy::Element
 
       def index
@@ -53,13 +53,25 @@ module Alchemy
       # Updates the element and all ingredients in the element.
       #
       def update
-        @page = @element.page
-
         if @element.update(element_params)
-          @element_validated = true
+          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?
+              }
+            end
+          }
         else
-          element_update_error
-          @error_messages = @element.ingredient_error_messages
+          @warning = Alchemy.t("Validation failed")
+          render json: {
+            warning: @warning,
+            errorMessage: Alchemy.t(:ingredient_validations_headline),
+            ingredientsWithErrors: @element.ingredients_with_errors.map(&:id),
+            errors: @element.ingredient_error_messages
+          }
         end
       end
 
@@ -70,37 +82,59 @@ module Alchemy
       end
 
       def publish
-        @element.update(public: !@element.public?)
+        @element.public = !@element.public?
+        @element.save(validate: false)
+        render json: {
+          public: @element.public?,
+          label: @element.public? ? Alchemy.t(:hide_element) : Alchemy.t(:show_element)
+        }
       end
 
       def order
-        @parent_element = Element.find_by(id: params[:parent_element_id])
-        Element.transaction do
-          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: position
-            )
-          end
-          # Need to manually touch the parent because Rails does not do it
-          # with the update_columns above
-          @parent_element&.touch
+        @element = Element.find(params[:element_id])
+        @element.update(
+          parent_element_id: params[:parent_element_id],
+          position: params[:position]
+        )
+        if params[:parent_element_id].present?
+          @parent_element = Element.find_by(id: params[:parent_element_id])
         end
+
+        render json: {
+          message: Alchemy.t(:successfully_saved_element_position),
+          preview_text: @element.preview_text
+        }
       end
 
-      # Toggle folds the element and persists the state in the db
+      # Collapses the element, all nested elements and persists the state in the db
       #
-      def fold
-        @page = @element.page
+      def collapse
         # We do not want to trigger the touch callback or any validations
-        @element.update_columns(folded: !@element.folded)
-        # Fold all nested elements if folded
-        if @element.folded?
-          ids = collapse_nested_elements_ids(@element)
-          Alchemy::Element.where(id: ids).update_all(folded: true)
-        end
+        @element.update_columns(folded: true)
+        # Collapse all nested elements
+        nested_elements_ids = collapse_nested_elements_ids(@element)
+        Alchemy::Element.where(id: nested_elements_ids).update_all(folded: true)
+
+        render json: {
+          nestedElementIds: nested_elements_ids,
+          title: Alchemy.t(@element.folded? ? :show_element_content : :hide_element_content)
+        }
+      end
+
+      # Expands the element, all parents and persists the state in the db
+      #
+      def expand
+        # We do not want to trigger the touch callback or any validations
+        @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
+        Alchemy::Element.where(id: parent_element_ids).update_all(folded: false)
+
+        render json: {
+          parentElementIds: parent_element_ids,
+          title: Alchemy.t(@element.folded? ? :show_element_content : :hide_element_content)
+        }
       end
 
       private
@@ -171,12 +205,6 @@ module Alchemy
       def create_element_params
         params.require(:element).permit(:name, :page_version_id, :parent_element_id)
       end
-
-      def element_update_error
-        @element_validated = false
-        @notice = Alchemy.t("Validation failed")
-        @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:ingredient_validations_headline)}</p>".html_safe
-      end
     end
   end
 end

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

@@ -38,9 +38,8 @@ module Alchemy
       end
 
       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
+        set_alchemy_language(params[:language_id])
+        do_redirect_to request.referer || alchemy.admin_dashboard_path
       end
 
       private

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

@@ -17,25 +17,6 @@ module Alchemy
       def edit
         @page = Page.find(params[:id])
       end
-
-      def update
-        @page = Page.find(params[:id])
-        if @page.update(page_params)
-          @notice = Alchemy.t("Page saved", name: @page.name)
-          render "alchemy/admin/pages/update"
-        else
-          render :edit, status: :unprocessable_entity
-        end
-      end
-
-      private
-
-      def page_params
-        params.require(:page).permit(
-          :name,
-          :tag_list
-        )
-      end
     end
   end
 end

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

@@ -183,15 +183,14 @@ module Alchemy
         respond_to do |format|
           format.js
           format.html do
-            redirect_to(unlock_redirect_path, allow_other_host: true)
+            redirect_to(
+              params[:redirect_to].presence || admin_pages_path,
+              allow_other_host: true
+            )
           end
         end
       end
 
-      def unlock_redirect_path
-        safe_redirect_path(fallback: admin_pages_path)
-      end
-
       # Sets the page public and updates the published_at attribute that is used as cache_key
       #
       def publish

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

data/app/controllers/alchemy/base_controller.rb

@@ -53,7 +53,9 @@ module Alchemy
           #{current_alchemy_user.inspect}
         WARN
       end
-      if current_alchemy_user
+      if request.format.json?
+        render json: {message: Alchemy.t("You are not authorized")}, status: :unauthorized
+      elsif current_alchemy_user
         handle_redirect_for_user
       else
         handle_redirect_for_guest
@@ -65,7 +67,7 @@ module Alchemy
       if can?(:index, :alchemy_admin_dashboard)
         redirect_or_render_notice
       else
-        redirect_to("/")
+        redirect_to Alchemy.unauthorized_path
       end
     end
 

data/app/controllers/alchemy/messages_controller.rb

@@ -97,7 +97,7 @@ module Alchemy
       else
         Language.current_root_page.urlname
       end
-      redirect_to alchemy.show_page_path(
+      redirect_to show_page_path(
         urlname: urlname,
         locale: prefix_locale? ? Language.current.code : nil
       )

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

@@ -12,11 +12,7 @@ module Alchemy
       private
 
       def load_current_language
-        @current_language = if session[:alchemy_language_id].present?
-          set_alchemy_language(session[:alchemy_language_id])
-        else
-          Alchemy::Language.current
-        end
+        @current_language = Alchemy::Language.current
         if @current_language.nil?
           flash[:warning] = Alchemy.t("Please create a language first.")
           redirect_to admin_languages_path

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

@@ -33,7 +33,7 @@ module Alchemy
       def uploader_response(file:, message:)
         {
           files: [file.to_jq_upload],
-          growl_message: message
+          message: message
         }
       end
     end

data/app/decorators/alchemy/element_editor.rb

@@ -65,8 +65,6 @@ module Alchemy
 
     # Tells us, if we should show the element footer and form inputs.
     def editable?
-      return false if folded?
-
       ingredient_definitions.any? || taggable?
     end
 

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

@@ -4,17 +4,18 @@ module Alchemy
   module Admin
     module AttachmentsHelper
       include Alchemy::Admin::BaseHelper
+      include Alchemy::Filetypes
 
       def mime_to_human(mime)
         Alchemy.t(mime, scope: "mime_types", default: Alchemy.t(:document))
       end
 
       def attachment_preview_size(attachment)
-        case attachment.icon_css_class
-        when "image" then "600x475"
-        when "audio" then "600x190"
-        when "video" then "600x485"
-        when "pdf" then "600x500"
+        case attachment.file_mime_type
+        when *IMAGE_FILE_TYPES then "600x475"
+        when *AUDIO_FILE_TYPES then "600x190"
+        when *VIDEO_FILE_TYPES then "600x485"
+        when "application/pdf" then "600x600"
         else
           "600x145"
         end

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

@@ -55,7 +55,10 @@ module Alchemy
         default_options = {modal: true}
         options = default_options.merge(options)
         link_to content, url,
-          html_options.merge("data-alchemy-dialog" => options.to_json)
+          html_options.merge(
+            "data-dialog-options" => options.to_json,
+            :is => "alchemy-dialog-link"
+          )
       end
 
       # Used for translations selector in Alchemy cockpit user settings.
@@ -189,7 +192,7 @@ module Alchemy
         options = {
           title: Alchemy.t("Delete"),
           message: Alchemy.t("Are you sure?"),
-          icon: :minus
+          icon: "delete-bin-2"
         }.merge(options)
         button_with_confirm(
           render_icon(options[:icon]),
@@ -322,18 +325,20 @@ module Alchemy
         date = Time.zone.parse(date) if date.is_a?(String)
         value = date&.iso8601
 
-        text_field object.class.name.demodulize.underscore.to_sym,
-          method.to_sym, {:type => "text", :class => type, "data-datepicker-type" => type, :value => value}.merge(html_options)
+        input_field = text_field object.class.name.demodulize.underscore.to_sym,
+          method.to_sym, {type: "text", class: type, value: value}.merge(html_options)
+
+        content_tag("alchemy-datepicker", input_field, "input-type" => type)
       end
 
       # Render a hint icon with tooltip for given object.
       # The model class needs to include the hints module
-      def render_hint_for(element)
+      def render_hint_for(element, icon_options = {})
         return unless element.has_hint?
 
-        content_tag :span, class: "hint-with-icon" do
-          render_icon("question-circle") +
-            content_tag(:span, element.hint.html_safe, class: "hint-bubble")
+        content_tag "sl-tooltip", class: "like-hint-tooltip", placement: "bottom-start" do
+          render_icon("question", icon_options) +
+            content_tag(:span, element.hint.html_safe, slot: "content")
         end
       end
 
@@ -372,12 +377,12 @@ module Alchemy
       #   <%= hint_with_tooltip('Page layout is missing', icon: 'info') %>
       #
       # @param text [String] - The text displayed in the tooltip
-      # @param icon: 'exclamation-triangle' [String] - Icon name
+      # @param icon: 'alert' [String] - Icon name
       #
       # @return [String]
-      def hint_with_tooltip(text, icon: "exclamation-triangle")
-        content_tag :span, class: "hint-with-icon" do
-          render_icon(icon) + content_tag(:span, text, class: "hint-bubble")
+      def hint_with_tooltip(text, icon: "alert")
+        content_tag :"sl-tooltip", class: "like-hint-tooltip", content: text, placement: "bottom" do
+          render_icon(icon)
         end
       end
 

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

@@ -34,7 +34,10 @@ module Alchemy
       # Renders the label and hint for a ingredient.
       def ingredient_label(ingredient, column = :value, html_options = {})
         label_tag ingredient.form_field_id(column), html_options do
-          [render_ingredient_role(ingredient), render_hint_for(ingredient)].compact.join(" ").html_safe
+          [
+            render_ingredient_role(ingredient),
+            render_hint_for(ingredient, size: "lg", fixed_width: false)
+          ].compact.join(" ").html_safe
         end
       end
     end

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

@@ -36,21 +36,15 @@ module Alchemy
 
       def page_status_checkbox(page, attribute)
         label = page.class.human_attribute_name(attribute)
-
-        if page.attribute_fixed?(attribute)
-          checkbox = check_box(:page, attribute, disabled: true)
-          hint = content_tag(:span, class: "hint-bubble") do
-            Alchemy.t(:attribute_fixed, attribute: attribute)
-          end
-          content = content_tag(:span, class: "with-hint") do
-            "#{checkbox}\n#{label}\n#{hint}".html_safe
+        checkbox = if page.attribute_fixed?(attribute)
+          content_tag("sl-tooltip", class: "like-hint-tooltip", content: Alchemy.t(:attribute_fixed, attribute: attribute), placement: "bottom-start") do
+            check_box_tag("page[#{attribute}]", "1", page.send(attribute), disabled: true)
           end
         else
-          checkbox = check_box(:page, attribute)
-          content = "#{checkbox}\n#{label}".html_safe
+          check_box(:page, attribute)
         end
 
-        content_tag(:label, class: "checkbox") { content }
+        content_tag(:label, class: "checkbox") { "#{checkbox}\n#{label}".html_safe }
       end
     end
   end

data/app/helpers/alchemy/base_helper.rb

@@ -19,21 +19,21 @@ module Alchemy
       end
     end
 
-    # Render a Fontawesome icon
+    # Render a Remix icon
     #
-    # @param icon_class [String] Fontawesome icon name
-    # @param size: nil [String] Fontawesome icon size
-    # @param transform: nil [String] Fontawesome transform style
+    # @param icon_name [String] icon name
+    # @option options - style: nil [String] icon style. line or fill
+    # @option options - size: nil [String] icon size
     #
     # @return [String]
-    def render_icon(icon_class, options = {})
-      options = {style: "solid"}.merge(options)
+    def render_icon(icon_name, options = {})
+      options = {style: "line", fixed_width: true}.merge(options)
+      style = options[:style] && "-#{options[:style]}"
       classes = [
-        "icon fa-fw",
-        "fa-#{icon_class}",
-        "fa#{options[:style].first}",
-        options[:size] ? "fa-#{options[:size]}" : nil,
-        options[:transform] ? "fa-#{options[:transform]}" : nil,
+        "icon",
+        "ri-#{ri_icon(icon_name)}#{style}",
+        options[:size] ? "ri-#{options[:size]}" : nil,
+        options[:fixed_width] ? "ri-fw" : nil,
         options[:class]
       ].compact
       content_tag("i", nil, class: classes)
@@ -87,18 +87,52 @@ module Alchemy
       end
     end
 
-    # Returns the FontAwesome icon name for given message type
+    # Returns the icon name for given message type
     #
     # @param message_type [String] The message type. One of +warning+, +info+, +notice+, +error+
-    # @return [String] The FontAwesome icon name
+    # @return [String] The icon name
     def message_icon_class(message_type)
       case message_type.to_s
       when "warning", "warn", "alert" then "exclamation"
       when "notice" then "check"
       when "error" then "bug"
+      when "hint" then "info"
       else
         message_type
       end
     end
+
+    private
+
+    # Returns the Remix icon name for given icon name
+    #
+    # @param icon_name [String] The icon name.
+    # @return [String] The Remix icon class
+    def ri_icon(icon_name)
+      case icon_name.to_s
+      when "minus", "remove", "delete"
+        "delete-bin-2"
+      when "plus"
+        "add"
+      when "copy"
+        "file-copy"
+      when "download"
+        "download-2"
+      when "upload"
+        "upload-2"
+      when "exclamation"
+        "alert"
+      when "info-circle", "info"
+        "information"
+      when "times"
+        "close"
+      when "tag"
+        "price-tag-3"
+      when "cog"
+        "settings-3"
+      else
+        icon_name
+      end
+    end
   end
 end