alchemy_cms 6.0.0.pre.rc3 → 6.0.0.pre.rc6

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.
@@ -146,6 +144,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

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

@@ -144,7 +144,7 @@ module Alchemy
     after_update :create_legacy_url,
       if: :saved_change_to_urlname?
 
-    after_update -> { nodes.update_all(updated_at: Time.current) }
+    after_update :touch_nodes
 
     # Concerns
     include PageScopes
@@ -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,
         })
@@ -603,5 +604,10 @@ module Alchemy
     def create_legacy_url
       legacy_urls.find_or_create_by(urlname: urlname_before_last_save)
     end
+
+    def touch_nodes
+      ids = node_ids + nodes.flat_map { |n| n.ancestors.pluck(:id) }
+      Node.where(id: ids).touch_all
+    end
   end
 end

data/app/services/alchemy/tag_validations.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class TagValidations
+    def self.call(klass)
+      new(klass).call
+    end
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def call
+      klass.validates :name, presence: true, uniqueness: { case_sensitive: true }
+    end
+
+    private
+
+    attr_reader :klass
+  end
+end

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/config/routes.rb

@@ -124,7 +124,6 @@ Alchemy::Engine.routes.draw do
 
   resources :messages, only: [:index, :new, :create]
   resources :elements, only: :show
-  resources :contents, only: :show
 
   namespace :api, defaults: { format: "json" } do
     resources :contents, only: [:index, :show]

data/db/migrate/20200226213334_alchemy_four_point_four.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
+class AlchemyFourPointFour < ActiveRecord::Migration[6.0]
   def up
     unless table_exists?("alchemy_attachments")
-      create_table "alchemy_attachments", force: :cascade do |t|
+      create_table "alchemy_attachments" do |t|
         t.string "name"
         t.string "file_name"
         t.string "file_mime_type"
         t.integer "file_size"
         t.references "creator"
         t.references "updater"
-        t.timestamps null: false
+        t.timestamps
         t.string "file_uid"
         t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
       end
     end
 
     unless table_exists?("alchemy_contents")
-      create_table "alchemy_contents", force: :cascade do |t|
+      create_table "alchemy_contents" do |t|
         t.string "name"
         t.references "essence", null: false, polymorphic: true, index: { unique: true }
         t.references "element", null: false
@@ -25,14 +25,14 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_elements")
-      create_table "alchemy_elements", force: :cascade do |t|
+      create_table "alchemy_elements" do |t|
         t.string "name"
         t.integer "position"
         t.references "page", null: false, index: false
         t.boolean "public", default: true
         t.boolean "folded", default: false
         t.boolean "unique", default: false
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.references "parent_element", index: false
@@ -44,27 +44,27 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_elements_alchemy_pages")
-      create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t|
+      create_table "alchemy_elements_alchemy_pages", id: false do |t|
         t.references "element"
         t.references "page"
       end
     end
 
     unless table_exists?("alchemy_essence_booleans")
-      create_table "alchemy_essence_booleans", force: :cascade do |t|
+      create_table "alchemy_essence_booleans" do |t|
         t.boolean "value"
         t.index ["value"], name: "index_alchemy_essence_booleans_on_value"
       end
     end
 
     unless table_exists?("alchemy_essence_dates")
-      create_table "alchemy_essence_dates", force: :cascade do |t|
+      create_table "alchemy_essence_dates" do |t|
         t.datetime "date"
       end
     end
 
     unless table_exists?("alchemy_essence_files")
-      create_table "alchemy_essence_files", force: :cascade do |t|
+      create_table "alchemy_essence_files" do |t|
         t.references "attachment"
         t.string "title"
         t.string "css_class"
@@ -73,13 +73,13 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_htmls")
-      create_table "alchemy_essence_htmls", force: :cascade do |t|
+      create_table "alchemy_essence_htmls" do |t|
         t.text "source"
       end
     end
 
     unless table_exists?("alchemy_essence_links")
-      create_table "alchemy_essence_links", force: :cascade do |t|
+      create_table "alchemy_essence_links" do |t|
         t.string "link"
         t.string "link_title"
         t.string "link_target"
@@ -88,13 +88,13 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_pages")
-      create_table "alchemy_essence_pages", force: :cascade do |t|
+      create_table "alchemy_essence_pages" do |t|
         t.references "page"
       end
     end
 
     unless table_exists?("alchemy_essence_pictures")
-      create_table "alchemy_essence_pictures", force: :cascade do |t|
+      create_table "alchemy_essence_pictures" do |t|
         t.references "picture"
         t.string "caption"
         t.string "title"
