alchemy_cms 8.0.0.a → 8.0.0.b

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

@@ -0,0 +1,36 @@
+<div class="resource-usage-info">
+  <% if assignments.any? %>
+    <alchemy-message type="info">
+      <%= Alchemy.t(resource_name, scope: :used_on_these_pages) %>
+    </alchemy-message>
+    <ul class="resource_page_list">
+      <% assignments.group_by(&:page).each do |page, related_ingredients| %>
+        <% if page %>
+          <li>
+            <h3>
+              <%= render_icon 'file' %>
+              <p><%= link_to page.name, edit_admin_page_path(page) %></p>
+            </h3>
+            <ul class="list">
+              <% related_ingredients.group_by(&:element).each do |element, related_ingredients| %>
+                <li class="<%= cycle('even', 'odd') %>">
+                  <% page_link = link_to element.display_name_with_preview_text,
+                                  edit_admin_page_path(page, anchor: "element_#{element.id}") %>
+                  <% ingredients = related_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
+                  <%= render_icon(:draggable, style: false) %>
+                  <p>
+                    <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
+                  </p>
+                </li>
+              <% end %>
+            </ul>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  <% else %>
+    <%= render_message do %>
+      <%= Alchemy.t(resource_name, scope: :not_in_use_yet) %>
+    <% end %>
+  <% end %>
+</div>

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

@@ -19,71 +19,6 @@
 
 <h1>AlchemyCMS Styleguide</h1>
 
-<h2>Typography</h2>
-
-<h1>Heading 1</h1>
-<h2>Heading 2</h2>
-<h3>Heading 3</h3>
-<h4>Heading 4</h4>
-<h5>Heading 5</h5>
-
-<p>This is a paragraph, with <a href="#">a link</a>, a <kbd>keyboard shortcut</kbd> and an <code>inline code snippet</code>.</p>
-
-<h2>Messages</h2>
-
-<h3>Info Message</h3>
-
-<%= render_message do %>
-  <p>Lorem ipsum <strong>dolor</strong> sit amet, consectetur adipiscing elit.</p>
-<% end %>
-
-<h3>Warning Message</h3>
-
-<%= render_message :warning do %>
-  <p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
-<% end %>
-
-<h3>Error Message</h3>
-
-<%= render_message :error do %>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
-<% end %>
-
-<h3>Tags Autocomplete</h3>
-
-<div>
-  <alchemy-tags-autocomplete>
-    <input type="text" class="full_width" />
-  </alchemy-tags-autocomplete>
-</div>
-
-<h3>Growl Messages</h3>
-
-<%= link_to render_icon(:check), 'javascript:Alchemy.growl("Success message")', class: "icon_button" %>
-<%= link_to render_icon(:info), 'javascript:Alchemy.growl("Info message", "info")', class: "icon_button" %>
-<%= link_to render_icon(:alert), 'javascript:Alchemy.growl("Warning message", "warn")', class: "icon_button" %>
-<%= link_to render_icon(:bug), 'javascript:Alchemy.growl("Error message", "error")', class: "icon_button" %>
-
-<h2>Dialog Links</h2>
-
-<sl-tooltip content="Open in Dialog">
-  <a
-    href="/admin/styleguide"
-    is="alchemy-dialog-link"
-    class="icon_button"
-    data-dialog-options="{&quot;size&quot;:&quot;800x600&quot;,&quot;title&quot;:&quot;Styleguide in Dialog&quot;}"
-  >
-    <%= render_icon "window" %>
-  </a>
-</sl-tooltip>
-<a
-  href="#"
-  is="alchemy-dialog-link"
-  class="icon_button disabled"
->
-  <%= render_icon "window" %>
-</a>
-
 <h2>Forms</h2>
 
 <div class="panel">
@@ -102,6 +37,13 @@
       </select>
     </div>
 
+    <div class="input select">
+      <label class="select control-label" for="select">Disabled Select</label>
+      <select class="select" id="disabled-select" is="alchemy-select" disabled>
+        <option value="">Cannot choose</option>
+      </select>
+    </div>
+
     <div class="input">
       <label class="control-label" for="datetime_picker">Date Time Picker</label>
       <alchemy-datepicker input-type="datetime">
@@ -171,7 +113,7 @@
     <div class="input text">
       <label class="text control-label" for="textarea">Textarea</label>
       <textarea class="text" id="textarea"></textarea>
-      <small class="hint">With hint</small>
+      <small class="hint">With hint and a <a href="/admin/styleguide">link</a> inside.</small>
     </div>
 
     <div class="input text tinymce_container">
