alchemy_cms 7.3.6 → 7.4.0

data/app/views/alchemy/admin/pages/_table.html.erb

@@ -67,7 +67,7 @@
   <% table.with_action :configure, Alchemy.t(:edit_page_properties) do |page| %>
     <%= link_to_dialog(
           render_icon(:cog),
-          alchemy.configure_admin_page_path(page),
+          alchemy.configure_admin_page_path(page, view: "list"),
           {
             title: Alchemy.t(:edit_page_properties),
             size: '450x680'
@@ -91,7 +91,7 @@
 <% end %>
 
 
-<script type="text/javascript">
+<script type="module">
   $(function() {
     Alchemy.PagePublicationFields();
   });

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -144,7 +144,7 @@
 <% end %>
 
 <% content_for :javascripts do %>
-<script type="text/javascript" charset="utf-8">
+<script type="module">
   $(document).one('turbo:load', function() {
     $('#unlock_page_form, #publish_page_form').on('submit', function(event) {
       var not_dirty = Alchemy.checkPageDirtyness(this);

data/app/views/alchemy/admin/pages/update.turbo_stream.erb

@@ -0,0 +1,39 @@
+<alchemy-growl><%= @notice %></alchemy-action>
+<alchemy-action name="closeCurrentDialog"></alchemy-action>
+
+<% if @while_page_edit -%>
+  <%= turbo_stream.replace "locked_page_#{@page.id}" do %>
+    <%= render("alchemy/admin/pages/current_page", current_page: @page) %>
+  <% end %>
+  <alchemy-action name="reloadPreview"></alchemy-action>
+<% else %>
+  <%= turbo_stream.replace "locked_page_#{@page.id}" do %>
+    <%= render("alchemy/admin/pages/locked_page", locked_page: @page) %>
+  <% end %>
+
+  <% if @view == "list" %>
+    <turbo-stream action="refresh"></turbo-stream>
+  <% elsif @page.parent_id != @old_parent_id -%>
+    <%= turbo_stream.append "sitemap" do %>
+      <script type="module">
+        Alchemy.currentSitemap.load(<%= @page.get_language_root.id %>);
+      </script>
+    <% end %>
+  <% else -%>
+    <% if @page.layoutpage %>
+      <%= turbo_stream.replace "page_#{@page.id}" do %>
+        <%= render("alchemy/admin/layoutpages/layoutpage", layoutpage: @page) %>
+      <% end %>
+    <% else %>
+      <%= turbo_stream.append "sitemap" do %>
+        <script type="module">
+          const page = document.getElementById('page_<%= @page.id %>');
+          const page_html = "<%= j render('page', page: @page) %>".replace(/__ID__/g, "<%= @page.id %>");
+          const compiler = Handlebars.compile(page_html);
+          const tree = <%== @tree.to_json %>;
+          page.outerHTML = compiler(tree.pages[0]);
+        </script>
+      <% end %>
+    <% end %>
+  <% end -%>
+<% end %>

data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb

@@ -6,10 +6,9 @@
       <% elsif navigation["inline_image"] %>
         <%== navigation["inline_image"] %>
       <% elsif navigation["icon"] %>
-        <%# Cannot use the render_icon helper, because the navigation["icon"] includes the style %>
-        <svg class="icon">
-          <use href="<%= asset_path("remixicon.symbol.svg") %>#ri-<%= navigation["icon"] %>" />
-        </svg>
+        <%= content_tag :"alchemy-icon", nil,
+          name: navigation["icon"],
+          "icon-style": navigation["icon-style"] %>
       <% else %>
         <%= render_icon :table %>
       <% end %>

data/app/views/alchemy/admin/pictures/_picture_description_field.html.erb

@@ -21,9 +21,11 @@
 <script type="module">
   const select = document.querySelector("#language_id")
 
-  select.addEventListener("change", () => {
-    const url = new URL(select.dataset.url)
-    url.searchParams.set("language_id", select.value)
-    Turbo.visit(url, { frame: "picture_descriptions" })
-  })
+  if (select) {
+    select.addEventListener("change", () => {
+      const url = new URL(select.dataset.url)
+      url.searchParams.set("language_id", select.value)
+      Turbo.visit(url, { frame: "picture_descriptions" })
+    })
+  }
 </script>

data/app/views/alchemy/admin/pictures/index.html.erb

@@ -86,16 +86,20 @@
 </div>
 
 <% content_for :javascripts do %>
-  <script type="text/javascript" charset="utf-8">
-    $(function() {
-      Alchemy.pictureSelector();
-      $('#picture_archive').on("click", ".thumbnail_background", function(event) {
-        var url = $(this).attr('href');
-        var overlay = new Alchemy.ImageOverlay(url);
-        overlay.open();
-        event.preventDefault();
-        return false;
+  <script type="module">
+    import ImageOverlay from "alchemy_admin/image_overlay";
+    import pictureSelector from "alchemy_admin/picture_selector";
+    import { on } from "alchemy_admin/utils/events";
+
+    pictureSelector();
+    on("click", "#picture_archive", ".thumbnail_background", (event) => {
+      const url = event.target.closest("a")?.href;
+      const overlay = new ImageOverlay(url, {
+        size: `${window.innerWidth}x${window.innerHeight}`,
+        padding: false
       });
+      overlay.open();
+      event.preventDefault();
     });
   </script>
 <% end %>

data/app/views/alchemy/admin/resources/_filter_bar.html.erb

@@ -2,7 +2,7 @@
   <%= render partial: "filter", collection: resource_filters_for_select %>
 </div>
 
-<script type="text/javascript">
+<script type="module">
   $(function() {
     $('select', '#filter_bar').on('change', function(e) {
       var $this = $(this);

data/app/views/layouts/alchemy/admin.html.erb

@@ -5,15 +5,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><%= render_alchemy_title %></title>
     <link rel="shortcut icon" href="<%= asset_path('alchemy/favicon.ico') %>">
+    <link rel="preload" href="<%= asset_path("remixicon.symbol.svg") %>" as="image" type="<%= Mime::Type.lookup_by_extension(:svg) %>" crossorigin>
     <%= csrf_meta_tag %>
     <meta name="robots" content="noindex">
-    <meta name="alchemy-icon-sprite" content="<%= asset_path("remixicon.symbol.svg") %>">
     <meta name="turbo-prefetch" content="false">
     <meta name="turbo-cache-control" content="no-cache">
     <%= stylesheet_link_tag('alchemy/custom-properties', media: 'screen', 'data-turbo-track' => true) %>
     <%= stylesheet_link_tag('alchemy/admin', media: 'screen', 'data-turbo-track' => true) %>
     <%= stylesheet_link_tag('alchemy/admin/print', media: 'print', 'data-turbo-track' => true) %>
-    <%= stylesheet_link_tag('alchemy/admin/custom', 'data-turbo-track' => true) %>
+    <% Alchemy.admin_stylesheets.each do |stylesheet| %>
+      <%= stylesheet_link_tag(stylesheet, 'data-turbo-track' => true) %>
+    <% end %>
     <%= yield :stylesheets %>
     <script>
       // Global Alchemy JavaScript object.
@@ -32,7 +34,9 @@
     <% end %>
     <%= yield :javascript_includes %>
   </head>
-  <%= content_tag :body, id: 'alchemy', class: alchemy_body_class + ["alchemy-light"] do %>
+  <%= content_tag :body, id: 'alchemy',
+    class: alchemy_body_class + ["alchemy-light"],
+    style: cookies["alchemy-elements-window-width"] && "--elements-window-width: #{cookies["alchemy-elements-window-width"]}px" do %>
     <noscript>
       <h1><%= Alchemy.t(:javascript_disabled_headline) %></h1>
       <p><%= Alchemy.t(:javascript_disabled_text) %></p>
@@ -89,7 +93,7 @@
     <div id="main_content">
       <%= yield %>
     </div>
-    <script>
+    <script type="module">
       // Setting the correct locale for select2 dropdown replacement.
       $.extend($.fn.select2.defaults, $.fn.select2.locales['<%= ::I18n.locale %>']);
     </script>

data/bundles/tinymce.js

@@ -3,6 +3,7 @@ import tinymce from "tinymce"
 
 /* Default icons are required. After that, import custom icons if applicable */
 import "tinymce/icons/default"
+import "tinymce/icons/remixicons"
 
 /* Required TinyMCE components */
 import "tinymce/themes/silver"
@@ -16,5 +17,6 @@ import "tinymce/plugins/directionality"
 import "tinymce/plugins/fullscreen"
 import "tinymce/plugins/link"
 import "tinymce/plugins/lists"
+import "tinymce/plugins/alchemy_link"
 
 export default tinymce

data/config/alchemy/config.yml

@@ -199,9 +199,9 @@ link_target_options: [blank]
 #   validates_format_of :url, with: Alchemy::Config.get('format_matchers')['url']
 #
 format_matchers:
-  email: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'
-  url: !ruby/regexp '/\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix'
-  link_url: !ruby/regexp '/^(tel:|mailto:|\/|[a-z]+:\/\/)/'
+  email: !ruby/regexp /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+  url: !ruby/regexp /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
+  link_url: !ruby/regexp /^(tel:|mailto:|\/|[a-z]+:\/\/)/
 
 # The layout used for rendering the +alchemy/admin/pages#show+ action.
 admin_page_preview_layout: application

data/config/alchemy/modules.yml

@@ -7,7 +7,7 @@
     name: Home
     controller: "/alchemy/admin/dashboard"
     action: index
-    icon: home-2-line
+    icon: home-2
 
 - name: pages
   engine_name: alchemy
@@ -16,7 +16,7 @@
     name: "modules.pages"
     controller: "/alchemy/admin/pages"
     action: index
-    icon: pages-line
+    icon: pages
     sub_navigation:
       - name: "modules.pages"
         controller: "/alchemy/admin/pages"
@@ -35,7 +35,7 @@
     name: "modules.menus"
     controller: "/alchemy/admin/nodes"
     action: index
-    icon: menu-2-line
+    icon: menu-2
 
 - name: languages
   engine_name: alchemy
@@ -45,6 +45,7 @@
     controller: "/alchemy/admin/languages"
     action: index
     icon: translate-2
+    icon-style: none
 
 - name: sites
   engine_name: alchemy
@@ -53,7 +54,7 @@
     name: "modules.sites"
     controller: "/alchemy/admin/sites"
     action: index
-    icon: global-line
+    icon: global
 
 - name: tags
   engine_name: alchemy
@@ -62,7 +63,7 @@
     name: "modules.tags"
     controller: "/alchemy/admin/tags"
     action: index
-    icon: price-tag-3-line
+    icon: price-tag-3
 
 - name: archive
   engine_name: alchemy
@@ -71,7 +72,7 @@
     controller: "/alchemy/admin/pictures"
     action: index
     name: "modules.library"
-    icon: archive-drawer-line
+    icon: archive-drawer
     sub_navigation:
       - name: "modules.pictures"
         controller: "/alchemy/admin/pictures"

data/config/importmap.rb

@@ -1,7 +1,11 @@
 pin "@ungap/custom-elements", to: "ungap-custom-elements.min.js", preload: true # @1.3.0
 pin "clipboard", to: "clipboard.min.js", preload: true
+pin "cropperjs", to: "cropperjs.min.js", preload: true
 pin "flatpickr", to: "flatpickr.min.js", preload: true # @4.6.13
+pin "handlebars", to: "handlebars.min.js", preload: true # @4.7.8
+pin "jquery", to: "jquery.min.js", preload: true
 pin "keymaster", to: "keymaster.min.js", preload: true
+pin "select2", to: "select2.min.js", preload: true
 pin "sortablejs", to: "sortable.min.js", preload: true # @1.15.1
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
 pin "shoelace", to: "shoelace.min.js", preload: true

data/config/routes.rb

@@ -88,7 +88,7 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    resource :clipboard, only: :index, controller: "clipboard" do
+    resource :clipboard, only: [], controller: "clipboard" do
       collection do
         get :index
         delete :clear

data/lib/alchemy/engine.rb

@@ -20,6 +20,12 @@ module Alchemy
       NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
+    initializer "alchemy.admin_stylesheets" do |app|
+      Alchemy.admin_stylesheets.each do |stylesheet|
+        app.config.assets.precompile << stylesheet
+      end
+    end
+
     initializer "alchemy.importmap" do |app|
       watch_paths = []
 

data/lib/alchemy/modules.rb

@@ -27,35 +27,8 @@ module Alchemy
       def register_module(module_definition)
         definition_hash = module_definition.deep_stringify_keys
 
-        ### Validate controller(s) existence
-        if definition_hash["navigation"].is_a?(Hash)
-          defined_controllers = [definition_hash["navigation"]["controller"]]
-
-          if definition_hash["navigation"]["sub_navigation"].is_a?(Array)
-            defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
-          end
-
-          validate_controllers_existence(defined_controllers, definition_hash)
-        end
-
         @@alchemy_modules |= [definition_hash]
       end
-
-      private
-
-      def validate_controllers_existence(controllers, definition_hash)
-        controllers.each do |controller_val|
-          next if controller_val.blank?
-
-          controller_name = "#{controller_val.camelize}Controller"
-
-          begin
-            controller_name.constantize
-          rescue NameError
-            raise "Error in AlchemyCMS module definition: '#{definition_hash["name"]}'. Could not find the matching controller class #{controller_name.sub(/^::/, "")} for the specified controller: '#{controller_val}'"
-          end
-        end
-      end
     end
 
     # Get the module definition for given module name

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -562,8 +562,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
         context "size 200x50" do
           let(:size) { "200x50" }
 
-          it "default box should be [0, 25, 200, 75]" do
-            expect(subject[:default_box]).to eq([0, 25, 200, 75])
+          it "default box should be [0, 25, 200, 50]" do
+            expect(subject[:default_box]).to eq([0, 25, 200, 50])
           end
         end
 
@@ -578,16 +578,16 @@ RSpec.shared_examples_for "having picture thumbnails" do
         context "size 50x100" do
           let(:size) { "50x100" }
 
-          it "the hash should be {x1: 75, y1: 0, x2: 125, y2: 100}" do
-            expect(subject[:default_box]).to eq([75, 0, 125, 100])
+          it "the hash should be {x1: 75, y1: 0, x2: 50, y2: 100}" do
+            expect(subject[:default_box]).to eq([75, 0, 50, 100])
           end
         end
 
         context "size 50x50" do
           let(:size) { "50x50" }
 
-          it "the hash should be {x1: 50, y1: 0, x2: 150, y2: 100}" do
-            expect(subject[:default_box]).to eq([50, 0, 150, 100])
+          it "the hash should be {x1: 50, y1: 0, x2: 100, y2: 100}" do
+            expect(subject[:default_box]).to eq([50, 0, 100, 100])
           end
         end
 
@@ -602,16 +602,16 @@ RSpec.shared_examples_for "having picture thumbnails" do
         context "size 400x100" do
           let(:size) { "400x100" }
 
-          it "the hash should be {x1: 0, y1: 25, x2: 200, y2: 75}" do
-            expect(subject[:default_box]).to eq([0, 25, 200, 75])
+          it "the hash should be {x1: 0, y1: 25, x2: 200, y2: 50}" do
+            expect(subject[:default_box]).to eq([0, 25, 200, 50])
           end
         end
 
         context "size 200x200" do
           let(:size) { "200x200" }
 
-          it "the hash should be {x1: 50, y1: 0, x2: 150, y2: 100}" do
-            expect(subject[:default_box]).to eq([50, 0, 150, 100])
+          it "the hash should be {x1: 50, y1: 0, x2: 100, y2: 100}" do
+            expect(subject[:default_box]).to eq([50, 0, 100, 100])
           end
         end
       end

data/lib/alchemy/tinymce.rb

@@ -5,6 +5,7 @@ module Alchemy
     mattr_accessor :languages, :plugins
 
     DEFAULT_PLUGINS = %w[
+      alchemy_link
       anchor
       charmap
       code
@@ -14,7 +15,7 @@ module Alchemy
       lists
     ]
 
-    @@plugins = DEFAULT_PLUGINS + %w[alchemy_link]
+    @@plugins = DEFAULT_PLUGINS
     @@init = {
       skin: "alchemy",
       content_css: "/assets/tinymce/skins/content/alchemy/content.min.css",

data/lib/alchemy/upgrader/seven_point_four.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "thor"
+
+module Alchemy
+  class Upgrader::SevenPointFour < Upgrader
+    include Thor::Base
+    include Thor::Actions
+
+    class << self
+      def update_custom_css_config
+        if File.exist? "app/assets/config/manifest.js"
+          log "Removing alchemy/admin/custom.css from assets config file."
+          task.gsub_file "app/assets/config/manifest.js", %r{//= link alchemy/admin/custom.css\n}, ""
+        end
+      end
+
+      private
+
+      def task
+        @_task || new
+      end
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.3.6"
+  VERSION = "7.4.0"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -98,6 +98,20 @@ module Alchemy
     }])
   end
 
+  # Additional stylesheets to be included in the Alchemy admin UI
+  #
+  # == Example
+  #
+  #    # lib/alchemy/devise/engine.rb
+  #    initializer "alchemy.devise.stylesheets", before: "alchemy.admin_stylesheets" do
+  #      Alchemy.admin_stylesheets << "alchemy/devise/admin.css"
+  #    end
+  #
+  # @return [Set<String>]
+  def self.admin_stylesheets
+    @_admin_stylesheets ||= Set.new(["alchemy/admin/custom.css"])
+  end
+
   # Define page publish targets
   #
   # A publish target is a ActiveJob that gets performed

data/lib/alchemy_cms.rb

@@ -11,9 +11,7 @@ require "awesome_nested_set"
 require "cancan"
 require "dragonfly"
 require "gutentag"
-require "handlebars_assets"
 require "importmap-rails"
-require "jquery-rails"
 require "kaminari"
 require "non_stupid_digest_assets"
 require "ransack"

data/lib/generators/alchemy/ingredient/ingredient_generator.rb

@@ -14,6 +14,10 @@ module Alchemy
         @ingredients_view_path = "app/views/alchemy/ingredients"
       end
 
+      def create_view_component
+        template "view_component.rb.tt", "app/components/alchemy/ingredients/#{file_name}_view.rb"
+      end
+
       def create_model
         template "model.rb.tt", "app/models/alchemy/ingredients/#{file_name}.rb"
       end
@@ -21,6 +25,7 @@ module Alchemy
       def copy_templates
         @ingredient_editor_local = "#{file_name}_editor"
         @ingredient_view_local = "#{file_name}_view"
+        @ingredient_view_component_class = "#{@class_name}View"
         template "view.html.erb", "#{@ingredients_view_path}/_#{file_name}_view.html.erb"
         template "editor.html.erb", "#{@ingredients_view_path}/_#{file_name}_editor.html.erb"
       end

data/lib/generators/alchemy/ingredient/templates/view.html.erb

@@ -1 +1 @@
-<%%= <%= @ingredient_view_local %>.value %>
+<%%= render Alchemy::Ingredients::<%= @ingredient_view_component_class %>.new(<%= @ingredient_view_local %>) %>

data/lib/generators/alchemy/ingredient/templates/view_component.rb.tt

@@ -0,0 +1,10 @@
+module Alchemy
+  module Ingredients
+    class <%= @class_name %>View < BaseView
+      
+      def call
+        content_tag(:div, ingredient.value)
+      end
+    end
+  end
+end

data/lib/generators/alchemy/install/install_generator.rb

@@ -66,7 +66,6 @@ module Alchemy
       def install_assets
         copy_file "all.js", app_vendor_assets_path.join("javascripts", "alchemy", "admin", "all.js")
         copy_file "custom.css", app_assets_path.join("stylesheets/alchemy/admin/custom.css")
-        append_to_file Rails.root.join("app/assets/config/manifest.js"), "//= link alchemy/admin/custom.css\n"
       end
 
       def copy_demo_views

data/lib/generators/alchemy/install/templates/elements.yml.tt

@@ -1,6 +1,6 @@
 # == In this configuration, you set up Alchemy's element layouts.
 #
-# For further information please see http://guides.alchemy-cms.com/stable/elements.html
+# For further information please see http://guides.alchemy-cms.com/elements.html
 
 <%- unless @options[:skip_demo_files] -%>
 - name: article

data/lib/tasks/alchemy/upgrade.rake

@@ -7,8 +7,8 @@ namespace :alchemy do
   desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
   task upgrade: [
     "alchemy:upgrade:prepare",
-    "alchemy:upgrade:7.0:run",
-    "alchemy:upgrade:7.3:run"
+    "alchemy:upgrade:7.3:run",
+    "alchemy:upgrade:7.4:run"
   ] do
     Alchemy::Upgrader.display_todos
   end
@@ -31,14 +31,6 @@ namespace :alchemy do
       Alchemy::Upgrader.copy_new_config_file
     end
 
-    desc "Upgrade Alchemy to v7.0"
-    task "7.0" => [
-      "alchemy:upgrade:prepare",
-      "alchemy:upgrade:7.0:run"
-    ] do
-      Alchemy::Upgrader.display_todos
-    end
-
     desc "Upgrade Alchemy to v7.3"
     task "7.3" => [
       "alchemy:upgrade:prepare",
@@ -47,16 +39,12 @@ namespace :alchemy do
       Alchemy::Upgrader.display_todos
     end
 
-    namespace "7.0" do
-      task "run" => [
-        "alchemy:upgrade:7.0:remove_admin_entrypoint"
-      ]
-
-      desc "Remove alchemy admin entrypoint"
-      task remove_admin_entrypoint: [:environment] do
-        puts "removing npm_package..."
-        Alchemy::Upgrader::SevenPointZero.remove_admin_entrypoint
-      end
+    desc "Upgrade Alchemy to v7.4"
+    task "7.4" => [
+      "alchemy:upgrade:prepare",
+      "alchemy:upgrade:7.4:run"
+    ] do
+      Alchemy::Upgrader.display_todos
     end
 
     namespace "7.3" do
@@ -77,5 +65,16 @@ namespace :alchemy do
         Alchemy::Upgrader::SevenPointThree.generate_custom_css_entrypoint
       end
     end
+
+    namespace "7.4" do
+      task "run" => [
+        "alchemy:upgrade:7.4:update_custom_css_config"
+      ]
+
+      desc "Update custom alchemy admin stylesheet config"
+      task update_custom_css_config: [:environment] do
+        Alchemy::Upgrader::SevenPointFour.update_custom_css_config
+      end
+    end
   end
 end