alchemy_cms 6.0.0.pre.rc5 → 6.0.0.pre.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380b59193f2297abbf578f48a662afd797a678edd9948b5967a5df870df20b5f
-  data.tar.gz: e36993e934138b801ce941d7a3b272790b41dde673f1cbded7e874cba637dd8d
+  metadata.gz: b2c4b9cbf469cb88a351047757a38e9ab434cd67006b0390170e22dd5b64d0a8
+  data.tar.gz: 48d6dec7c669c2f854ac0414e16801236cace3a6cef2eef5fb07fa4e509ef996
 SHA512:
-  metadata.gz: '01489e9bf191e8ba5f42d19dfc93336d318744c41ccf6764625ebf787b8f2f030d219829be4b3b5830db93699e681883217909d8239ca023323469c95b7aab28'
-  data.tar.gz: 33599581bdff5315660e260562179f7e9b12ef9269dd50aeba7e5e52cdcb8bf5db5188bb86cb8cc60b53a0346d6c0bf8fe336c5eef234aec54a6110f7d5386b8
+  metadata.gz: 9b290944338b8ca490e0472fa886c8f4b09d47bd957a7d45c014ab328c81a9545cc74196a69eda2969dcf2e5fb0af3bad4bfc9d5079e45c645a51d41582b4137
+  data.tar.gz: 67c3a355c1df19256609680c562d0ae0c2bd76811daee6ea930b1425e85e3ff2087313e3a2d5d203523320f0da20d643d79b11badd1700912930e3209dfb2ddd

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.0.0-rc6 (2022-03-05)
+
+- Rework sitemap JS [#2249](https://github.com/AlchemyCMS/alchemy_cms/pull/2249) ([tvdeyen](https://github.com/tvdeyen))
+- Remove old page layout change code from update action [#2248](https://github.com/AlchemyCMS/alchemy_cms/pull/2248) ([tvdeyen](https://github.com/tvdeyen))
+- Fix rendering errors in page configure overlay [#2247](https://github.com/AlchemyCMS/alchemy_cms/pull/2247) ([tvdeyen](https://github.com/tvdeyen))
+- Fix copying page with descendants to a different language [#2243](https://github.com/AlchemyCMS/alchemy_cms/pull/2243) ([dbwinger](https://github.com/dbwinger))
+- Handle copying/pasting global pages [#2241](https://github.com/AlchemyCMS/alchemy_cms/pull/2241) ([dbwinger](https://github.com/dbwinger))
+
 ## 6.0.0-rc5 (2022-02-24)
 
 ### Changes

data/app/assets/javascripts/alchemy/admin.js

@@ -38,7 +38,6 @@
 //= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.preview_window
-//= require alchemy/alchemy.sitemap
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.tinymce
 //= require alchemy/alchemy.tooltips

data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee

@@ -82,7 +82,12 @@ class window.Alchemy.Dialog
     @dialog_body.hide()
     @dialog_body.html(data)
     @init()
-    @dialog.trigger('DialogReady.Alchemy', @dialog_body)
+    @dialog[0].dispatchEvent(new CustomEvent(
+      "DialogReady.Alchemy",
+      bubbles: true
+      detail:
+        body: @dialog_body[0]
+    ))
     if @options.ready?
       @options.ready(@dialog_body)
     @dialog_body.show('fade', 200)

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

@@ -23,7 +23,7 @@ $sitemap-url-xlarge-width: 350px;
 
 #sitemap-wrapper {
   position: relative;
-  min-height: calc(100vh - 96px);
+  min-height: calc(100vh - 148px);
 }
 
 .sitemap_pagename_link {
@@ -154,6 +154,8 @@ $sitemap-url-xlarge-width: 350px;
     position: absolute;
     left: -23px;
     top: 0;
+    width: 16px;
+    height: $sitemap-line-height;
   }
 
   .placeholder {
@@ -258,3 +260,7 @@ $sitemap-url-xlarge-width: 350px;
     }
   }
 }
+
+#search_field_clear {
+  cursor: pointer;
+}

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

@@ -123,8 +123,6 @@ module Alchemy
       # * fetches page via before filter
       #
       def update
-        # stores old page_layout value, because unfurtunally rails @page.changes does not work here.
-        @old_page_layout = @page.page_layout
         if @page.update(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?("edit")
@@ -133,7 +131,7 @@ module Alchemy
             @tree = serialized_page_tree
           end
         else
-          configure
+          render :configure
         end
       end
 

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/views/alchemy/admin/pages/_sitemap.html.erb

@@ -1,11 +1,10 @@
-<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">
@@ -22,7 +21,7 @@
 
 <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 %>
@@ -32,5 +31,6 @@
      }
      <% end %>
    });