@@ -188,6 +130,116 @@
   </form>
 </div>
 
+<h2>Buttons</h2>
+
+<p>
+  <button class="secondary" disabled>Disabled Secondary</button>
+  <button type="submit" is="alchemy-button" disabled>Disabled Primary</button>
+</p>
+
+<h2>Selects</h2>
+
+<div style="display: flex; gap: 1em;">
+  <div style="width: 25%">
+    <h3>Select with Search</h3>
+    <select is="alchemy-select" class="full_width">
+      <option value="1">Option 1</option>
+      <option value="2">Option 2</option>
+      <option value="3">Option 3</option>
+      <option value="4">Option 4</option>
+      <option value="5">Option 5</option>
+      <option value="6">Option 6</option>
+      <option value="7">Option 7</option>
+    </select>
+  </div>
+
+  <div style="width: 25%">
+    <h3>Page Select</h3>
+    <%= render Alchemy::Admin::PageSelect.new do %>
+      <input name="page" class="full_width" />
+    <% end %>
+  </div>
+
+  <div style="width: 25%">
+    <h3>Node Select</h3>
+    <%= render Alchemy::Admin::NodeSelect.new do %>
+      <input name="node" class="full_width" />
+    <% end %>
+  </div>
+
+  <div style="width: 25%">
+    <h3>Attachment Select</h3>
+    <%= render Alchemy::Admin::AttachmentSelect.new do %>
+      <input name="attachment" class="full_width" />
+    <% end %>
+  </div>
+</div>
+
+<h3>Tags Autocomplete</h3>
+
+<div style="width: 25%">
+  <alchemy-tags-autocomplete>
+    <input type="text" class="full_width" />
+  </alchemy-tags-autocomplete>
+</div>
+
+<h2>Typography</h2>
+
+<h1>Heading 1</h1>
+<h2>Heading 2</h2>
+<h3>Heading 3</h3>
+<h4>Heading 4</h4>
+<h5>Heading 5</h5>
+
+<p>This is a paragraph, with <a href="#">a link</a>, a <kbd>keyboard shortcut</kbd> and an <code>inline code snippet</code>.</p>
+
+<h2>Messages</h2>
+
+<h3>Info Message</h3>
+
+<%= render_message do %>
+  <p>Lorem ipsum <strong>dolor</strong> sit amet, <a href="">consectetur</a> adipiscing elit.</p>
+<% end %>
+
+<h3>Warning Message</h3>
+
+<%= render_message :warning do %>
+  <p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
+<% end %>
+
+<h3>Error Message</h3>
+
+<%= render_message :error do %>
+  <p>Lorem ipsum dolor sit amet, <a href="">consectetur</a> adipiscing elit.</p>
+<% end %>
+
+<h3>Growl Messages</h3>
+
+<%= link_to render_icon(:check), 'javascript:Alchemy.growl("Success message")', class: "icon_button" %>
+<%= link_to render_icon(:info), 'javascript:Alchemy.growl("Info message", "info")', class: "icon_button" %>
+<%= link_to render_icon(:alert), 'javascript:Alchemy.growl("Warning message", "warn")', class: "icon_button" %>
+<%= link_to render_icon(:bug), 'javascript:Alchemy.growl("Error message", "error")', class: "icon_button" %>
+
+<h2>Dialog Links</h2>
+
+<sl-tooltip content="Open in Dialog">
+  <a
+    href="/admin/styleguide"
+    is="alchemy-dialog-link"
+    class="icon_button"
+    data-dialog-options="{&quot;size&quot;:&quot;800x600&quot;,&quot;title&quot;:&quot;Styleguide in Dialog&quot;}"
+  >
+    <%= render_icon "window" %>
+  </a>
+</sl-tooltip>
+<a
+  href="#"
+  is="alchemy-dialog-link"
+  class="icon_button disabled"
+>
+  <%= render_icon "window" %>
+</a>
+
 <h2>Tables</h2>
 
 <h3>Normal Table</h3>

data/app/views/alchemy/base/error_notice.html.erb

@@ -1,3 +1,3 @@
 <%= render_message :error do %>
-  <strong><%= @notice %></strong>
+  <%= @notice %>
 <% end %>

data/app/views/alchemy/ingredients/_page_editor.html.erb

@@ -7,7 +7,6 @@
       <%= f.text_field :page_id,
         value: page_editor.page&.id,
         id: page_editor.form_field_id(:page_id),
