alchemy_cms 7.1.7 → 7.2.0.b

data/config/locales/alchemy.en.yml

@@ -250,6 +250,7 @@ en:
     "Confirm new password": "Confirm new password"
     "Copy": "Copy"
     "Could not load Adobe Flash® Plugin!": "Could not load Adobe Flash® Plugin!"
+    "Create node on parent:": "Create node on parent:"
     "Currently locked pages": "Currently locked pages"
     "Default language has to be public": "Default language has to be public"
     "Delete image": "Delete image"
@@ -286,6 +287,7 @@ en:
     "New": "New"
     "New Element": "New element"
     "New page": "New page"
+    "No menu node for this page found": "No menu node for this page found"
     "No page links for this page found": "No page links for this page found"
     "New password": "New password"
     "New Tag": "New tag"
@@ -300,7 +302,6 @@ en:
     "Page deleted": "%{name} deleted"
     "Page saved": "%{name} saved"
     "Page cache flushed": "Page cache flushed"
-    "Pages order saved": "Pages order saved"
     "Password": "Password"
     "Password reset": "Password reset"
     "Paste from clipboard": "Paste from clipboard"
@@ -411,6 +412,9 @@ en:
     delete_node: "Delete this menu node"
     delete_page: "Delete this page"
     delete_tag: "Delete tag"
+    search_page: "Search page"
+    search_node: "Search menu node"
+    search_tag: "Search tag"
     document: "File"
     download_csv: "Download CSV"
     download_file: "Download file '%{filename}'"
@@ -587,7 +591,12 @@ en:
     replace: replace
     replace_file: Replace file
     "Replaced Tag": "Tag '%{old_tag}' was replaced with '%{new_tag}'"
+    "%{resource_name} successfully %{action}": "%{resource_name} successfully %{action}."
     resources:
+      actions:
+        created: "created"
+        updated: "updated"
+        removed: "removed"
       relation_select:
         blank: "- none -"
     right: "right"
@@ -656,7 +665,6 @@ en:
     "Successfully updated": "Successfully updated"
     "Successfully removed": "Successfully removed"
     "Nothing found": "Nothing found."
-    complete: "Abgeschlossen"
     "Update available": "Update available"
     "Update status unavailable": "Update status unavailable"
     "Uploading": "Uploading"
@@ -790,7 +798,7 @@ en:
         other: "Elements"
       alchemy/ingredients/headline:
         one: Headline
-        other: Headline
+        other: Headlines
       alchemy/legacy_page_url:
         one: "Link"
         other: "Links"
@@ -809,6 +817,9 @@ en:
       alchemy/picture:
         one: Picture
         other: Pictures
+      alchemy/picture_description:
+        one: Picture Description
+        other: Picture Descriptions
       alchemy/user:
         one: User
         other: User
@@ -899,6 +910,8 @@ en:
         image_file_size: "Filesize"
         name: "Name"
         tag_list: Tags
+      alchemy/picture_description:
+        text: "Description"
       alchemy/site:
         name: "Name"
         host: "Primary Host"

data/config/routes.rb

@@ -22,7 +22,6 @@ Alchemy::Engine.routes.draw do
     resources :pages do
       resources :elements
       collection do
-        post :order
         post :flush
         post :copy_language_tree
         get :create_language
@@ -65,6 +64,8 @@ Alchemy::Engine.routes.draw do
       end
     end
 
+    resources :picture_descriptions, only: [:index, :edit]
+
     resources :attachments, except: [:new] do
       member do
         get :download
@@ -116,6 +117,7 @@ Alchemy::Engine.routes.draw do
   resources :elements, only: :show
 
   namespace :api, defaults: {format: "json"} do
+    resources :attachments, only: [:index]
     resources :ingredients, only: [:index]
 
     resources :elements, only: [:index, :show]

data/db/migrate/20240314105244_create_alchemy_picture_descriptions.rb

@@ -0,0 +1,11 @@
+class CreateAlchemyPictureDescriptions < ActiveRecord::Migration[7.0]
+  def change
+    create_table :alchemy_picture_descriptions do |t|
+      t.belongs_to :picture, null: false, foreign_key: {to_table: :alchemy_pictures}
+      t.belongs_to :language, null: false, foreign_key: {to_table: :alchemy_languages}
+      t.text :text
+
+      t.timestamps
+    end
+  end
+end

