alchemy_cms 7.1.7 → 7.2.0.rc1

data/lib/alchemy.rb

@@ -62,6 +62,42 @@ module Alchemy
     @_admin_js_imports = Set[sources]
   end
 
+  # Additional importmaps to be included in the Alchemy admin UI
+  #
+  # Be sure to also pin modules with +Alchemy.importmap+.
+  #
+  # == Example
+  #
+  #    # config/alchemy/importmap.rb
+  #    Alchemy.importmap.pin "alchemy_solidus", to: "alchemy_solidus.js", preload: true
+  #    Alchemy.importmap.pin_all_from Alchemy::Solidus::Engine.root.join("app/javascript/alchemy_solidus"),
+  #      under: "alchemy_solidus",
+  #      preload: true
+  #
+  #    # lib/alchemy/solidus/engine.rb
+  #    initializer "alchemy_solidus.assets", before: "alchemy.importmap" do |app|
+  #      Alchemy.admin_importmaps.add({
+  #        importmap_path: root.join("config/importmap.rb"),
+  #        source_paths: [
+  #          root.join("app/javascript")
+  #        ],
+  #        name: "alchemy_solidus"
+  #      })
+  #      app.config.assets.precompile << "alchemy_solidus/manifest.js"
+  #    end
+  #
+  # @return [Set<Hash>]
+  def self.admin_importmaps
+    @_admin_importmaps ||= Set.new([{
+      importmap_path: Engine.root.join("config/importmap.rb"),
+      source_paths: [
+        Engine.root.join("app/javascript"),
+        Engine.root.join("vendor/javascript")
+      ],
+      name: "alchemy_admin"
+    }])
+  end
+
   # Define page publish targets
   #
   # A publish target is a ActiveJob that gets performed
@@ -102,4 +138,40 @@ module Alchemy
   # JS Importmap instance
   singleton_class.attr_accessor :importmap
   self.importmap = Importmap::Map.new
+
+  # Configure tabs in the link dialog
+  #
+  # With this configuration that tabs in the link dialog can be extended
+  # without overwriting or defacing the Admin Interface.
+  #
+  # == Example
+  #
+  #    # components/acme/link_tab.rb
+  #    module Acme
+  #      class LinkTab < ::Alchemy::Admin::LinkDialog::BaseTab
+  #        def title
+  #          "Awesome Tab Title"
+  #        end
+  #
+  #        def name
+  #          :unique_name
+  #        end
+  #
+  #        def fields
+  #           [ title_input, target_select ]
+  #        end
+  #      end
+  #    end
+  #
+  #    # config/initializers/alchemy.rb
+  #    Alchemy.link_dialog_tabs << Acme::LinkTab
+  #
+  def self.link_dialog_tabs
+    @_link_dialog_tabs ||= Set.new([
+      Alchemy::Admin::LinkDialog::InternalTab,
+      Alchemy::Admin::LinkDialog::AnchorTab,
+      Alchemy::Admin::LinkDialog::ExternalTab,
+      Alchemy::Admin::LinkDialog::FileTab
+    ])
+  end
 end

data/lib/alchemy_cms.rb

@@ -17,7 +17,6 @@ require "jquery-rails"
 require "kaminari"
 require "non_stupid_digest_assets"
 require "ransack"
-require "request_store"
 require "responders"
 require "sassc-rails"
 require "simple_form"

data/lib/generators/alchemy/menus/templates/node.html.erb

@@ -1,8 +1,8 @@
-<%% cache [node, @page, @preview_mode] do %>
+<%% cache [node, @page, Alchemy::Current.preview_page?] do %>
   <%%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
     <%%= link_to_if node.url,
       node.name,
-      @preview_mode ? 'javascript: void(0)' : node.url,
+      Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
       class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
       title: node.title,
       target: node.external? ? '_blank' : nil,

data/lib/generators/alchemy/menus/templates/node.html.haml

@@ -1,9 +1,9 @@
-- cache [node, @page, @preview_mode] do
+- cache [node, @page, Alchemy::Current.preview_page?] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,
       node.name,
-      @preview_mode ? 'javascript: void(0)' : node.url,
+      Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
       class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
       title: node.title,
       target: node.external? ? '_blank' : nil,

data/lib/generators/alchemy/menus/templates/node.html.slim

@@ -1,9 +1,9 @@
-- cache [node, @page, @preview_mode] do
+- cache [node, @page, Alchemy::Current.preview_page?] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,
       node.name,
-      @preview_mode ? 'javascript: void(0)' : node.url,
+      Alchemy::Current.preview_page? ? 'javascript: void(0)' : node.url,
       class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
       title: node.title,
       target: node.external? ? '_blank' : nil,

data/lib/generators/alchemy/menus/templates/wrapper.html.erb