-        required: page_editor.presence_validation?,
         class: 'full_width' %>
       <% end %>
     <% end %>

data/app/views/alchemy/ingredients/_richtext_editor.html.erb

@@ -9,7 +9,6 @@
       <%= f.text_area :value,
         minlength: richtext_editor.length_validation&.fetch(:minimum, nil),
         maxlength: richtext_editor.length_validation&.fetch(:maximum, nil),
-        required: richtext_editor.presence_validation?,
         id: richtext_editor.form_field_id(:value) %>
     <% end %>
   <% end %>

data/app/views/alchemy/ingredients/_select_editor.html.erb

@@ -24,8 +24,7 @@
       <%= f.select :value, options_tags, {}, {
         id: select_editor.form_field_id,
         class: ["ingredient-editor-select"],
-        is: "alchemy-select",
-        required: select_editor.presence_validation?
+        is: "alchemy-select"
       } %>
     <% end %>
   <% end %>

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

@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<html lang="<%= ::I18n.locale %>" class="no-js loading-custom-elements alchemy-light">
+<html lang="<%= ::I18n.locale %>" class="no-js loading-custom-elements">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="color-scheme" content="light dark">
     <title><%= render_alchemy_title %></title>
     <link rel="shortcut icon" href="<%= asset_path('alchemy/favicon.ico') %>">
     <link rel="preload" href="<%= asset_path("alchemy/icons-sprite.svg") %>" as="image" type="<%= Mime::Type.lookup_by_extension(:svg) %>" crossorigin>
@@ -10,6 +11,7 @@
     <meta name="robots" content="noindex">
     <meta name="turbo-prefetch" content="false">
     <meta name="turbo-cache-control" content="no-cache">
+    <%= stylesheet_link_tag('alchemy/theme', 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) %>
     <% Alchemy.admin_stylesheets.each do |stylesheet| %>
@@ -49,23 +51,26 @@
         <% end %>
         <%= yield(:alchemy_main_navigation) %>
       </div>
-      <div id="logout" class="main_navi_entry">
-        <% if current_alchemy_user %>
-          <%= link_to_dialog(
-            %(
-              #{render_icon('logout-box-r', class: 'module')}
-              <label>#{Alchemy.t(:leave)}</label>
-            ).html_safe,
-            alchemy.leave_admin_path, {
-              size: "300x155",
-              title: Alchemy.t("Leave Alchemy")
-          }, {'data-alchemy-hotkey' => 'alt+q'}) %>
-        <% else %>
-          <%= link_to(alchemy.root_path) do %>
-            <%= render_icon "logout-box-r", size: "lg" %>
-            <label><%= Alchemy.t(:leave) %></label>
+
+      <div id="logout">
+        <div class="main_navi_entry">
+          <% if current_alchemy_user %>
+            <%= link_to_dialog(
+              %(
+                #{render_icon('logout-box-r', class: 'module')}
+                <label>#{Alchemy.t(:leave)}</label>
+              ).html_safe,
+              alchemy.leave_admin_path, {
+                size: "300x155",
+                title: Alchemy.t("Leave Alchemy")
+            }, {'data-alchemy-hotkey' => 'alt+q'}) %>
+          <% else %>
+            <%= link_to(alchemy.root_path) do %>
+              <%= render_icon "logout-box-r", size: "lg" %>
+              <label><%= Alchemy.t(:leave) %></label>
+            <% end %>
           <% end %>
-        <% end %>
+        </div>
       </div>
     </div>
     <% if current_alchemy_user %>

data/config/locales/alchemy.en.yml

@@ -143,7 +143,7 @@ en:
         without_tag:
           name: Without tag
         deletable:
-          name: Not linked by file content
+          name: Not used
       attachment:
         by_file_type:
           name: File Type
@@ -156,6 +156,8 @@ en:
           name: Recently uploaded only
         without_tag:
           name: Without tag
+        deletable:
+          name: Not used
 
     default_ingredient_texts:
       lorem: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
@@ -224,6 +226,11 @@ en:
       elements:
         toolbar:
           hide: Hide
+      pictures:
+        sorting_select:
+          label: "Sorting"
+          by_latest: "Latest"
+          alphabetical: "A-Z"
     add_nested_element: "Add %{name}"
     anchor: "Anchor"
     anchor_link_headline: You can link to an anchor from the current page.
@@ -333,7 +340,6 @@ en:
     "Size": "Size"
     "Successfully deleted element": "Successfully deleted %{element}"
     "Tags": "Tags"