data/lib/alchemy/configuration_methods.rb

@@ -28,7 +28,7 @@ module Alchemy
     # matches the current I18n.locale then the prefix os omitted.
     # Also, if only one published language exists.
     #
-    def prefix_locale?(locale = Language.current&.code)
+    def prefix_locale?(locale = Current.language&.code)
       return false unless locale
 
       multi_language? && locale != ::I18n.default_locale.to_s

data/lib/alchemy/controller_actions.rb

@@ -56,7 +56,7 @@ module Alchemy
     # can be scoped against it.
     #
     def set_current_alchemy_site
-      Site.current = current_alchemy_site
+      Current.site = current_alchemy_site
     end
 
     # Sets the current language for Alchemy.
@@ -83,11 +83,11 @@ module Alchemy
         Language.find_by_code(id_or_code)
     end
 
-    # Stores language in +Language.current+
+    # Stores language in +Current.language+
     #
     def store_current_alchemy_language(language)
       if language&.id
-        Language.current = language
+        Current.language = language
       end
     end
   end

data/lib/alchemy/element_definition.rb

@@ -42,6 +42,16 @@ module Alchemy
         all.detect { |a| a["name"] == name }
       end
 
+      def reset!
+        @definitions = nil
+      end
+
+      # The absolute +elements.yml+ file path
+      # @return [Pathname]
+      def definitions_file_path
+        Rails.root.join("config", "alchemy", "elements.yml")
+      end
+
       private
 
       # Reads the element definitions from +config/alchemy/elements.yml+.
@@ -58,12 +68,6 @@ module Alchemy
             "Could not find elements.yml file! Please run `rails generate alchemy:install`"
         end
       end
-
-      # Returns the elements.yml file path
-      #
-      def definitions_file_path
-        Rails.root.join "config/alchemy/elements.yml"
-      end
     end
   end
 end

data/lib/alchemy/engine.rb

@@ -35,6 +35,23 @@ module Alchemy
       end
     end
 
+    initializer "alchemy.watch_definition_changes" do |app|
+      elements_reloader = app.config.file_watcher.new([ElementDefinition.definitions_file_path]) do
+        Rails.logger.info "[#{engine_name}] Reloading Element Definitions."
+        ElementDefinition.reset!
+      end
+      page_layouts_reloader = app.config.file_watcher.new([PageLayout.layouts_file_path]) do
+        Rails.logger.info "[#{engine_name}] Reloading Page Layouts."
+        PageLayout.reset!
+      end
+      [elements_reloader, page_layouts_reloader].each do |reloader|
+        app.reloaders << reloader
+        app.reloader.to_run do
+          reloader.execute_if_updated
+        end
+      end
+    end
+
     # Gutentag downcases all tags before save
     # and Gutentag validations are not case sensitive.
     # But we support having tags with uppercase characters.
@@ -47,8 +64,8 @@ module Alchemy
     initializer "alchemy.ransack" do
       Ransack.configure do |config|
         config.custom_arrows = {
-          up_arrow: '<i class="ri-1x ri-arrow-up-line"></i>',
-          down_arrow: '<i class="ri-1x ri-arrow-down-line"></i>'
+          up_arrow: '<alchemy-icon name="arrow-up" size="1x"></alchemy-icon>',
+          down_arrow: '<alchemy-icon name="arrow-down" size="1x"></alchemy-icon>'
         }
       end
     end

data/lib/alchemy/page_layout.rb

@@ -41,6 +41,16 @@ module Alchemy
         all.detect { |a| a["name"].casecmp(name).zero? }
       end
 
+      def reset!
+        @definitions = nil
+      end
+
+      # The absolute +page_layouts.yml+ file path
+      # @return [Pathname]
+      def layouts_file_path
+        Rails.root.join("config", "alchemy", "page_layouts.yml")
+      end
+
       private
 
       # Reads the layout definitions from +config/alchemy/page_layouts.yml+.
@@ -58,12 +68,6 @@ module Alchemy
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:install`"
         end
       end
-
-      # Returns the page_layouts.yml file path
-      #
-      def layouts_file_path
-        Rails.root.join "config/alchemy/page_layouts.yml"
-      end
     end
   end
 end

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
@@ -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/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.7"
+  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/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": {