alchemy_cms 6.0.0.pre.rc4 → 6.0.0.pre.rc7

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
@@ -44,12 +45,5 @@ 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/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-rc4"
+  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/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/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

@@ -0,0 +1,28 @@
+// 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"
+    )
+    const public_field = dialog.querySelector("#page_public")
+
+    if(!public_field) return
+
+    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)
+}

data/package/src/picture_editors.js

@@ -1,6 +1,6 @@
-import debounce from "lodash/debounce"
-import max from "lodash/max"
-import ajax from "./utils/ajax"
+import debounce from "lodash-es/debounce"
+import max from "lodash-es/max"
+import { get } from "./utils/ajax"
 import ImageLoader from "./image_loader"
 
 const UPDATE_DELAY = 125
@@ -62,7 +62,7 @@ class PictureEditor {
     this.image.removeAttribute("alt")
     this.image.removeAttribute("src")
     this.imageLoader.load(true)
-    ajax("GET", `/admin/pictures/${this.pictureId}/url`, {
+    get(`/admin/pictures/${this.pictureId}/url`, {
       crop: this.imageCropperEnabled,
       crop_from: this.cropFrom,
       crop_size: this.cropSize,