+   Alchemy.PagePublicationFields();
  });
 </script>

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/fold.js.erb

@@ -1,2 +1,2 @@
 $('#fold_button_<%= @page.id %>').css('background', 'none');
-Alchemy.Sitemap.fetch(<%= @page.id %>);
+Alchemy.currentSitemap.reload(<%= @page.id %>);

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();

data/config/locales/alchemy.en.yml

@@ -534,7 +534,6 @@ en:
     or_replace_it_with_an_existing_tag: 'Or replace it with an existing tag'
     "Page created": "Page: '%{name}' created."
     page_infos: 'Page info'
-    page_layout_changed_notice: "Page type was changed. Elements not usable anymore have been hided."
     page_properties: "Page properties"
     page_public: "published"
     page_published: "Published page"

data/lib/alchemy/version.rb

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

data/package/admin.js

@@ -6,6 +6,8 @@ import pictureEditors from "./src/picture_editors"
 import ImageLoader from "./src/image_loader"
 import ImageCropper from "./src/image_cropper"
 import Datepicker from "./src/datepicker"
+import Sitemap from "./src/sitemap"
+import PagePublicationFields from "./src/page_publication_fields.js"
 
 // Global Alchemy object
 if (typeof window.Alchemy === "undefined") {
@@ -22,5 +24,7 @@ Object.assign(Alchemy, {
   pictureEditors,
   ImageLoader: ImageLoader.init,
   ImageCropper,
-  Datepicker
+  Datepicker,
+  Sitemap,
+  PagePublicationFields
 })

data/package/src/page_publication_fields.js

@@ -0,0 +1,27 @@
+// Handles the page publication date fields
+export default function () {
+  document.addEventListener("DialogReady.Alchemy", function (evt) {
+    const dialog = evt.detail.body
+    const public_on_field = dialog.querySelector("#page_public_on")
+    const public_until_field = dialog.querySelector("#page_public_until")
+    const publication_date_fields = dialog.querySelector(
+      ".page-publication-date-fields"
+    )
+
+    dialog
+      .querySelector("#page_public")
+      .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/sitemap.js

@@ -0,0 +1,133 @@
+// The admin sitemap Alchemy class
+
+export default class Sitemap {
+  // Storing some objects.
+  constructor(options) {
+    const list_template_regexp = new RegExp("/" + options.page_root_id, "g")
+    const list_template_html = document
+      .getElementById("sitemap-list")
+      .innerHTML.replace(list_template_regexp, "/{{id}}")
+    this.search_field = document.querySelector(".search_input_field")
+    this.filter_field_clear = document.querySelector(".search_field_clear")
+    this.filter_field_clear.removeAttribute("href")
+    this.display = document.getElementById("page_filter_result")
+    this.sitemap_wrapper = document.getElementById("sitemap-wrapper")
+    this.template = Handlebars.compile(
+      document.getElementById("sitemap-template").innerHTML
+    )
+    this.list_template = Handlebars.compile(list_template_html)
+    this.items = null
+    this.options = options
+    Handlebars.registerPartial("list", list_template_html)
+    this.load(options.page_root_id)
+  }
+
+  // Loads the sitemap
+  load(pageId) {
+    const spinner = this.options.spinner || new Alchemy.Spinner("medium")
+    const spinTarget = this.sitemap_wrapper
+    spinTarget.innerHTML = ""
+    spinner.spin(spinTarget)
+    this.fetch(
+      `${this.options.url}?id=${pageId}&full=${this.options.full}`
+    ).then(async (response) => {
+      this.render(await response.json())
+      spinner.stop()
+    })
+  }
+
+  // Reload the sitemap for a specific branch
+  reload(pageId) {
+    const spinner = new Alchemy.Spinner("small")
+    const spinTarget = document.getElementById(`fold_button_${pageId}`)
+    spinTarget.querySelector(".far").remove()
+    spinner.spin(spinTarget)
+    this.fetch(`${this.options.url}?id=${pageId}`).then(async (response) => {
+      this.render(await response.json(), pageId)
+      spinner.stop()
+    })
+  }
+
+  fetch(url) {
+    return fetch(url).catch((error) => console.warn(`Request failed: ${error}`))
+  }
+
+  // Renders the sitemap
+  render(data, foldingId) {
+    let renderTarget, renderTemplate
+
+    if (foldingId) {
+      renderTarget = document.getElementById(`page_${foldingId}`)
+      renderTemplate = this.list_template
+      renderTarget.outerHTML = renderTemplate({ children: data.pages })
+    } else {
+      renderTarget = this.sitemap_wrapper
+      renderTemplate = this.template
+      renderTarget.innerHTML = renderTemplate({ children: data.pages })
+    }
+    this.items = document
+      .getElementById("sitemap")
+      .querySelectorAll(".sitemap_page")
+    this.sitemap_wrapper = document.getElementById("sitemap-wrapper")
+    this._observe()
+
+    if (this.options.ready) {
+      this.options.ready()
+    }
+  }
+
+  // Filters the sitemap
+  filter(term) {
+    const results = []
+
+    this.items.forEach(function (item) {
+      if (
+        term !== "" &&
+        item.getAttribute("name").toLowerCase().indexOf(term) !== -1
+      ) {
+        item.classList.add("highlight")
+        item.classList.remove("no-match")
+        results.push(item)
+      } else {
+        item.classList.add("no-match")
+        item.classList.remove("highlight")
+      }
+    })
+    this.filter_field_clear.style.display = "inline-block"
+    const { length } = results
+
+    if (length === 1) {
+      this.display.style.display = "block"
+      this.display.innerText = `1 ${Alchemy.t("page_found")}`
+      results[0].scrollIntoView({ behavior: "smooth", block: "center" })
+    } else if (length > 1) {
+      this.display.style.display = "block"
+      this.display.innerText = `${length} ${Alchemy.t("pages_found")}`
+    } else {
+      this.items.forEach((item) =>
+        item.classList.remove("no-match", "highlight")
+      )
+      this.display.style.display = "none"
+      window.scrollTo({
+        top: 0,
+        left: 0,
+        behavior: "smooth"
+      })
+      this.filter_field_clear.style.display = "none"
+    }
+  }
+
+  // Adds onkey up observer to search field
+  _observe() {
+    this.search_field.addEventListener("keyup", (evt) => {
+      const term = evt.target.value
+      this.filter(term.toLowerCase())
+    })
+    this.search_field.addEventListener("focus", () => key.setScope("search"))
+    this.filter_field_clear.addEventListener("click", () => {
+      this.search_field.value = ""
+      this.filter("")
+      return false
+    })
+  }
+}

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.0-rc4",
+  "version": "6.0.0-rc6",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc5
+  version: 6.0.0.pre.rc6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -775,7 +775,6 @@ files:
 - app/assets/javascripts/alchemy/alchemy.page_sorter.js
 - app/assets/javascripts/alchemy/alchemy.preview.js.coffee
 - app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee
-- app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee
 - app/assets/javascripts/alchemy/alchemy.spinner.js
 - app/assets/javascripts/alchemy/alchemy.string_extension.js.coffee
 - app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee
@@ -1431,7 +1430,9 @@ files:
 - package/src/image_cropper.js
 - package/src/image_loader.js
 - package/src/node_tree.js
+- package/src/page_publication_fields.js
 - package/src/picture_editors.js
+- package/src/sitemap.js
 - package/src/translations.js
 - package/src/utils/__tests__/ajax.spec.js
 - package/src/utils/__tests__/events.spec.js

data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee

@@ -1,119 +0,0 @@
-window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
-
-# The admin sitemap Alchemy module
-Alchemy.Sitemap =
-
-  # Storing some objects.
-  init: (options) ->
-    @search_field = $(".search_input_field")
-    @filter_field_clear = $('.search_field_clear')
-    @display = $('#page_filter_result')
-    @sitemap_wrapper = $('#sitemap-wrapper p.loading')
-    @template = Handlebars.compile($('#sitemap-template').html())
-    list_template_regexp = new RegExp '\/' + options.page_root_id, 'g'
-    list_template_html = $('#sitemap-list').html().replace(list_template_regexp, '/{{id}}')
-    @list_template = Handlebars.compile(list_template_html)
-    @items = null
-    @options = options
-    @watchPagePublicationState()
-    true
-
-    Handlebars.registerPartial('list', list_template_html)
-
-    @fetch()
-
-  # Fetches the sitemap from JSON
-  fetch: (foldingId) ->
-    self = Alchemy.Sitemap
-
-    if foldingId
-      spinner = new Alchemy.Spinner('small')
-      spinTarget = $('#fold_button_' + foldingId)
-      renderTarget = $('#page_' + foldingId)
-      renderTemplate = @list_template
-      pageId = foldingId
-    else
-      spinner = @options.spinner || new Alchemy.Spinner('medium')
-      spinTarget = @sitemap_wrapper
-      renderTarget = @sitemap_wrapper
-      renderTemplate = @template
-      pageId = @options.page_root_id
-
-    spinner.spin(spinTarget[0])
-
-    request = $.ajax url: @options.url, data:
-      id: pageId
-      full: @options.full
-
-    request.done (data) ->
-      # This will also remove the spinner
-      renderTarget.replaceWith(renderTemplate({children: data.pages}))
-      self.items = $(".sitemap_page", '#sitemap')
-      self._observe()
-
-      if self.options.ready
-        self.options.ready()
-
-    request.fail (jqXHR, status) ->
-      console.warn("Request failed: " + status)
-
-  # Filters the sitemap
-  filter: (term) ->
-    results = []
-    self = Alchemy.Sitemap
-    self.items.map ->
-      item = $(this)
-      if term != '' && item.attr('name').toLowerCase().indexOf(term) != -1
-        item.addClass('highlight')
-        item.removeClass('no-match')
-        results.push item
-      else
-        item.addClass('no-match')
-        item.removeClass('highlight')
-    self.filter_field_clear.show()
-    length = results.length
-    if length == 1
-      self.display.show().text("1 #{Alchemy.t('page_found')}")
-      $.scrollTo(results[0], {duration: 400, offset: -80})
-    else if length > 1
-      self.display.show().text("#{length} #{Alchemy.t('pages_found')}")
-    else
-      self.items.removeClass('no-match highlight')
-      self.display.hide()
-      $.scrollTo('0', 400)
-      self.filter_field_clear.hide()
-
-  # Adds onkey up observer to search field
-  _observe: ->
-    filter = @filter
-    @search_field.on 'keyup', ->
-      term = $(this).val()
-      filter(term.toLowerCase())
-    @search_field.on 'focus', ->
-      key.setScope('search')
-    @filter_field_clear.click =>
-      @search_field.val('')
-      filter('')
-      false
-
-  # Handles the page publication date fields
-  watchPagePublicationState: ->
-    $(document).on 'DialogReady.Alchemy', (e, $dialog) ->
-      $public_on_field = $('#page_public_on', $dialog)
-      $public_until_field = $('#page_public_until', $dialog)
-      $publication_date_fields = $('.page-publication-date-fields', $dialog)
-
-      $('#page_public', $dialog).click ->
-        $checkbox = $(this)
-        format = $checkbox.data('date-format')
-        now = new Date()
-        if $checkbox.is(':checked')
-          $publication_date_fields.removeClass('hidden')
-          $public_on_field[0]._flatpickr.setDate(now)
-        else
-          $publication_date_fields.addClass('hidden')
-          $public_on_field.val('')
-        $public_until_field.val('')
-        true
-
-    return