alchemy_cms 7.0.12 → 7.1.0.pre.b1

data/app/models/alchemy/attachment.rb

@@ -138,29 +138,27 @@ module Alchemy
     def icon_css_class
       case file_mime_type
       when "application/pdf"
-        "file-pdf"
-      when "application/msword"
-        "file-word"
+        "file-pdf-2"
       when *TEXT_FILE_TYPES
-        "file-alt"
+        "file-text"
       when *EXCEL_FILE_TYPES
-        "file-excel"
+        "file-excel-2"
       when *POWERPOINT_FILE_TYPES
-        "file-powerpoint"
+        "file-ppt-2"
       when *WORD_FILE_TYPES
-        "file-word"
+        "file-word-2"
       when *VCARD_FILE_TYPES
-        "address-card"
+        "profile"
       when *ARCHIVE_FILE_TYPES
-        "file-archive"
+        "file-zip"
       when *AUDIO_FILE_TYPES
-        "file-audio"
+        "file-music"
       when *IMAGE_FILE_TYPES
         "file-image"
       when *VIDEO_FILE_TYPES
         "file-video"
       else
-        "file"
+        "file-3"
       end
     end
 

data/app/models/alchemy/element.rb

@@ -183,6 +183,17 @@ 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
+      end
+      ids
+    end
+
     # Returns next public element from same page.
     #
     # Pass an element name to get next of this kind.

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

@@ -28,21 +28,12 @@ module Alchemy
         stripped_body.to_s[0..max_length - 1]
       end
 
-      def element_id
-        "tinymce_#{id}"
-      end
-
       def has_tinymce?
         true
       end
 
-      # Returns true if there is a tinymce setting defined that contains settings.
-      def has_custom_tinymce_config?
-        custom_tinymce_config.is_a?(Hash)
-      end
-
       def custom_tinymce_config
-        settings[:tinymce]
+        settings[:tinymce] || {}
       end
 
       private

data/app/models/alchemy/node.rb

@@ -48,6 +48,10 @@ module Alchemy
 
       private
 
+      def searchable_alchemy_resource_associations
+        %w[page]
+      end
+
       # Reads the element definitions file named +menus.yml+ from +config/alchemy/+ folder.
       #
       def read_definitions_file

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

@@ -37,20 +37,11 @@ module Alchemy
         #
         def copy_elements(source, target)
           repository = source.draft_version.element_repository
-          elements = repository.not_nested
-          page_version = target.draft_version
-          duplicate_elements(elements.unfixed, repository, page_version) +
-            duplicate_elements(elements.fixed, repository, page_version)
-        end
-
-        private
-
-        def duplicate_elements(elements, repository, page_version)
           transaction do
             Element.acts_as_list_no_update do
-              elements.each.with_index(1) do |element, position|
+              repository.not_nested.each.with_index(1) do |element, position|
                 Alchemy::DuplicateElement.new(element, repository: repository).call(
-                  page_version_id: page_version.id,
+                  page_version_id: target.draft_version.id,
                   position: position
                 )
               end

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

@@ -62,14 +62,22 @@ module Alchemy
         }
       end
 
-      # Returns the translated status for given status type.
+      # Returns the long translated status message for given status type.
       #
       # @param [Symbol] status_type
       #
-      def status_title(status_type)
+      def status_message(status_type)
         Alchemy.t(status[status_type].to_s, scope: "page_states.#{status_type}")
       end
 
+      # Returns the sort translated status title for given status type.
+      #
+      # @param [Symbol] status_type
+      #
+      def status_title(status_type)
+        Alchemy.t(status[status_type].to_s, scope: "page_status_titles.#{status_type}")
+      end
+
       # Returns the self#page_layout definition from config/alchemy/page_layouts.yml file.
       def definition
         definition = PageLayout.get(page_layout)

data/app/models/alchemy/page.rb

@@ -121,8 +121,6 @@ module Alchemy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
     has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
-    has_many :page_ingredients, class_name: "Alchemy::Ingredients::Page", foreign_key: :related_object_id, dependent: :nullify
-
     before_validation :set_language,
       if: -> { language.nil? }
 
@@ -235,23 +233,17 @@ module Alchemy
       # @return [Alchemy::Page]
       #
       def copy(source, differences = {})
-        transaction do
-          page = Alchemy::Page.new(attributes_from_source_for_copy(source, differences))
-          page.tag_list = source.tag_list
-          if page.save!
-            copy_elements(source, page)
-            page
-          end
-        end
+        Alchemy::CopyPage.new(page: source).call(changed_attributes: differences)
       end
 
       def copy_and_paste(source, new_parent, new_name)