-    "These pictures could not be deleted, because they were in use": "These pictures could not be deleted, because they were in use: %{names}"
     "This page is locked": "This page is currently locked by %{name}"
     "Title": "Title"
     "Trash": "Trash"
@@ -561,6 +567,7 @@ en:
     password: "Password"
     paste: "paste"
     pictures_in_page: "%{page} in %{pictures}"
+    pictures_will_be_deleted_now: Pictures will be deleted now
     place_link: "Add link"
     player_version: "Flash Player version"
     "please enter subject and mail address": "Please enter recipient and subject."
@@ -621,6 +628,12 @@ en:
     tag_list: Tags
     tags_get_created_if_used_the_first_time: "Tags get created if used the first time."
     this_picture_is_used_on_these_pages: "This picture is used on following pages"
+    used_on_these_pages:
+      attachment: "This file is used on following pages"
+      picture: "This picture is used on following pages"
+    not_in_use_yet:
+      attachment: "This file is not in use yet."
+      picture: "This picture is not in use yet."
     title: "Title"
     to_alchemy: "To Alchemy"
     unknown: "unknown"
@@ -773,16 +786,19 @@ en:
               node_ingredients_present: "This menu item is in use inside an Alchemy element on the following pages: %{page_names}."
         alchemy/site:
           attributes:
-            languages:
-              still_present: "are still attached to this site. Please remove them first."
+            base:
+              restrict_dependent_destroy:
+                has_many: "There are still %{record} attached to this site. Please remove them first."
         alchemy/language:
           attributes:
-            pages:
-              still_present: "are still attached to this language. Please remove them first."
+            base:
+              restrict_dependent_destroy:
+                has_many: "There are still %{record} attached to this language. Please remove them first."
         alchemy/page:
           attributes:
-            nodes:
-              still_present: "are still attached to this page. Please remove them first."
+            base:
+              restrict_dependent_destroy:
+                has_many: "There are still %{record} attached to this page. Please remove them first."
     models:
       gutentag/tag:
         one: Tag
@@ -869,6 +885,7 @@ en:
         public: "Public"
         locale: Localization
         code: ISO Code
+        nodes: Menu nodes
       alchemy/legacy_page_url:
         urlname: "URL-Path"
       alchemy/node:
@@ -887,6 +904,7 @@ en:
         meta_description: "Description"
         meta_keywords: "Keywords"
         name: "Name"
+        nodes: "Menu nodes"
         page_layout: "Page type"
         public: "public"
         restricted: "restricted"

data/db/migrate/20250905140323_add_created_at_index_to_pictures_and_attachments.rb

@@ -0,0 +1,14 @@
+class AddCreatedAtIndexToPicturesAndAttachments < ActiveRecord::Migration[7.1]
+  disable_ddl_transaction! if connection.adapter_name.match?(/postgres/i)
+
+  def change
+    add_index :alchemy_pictures, :created_at, if_not_exists: true, algorithm: algorithm
+    add_index :alchemy_attachments, :created_at, if_not_exists: true, algorithm: algorithm
+  end
+
+  private
+
+  def algorithm
+    connection.adapter_name.match?(/postgres/i) ? :concurrently : nil
+  end
+end

data/lib/alchemy/configurations/format_matchers.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Configurations
     class FormatMatchers < Alchemy::Configuration
       option :email, :regexp, default: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