@@ -1,4 +1,4 @@
-<%% cache [menu, @page, @preview_mode] do %>
+<%% cache [menu, @page, Alchemy::Current.preview_page?] do %>
   <ul class="nav">
     <%%= render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/generators/alchemy/menus/templates/wrapper.html.haml

@@ -1,4 +1,4 @@
-- cache [menu, @page, @preview_mode] do
+- cache [menu, @page, Alchemy::Current.preview_page?] do
   %ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/generators/alchemy/menus/templates/wrapper.html.slim

@@ -1,4 +1,4 @@
-- cache [menu, @page, @preview_mode] do
+- cache [menu, @page, Alchemy::Current.preview_page?] do
   ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/tasks/alchemy/sitemap.rake

@@ -0,0 +1,97 @@
+class SiteMapIssueFinder
+  attr_reader :save
+  attr_accessor :depth_issue_page_ids, :lft_rgt_issue_page_ids
+
+  def initialize(save: false)
+    @save = save
+    @depth_issue_page_ids = Set.new
+    @lft_rgt_issue_page_ids = Set.new
+  end
+
+  def depth_issues
+    puts "\nFind Page Depth Issues"
+    puts "======================\n"
+
+    Alchemy::Page.each_with_level(Alchemy::Page.root.self_and_descendants) do |page, level|
+      not_the_same_level = level != page.depth
+      print not_the_same_level ? "F" : "."
+      if not_the_same_level
+        depth_issue_page_ids << page.id
+        page.update_column(:depth, level) if save
+      end
+    end
+
+    print_conclusion(depth_issue_page_ids, "depth")
+  end
+
+  def lft_rgt_issues
+    puts "\nFind Page Left/Right Value Issues"
+    puts "=================================\n"
+
+    Alchemy::Page.roots.each do |root_page|
+      traverse_children(root_page, root_page.lft)
+    end
+
+    print_conclusion(lft_rgt_issue_page_ids, "left/right value")
+  end
+
+  private
+
+  def print_conclusion(page_ids, field_description)
+    puts "\n\n"
+    if page_ids.length > 0
+      if save
+        puts "Found and corrected #{field_description} for #{page_ids.length} page(s)!"
+      else
+        puts "Following Pages have an incorrect #{field_description}: #{page_ids.join(", ")}"
+      end
+    else
+      puts "All pages have the correct #{field_description}!\n"
+    end
+    puts "\n"
+  end
+
+  def fix_page_field(page, field, counter)
+    wrong_counter = page[field] != counter
+    print wrong_counter ? "F" : "."
+    if wrong_counter
+      lft_rgt_issue_page_ids << page.id
+      page.update_column(field, counter) if save
+    end
+  end
+
+  ##
+  # @param [Alchemy::Page] page
+  # @param [Integer] counter
+  # @return [Integer]
+  def traverse_children(page, counter)
+    page.children.order(lft: :asc).each do |child_page|
+      counter += 1
+      fix_page_field(child_page, :lft, counter)
+      counter = traverse_children(child_page, counter) unless child_page.leaf?
+
+      counter += 1
+      fix_page_field(child_page, :rgt, counter)
+    end
+
+    counter
+  end
+end
+
+namespace :alchemy do
+  namespace :sitemap do
+    desc "Get an overview over all sitemap issues"
+    task anomalies: [:environment] do
+      finder = SiteMapIssueFinder.new
+      finder.lft_rgt_issues
+      finder.depth_issues
+    end
+
+    desc "Fix nested set sitemap issues"
+    task fix: [:environment] do
+      finder = SiteMapIssueFinder.new(save: true)
+      finder.lft_rgt_issues
+      finder.depth_issues
+    end
+  end
+end

data/package.json

@@ -11,28 +11,28 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "@rails/ujs": "^7.1.3",
-    "@shoelace-style/shoelace": "^2.13.1",
+    "@shoelace-style/shoelace": "^2.14.0",
     "@ungap/custom-elements": "^1.3.0",
     "clipboard": "^2.0.11",
     "flatpickr": "^4.6.13",
     "keymaster": "^1.6.2",
     "sortablejs": "^1.15.2",
-    "tinymce": "^6.8.3"
+    "tinymce": "^7.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.7",
+    "@babel/core": "^7.24.5",
+    "@babel/preset-env": "^7.24.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "babel-jest": "^29.6.4",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "jest": "^29.6.4",
     "jest-environment-jsdom": "^29.6.4",
     "jquery": "^3.7.1",
-    "jsdom-testing-mocks": "^1.11.0",
-    "prettier": "^3.2.4",
-    "rollup": "^4.9.5",
+    "jsdom-testing-mocks": "^1.13.0",
+    "prettier": "^3.2.5",
+    "rollup": "^4.17.2",
     "xhr-mock": "^2.5.1"
   },
   "jest": {