alchemy_cms 5.2.5 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2b93464ba8a1fb5b20e6447d23b908e7fd59e29e028f5c4ab70f536cf87c27
-  data.tar.gz: 77c91a87955eba711b381ea272e9bc982d3f744869cbfeefc17fb7d9be022e97
+  metadata.gz: b27eb5b4a0bdb143597a3e2cc33d0a8bfa4dd0d8febb2fd9261f2ad692716bc8
+  data.tar.gz: 7c67ed54f66b70419ac653421bdf3f8d38389bd3e67acfe70675bfcc8b357abd
 SHA512:
-  metadata.gz: 5cb3dd94c9170ad15e0ccb1ac780f8503d27b5deb5cab962f1170f1303dc226f492bf8e8cc8e40661847e71c5349fb4bfff373094e3f04c92b43c1db2b12be6a
-  data.tar.gz: ed77728e349bf1612ca18616e5bdaed478519e83a3d990238b0b227cf4668d3553f2bdd30856a36c490053d94c347c86e7261e309a481bbc676febad5fba4c2f
+  metadata.gz: aad3d674038b933605c7c8b5d11d74c707ed2687f9a5350e7762d56882a8994f85ea0a7e86e60ed4ee6cddb32aa46ecde70c42bcf91ceca62ad00e071195c497
+  data.tar.gz: c2f4a299345aafda98c2d40465ab8e011ee5d345104d32342503197afedccc4ed7bc527cce09afe8163dad148fe2019f3a2e18b0a0770eb48d971c9df51239dc

data/.gitignore

@@ -34,7 +34,6 @@ spec/dummy/uploads/
 .ruby-gemset
 .ruby-version
 .env