-        page = copy(source, {
-          parent: new_parent,
-          language: new_parent&.language,
-          name: new_name,
-          title: new_name
-        })
+        page = Alchemy::CopyPage.new(page: source)
+          .call(changed_attributes: {
+            parent: new_parent,
+            language: new_parent&.language,
+            name: new_name,
+            title: new_name
+          })
         if source.children.any?
           source.copy_children_to(page)
         end
@@ -282,40 +274,6 @@ module Alchemy
         end
         options
       end
-
-      private
-
-      # Aggregates the attributes from given source for copy of page.
-      #
-      # @param [Alchemy::Page]
-      #   The source page
-      # @param [Hash]
-      #   A optional hash with attributes that take precedence over the source attributes
-      #
-      def attributes_from_source_for_copy(source, differences = {})
-        source.attributes.stringify_keys!
-        differences.stringify_keys!
-        attributes = source.attributes.merge(differences)
-        attributes.merge!(DEFAULT_ATTRIBUTES_FOR_COPY)
-        attributes["name"] = new_name_for_copy(differences["name"], source.name)
-        attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY)
-      end
-
-      # Returns a new name for copy of page.
-      #
-      # If the differences hash includes a new name this is taken.
-      # Otherwise +source.name+
-      #
-      # @param [String]
-      #   The differences hash that contains a new name
-      # @param [String]
-      #   The name of the source
-      #
-      def new_name_for_copy(custom_name, source_name)
-        return custom_name if custom_name.present?
-
-        "#{source_name} (#{Alchemy.t("Copy")})"
-      end
     end
 
     # Instance methods
@@ -449,7 +407,7 @@ module Alchemy
       children.each do |child|
         next if child == new_parent
 
