alchemy_cms 7.1.13 → 7.2.0.b

data/lib/alchemy/permissions.rb

@@ -42,7 +42,7 @@ module Alchemy
         end
 
         can :read, Alchemy::Page, Alchemy::Page.published.not_restricted.from_current_site do |p|
-          p.public? && !p.restricted? && p.site == Alchemy::Site.current
+          p.public? && !p.restricted? && p.site == Alchemy::Current.site
         end
       end
     end
@@ -65,7 +65,7 @@ module Alchemy
         end
 
         can :read, Alchemy::Page, Alchemy::Page.published.from_current_site do |p|
-          p.public? && p.site == Alchemy::Site.current
+          p.public? && p.site == Alchemy::Current.site
         end
       end
     end
@@ -96,7 +96,7 @@ module Alchemy
         can :leave, :alchemy_admin
         can [:info, :help], :alchemy_admin_dashboard
         can :manage, :alchemy_admin_clipboard
-        can :update, :alchemy_admin_layoutpages
+        can :edit, :alchemy_admin_layoutpages
         can :tree, :alchemy_admin_pages
 
         # Resources
@@ -157,6 +157,7 @@ module Alchemy
         end
 
         can :manage, Alchemy::Picture
+        can :manage, Alchemy::PictureDescription
         can :manage, Alchemy::Attachment
         can :manage, Alchemy::Tag
         can :index, Alchemy::Language

data/lib/alchemy/resource.rb

@@ -188,21 +188,11 @@ module Alchemy
       end
     end
 
-    # Returns a sorted array of attributes.
-    #
-    # Attribute called "name" comes first.
-    # Attribute called "updated_at" comes last.
-    # Boolean type attributes come after non-boolean attributes but before "updated_at".
-    #
     def sorted_attributes
-      @_sorted_attributes ||= attributes.sort_by! do |attr|
-        [
-          (attr[:name] == "name") ? 0 : 1,
-          (attr[:name] == "updated_at") ? 3 : 2,
-          (attr[:type] == :boolean) ? 2 : 1,
-          attr[:name]
-        ]
-      end
+      @_sorted_attributes ||= attributes
+        .sort_by { |attr| (attr[:name] == "name") ? 0 : 1 }
+        .sort_by! { |attr| (attr[:type] == :boolean) ? 1 : 0 }
+        .sort_by! { |attr| (attr[:name] == "updated_at") ? 1 : 0 }
     end
 
     def editable_attributes

data/lib/alchemy/routing_constraints.rb

@@ -27,7 +27,7 @@ module Alchemy
     # because it could be a legacy route that needs to be redirected.
     #
     def handable_format?
-      @request.format.symbol.nil? || @request.format.html?
+      @request.format.symbol.nil? || (@request.format.symbol == :html)
     end
 
     # We don't want to handle the Rails info routes.

data/lib/alchemy/seeder.rb

@@ -31,7 +31,7 @@ module Alchemy
           log "There are already pages present in your database. " \
               "Please use `rake db:reset' if you want to rebuild your database.", :skip
         else
-          create_default_site! unless Alchemy::Site.default
+          create_default_site! unless Alchemy::Site.first
           create_default_language! unless Alchemy::Language.default
           seed_pages if contentpages.present?
           seed_layoutpages if layoutpages.present?
@@ -126,7 +126,7 @@ module Alchemy
             page_layout: default_language["page_layout"],
             public: true,
             default: true,
-            site: Alchemy::Site.default
+            site: Alchemy::Site.first
           )
         else
           raise DefaultLanguageNotFoundError

data/lib/alchemy/test_support/capybara_helpers.rb

@@ -54,6 +54,10 @@ module Alchemy
         find(%([content="#{content}"] > a)).click
       end
 
+      def click_icon(name)
+        find(%(alchemy-icon[name="#{name}"])).click
+      end
+
       private
 
       def within_entire_page(&block)

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -10,7 +10,7 @@ FactoryBot.define do
 
     public { true }
 
-    site { Alchemy::Site.default || create(:alchemy_site, :default) }
+    site { Alchemy::Site.first || create(:alchemy_site, :default) }
 
     trait :klingon do
       name { "Klingon" }

data/lib/alchemy/test_support/shared_contexts.rb

@@ -14,3 +14,11 @@ RSpec.shared_context "with invalid file" do
     end
   end
 end
+
+RSpec.shared_context "in preview mode" do
+  around do |example|
+    Alchemy::Current.preview_page = page
+    example.run
+    Alchemy::Current.preview_page = nil
+  end
+end

data/lib/alchemy/tinymce.rb

@@ -33,7 +33,8 @@ module Alchemy
       entity_encoding: "raw",
       paste_as_text: true,
       element_format: "html",
-      branding: false
+      branding: false,
+      license_key: "gpl"
     }
 
     class << self

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.1.13"
+  VERSION = "7.2.0.b"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -102,4 +102,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/lib/tasks/alchemy/tidy.rake

@@ -7,6 +7,7 @@ namespace :alchemy do
     desc "Tidy up Alchemy database."
     task :up do
       Rake::Task["alchemy:tidy:element_positions"].invoke
+      Rake::Task["alchemy:tidy:content_positions"].invoke
       Rake::Task["alchemy:tidy:remove_orphaned_records"].invoke
       Rake::Task["alchemy:tidy:remove_trashed_elements"].invoke
       Rake::Task["alchemy:tidy:remove_duplicate_legacy_urls"].invoke

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": {