@@ -111,7 +111,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_richtexts")
-      create_table "alchemy_essence_richtexts", force: :cascade do |t|
+      create_table "alchemy_essence_richtexts" do |t|
         t.text "body"
         t.text "stripped_body"
         t.boolean "public"
@@ -119,14 +119,14 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_selects")
-      create_table "alchemy_essence_selects", force: :cascade do |t|
+      create_table "alchemy_essence_selects" do |t|
         t.string "value"
         t.index ["value"], name: "index_alchemy_essence_selects_on_value"
       end
     end
 
     unless table_exists?("alchemy_essence_texts")
-      create_table "alchemy_essence_texts", force: :cascade do |t|
+      create_table "alchemy_essence_texts" do |t|
         t.text "body"
         t.string "link"
         t.string "link_title"
@@ -137,7 +137,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_folded_pages")
-      create_table "alchemy_folded_pages", force: :cascade do |t|
+      create_table "alchemy_folded_pages" do |t|
         t.references "page", null: false, index: false
         t.references "user", null: false, index: false
         t.boolean "folded", default: false
@@ -146,13 +146,13 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_languages")
-      create_table "alchemy_languages", force: :cascade do |t|
+      create_table "alchemy_languages" do |t|
         t.string "name"
         t.string "language_code"
         t.string "frontpage_name"
         t.string "page_layout", default: "intro"
         t.boolean "public", default: false
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.boolean "default", default: false
@@ -165,16 +165,16 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_legacy_page_urls")
-      create_table "alchemy_legacy_page_urls", force: :cascade do |t|
+      create_table "alchemy_legacy_page_urls" do |t|
         t.string "urlname", null: false
         t.references "page", null: false
-        t.timestamps null: false
+        t.timestamps
         t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
       end
     end
 
     unless table_exists?("alchemy_nodes")
-      create_table "alchemy_nodes", force: :cascade do |t|
+      create_table "alchemy_nodes" do |t|
         t.string "name"
         t.string "title"
         t.string "url"
@@ -189,7 +189,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
         t.references "language", null: false
         t.references "creator"
         t.references "updater"
-        t.timestamps null: false
+        t.timestamps
         t.references "site", null: false
         t.index ["lft"], name: "index_alchemy_nodes_on_lft"
         t.index ["rgt"], name: "index_alchemy_nodes_on_rgt"
@@ -197,7 +197,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_pages")
-      create_table "alchemy_pages", force: :cascade do |t|
+      create_table "alchemy_pages" do |t|
         t.string "name"
         t.string "urlname"
         t.string "title"
@@ -217,7 +217,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
         t.boolean "robot_follow", default: true
         t.boolean "sitemap", default: true
         t.boolean "layoutpage", default: false
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.references "language"
@@ -234,12 +234,12 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_pictures")
-      create_table "alchemy_pictures", force: :cascade do |t|
+      create_table "alchemy_pictures" do |t|
         t.string "name"
         t.string "image_file_name"
         t.integer "image_file_width"
         t.integer "image_file_height"
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.string "upload_hash"
@@ -250,10 +250,10 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_sites")
-      create_table "alchemy_sites", force: :cascade do |t|
+      create_table "alchemy_sites" do |t|
         t.string "host"
         t.string "name"
-        t.timestamps null: false
+        t.timestamps
         t.boolean "public", default: false
         t.text "aliases"
         t.boolean "redirect_to_primary_host"

data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateAlchemyEssenceNodes < ActiveRecord::Migration[5.2]
+class CreateAlchemyEssenceNodes < ActiveRecord::Migration[6.0]
   def change
     create_table :alchemy_essence_nodes do |t|
       t.references "node"

data/db/migrate/20200504210159_remove_site_id_from_nodes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class RemoveSiteIdFromNodes < ActiveRecord::Migration[5.2]
+class RemoveSiteIdFromNodes < ActiveRecord::Migration[6.0]
   def up
     remove_foreign_key :alchemy_nodes, :alchemy_sites
     remove_index :alchemy_nodes, :site_id

data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddLanguageIdForeignKeyToAlchemyPages < ActiveRecord::Migration[5.2]
+class AddLanguageIdForeignKeyToAlchemyPages < ActiveRecord::Migration[6.0]
   def change
     add_foreign_key :alchemy_pages, :alchemy_languages, column: :language_id
     change_column_null :alchemy_pages, :language_id, false, Alchemy::Language.default&.id