-        new_child = Page.copy(child, {
+        new_child = Alchemy::CopyPage.new(page: child).call(changed_attributes: {
           parent_id: new_parent.id,
           language_id: new_parent.language_id,
           language_code: new_parent.language_code

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

@@ -35,7 +35,7 @@ module Alchemy
           thumb.uid
         else
           uid = PictureThumb::Uid.call(signature, variant)
-          ActiveRecord::Base.connected_to(role: db_writing_role) do
+          ActiveRecord::Base.connected_to(role: ActiveRecord.writing_role) do
             PictureThumb::Create.call(variant, signature, uid)
           end
           uid
@@ -49,14 +49,6 @@ module Alchemy
           variant.picture.thumbs.find_by(signature: signature)
         end
       end
-
-      def db_writing_role
-        if ActiveRecord::Base.respond_to?(:writing_role)
-          ActiveRecord::Base.writing_role
-        else
-          ActiveRecord.writing_role
-        end
-      end
     end
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -105,7 +105,8 @@ module Alchemy
     def page_status_titles(page)
       {
         public: page.status_title(:public),
-        restricted: page.status_title(:restricted)
+        restricted: page.status_title(:restricted),
+        locked: page.status_title(:locked)
       }
     end
   end

data/app/services/alchemy/copy_page.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Alchemy
+  # Creates a copy of given source page.
+  #
+  # Also copies all elements included in source page.
+  #
+  # === Note:
+  #
+  # It prevents the element auto generator from running.
+  class CopyPage
+    DEFAULT_ATTRIBUTES_FOR_COPY = {
+      autogenerate_elements: false,
+      public_on: nil,
+      public_until: nil,
+      locked_at: nil,
+      locked_by: nil
+    }
+
+    SKIPPED_ATTRIBUTES_ON_COPY = %w[
+      id
+      updated_at
+      created_at
+      creator_id
+      updater_id
+      lft
+      rgt
+      depth
+      urlname
+      cached_tag_list
+    ]
+
+    attr_reader :page
+
+    # @param page [Alchemy::Page]
+    #   The source page the copy is taken from
+    def initialize(page:)
+      @page = page
+    end
+
+    # @param changed_attributes [Hash]
+    #   A optional hash with attributes that take precedence over the source attributes
+    #
+    # @return [Alchemy::Page]
+    #
+    def call(changed_attributes:)
+      Alchemy::Page.transaction do
+        new_page = Alchemy::Page.new(attributes_from_source_for_copy(changed_attributes))
+        new_page.tag_list = page.tag_list
+        if new_page.save!
+          Alchemy::Page.copy_elements(page, new_page)
+        end
+        new_page
+      end
+    end
+
+    private
+
+    # Aggregates the attributes from given source for copy of page.
+    #
+    # @param [Alchemy::Page]
+    #   The source page
+    # @param [Hash]
+    #   A optional hash with attributes that take precedence over the source attributes
+    #
+    def attributes_from_source_for_copy(differences = {})
+      source_attributes = page.attributes.stringify_keys
+      differences.stringify_keys!
+      desired_attributes = source_attributes
+        .merge(DEFAULT_ATTRIBUTES_FOR_COPY)
+        .merge(differences)
+      desired_attributes["name"] = best_name_for_copy(source_attributes, desired_attributes)
+      desired_attributes.except(*SKIPPED_ATTRIBUTES_ON_COPY)
+    end
+
+    # Returns a new name for copy of page.
+    #
+    # If the differences hash includes a new name this is taken.
+    # Otherwise +source.name+
+    #
+    # @param [Hash]
+    #   The differences hash that contains a new name
+    # @param [Hash]
+    #   The name of the source
+    #
+    def best_name_for_copy(source_attributes, desired_attributes)
+      desired_name = desired_attributes["name"].presence || source_attributes["name"]
+
+      new_parent_id = desired_attributes["parent"]&.id || desired_attributes["parent_id"]
+
+      if Alchemy::Page.where(parent_id: new_parent_id, name: desired_name).exists?
+        "#{desired_name} (#{Alchemy.t("Copy")})"
+      else
+        desired_name
+      end
+    end
+  end
+end

data/app/views/alchemy/_menubar.html.erb

@@ -1,16 +1,20 @@
 <% if !@preview_mode && @page && can?(:edit_content, @page) %>
-  <div id="alchemy_menubar" style="display: none" data-turbo="false" data-turbolinks="false">
-    <ul>
-      <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>
-      <li><%= link_to Alchemy.t(:edit_page), alchemy.edit_admin_page_url(@page) %></li>
-      <li>
-        <%= form_tag Alchemy.logout_path, method: Alchemy.logout_method do %>
-          <%= button_tag Alchemy.t(:logout) %>
-        <% end %>
-      </li>
-    </ul>
-  </div>
+  <alchemy-menubar>
+    <template>
+      <%= stylesheet_link_tag("alchemy/menubar") %>
+      <div id="alchemy_menubar" data-turbo="false">
+        <ul>
+          <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>
+          <li><%= link_to Alchemy.t(:edit_page), alchemy.edit_admin_page_url(@page) %></li>
+          <li>
+            <%= form_tag Alchemy.logout_path, method: Alchemy.logout_method do %>
+              <%= button_tag Alchemy.t(:logout) %>
+            <% end %>
+          </li>
+        </ul>
+      </div>
+    </template>
+  </alchemy-menubar>
 
-  <%= stylesheet_link_tag("alchemy/menubar") %>
-  <%= javascript_include_tag('alchemy/menubar') %>
+  <%= javascript_include_tag('menubar', type: "module") %>
 <% end %>

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -1,14 +1,18 @@
 <div id="overlay_toolbar">
-  <% if can? :create, Alchemy::Attachment %>
-    <%= render 'alchemy/admin/uploader/button',
-      object: Alchemy::Attachment.new,
-      dropzone: '#assign_file_list',
-      file_attribute: 'file',
-      in_dialog: true,
-      redirect_url: admin_attachments_path(
-        form_field_id: @form_field_id
-      ) %>
-  <% end %>
+  <div class="toolbar_buttons">
+    <% if can? :create, Alchemy::Attachment %>
+      <div class="toolbar_button">
+        <%= render 'alchemy/admin/uploader/button',
+          object: Alchemy::Attachment.new,
+          dropzone: '#assign_file_list',
+          file_attribute: 'file',
+          in_dialog: true,
+          redirect_url: admin_attachments_path(
+            form_field_id: @form_field_id
+          ) %>
+      </div>
+    <% end %>
+  </div>
   <%= render 'alchemy/admin/partials/remote_search_form' %>
 </div>
 

data/app/views/alchemy/admin/attachments/_attachment.html.erb

@@ -1,6 +1,6 @@
 <tr class="<%= cycle('even', 'odd') %>">
   <td class="icon">
-    <%= render_icon attachment.icon_css_class, style: 'regular', size: 'lg' %>
+    <%= render_icon attachment.icon_css_class, size: "xl" %>
   </td>
   <td class="name">
   <% if can?(:show, attachment) %>
@@ -25,49 +25,57 @@
   <td class="date"><%= l(attachment.created_at, format: :'alchemy.default') %></td>
   <td class="tools long">
   <% if can?(:show, attachment) %>
-    <%= link_to_dialog(
-      render_icon('info-circle'),
-      alchemy.admin_attachment_path(attachment),
-      {
-        title: attachment.name,
-        size: attachment_preview_size(attachment)
-      },
-      {
-        title: Alchemy.t('Attachment Preview')
-      }
-    ) %>
+    <sl-tooltip content="<%= Alchemy.t('Attachment Preview') %>">
+      <%= link_to_dialog(
+        render_icon(:information),
+        alchemy.admin_attachment_path(attachment),
+        {
+          title: attachment.name,
+          size: attachment_preview_size(attachment)
+        },
+        class: "icon_button"
+      ) %>
+    </sl-tooltip>
   <% end %>
   <% if can?(:download, attachment) %>
-    <%= link_to render_icon(:download),
-      alchemy.download_admin_attachment_path(attachment),
-      title: Alchemy.t("download_file", filename: attachment.file_name),
-      target: "_blank" %>
+    <sl-tooltip content="<%= Alchemy.t("download_file", filename: attachment.file_name) %>">
+      <%= link_to render_icon(:download),
+        alchemy.download_admin_attachment_path(attachment),
+        target: "_blank",
+        class: "icon_button" %>
+    </sl-tooltip>
   <% end %>
   <% if can?(:edit, attachment) %>
-    <%= render 'alchemy/admin/attachments/replace_button',
-      redirect_url: alchemy.admin_attachments_path,
-      object: attachment,
-      file_attribute: 'file' %>
+    <sl-tooltip content="<%= Alchemy.t(:replace_file) %>">
+      <%= render 'alchemy/admin/attachments/replace_button',
+        redirect_url: alchemy.admin_attachments_path,
+        object: attachment,
+        file_attribute: 'file' %>
+    </sl-tooltip>
   <% end %>
   <% if can?(:destroy, attachment) %>
-    <%= link_to_confirm_dialog render_icon(:minus),
-      Alchemy.t(:confirm_to_delete_file),
-      alchemy.admin_attachment_path(
-        id: attachment,
-        q: search_filter_params[:q],
-        page: params[:page],
-        per_page: params[:per_page]
-      ),
-      title: Alchemy.t(:delete_file) %>
+    <sl-tooltip content="<%= Alchemy.t(:delete_file) %>">
+      <%= link_to_confirm_dialog render_icon(:minus),
+        Alchemy.t(:confirm_to_delete_file),
+        alchemy.admin_attachment_path(
+          id: attachment,
+          q: search_filter_params[:q],
+          page: params[:page],
+          per_page: params[:per_page]
+        ),
+        class: "icon_button" %>
+    </sl-tooltip>
   <% end %>
   <% if can?(:edit, attachment) %>
-    <%= link_to_dialog render_icon(:edit),
-      alchemy.edit_admin_attachment_path(attachment, q: search_filter_params[:q], page: params[:page]),
-      {
-        title: Alchemy.t(:rename_file),
-        size: '500x250'
-      },
-      title: Alchemy.t(:rename_file) %>
+    <sl-tooltip content="<%= Alchemy.t(:rename_file) %>">
+      <%= link_to_dialog render_icon(:edit),
+        alchemy.edit_admin_attachment_path(attachment, q: search_filter_params[:q], page: params[:page]),
+        {
+          title: Alchemy.t(:rename_file),
+          size: '500x250'
+        },
+        class: "icon_button" %>
+    </sl-tooltip>
   <% end %>
   </td>
 </tr>

data/app/views/alchemy/admin/attachments/_replace_button.html.erb

@@ -1,25 +1,19 @@
-<%= form_for [:admin, object], html: {multipart: true, class: 'upload-button'} do |f| %>
-  <%= f.file_field file_attribute,
-    class: 'fileupload--field',
-    name: "#{f.object_name}[#{file_attribute}]",
-    id: "replace_#{dom_id(object)}" %>
-  <%= label_tag "replace_#{dom_id(object)}", title: Alchemy.t(:replace_file) do %>
-    <%= render_icon :sync %>
-  <% end %>
-<% end %>
+<% file_upload_id = "file_upload_#{dom_id(object)}" %>
 
-<% file_types = local_assigns[:file_types].presence ||
-  configuration(:uploader)['allowed_filetypes'][object.class.model_name.collection] || ['*'] %>
+<alchemy-uploader id="<%= file_upload_id %>">
+  <%= form_for [:admin, object], html: {multipart: true, class: 'upload-button'} do |f| %>
+    <%= f.file_field file_attribute,
+      class: 'fileupload--field',
+      name: "#{f.object_name}[#{file_attribute}]",
+      id: "replace_#{dom_id(object)}" %>
+    <%= label_tag "replace_#{dom_id(object)}", class: "icon_button" do %>
+      <%= render_icon "file-upload" %>
+    <% end %>
+  <% end %>
+</alchemy-uploader>
 
 <script type='text/javascript'>
-  $(function() {
-    var options = {
-      selector: '#replace_<%= dom_id(object) %>',
-      file_types: '<%= file_types.join("|") %>',
-      complete: function() {
-        Turbo.visit('<%= redirect_url.html_safe %>');
-      }
-    };
-    Alchemy.Uploader(options);
-  });
+  document.getElementById("<%= file_upload_id %>").addEventListener("Alchemy.upload.successful", (event) => {
+    Turbo.visit('<%= redirect_url.html_safe %>');
+  })
 </script>

data/app/views/alchemy/admin/attachments/archive_overlay.js.erb

@@ -1,6 +1,5 @@
 (function() {
   var dialog = Alchemy.currentDialog();
   dialog.dialog_body.html('<%= j render("archive_overlay") %>');
-  Alchemy.SelectBox('#filter_bar');
   Alchemy.ListFilter(dialog.dialog_body);
 })();

data/app/views/alchemy/admin/attachments/assign.js.erb

@@ -6,6 +6,6 @@
   $form_field.parent().find("> .file_icon").html("<%= j render_icon(@attachment.icon_css_class) %>")
   $form_field.parent().find("> .remove_file_link").removeClass("hidden")
   Alchemy.closeCurrentDialog(function() {
-    Alchemy.setElementDirty($form_field.closest(".element-editor"))
+    $form_field[0].closest("alchemy-element-editor").setDirty()
   })
 })()

data/app/views/alchemy/admin/attachments/index.html.erb

@@ -1,10 +1,12 @@
 <% content_for(:toolbar) do %>
   <div class="toolbar_buttons">
     <% if can? :create, Alchemy::Attachment %>
-      <%= render 'alchemy/admin/uploader/button',
-        redirect_url: alchemy.admin_attachments_path,
-        object: Alchemy::Attachment.new,
-        file_attribute: 'file' %>
+      <div class="toolbar_button">
+        <%= render 'alchemy/admin/uploader/button',
+          redirect_url: alchemy.admin_attachments_path,
+          object: Alchemy::Attachment.new,
+          file_attribute: 'file' %>
+      </div>
     <% end %>
   </div>
   <%= render 'alchemy/admin/partials/search_form' %>

data/app/views/alchemy/admin/attachments/show.html.erb

@@ -1,7 +1,7 @@
 <div class="resource_info">
   <div class="value">
     <label>
-      <%= render_icon @attachment.icon_css_class, style: 'regular', size: 'lg' %>
+      <%= render_icon @attachment.icon_css_class %>
     </label>
     <p><%= @attachment.file_name %></p>
   </div>
@@ -9,32 +9,32 @@
     <label><%= Alchemy::Attachment.human_attribute_name(:url) %></label>
     <p><%= @attachment.url %></p>
     <a data-clipboard-text="<%= @attachment.url %>" class="icon_button--right">
-      <%= render_icon(:clipboard, style: 'regular') %>
+      <%= render_icon(:clipboard) %>
     </a>
   </div>
   <div class="value with-icon">
     <label><%= Alchemy::Attachment.human_attribute_name(:download_url) %></label>
     <p><%= @attachment.url(download: true) %></p>
     <a data-clipboard-text="<%= @attachment.url(download: true) %>" class="icon_button--right">
-      <%= render_icon(:clipboard, style: 'regular') %>
+      <%= render_icon(:clipboard) %>
     </a>
   </div>
 </div>
 
-<% case @attachment.icon_css_class %>
-<% when "file-image" %>
+<% case @attachment.file_mime_type %>
+<% when *Alchemy::Filetypes::IMAGE_FILE_TYPES %>
 <div class="attachment_preview_container image-preview">
   <%= image_tag(@attachment.url, class: "full_width") %>
 </div>
-<% when "file-audio" %>
+<% when *Alchemy::Filetypes::AUDIO_FILE_TYPES %>
 <div class="attachment_preview_container player-preview">
   <%= audio_tag(@attachment.url, preload: "none", controls: true, class: "full_width") %>
 </div>
-<% when "file-video" %>
+<% when *Alchemy::Filetypes::VIDEO_FILE_TYPES %>
 <div class="attachment_preview_container player-preview">
   <%= video_tag(@attachment.url, preload: "metadata", controls: true, class: "full_width") %>
 </div>
-<% when "file-pdf" %>
+<% when "application/pdf" %>
 <iframe src="<%= @attachment.url %>" frameborder=0 class="full-iframe">
   Your browser does not support frames.
 </iframe>