-.rspec
 node_modules
 yarn-error.log
 yarn-debug.log*

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.2.7 (2022-03-01)
+
+- Fix copying page with descendants to a different language ([dbwinger](https://github.com/dbwinger))
+- Handle copying/pasting global pages ([dbwinger](https://github.com/dbwinger))
+
+## 5.2.6 (2022-02-28)
+
+- Add crop_resize Dragonfly processor ([tvdeyen](https://github.com/tvdeyen))
+
 ## 5.2.5 (2021-11-24)
 
 - Adjust tinymce skin assets urls again ([tvdeyen](https://github.com/tvdeyen))

data/Rakefile

@@ -41,12 +41,16 @@ namespace :alchemy do
     task :prepare do
       system(
         <<~BASH
+          yarn install && \
+          yarn link && \
           cd spec/dummy && \
           export RAILS_ENV=test && \
           bin/rake db:create && \
           bin/rake db:environment:set && \
           bin/rake db:migrate:reset && \
           bin/rails g alchemy:install --skip --skip-demo-files --auto-accept && \
+          yarn link @alchemy_cms/admin && \
+          RAILS_ENV=test bin/webpack && \
           cd -
         BASH
       ) || fail
@@ -72,4 +76,18 @@ namespace :alchemy do
       File.delete(backup)
     end
   end
+
+  desc "Release a new Ruby gem and npm package in one command"
+  task :release do
+    require "json"
+    require_relative "lib/alchemy/version"
+    package = File.read("package.json")
+    unless JSON.parse(package)["version"] == Alchemy.version
+      abort "Ruby gem and npm package versions are out of sync! Please fix."
+    end
+    # Release the Ruby gem with bundler
+    Rake::Task["release"].invoke
+    # Publish npm package via CLI
+    system "npm publish"
+  end
 end

data/alchemy_cms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
   gem.add_runtime_dependency 'cancancan',                        ['>= 2.1', '< 4.0']
   gem.add_runtime_dependency 'coffee-rails',                     ['>= 4.0', '< 6.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7', '< 1.4']
+  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.4']
   gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
   gem.add_runtime_dependency 'gutentag',                         ['~> 2.2', '>= 2.2.1']
   gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']
@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'originator',                       ['~> 3.1']
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
   gem.add_runtime_dependency 'rails',                            ['>= 5.2.0', '< 6.1']
-  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 2.4.2'] # 2.4.2 dropped Ruby 2.5 support in a patch level release
+  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 3.0']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
   gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
   gem.add_runtime_dependency 'sassc-rails',                      ['~> 2.1']

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

@@ -40,7 +40,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/javascripts/alchemy/page_select.js

@@ -1,9 +1,11 @@
-$.fn.alchemyPageSelect = function(options) {
+$.fn.alchemyPageSelect = function (options) {
   var pageTemplate = HandlebarsTemplates.page
 
   return this.select2({
     placeholder: options.placeholder,
-    allowClear: true,
+    allowClear: options.hasOwnProperty("allowClear")
+      ? options.allowClear
+      : true,
     minimumInputLength: 3,
     initSelection: function (_$el, callback) {
       if (options.initialSelection) {
@@ -12,13 +14,16 @@ $.fn.alchemyPageSelect = function(options) {
     },
     ajax: {
       url: options.url,
-      datatype: 'json',
+      datatype: "json",
       quietMillis: 300,
       data: function (term, page) {
         return {
-          q: $.extend({
-            name_cont: term
-          }, options.query_params),
+          q: $.extend(
+            {
+              name_cont: term
+            },
+            options.query_params
+          ),
           page: page
         }
       },
@@ -34,8 +39,8 @@ $.fn.alchemyPageSelect = function(options) {
     formatSelection: function (page) {
       return page.text || page.name
     },
-    formatResult: function(page) {
-      return pageTemplate({page: page})
+    formatResult: function (page) {
+      return pageTemplate({ page: page })
     }
   })
 }

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/base_controller.rb

@@ -40,9 +40,7 @@ module Alchemy
       def exception_handler(error)
         exception_logger(error)
         show_error_notice(error)
-        if defined?(Airbrake)
-          notify_airbrake(error) unless Rails.env.development? || Rails.env.test?
-        end
+        notify_error_tracker(error)
       end
 
       # Displays an error notice in the Alchemy backend.
@@ -148,6 +146,14 @@ module Alchemy
             site
           end
       end
+
+      def notify_error_tracker(exception)
+        if ::Alchemy::ErrorTracking.notification_handler.respond_to?(:call)
+          ::Alchemy::ErrorTracking.notification_handler.call(exception)
+        else
+          Rails.logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
+        end
+      end
     end
   end
 end

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

@@ -128,6 +128,7 @@ module Alchemy
       def update
         # stores old page_layout value, because unfurtunally rails @page.changes does not work here.
         @old_page_layout = @page.page_layout
+        @old_parent_id = @page.parent_id
         if @page.update(page_params)
           @notice = Alchemy.t("Page saved", name: @page.name)
           @while_page_edit = request.referer.include?("edit")
@@ -136,7 +137,7 @@ module Alchemy
             @tree = serialized_page_tree
           end
         else
-          configure
+          render :configure
         end
       end
 

data/app/models/alchemy/page.rb

@@ -217,8 +217,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,
         })
@@ -415,6 +415,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/transformations.rb

@@ -197,12 +197,12 @@ module Alchemy
     # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.
     #
     def xy_crop_resize(dimensions, top_left, crop_dimensions, upsample)
-      crop_argument = "-crop #{dimensions_to_string(crop_dimensions)}"
+      crop_argument = dimensions_to_string(crop_dimensions)
       crop_argument += "+#{top_left[:x]}+#{top_left[:y]}"
 
-      resize_argument = "-resize #{dimensions_to_string(dimensions)}"
+      resize_argument = dimensions_to_string(dimensions)
       resize_argument += ">" unless upsample
-      image_file.convert "#{crop_argument} #{resize_argument}"
+      image_file.crop_resize(crop_argument, resize_argument)
     end
 
     # Used when centercropping.

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 %>
+
   <%= f.input :page_layout,
     collection: @page_layouts,
     label: page_layout_label(@page),
@@ -43,3 +47,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/_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

@@ -133,7 +133,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_id: @page.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

@@ -13,6 +13,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/config/initializers/dragonfly.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "dragonfly_svg"
+require "alchemy/dragonfly/processors/crop_resize"
 
 # Logger
 Dragonfly.logger = Rails.logger
@@ -9,3 +10,10 @@ if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend Dragonfly::Model
   ActiveRecord::Base.extend Dragonfly::Model::Validations
 end
+
+# Dragonfly 1.4.0 only allows `quality` as argument to `encode`
+Dragonfly::ImageMagick::Processors::Encode::WHITELISTED_ARGS << "flatten"
+
+Rails.application.config.after_initialize do
+  Dragonfly.app(:alchemy_pictures).add_processor(:crop_resize, Alchemy::Dragonfly::Processors::CropResize.new)
+end

data/lib/alchemy/dragonfly/processors/crop_resize.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "dragonfly/image_magick/commands"
+
+module Alchemy
+  module Dragonfly
+    module Processors
+      class CropResize
+        include ::Dragonfly::ParamValidators
+
+        IS_CROP_ARGUMENT = ->(args_string) {
+          args_string.match?(::Dragonfly::ImageMagick::Processors::Thumb::CROP_GEOMETRY)
+        }
+
+        IS_RESIZE_ARGUMENT = ->(args_string) {
+          args_string.match?(::Dragonfly::ImageMagick::Processors::Thumb::RESIZE_GEOMETRY)
+        }
+
+        def call(content, crop_argument, resize_argument)
+          validate!(crop_argument, &IS_CROP_ARGUMENT)
+          validate!(resize_argument, &IS_RESIZE_ARGUMENT)
+          ::Dragonfly::ImageMagick::Commands.convert(
+            content,
+            "-crop #{crop_argument} -resize #{resize_argument}"
+          )
+        end
+
+        def update_url(attrs, _args = "", opts = {})
+          format = opts["format"]
+          attrs.ext = format if format
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/engine.rb

@@ -44,5 +44,12 @@ module Alchemy
         end
       end
     end
+
+    initializer "alchemy.error_tracking" do
+      if defined?(Airbrake)
+        require_relative "error_tracking/airbrake_handler"
+        Alchemy::ErrorTracking.notification_handler = Alchemy::ErrorTracking::AirbrakeHandler
+      end
+    end
   end
 end

data/lib/alchemy/error_tracking/airbrake_handler.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ErrorTracking
+    class AirbrakeHandler < BaseHandler
+      def self.call(exception)
+        return if ["development", "test"].include?(Rails.env)
+
+        notify_airbrake(exception)
+      end
+    end
+  end
+end

data/lib/alchemy/error_tracking.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ErrorTracking
+    class BaseHandler
+      def self.call(exception)
+        # implement your own notification method
+      end
+    end
+
+    mattr_accessor :notification_handler
+    @@notification_handler = BaseHandler
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.2.5"
+  VERSION = "5.3.0"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -37,6 +37,7 @@ require_relative "alchemy/controller_actions"
 require_relative "alchemy/deprecation"
 require_relative "alchemy/element_definition"
 require_relative "alchemy/elements_finder"
+require_relative "alchemy/error_tracking"
 require_relative "alchemy/errors"
 require_relative "alchemy/essence"
 require_relative "alchemy/filetypes"

data/package/admin.js

@@ -1,6 +1,8 @@
 import translate from "./src/i18n"
 import translationData from "./src/translations"
 import NodeTree from "./src/node_tree"
+import Sitemap from "./src/sitemap"
+import PagePublicationFields from "./src/page_publication_fields.js"
 
 // Global Alchemy object
 if (typeof window.Alchemy === "undefined") {
@@ -12,5 +14,7 @@ Object.assign(Alchemy, {
   // Global utility method for translating a given string
   t: translate,
   translations: Object.assign(Alchemy.translations || {}, translationData),
-  NodeTree
+  NodeTree,
+  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": "5.2.5",
+  "version": "5.3.0",
   "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: 5.2.5
+  version: 5.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -108,12 +108,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
@@ -121,12 +115,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.7
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
@@ -282,7 +270,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -292,7 +280,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -602,6 +590,7 @@ files:
 - ".hound.yml"
 - ".localeapp/config.rb"
 - ".prettierrc"
+- ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -647,7 +636,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
@@ -1092,9 +1080,12 @@ files:
 - lib/alchemy/configuration_methods.rb
 - lib/alchemy/controller_actions.rb
 - lib/alchemy/deprecation.rb
+- lib/alchemy/dragonfly/processors/crop_resize.rb
 - lib/alchemy/element_definition.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb
+- lib/alchemy/error_tracking.rb
+- lib/alchemy/error_tracking/airbrake_handler.rb
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/filetypes.rb
@@ -1198,6 +1189,8 @@ files:
 - package/src/__tests__/i18n.spec.js
 - package/src/i18n.js
 - package/src/node_tree.js
+- package/src/page_publication_fields.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