-      option :url, :regexp, default: /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
+      option :url, :regexp, default: /\A[a-z0-9]+([-.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
       option :link_url, :regexp, default: /^(tel:|mailto:|\/|[a-z]+:\/\/)/
     end
   end

data/lib/alchemy/configurations/main.rb

@@ -5,6 +5,7 @@ require "alchemy/configurations/default_language"
 require "alchemy/configurations/default_site"
 require "alchemy/configurations/format_matchers"
 require "alchemy/configurations/mailer"
+require "alchemy/configurations/page_cache"
 require "alchemy/configurations/preview"
 require "alchemy/configurations/sitemap"
 require "alchemy/configurations/uploader"
@@ -31,6 +32,12 @@ module Alchemy
       #
       option :cache_pages, :boolean, default: true
 
+      # === Page caching max age
+      #
+      # max-age [Integer] # The duration in seconds for which the page is cached before revalidation.
+      # stale-while-revalidate [Boolean] # If true, enables the stale-while-revalidate caching strategy.
+      configuration :page_cache, PageCache
+
       # === Sitemap
       #
       # Alchemy creates a XML, Google compatible, sitemap for you.

data/lib/alchemy/configurations/page_cache.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Configurations
+    class PageCache < Alchemy::Configuration
+      # === Page caching max age
+      #
+      # Control the max-age duration in seconds in the cache-control header.
+      #
+      option :max_age, :integer, default: 600
+
+      # === Page caching stale-while-revalidate
+      #
+      # Set stale-while-revalidate cache-control header.
+      #
+      option :stale_while_revalidate, :integer
+    end
+  end
+end

data/lib/alchemy/engine.rb

@@ -62,13 +62,15 @@ module Alchemy
       end
     end
 
+    # All the initialization that needs to be re-triggered during reloads
     config.to_prepare do
+      # Definition files
       elements_reloader = Rails.application.config.file_watcher.new([ElementDefinition.definitions_file_path]) do
-        Rails.logger.info "[#{engine_name}] Reloading Element Definitions."
+        Rails.logger.info "[alchemy] Reloading Element Definitions."
         ElementDefinition.reset!
       end
       page_layouts_reloader = Rails.application.config.file_watcher.new([PageDefinition.layouts_file_path]) do
-        Rails.logger.info "[#{engine_name}] Reloading Page Layouts."
+        Rails.logger.info "[alchemy] Reloading Page Layouts."
         PageDefinition.reset!
       end
       [elements_reloader, page_layouts_reloader].each do |reloader|
@@ -77,12 +79,19 @@ module Alchemy
           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.
-    config.to_prepare do
+      # The storage adapter for Pictures and Attachments
+      #
+      # Chose between 'active_storage' (default) or 'dragonfly' (legacy)
+      #
+      # Can be set via 'ALCHEMY_STORAGE_ADAPTER' env var.
+      Alchemy.storage_adapter = Alchemy::StorageAdapter.new(
+        ENV.fetch("ALCHEMY_STORAGE_ADAPTER", Alchemy.config.storage_adapter)
+      )
+
+      # Gutentag downcases all tags before save
+      # and Gutentag validations are not case sensitive.
+      # But we support having tags with uppercase characters.
       Gutentag.normaliser = ->(value) { value.to_s }
       Gutentag.tag_validations = Alchemy::TagValidations
     end

data/lib/alchemy/install/tasks.rb

@@ -22,18 +22,6 @@ module Alchemy
             {after: SENTINEL, verbose: true}
         end
 
-        def set_primary_language(code: "en", name: "English", auto_accept: false)
-          unless auto_accept
-            code = ask("- What is the language code of your site's primary language?", default: code)
-          end
-          unless auto_accept
-            name = ask("- What is the name of your site's primary language?", default: name)
-          end
-          gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do
-            "default_language:\n  code: #{code}\n  name: #{name}"
-          end
-        end
-
         def inject_seeder
           seed_file = Rails.root.join("db", "seeds.rb")
           args = [seed_file, "Alchemy::Seeder.seed!\n"]

data/lib/alchemy/name_conversions.rb

@@ -22,5 +22,11 @@ module Alchemy
     def convert_to_humanized_name(name, suffix)
       name.gsub(/\.#{::Regexp.quote(suffix)}$/i, "").tr("_", " ").strip
     end
+
+    # Sanitizes a given filename by removing directory traversal attempts and HTML entities.
+    def sanitized_filename(file_name)
+      file_name = File.basename(file_name)
+      CGI.escapeHTML(file_name)
+    end
   end
 end

data/lib/alchemy/tasks/tidy.rb

@@ -73,6 +73,24 @@ module Alchemy
         log "Deleted #{count} duplicate legacy URLs"
       end
 
+      def remove_legacy_essence_tables
+        puts "\n## Removing legacy essence tables"
+        matching_tables = ActiveRecord::Base.connection.tables.select do |table|
+          table.start_with?("alchemy_essence_")
+        end
+        if matching_tables.length.zero?
+          log "No legacy essence tables found", :skip
+          nil
+        else
+          matching_tables.each do |table|
+            ActiveRecord::Base.connection.drop_table(table, if_exists: true)
+            print "."
+          end
+          puts "\n"
+          log "Deleted #{matching_tables.length} legacy essence tables"
+        end
+      end
+
       private
 
       def destroy_orphaned_records(records, class_name)

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

@@ -29,6 +29,7 @@ FactoryBot.define do
         when :dragonfly
           picture.image_file = acc.image_file
           picture.image_file_size = acc.image_file.size
+          picture.image_file_format = File.extname(acc.image_file_name).delete(".").downcase
         end
       end
     end