alchemy_cms 6.0.0.pre.rc6 → 6.0.0.pre.rc7

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

@@ -8,7 +8,7 @@
 </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>
@@ -23,13 +23,7 @@
  $(function() {
    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();
  });

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/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

@@ -8,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) {

data/app/views/alchemy/admin/partials/_routes.html.erb

@@ -19,8 +19,15 @@
       },
     },
 
+    move_admin_page_path: function(id) {
+      return '<%= alchemy.move_api_page_path(id: 1) %>'.replace(/1/, id);
+    },
+
+    fold_admin_page_path: function(id) {
+      return '<%= alchemy.fold_admin_page_path(id: 1) %>'.replace(/1/, id);
+    },
+
     order_admin_elements_path: '<%= alchemy.order_admin_elements_path %>',
-    order_admin_pages_path: '<%= alchemy.order_admin_pages_path %>',
     link_admin_pages_path: '<%= alchemy.link_admin_pages_path %>',
     api_pages_path: '<%= alchemy.api_pages_path %>',
     api_elements_path: '<%= alchemy.api_elements_path %>'

data/app/views/alchemy/essences/_essence_page_editor.html.erb

@@ -14,7 +14,7 @@
 <script>
   $('#<%= essence_page_editor.form_field_id %>').alchemyPageSelect({
     placeholder: "<%= Alchemy.t(:search_page) %>",
-    url: "<%= alchemy.api_pages_path %>",
+    url: "<%= alchemy.api_pages_path language_id: essence_page_editor.page&.language_id %>",
     query_params: <%== essence_page_editor.settings[:query_params].to_json %>,
     <% if essence_page_editor.essence.page %>
     initialSelection: {

data/config/locales/alchemy.en.yml

@@ -334,7 +334,6 @@ en:
     "Site successfully removed": "Website successfully removed."
     "Site successfully updated": "Website successfully updated."
     "Size": "Size"
-    "Sort pages": "Reorder pages"
     "Successfully added content": "Successfully added %{content}"
     "Successfully deleted content": "Successfully deleted %{content}"
     "Successfully deleted element": "Successfully deleted %{element}"
@@ -437,7 +436,6 @@ en:
     enter_external_link: "Please enter the URL you want to link with"
     explain_cropping: "<p>Move the frame and change its size with the mouse or arrow keys to adjust the image mask. Click on \"apply\" when you are satisfied with your selection.</p><p>If you want to return to the original centered image mask like it was defined in the layout, click \"reset\" and \"apply\" afterwards.</p>"
     explain_publishing: "Publish current page content"
-    explain_sitemap_dragndrop_sorting: "Tip: Drag the pages at the icon in order to sort them."
     explain_unlocking: "Leave page and unlock it for other users."
     external_link_notice_1: "Please enter the complete url with http:// or a similar protocol."
     external_link_notice_2: "To refer a path from your website url, start with a /."
@@ -592,7 +590,6 @@ en:
     robot_follow: "robot may follow links."
     robot_index: "allow robot to index."
     save: "Save"
-    "save order": "Save order"
     saved_link: "Link saved."
     search: "search"
     search_engines: "Search engines"

data/config/routes.rb

@@ -28,13 +28,12 @@ Alchemy::Engine.routes.draw do
         post :copy_language_tree
         get :create_language
         get :link
-        get :sort
         get :tree
       end
       member do
         post :unlock
         post :publish
-        post :fold
+        patch :fold
         get :configure
         get :preview
         get :info
@@ -139,6 +138,9 @@ Alchemy::Engine.routes.draw do
       collection do
         get :nested
       end
+      member do
+        patch :move
+      end
     end
 
     get "/pages/*urlname(.:format)" => "pages#show", as: "page"

data/lib/alchemy/permissions.rb

@@ -147,7 +147,6 @@ module Alchemy
           :copy_language_tree,
           :flush,
           :order,
-          :sort,
           :switch_language,
         ], Alchemy::Page
 

data/lib/alchemy/test_support/shared_ingredient_examples.rb

@@ -28,7 +28,7 @@ RSpec.shared_examples_for "an alchemy ingredient" do
 
     context "with element" do
       before do
-        expect(element).to receive(:ingredient_definition_for) do
+        expect(element).to receive(:ingredient_definition_for).at_least(:once) do
           {
             settings: {
               linkable: true,
@@ -63,7 +63,9 @@ RSpec.shared_examples_for "an alchemy ingredient" do
       end
 
       before do
-        expect(element).to receive(:ingredient_definition_for) { definition }
+        expect(element).to receive(:ingredient_definition_for).at_least(:once) do
+          definition
+        end
       end
 
       it "returns ingredient definition" do

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0-rc6"
+  VERSION = "6.0.0-rc7"
 
   def self.version
     VERSION

data/lib/generators/alchemy/install/install_generator.rb

@@ -23,6 +23,11 @@ module Alchemy
         default: false,
         desc: "Skip running the webpacker installer."
 
+      class_option :skip_db_create,
+        type: :boolean,
+        default: false,
+        desc: "Skip creting the database during install."
+
       source_root File.expand_path("files", __dir__)
 
       def setup
@@ -104,7 +109,7 @@ module Alchemy
       end
 
       def setup_database
-        rake("db:create", abort_on_failure: true)
+        rake("db:create", abort_on_failure: true) unless options[:skip_db_create]
         # We can't invoke this rake task, because Rails will use wrong engine names otherwise
         rake("railties:install:migrations", abort_on_failure: true)
         rake("db:migrate", abort_on_failure: true)

data/package/src/image_loader.js

@@ -39,9 +39,11 @@ export default class ImageLoader {
     this.unbind()
   }
 
-  onError() {
+  onError(evt) {
+    const message = `Could not load ${this.image.src}`
     this.removeSpinner()
-    this.parent.innerHtml = '<span class="icon warn"></span>'
+    this.parent.innerHTML = `<span class="icon fas fa-exclamation-triangle" title="${message}" />`
+    console.error(message, evt)
     this.unbind()
   }
 

data/package/src/node_tree.js

@@ -1,12 +1,16 @@
 import Sortable from "sortablejs"
-import ajax from "./utils/ajax"
+import { patch } from "./utils/ajax"
 import { on } from "./utils/events"
 
 function displayNodeFolders() {
   document.querySelectorAll("li.menu-item").forEach((el) => {
     const leftIconArea = el.querySelector(".nodes_tree-left_images")
     const list = el.querySelector(".children")
-    const node = { folded: el.dataset.folded === "true", id: el.dataset.id, type: el.dataset.type }
+    const node = {
+      folded: el.dataset.folded === "true",
+      id: el.dataset.id,
+      type: el.dataset.type
+    }
 
     if (list.children.length > 0 || node.folded) {
       leftIconArea.innerHTML = HandlebarsTemplates.node_folder({ node: node })
@@ -17,13 +21,15 @@ function displayNodeFolders() {
 }
 
 function onFinishDragging(evt) {
-  const url = Alchemy.routes[evt.item.dataset.type].move_api_path(evt.item.dataset.id)
+  const url = Alchemy.routes[evt.item.dataset.type].move_api_path(
+    evt.item.dataset.id
+  )
   const data = {
     target_parent_id: evt.to.dataset.recordId,
     new_position: evt.newIndex
   }
 
-  ajax("PATCH", url, data)
+  patch(url, data)
     .then(() => {
       const message = Alchemy.t("Successfully moved menu item")
       Alchemy.growl(message)
@@ -38,10 +44,11 @@ function handleNodeFolders() {
   on("click", ".nodes_tree", ".node_folder", function () {
     const nodeId = this.dataset.recordId
     const menu_item = this.closest("li.menu-item")
-    const url = Alchemy.routes[this.dataset.recordType].toggle_folded_api_path(nodeId)
+    const url =
+      Alchemy.routes[this.dataset.recordType].toggle_folded_api_path(nodeId)
     const list = menu_item.querySelector(".children")
 
-    ajax("PATCH", url)
+    patch(url)
       .then(() => {
         list.classList.toggle("folded")
         menu_item.dataset.folded =

data/package/src/page_publication_fields.js

@@ -7,21 +7,22 @@ export default function () {
     const publication_date_fields = dialog.querySelector(
       ".page-publication-date-fields"
     )
+    const public_field = dialog.querySelector("#page_public")
 
-    dialog
-      .querySelector("#page_public")
-      .addEventListener("click", function (evt) {
-        const checkbox = evt.target
-        const now = new Date()
+    if(!public_field) return
 
-        if (checkbox.checked) {
-          publication_date_fields.classList.remove("hidden")
-          public_on_field._flatpickr.setDate(now)
-        } else {
-          publication_date_fields.classList.add("hidden")
-          public_on_field.value = ""
-        }
-        public_until_field.value = ""
-      })
+    public_field.addEventListener("click", function (evt) {
+      const checkbox = evt.target
+      const now = new Date()
+
+      if (checkbox.checked) {
+        publication_date_fields.classList.remove("hidden")
+        public_on_field._flatpickr.setDate(now)
+      } else {
+        publication_date_fields.classList.add("hidden")
+        public_on_field.value = ""
+      }
+      public_until_field.value = ""
+    })
   })
 }

data/package/src/page_sorter.js

@@ -0,0 +1,62 @@
+import Sortable from "sortablejs"
+import { patch } from "./utils/ajax"
+
+function onFinishDragging(evt) {
+  const pageId = evt.item.dataset.pageId
+  const url = Alchemy.routes.move_admin_page_path(pageId)
+  const data = {
+    target_parent_id: evt.to.dataset.parentId,
+    new_position: evt.newIndex
+  }
+
+  patch(url, data)
+    .then(async (response) => {
+      const pageData = await response.data
+      const pageEl = document.getElementById(`page_${pageId}`)
+      const urlPathEl = pageEl.querySelector(".sitemap_url")
+
+      Alchemy.growl(Alchemy.t("Successfully moved page"))
+      urlPathEl.textContent = pageData.url_path
+      displayPageFolders()
+    })
+    .catch((error) => {
+      Alchemy.growl(error.message || error, "error")
+    })
+}
+
+export function displayPageFolders() {
+  document.querySelectorAll("li.sitemap-item").forEach((el) => {
+    const pageFolderEl = el.querySelector(".page_folder")
+    const list = el.querySelector(".children")
+    const page = {
+      folded: el.dataset.folded === "true",
+      id: el.dataset.pageId,
+      type: el.dataset.type
+    }
+
+    if (list.children.length > 0 || page.folded) {
+      pageFolderEl.outerHTML = HandlebarsTemplates.page_folder({ page })
+    } else {
+      pageFolderEl.innerHTML = ""
+    }
+  })
+}
+
+export function createSortables(sortables) {
+  sortables.forEach((el) => {
+    new Sortable(el, {
+      group: "pages",
+      animation: 150,
+      fallbackOnBody: true,
+      swapThreshold: 0.65,
+      handle: ".handle",
+      onEnd: onFinishDragging
+    })
+  })
+}
+
+export default function () {
+  const sortables = document.querySelectorAll("ul.children")
+  displayPageFolders()
+  createSortables(sortables)
+}