alchemy_cms 6.0.0.pre.rc5 → 6.0.0

data/app/controllers/alchemy/api/contents_controller.rb

@@ -46,11 +46,7 @@ module Alchemy
     private
 
     def content_includes
-      [
-        {
-          essence: :ingredient_association,
-        },
-      ]
+      %i[essence]
     end
   end
 end

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

@@ -47,18 +47,14 @@ module Alchemy
         {
           nested_elements: [
             {
-              contents: {
-                essence: :ingredient_association,
-              },
+              contents: :essence,
               ingredients: :related_object,
             },
             :tags,
           ],
         },
         {
-          contents: {
-            essence: :ingredient_association,
-          },
+          contents: :essence,
           ingredients: :related_object,
         },
         :tags,

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

@@ -2,17 +2,19 @@
 
 module Alchemy
   class Api::PagesController < Api::BaseController
+    serialization_scope :current_ability
     before_action :load_page, only: [:show]
 
     # Returns all pages as json object
     #
     def index
       # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if cannot? :edit_content, Alchemy::Page
-        @pages = Alchemy::Page.accessible_by(current_ability, :index)
-        @pages = @pages.where(language: Language.current)
+      if can? :edit_content, Alchemy::Page
+        @pages = Alchemy::Page.all
       else
-        @pages = Language.current&.pages.presence || Alchemy::Page.none
+        language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
+        @pages = Alchemy::Page.accessible_by(current_ability, :index)
+        @pages = @pages.where(language: language)
       end
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result
@@ -49,6 +51,14 @@ module Alchemy
       respond_with @page
     end
 
+    def move
+      @page = Page.find(params[:id])
+      authorize! :update, @page
+      target_parent_page = Page.find(params[:target_parent_id])
+      @page.move_to_child_with_index(target_parent_page, params[:new_position])
+      render json: @page, serializer: PageSerializer
+    end
+
     private
 
     def load_page
@@ -102,17 +112,13 @@ module Alchemy
             {
               nested_elements: [
                 {
-                  contents: {
-                    essence: :ingredient_association,
-                  },
+                  contents: :essence,
                 },
                 :tags,
               ],
             },
             {
-              contents: {
-                essence: :ingredient_association,
-              },
+              contents: :essence,
             },
             :tags,
           ],

data/app/helpers/alchemy/elements_helper.rb