data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class AddMenuTypeToAlchemyNodes < ActiveRecord::Migration[5.2]
+class AddMenuTypeToAlchemyNodes < ActiveRecord::Migration[6.0]
   class LocalNode < ActiveRecord::Base
     self.table_name = :alchemy_nodes
     acts_as_nested_set scope: :language_id

data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class MakePageLayoutpageNullFalse < ActiveRecord::Migration[5.2]
+class MakePageLayoutpageNullFalse < ActiveRecord::Migration[6.0]
   def change
     change_column_null :alchemy_pages, :layoutpage, false, false
   end

data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class RemoveVisibleFromAlchemyPages < ActiveRecord::Migration[5.2]
+class RemoveVisibleFromAlchemyPages < ActiveRecord::Migration[6.0]
   class LocalPage < ActiveRecord::Base
     self.table_name = "alchemy_pages"
 

data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateAlchemyPictureThumbs < ActiveRecord::Migration[5.2]
+class CreateAlchemyPictureThumbs < ActiveRecord::Migration[6.0]
   def up
     return if table_exists?(:alchemy_picture_thumbs)
 

data/db/migrate/20200907111332_remove_tri_state_booleans.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RemoveTriStateBooleans < ActiveRecord::Migration[5.2]
+class RemoveTriStateBooleans < ActiveRecord::Migration[6.0]
   def change
     change_column_null :alchemy_elements, :public, false, false
     change_column_default :alchemy_elements, :public, true

data/db/migrate/20201207131309_create_page_versions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreatePageVersions < ActiveRecord::Migration[5.2]
+class CreatePageVersions < ActiveRecord::Migration[6.0]
   def change
     create_table :alchemy_page_versions do |t|
       t.references :page,

data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddPageVersionIdToAlchemyElements < ActiveRecord::Migration[5.2]
+class AddPageVersionIdToAlchemyElements < ActiveRecord::Migration[6.0]
   class LocalPage < ActiveRecord::Base
     self.table_name = :alchemy_pages
     has_many :elements, class_name: "LocalElement", inverse_of: :page

data/lib/alchemy/engine.rb

@@ -19,11 +19,12 @@ module Alchemy
       NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
-    # Gutentag downcases all tgas before save.
-    # We support having tags with uppercase characters.
-    # The Gutentag search is case insensitive.
-    initializer "alchemy.gutentag_normalizer" do
+    # Gutentag downcases all tags before save
+    # and Gutentag validations are not case sensitive.
+    # But we support having tags with uppercase characters.
+    config.to_prepare do
       Gutentag.normaliser = ->(value) { value.to_s }
+      Gutentag.tag_validations = Alchemy::TagValidations
     end
 
     # Custom Ransack sort arrows

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 = "6.0.0-rc3"
+  VERSION = "6.0.0-rc6"
 
   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

@@ -5,6 +5,9 @@ import fileEditors from "./src/file_editors"
 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") {
@@ -20,5 +23,8 @@ Object.assign(Alchemy, {
   fileEditors,
   pictureEditors,
   ImageLoader: ImageLoader.init,
-  ImageCropper
+  ImageCropper,
+  Datepicker,
+  Sitemap,
+  PagePublicationFields
 })

data/package/src/datepicker.js

@@ -0,0 +1,39 @@
+import flatpickr from "flatpickr"
+
+export default function Datepicker(scope = document) {
+  if (scope === "") {
+    scope = document
+  } else if (scope instanceof String) {
+    scope = document.querySelectorAll(scope)
+  }
+
+  const datepickerInputs = scope.querySelectorAll("input[data-datepicker-type]")
+
+  // Initializes the datepickers on the text inputs and sets the proper type
+  // to enable browsers default datepicker if the current OS is iOS.
+  if (Alchemy.isiOS) {
+    datepickerInputs.forEach((input) => {
+      input.attributes.type = input.dataset.datepickerType
+    })
+  } else {
+    datepickerInputs.forEach((input) => {
+      const type = input.dataset.datepickerType
+      const options = {
+        // alchemy_i18n supports `zh_CN` etc., but flatpickr only has two-letter codes (`zh`)
+        locale: Alchemy.locale.slice(0, 2),
+        altInput: true,
+        altFormat: Alchemy.t(`formats.${type}`),
+        altInputClass: "flatpickr-input",
+        enableTime: /time/.test(type),
+        noCalendar: type === "time",
+        time_24hr: Alchemy.t("formats.time_24hr"),
+        onValueUpdate(_selectedDates, _dateStr, instance) {
+          return Alchemy.setElementDirty(
+            instance.element.closest(".element-editor")
+          )
+        }
+      }
+      flatpickr(input, options)
+    })
+  }
+}