@@ -149,8 +149,8 @@ module Alchemy
       render element, {
         element: element,
         counter: counter,
-        options: options,
-      }.merge(options.delete(:locals) || {})
+        options: options.except(:locals),
+      }.merge(options[:locals] || {})
     rescue ActionView::MissingTemplate => e
       warning(%(
         Element view partial not found for #{element.name}.\n

data/app/models/alchemy/ingredient.rb

@@ -11,7 +11,8 @@ module Alchemy
     belongs_to :element, touch: true, class_name: "Alchemy::Element", inverse_of: :ingredients
     belongs_to :related_object, polymorphic: true, optional: true
 
-    before_validation(on: :create) { self.value ||= default_value }
+    after_initialize :set_default_value,
+      if: -> { definition.key?(:default) && value.nil? }
 
     validates :type, presence: true
     validates :role, presence: true
@@ -161,6 +162,10 @@ module Alchemy
       role
     end
 
+    def set_default_value
+      self.value = default_value
+    end
+
     # Returns the default value from ingredient definition
     #
     # If the value is a symbol it gets passed through i18n

data/app/models/alchemy/page.rb

@@ -245,8 +245,8 @@ module Alchemy
 
       def copy_and_paste(source, new_parent, new_name)
         page = copy(source, {
-          parent_id: new_parent.id,
-          language: new_parent.language,
+          parent: new_parent,
+          language: new_parent&.language,
           name: new_name,
           title: new_name,
         })
@@ -448,6 +448,7 @@ module Alchemy
         next if child == new_parent
 
         new_child = Page.copy(child, {
+          parent_id: new_parent.id,
           language_id: new_parent.language_id,
           language_code: new_parent.language_code,
         })

data/app/models/alchemy/picture.rb

@@ -28,7 +28,7 @@ module Alchemy
       large: "240x180",
     }.with_indifferent_access.freeze
 
-    CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
+    CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
 
     TRANSFORMATION_OPTIONS = [
       :crop,

data/app/serializers/alchemy/page_serializer.rb

@@ -14,8 +14,14 @@ module Alchemy
       :created_at,
       :updated_at,
       :status,
-      :url_path
+      :url_path,
+      :parent_id
 
     has_many :elements
+
+    with_options if: -> { scope.can?(:edit_content, object) } do
+      belongs_to :site
+      belongs_to :language
+    end
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -3,13 +3,13 @@
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes
-      {"pages" => nil}
+      { "pages" => nil }
     end
 
     def pages
       tree = []
-      path = [{id: object.parent_id, children: tree}]
-      page_list = object.self_and_descendants
+      path = [{ id: object.parent_id, children: tree }]
+      page_list = object.self_and_descendants.includes(:public_version, { language: :site })
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -1,4 +1,8 @@
 <%= alchemy_form_for [:admin, @page], class: 'edit_page' do |f| %>
+  <% unless @page.language_root? || @page.layoutpage %>
+    <%= f.input :parent_id, required: true, input_html: { class: 'alchemy_selectbox' } %>
+  <% end %>
+
   <div class="input check_boxes">
     <label class="control-label"><%= Alchemy.t(:page_status) %></label>
     <div class="control_group">
@@ -37,3 +41,18 @@
 
   <%= f.submit Alchemy.t(:save) %>
 <% end %>
+
+<script>
+  $('#page_parent_id').alchemyPageSelect({
+    placeholder: "<%= Alchemy.t(:search_page) %>",
+    url: "<%= alchemy.api_pages_path %>",
+    allowClear: false,
+    <% if @page.parent %>
+    initialSelection: {
+      id: <%= @page.parent.id %>,
+      text: "<%= @page.parent.name %>",
+      url_path: "<%= @page.parent.url_path %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/admin/pages/_new_page_form.html.erb

@@ -3,11 +3,7 @@
     <%= f.hidden_field(:parent_id) %>
   <% else %>
     <% @page.parent = @current_language.root_page %>
-    <%= f.input :parent_id,
-      collection: @current_language.pages.contentpages,
-      label_method: :name,
-      value_method: :id,
-      input_html: { class: "alchemy_selectbox" } %>
+    <%= f.input :parent_id, as: :string, input_html: { class: 'alchemy_selectbox' } %>
   <% end %>
   <%= f.hidden_field(:language_id) %>
   <%= f.hidden_field(:layoutpage) %>
@@ -21,3 +17,18 @@
   <%= f.input :name %>
   <%= f.submit Alchemy.t(:create) %>
 <% end %>
+
+<script>
+  $('input[type="text"]#page_parent_id').alchemyPageSelect({
+    placeholder: "<%= Alchemy.t(:search_page) %>",
+    url: "<%= alchemy.api_pages_path %>",
+    allowClear: false,
+    <% if @page.parent %>
+    initialSelection: {
+      id: <%= @page.parent.id %>,
+      text: "<%= @page.parent.name %>",
+      url_path: "<%= @page.parent.url_path %>"
+    }
+    <% end %>
+  })
+</script>

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -1,24 +1,7 @@
-<li id="page_{{id}}" class="page_level_{{level}} {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}">
+<li id="page_{{id}}" class="sitemap-item {{page_layout}}" data-slug="{{slug}}" data-restricted="{{restricted}}" data-page-id="{{id}}" data-folded="{{folded}}">
   <div class="sitemap_page{{#if locked}} locked{{/if}}" name="{{name}}">
-    <div class="sitemap_left_images<% if @sorting %>{{#unless root}} handle{{/unless}}<% end %>">
-      <% unless @sorting %>
-        {{#unless root_or_leaf}}
-        <%= link_to(
-          alchemy.fold_admin_page_path(page),
-          remote: true,
-          method: :post,
-          class: "page_folder",
-          title: "{{#if folded}}#{Alchemy.t('Show childpages')}{{else}}#{Alchemy.t('Hide childpages')}{{/if}}",
-          id: "fold_button_{{id}}"
-        ) do %>
-          {{#if folded}}
-            <i class="far fa-plus-square fa-fw"></i>
-          {{else}}
-            <i class="far fa-minus-square fa-fw"></i>
-          {{/if}}
-        <% end %>
-        {{/unless}}
-      <% end %>
+    <div class="sitemap_left_images">
+      <span class="page_folder"></span>
       {{#if definition_missing}}
         <%= page_layout_missing_warning %>
       {{else}}
@@ -31,121 +14,121 @@
               </span>
             </span>
           {{else}}
+          <span class="{{#unless root}}handle{{/unless}}">
             <i class="icon far fa-file fa-lg"></i>
+          </span>
           {{/if}}
         {{else}}
           <span class="with-hint">
             <i class="icon fas fa-ban fa-fw"></i>
             <span class="hint-bubble">
-              <%= Alchemy.t('Your user role does not allow you to edit this page') %>
+              <%= Alchemy.t("Your user role does not allow you to edit this page") %>
             </span>
           </span>
         {{/if}}
       {{/if}}
     </div>
     <div class="sitemap_right_tools">
-      <%- unless @sorting -%>
-        {{#if permissions.info}}
-        <div class="button_with_label sitemap_tool">
-          <%= link_to_dialog(
-            render_icon('info-circle'),
-            alchemy.info_admin_page_path(page),
-            {
-              title: Alchemy.t(:page_infos),
-              size: '520x290'
-            }
-          ) %>
-          <label class="center"><%= Alchemy.t(:page_infos) %></label>
-        {{else}}
-        <div class="sitemap_tool disabled with-hint">
-          <%= render_icon('info-circle') %>
-          <span class="hint-bubble">
-            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
-          </span>
-        {{/if}}
-        </div>
-        {{#if permissions.configure}}
-        <div class="button_with_label sitemap_tool">
-          <%= link_to_dialog(
-            render_icon(:cog),
-            alchemy.configure_admin_page_path(page),
-            {
-              title: Alchemy.t(:edit_page_properties),
-              size: '450x680'
-            }
-          ) -%>
-          <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
-        {{else}}
-        <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:cog) %>
-          <span class="hint-bubble">
-            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
-          </span>
-        {{/if}}
-        </div>
-        {{#if permissions.copy}}
-        <div class="button_with_label sitemap_tool">
-          <%= link_to(
-            render_icon(:copy),
-            alchemy.insert_admin_clipboard_path(
-              remarkable_type: page.class.name.demodulize.underscore.pluralize,
-              remarkable_id: '__ID__',
-            ).gsub('__ID__', '{{id}}'),
-            remote: true,
-            method: 'post'
-          ) %>
-          <label class="center"><%= Alchemy.t(:copy_page) %></label>
-        {{else}}
-        <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:copy) %>
-          <span class="hint-bubble">
-            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
-          </span>
-        {{/if}}
-        </div>
-        {{#if permissions.destroy}}
-        <div class="button_with_label sitemap_tool">
-          <%= link_to_confirm_dialog(
-            render_icon(:minus),
-            Alchemy.t(:confirm_to_delete_page),
-            url_for(
-              controller: 'pages',
-              action: 'destroy',
-              id: '__ID__'
-            ).gsub('__ID__', '{{id}}')
-          ) -%>
-          <label class="center"><%= Alchemy.t(:delete_page) %></label>
-        {{else}}
-        <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:minus) %>
-          <span class="hint-bubble">
-            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
-          </span>
-        {{/if}}
-        </div>
-        {{#if permissions.create}}
-        <div class="button_with_label sitemap_tool">
-          <%= link_to_dialog(
-            render_icon(:plus),
-            alchemy.new_admin_page_path(parent_id: '__ID__').gsub('__ID__', '{{id}}'),
-            {
-              title: Alchemy.t(:create_page),
-              size: '340x165',
-              overflow: true
-            }
-          ) -%>
-          <label class="left"><%= Alchemy.t(:create_page) %></label>
-        {{else}}
-        <div class="sitemap_tool disabled with-hint">
-          <%= render_icon(:plus) %>
-          <span class="hint-bubble">
-            <%= Alchemy.t('Your user role does not allow you to edit this page') %>
-          </span>
-        {{/if}}
-        </div>
-      <%- end -%>
+      {{#if permissions.info}}
+      <div class="button_with_label sitemap_tool">
+        <%= link_to_dialog(
+          render_icon("info-circle"),
+          alchemy.info_admin_page_path(id: "__ID__"),
+          {
+            title: Alchemy.t(:page_infos),
+            size: "520x290"
+          }
+        ) %>
+        <label class="center"><%= Alchemy.t(:page_infos) %></label>
+      {{else}}
+      <div class="sitemap_tool disabled with-hint">
+        <%= render_icon("info-circle") %>
+        <span class="hint-bubble">
+          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
+        </span>
+      {{/if}}
+      </div>
+      {{#if permissions.configure}}
+      <div class="button_with_label sitemap_tool">
+        <%= link_to_dialog(
+          render_icon(:cog),
+          alchemy.configure_admin_page_path(id: "__ID__"),
+          {
+            title: Alchemy.t(:edit_page_properties),
+            size: "450x680"
+          }
+        ) -%>
+        <label class="center"><%= Alchemy.t(:edit_page_properties) %></label>
+      {{else}}
+      <div class="sitemap_tool disabled with-hint">
+        <%= render_icon(:cog) %>
+        <span class="hint-bubble">
+          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
+        </span>
+      {{/if}}
+      </div>
+      {{#if permissions.copy}}
+      <div class="button_with_label sitemap_tool">
+        <%= link_to(
+          render_icon(:copy),
+          alchemy.insert_admin_clipboard_path(
+            remarkable_type: :pages,
+            remarkable_id: "__ID__",
+          ),
+          remote: true,
+          method: :post
+        ) %>
+        <label class="center"><%= Alchemy.t(:copy_page) %></label>
+      {{else}}
+      <div class="sitemap_tool disabled with-hint">
+        <%= render_icon(:copy) %>
+        <span class="hint-bubble">
+          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
+        </span>
+      {{/if}}
+      </div>
+      {{#if permissions.destroy}}
+      <div class="button_with_label sitemap_tool">
+        <%= link_to_confirm_dialog(
+          render_icon(:minus),
+          Alchemy.t(:confirm_to_delete_page),
+          url_for(
+            controller: "pages",
+            action: "destroy",
+            id: "__ID__"
+          )
+        ) -%>
+        <label class="center"><%= Alchemy.t(:delete_page) %></label>
+      {{else}}
+      <div class="sitemap_tool disabled with-hint">
+        <%= render_icon(:minus) %>
+        <span class="hint-bubble">
+          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
+        </span>
+      {{/if}}
+      </div>
+      {{#if permissions.create}}
+      <div class="button_with_label sitemap_tool">
+        <%= link_to_dialog(
+          render_icon(:plus),
+          alchemy.new_admin_page_path(parent_id: "__ID__"),
+          {
+            title: Alchemy.t(:create_page),
+            size: "340x165",
+            overflow: true
+          }
+        ) -%>
+        <label class="left"><%= Alchemy.t(:create_page) %></label>
+      {{else}}
+      <div class="sitemap_tool disabled with-hint">
+        <%= render_icon(:plus) %>
+        <span class="hint-bubble">
+          <%= Alchemy.t("Your user role does not allow you to edit this page") %>
+        </span>
+      {{/if}}
+      </div>
     </div>
-    <div class="page_infos" id="page_<%= page.id %>_infos">
+    <div class="page_infos">
       <span class="page_status with-hint">
         <i class="icon fas fa-fw fa-compass {{#unless public}}disabled{{/unless}}" data-fa-transform="shrink-2"></i>
         <span class="hint-bubble">{{status_titles.public}}</span>
@@ -160,23 +143,18 @@
     </div>
     <div class="sitemap_sitename">
       {{#if permissions.edit_content}}
-        <%= link_to_unless(
-          @sorting,
-          '{{name}}',
-          alchemy.edit_admin_page_path(page),
+        <%= link_to(
+          "{{name}}",
+          alchemy.edit_admin_page_path(id: "__ID__"),
           title: Alchemy.t(:edit_page),
           class: "sitemap_pagename_link"
-        ) { content_tag('span', '{{name}}', class: "sitemap_pagename_link") } -%>
+        ) -%>
       {{else}}
-        <%= content_tag('span', '{{name}}', class: "sitemap_pagename_link") %>
+        <%= content_tag("span", "{{name}}", class: "sitemap_pagename_link") %>
       {{/if}}
     </div>
   </div>
-  {{#if children}}
-  <% unless @sorting %>{{#unless folded}}<% end %>
-  <ul id="page_{{id}}_children" class="level_{{level}}_children">
+  <ul id="page_{{id}}_children" class="children" data-parent-id="{{id}}">
     {{> list}}
   </ul>
-  <% unless @sorting %>{{/unless}}<% end %>
-  {{/if}}
 </li>

data/app/views/alchemy/admin/pages/_sitemap.html.erb

@@ -1,15 +1,14 @@
-<div id="sitemap-wrapper">
-  <h4 id="sitemap_heading">
-    <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
-    <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
-    <span class="page_status"><%= Alchemy.t(:page_status) %></span>
-  </h4>
+<h4 id="sitemap_heading">
+  <span class="page_name"><%= Alchemy::Page.human_attribute_name(:name) %></span>
+  <span class="page_urlname"><%= Alchemy::Page.human_attribute_name(:urlname) %></span>
+  <span class="page_status"><%= Alchemy.t(:page_status) %></span>
+</h4>
 
-  <p class="loading"></p>
+<div id="sitemap-wrapper">
 </div>
 
 <script id="sitemap-template" type="text/x-handlebars-template">
-  <ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
+  <ul id="sitemap" class="list">
     {{> list}}
   </ul>
 </script>
@@ -22,15 +21,10 @@
 
 <script type="text/javascript">
  $(function() {
-   Alchemy.Sitemap.init({
+   Alchemy.currentSitemap = new Alchemy.Sitemap({
      url: '<%= alchemy.tree_admin_pages_path %>',
-     page_root_id: <%= @page_root.id %>,
-     full: <%= full %>
-     <% if @sorting  %>
-     ,ready: function () {
-       Alchemy.PageSorter();
-     }
-     <% end %>
+     page_root_id: <%= @page_root.id %>
    });
+   Alchemy.PagePublicationFields();
  });
 </script>

data/app/views/alchemy/admin/pages/_toolbar.html.erb

@@ -28,18 +28,6 @@
       <label><%= Alchemy.t("Flush page cache") %></label>
     </div>
   <% end %>
-  <% if can?(:sort, Alchemy::Page) %>
-    <div class="button_with_label">
-      <%= link_to(
-        render_icon(:random),
-        alchemy.sort_admin_pages_path,
-        method: :get,
-        class: "icon_button",
-        title: Alchemy.t("Sort pages")
-      ) %>
-      <label><%= Alchemy.t("Sort pages") %></label>
-    </div>
-  <% end %>
   <div class="button_with_label" id="clipboard_button">
     <%= link_to_dialog(
       render_icon(clipboard_empty?("pages") ? :clipboard : :paste),

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -154,7 +154,7 @@
       if (!not_dirty) Alchemy.pleaseWaitOverlay(false);
       return not_dirty;
     });
-    Alchemy.Sitemap.watchPagePublicationState();
+    Alchemy.PagePublicationFields();
     Alchemy.PageLeaveObserver();
     Alchemy.ElementsWindow.init('<%= alchemy.admin_elements_path(page_version_id: @page_version.id) %>', {
       texts: {

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

@@ -30,7 +30,7 @@
   <% else %>
     <% if @page_root %>
       <h2 id="page_filter_result"></h2>
-      <%= render "sitemap", page_partial: "page", full: !!@sorting %>
+      <%= render "sitemap", page_partial: "page" %>
     <% elsif can?(:create, Alchemy::Page) %>
       <%= render partial: "create_language_form" %>
     <% else %>

data/app/views/alchemy/admin/pages/update.js.erb

@@ -1,11 +1,6 @@
 (function() {
   var page = document.querySelector('#page_<%= @page.id %>');
 
-<% if @old_page_layout != @page.page_layout -%>
-  Alchemy.ElementsWindow.reload();
-  Alchemy.growl('<%= j Alchemy.t(:page_layout_changed_notice) %>');
-<% end -%>
-
 <% if @while_page_edit -%>
 
   Alchemy.reloadPreview();
@@ -13,6 +8,13 @@
   Alchemy.growl("<%= j @notice %>");
   Alchemy.closeCurrentDialog();
 
+<% elsif @page.parent_id != @old_parent_id -%>
+
+  Alchemy.closeCurrentDialog(function() {
+    Alchemy.growl("<%= j @notice %>");
+    Alchemy.currentSitemap.load(<%= @page.get_language_root.id %>);
+  });
+
 <% else -%>
 
   if (page) {