alchemy_cms 8.2.7 → 8.3.0

data/app/javascript/alchemy_admin/image_cropper.js

@@ -17,6 +17,9 @@ export default class ImageCropper {
       settings.crop_size_form_field_id
     )
     this.elementId = settings.element_id
+    this.elementEditor = document.querySelector(
+      `[data-element-id='${this.elementId}']`
+    )
     this.dialog = Alchemy.currentDialog()
     if (this.dialog) {
       this.dialog.options.closed = () => this.destroy()
@@ -32,11 +35,7 @@ export default class ImageCropper {
       zoomable: false,
       checkCrossOrigin: false, // Prevent CORS issues
       checkOrientation: false, // Prevent loading the image via AJAX which can cause CORS issues
-      data: this.box,
-      cropend: () => {
-        const data = this.#cropper.getData(true)
-        this.update(data)
-      }
+      data: this.box
     }
   }
 
@@ -116,10 +115,9 @@ export default class ImageCropper {
 
   bind() {
     this.dialog.dialog_body.find('button[type="submit"]').on("click", () => {
-      const elementEditor = document.querySelector(
-        `[data-element-id='${this.elementId}']`
-      )
-      elementEditor.setDirty()
+      const data = this.#cropper.getData(true)
+      this.update(data)
+      this.elementEditor.setDirty()
       this.dialog.close()
       return false
     })

data/app/javascript/alchemy_admin/initializer.js

@@ -1,5 +1,22 @@
 import Hotkeys from "alchemy_admin/hotkeys"
 import pleaseWaitOverlay from "alchemy_admin/please_wait_overlay"
+import { openDialog } from "alchemy_admin/dialog"
+
+// Opens the help dialog when the user presses the "?" key outside of a field.
+function showHelp(evt) {
+  if (
+    !$(evt.target).is("input, textarea") &&
+    String.fromCharCode(evt.which) === "?"
+  ) {
+    openDialog("/admin/help", {
+      title: Alchemy.t("help"),
+      size: "400x492"
+    })
+    return false
+  } else {
+    return true
+  }
+}
 
 export default function Initializer() {
   // We obviously have javascript enabled.
@@ -8,6 +25,10 @@ export default function Initializer() {
   // Initialize hotkeys.
   Hotkeys()
 
+  // (Re)bind the help dialog hotkey.
+  document.removeEventListener("keypress", showHelp)
+  document.addEventListener("keypress", showHelp)
+
   // Add observer for please wait overlay.
   document.querySelectorAll(".please_wait").forEach((element) => {
     element.addEventListener("click", pleaseWaitOverlay)

data/app/javascript/alchemy_admin/utils/dispatch_page_dirty_event.js

@@ -0,0 +1,7 @@
+export function dispatchPageDirtyEvent(data) {
+  document.dispatchEvent(
+    new CustomEvent("alchemy:page-dirty", {
+      detail: { tooltip: data.publishButtonTooltip }
+    })
+  )
+}

data/app/javascript/tinymce/plugins/alchemy_link/index.js

@@ -48,4 +48,13 @@ tinymce.PluginManager.add("alchemy_link", function (editor) {
   // Replace the default link command with our own
   editor.addCommand("mceLink", openLinkDialog)
   editor.addShortcut("Meta+K", "", openLinkDialog)
+
+  // Override the default link menu item so the contextual menu
+  // (right-click) opens the Alchemy link dialog instead of TinyMCE's.
+  editor.ui.registry.addMenuItem("link", {
+    icon: "link",
+    text: "Link...",
+    shortcut: "Meta+K",
+    onAction: openLinkDialog
+  })
 })

data/app/jobs/alchemy/base_job.rb

@@ -3,9 +3,9 @@
 module Alchemy
   class BaseJob < ActiveJob::Base
     # Automatically retry jobs that encountered a deadlock
-    # retry_on ActiveRecord::Deadlocked
+    retry_on ActiveRecord::Deadlocked
 
     # Most jobs are safe to ignore if the underlying records are no longer available
-    # discard_on ActiveJob::DeserializationError
+    discard_on ActiveJob::DeserializationError
   end
 end

data/app/jobs/alchemy/invalidate_elements_cache_job.rb

@@ -0,0 +1,33 @@
+module Alchemy
+  class InvalidateElementsCacheJob < BaseJob
+    queue_as :default
+
+    def perform(related_object_type, related_object_id)
+      element_ids = Ingredient
+        .where(related_object_type:, related_object_id:)
+        .joins(:element)
+        .pluck(:element_id)
+      elements = Element.where(id: element_ids)
+
+      all_element_ids = get_all_element_ids(elements, element_ids)
+      Element.where(id: all_element_ids).touch_all
+
+      page_ids = elements.joins(page_version: :page).select("DISTINCT alchemy_pages.id")
+      Page.where(id: page_ids).touch_all
+    end
+
+    private
+
+    def get_all_element_ids(elements, element_ids)
+      parent_element_ids = elements.where.not(parent_element_id: nil).pluck(:parent_element_id)
+      parent_elements = Element.distinct.where(id: parent_element_ids)
+
+      if parent_elements.any?
+        element_ids += parent_element_ids
+        get_all_element_ids(parent_elements, element_ids)
+      else
+        element_ids
+      end
+    end
+  end
+end

data/app/models/alchemy/page/page_naming.rb

@@ -8,6 +8,8 @@ module Alchemy
 
       RESERVED_URLNAMES = %w[admin messages new]
 
+      delegate :wildcard_url, to: :definition
+
       included do
         before_validation :set_urlname,
           if: :renamed?,
@@ -18,6 +20,7 @@ module Alchemy
         validates :urlname,
           uniqueness: {scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false},
           exclusion: {in: RESERVED_URLNAMES}
+        validate :unique_wildcard_param_keys, if: :has_wildcard_url?
 
         after_update :update_descendants_urlnames,
           if: :saved_change_to_urlname?
@@ -42,13 +45,32 @@ module Alchemy
         end
       end
 
-      # Returns always the last part of a urlname path
+      # Returns wildcard url param or the last part of an urlname path
       def slug
         urlname.to_s.split("/").last
       end
 
+      def has_wildcard_url?
+        wildcard_url.present?
+      end
+
       private
 
+      def unique_wildcard_param_keys
+        conflicting = PageDefinition.all.find do |other|
+          other.name != page_layout && other.wildcard_url == wildcard_url
+        end
+
+        if conflicting
+          errors.add(
+            :page_layout,
+            :conflicting_wildcard_param_key,
+            param: wildcard_url,
+            conflicting_layout: conflicting.name
+          )
+        end
+      end
+
       def update_descendants_urlnames
         reload
         descendants.each(&:update_urlname!)
@@ -67,13 +89,14 @@ module Alchemy
       end
 
       # Returns the full nested urlname.
-      #
+      # Uses the wildcard_url from the page definition if present,
+      # otherwise converts the slug or name to a url-friendly string.
       def nested_url_name
-        converted_url_name = convert_to_urlname(slug.blank? ? name : slug)
+        url_part = wildcard_url.presence || convert_to_urlname(slug.blank? ? name : slug)
         if parent&.language_root?
-          converted_url_name
+          url_part
         else
-          [parent&.urlname, converted_url_name].compact.join("/")
+          [parent&.urlname, url_part].compact.join("/")
         end
       end
     end

data/app/models/alchemy/page/page_natures.rb

@@ -83,7 +83,8 @@ module Alchemy
         {
           public: public?,
           locked: locked?,
-          restricted: restricted?
+          restricted: restricted?,
+          scheduled: scheduled?
         }
       end
 
@@ -92,7 +93,11 @@ module Alchemy
       # @param [Symbol] status_type
       #
       def status_message(status_type)
-        Alchemy.t(status[status_type].to_s, scope: "page_states.#{status_type}")
+        if status_type == :scheduled && scheduled?
+          Alchemy.t(public_on&.future? ? :public_on : :public_until, scope: "page_states.scheduled", public_on: public_on && ::I18n.l(public_on, format: :"alchemy.default"), public_until: public_until && ::I18n.l(public_until, format: :"alchemy.default"))
+        else
+          Alchemy.t(status[status_type].to_s, scope: "page_states.#{status_type}")
+        end
       end
 
       # Returns the sort translated status title for given status type.

data/app/models/alchemy/page/page_scopes.rb

@@ -63,11 +63,11 @@ module Alchemy
             )
           }
 
-        # Last 5 pages that where recently edited by given user
+        # Pages that where updated by given user sorted by update time
         #
         scope :all_last_edited_from,
           ->(user) {
-            where(updater_id: user.id).order("updated_at DESC").limit(5)
+            where(updater_id: user.id).order("updated_at DESC")
           }
 
         # Returns all pages that have the given +language_id+

data/app/models/alchemy/page/url_path.rb

@@ -20,11 +20,12 @@ module Alchemy
     #     link_to page.url
     #
     class UrlPath
-      def initialize(page, optional_params = {})
+      def initialize(page, optional_params = {}, wildcard_params: {})
         @page = page
         @language = @page.language
         @site = @language.site
         @optional_params = optional_params
+        @wildcard_params = wildcard_params
       end
 
       def call
@@ -64,7 +65,11 @@ module Alchemy
       end
 
       def page_path
-        "#{root_path}#{@page.urlname}"
+        urlname = @page.urlname
+        @wildcard_params.each do |key, val|
+          urlname = urlname.gsub(":#{key}", val.to_s)
+        end
+        "#{root_path}#{urlname}"
       end
 
       def root_path

data/app/models/alchemy/page.rb

@@ -305,8 +305,8 @@ module Alchemy
     # = The url_path for this page
     #
     # @see Alchemy::Page::UrlPath#call
-    def url_path(optional_params = {})
-      self.class.url_path_class.new(self, optional_params).call
+    def url_path(optional_params = {}, wildcard_params: {})
+      self.class.url_path_class.new(self, optional_params, wildcard_params: wildcard_params).call
     end
 
     # The page's view partial is dependent from its page layout

data/app/models/alchemy/page_definition.rb

@@ -20,6 +20,7 @@ module Alchemy
     attribute :hide, :boolean, default: false
     attribute :editable_by
     attribute :hint
+    attribute :wildcard_url, Alchemy::WildcardUrlType.new
 
     # Needs to be down here in order to have the attribute reader
     # available after the attribute is defined.

data/app/models/alchemy/permissions.rb

@@ -94,7 +94,7 @@ module Alchemy
 
         # Controller actions
         can :leave, :alchemy_admin
-        can [:info, :help], :alchemy_admin_dashboard
+        can [:info, :help, :show], :alchemy_admin_dashboard
         can :manage, :alchemy_admin_clipboard
         can :update, :alchemy_admin_layoutpages
         can :tree, :alchemy_admin_pages

data/app/models/concerns/alchemy/relatable_resource.rb

@@ -41,6 +41,8 @@ module Alchemy
 
       has_many :related_elements, through: :related_ingredients, source: :element
       has_many :related_pages, through: :related_elements, source: :page
+
+      after_touch :touch_related_ingredients, if: -> { related_ingredients.exists? }
     end
 
     # Returns true if object is not assigned to any ingredient.
@@ -48,5 +50,11 @@ module Alchemy
     def deletable?
       related_ingredients.none?
     end
+
+    private
+
+    def touch_related_ingredients
+      InvalidateElementsCacheJob.perform_later(self.class.name, id)
+    end
   end
 end

data/app/services/alchemy/page_finder.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PageFinder
+    attr_reader :urlname
+
+    Result = Data.define(:page, :extracted_params)
+
+    def initialize(urlname)
+      @urlname = urlname
+    end
+
+    # @return [PageFinder::Result, nil]
+    def call
+      return if urlname.blank?
+
+      find_by_urlname || find_by_wildcard_url
+    end
+
+    private
+
+    # Finds a page by exact urlname match within the current language.
+    def find_by_urlname
+      page = Current.language.pages.contentpages.find_by(urlname: urlname)
+      Result.new(page: page, extracted_params: ActionController::Parameters.new.permit!) if page
+    end
+
+    # Finds a page whose urlname pattern matches the given URL.
+    # Loads all pages whose urlname contains a `:param` segment in a
+    # single SQL query, then matches each in Ruby.
+    #
+    # A urlname may contain more than one `:param` segment when a wildcard
+    # page is nested under another wildcard page.
+    def find_by_wildcard_url
+      return unless any_wildcard_definitions?
+
+      # Tree depth of a contentpage = urlname slash count + 1 (skipping the language root)
+      page_depth = urlname.count("/") + 1
+
+      wildcard_pages = Current.language.pages.contentpages
+        .where("urlname LIKE ?", "%:%")
+        .where(depth: page_depth)
+        .order(:lft)
+
+      wildcard_pages.each do |wildcard_page|
+        matched_params = match_url_pattern(wildcard_page)
+        next unless matched_params
+
+        # return the first match
+        return Result.new(
+          page: wildcard_page,
+          extracted_params: ActionController::Parameters.new(matched_params).permit!
+        )
+      end
+
+      nil
+    end
+
+    # Matches the urlname against a page's urlname pattern.
+    # Static segments must match literally; each `:param` segment is captured
+    # as a single URL segment.
+    #
+    # @param wildcard_page [Alchemy::Page] a page whose urlname contains one or more `:param` segments
+    # @return [Hash<Symbol, String>, nil] matched params or nil
+    def match_url_pattern(wildcard_page)
+      regex_parts = wildcard_page.urlname.split("/").map do |segment|
+        if segment.start_with?(":")
+          # create a named capture group for the segment e.g. ":slug" => "(?<slug>.+)"
+          "(?<#{segment[1..]}>[\\w\\-]+)"
+        else
+          # only return the current segment and escape any special regex characters
+          Regexp.escape(segment)
+        end
+      end
+
+      # connect regex parts and match them against the urlname
+      match = Regexp.new("\\A#{regex_parts.join("/")}\\z").match(urlname)
+
+      # extract the named capture groups as parameters
+      match&.named_captures&.symbolize_keys!
+    end
+
+    # @return [Boolean] whether any page definition declares a wildcard_url
+    def any_wildcard_definitions?
+      PageDefinition.all.any?(&:wildcard_url)
+    end
+  end
+end

data/app/stylesheets/alchemy/_custom-properties.scss

@@ -65,6 +65,7 @@
   --font-size_small: 10px; /* 0.875rem */
   --font-size_medium: 12px; /* 1rem */
   --font-size_large: 16px; /* 1.25 rem */
+  --font-size_xlarge: 24px; /* 2 rem */
 
   --font-weight_normal: 500;
   --font-weight_bold: 700;
@@ -73,6 +74,7 @@
 
   /* Borders */
   --border-radius_medium: 3px;
+  --border-radius_large: 6px;
   --border-width_small: 1px;
   --border-style: solid;
   --border-default: var(--border-width_small) var(--border-style)
@@ -90,7 +92,7 @@
     var(--button-border-color);
   --button-font-size: var(--font-size_medium);
   --button-font-weight: var(--font-weight_bold);
-  --button-height: 30px;
+  --button-height: 31px;
   --button-line-height: var(--form-field-line-height);
   --button-margin: var(--form-field-margin);
   --button-padding: var(--spacing-1) var(--spacing-5);
@@ -111,12 +113,12 @@
   --elements-window-transition-easing: ease-in-out;
 
   /* Form */
-  --form-left-column-width: 35%;
-  --form-right-column-width: 65%;
+  --form-left-column-width: 1fr;
+  --form-right-column-width: 2.25fr;
 
   /* Form Field */
   --form-field-margin: var(--spacing-1) 0;
-  --form-field-height: 31px;
+  --form-field-height: var(--button-height);
   --form-field-addon-width: 30px;
   --form-field-border-width: var(--border-width_small);
   --form-field-border-style: var(--border-style);

data/app/stylesheets/alchemy/_mixins.scss

@@ -84,13 +84,7 @@
 }
 
 @mixin form-label {
-  width: var(--form-left-column-width);
-  padding-right: var(--spacing-2);
-  padding-top: 0.6em;
-  margin-top: var(--spacing-1);
-  vertical-align: top;
   word-break: normal;
-  float: left;
   text-align: right;
   font-size: var(--font-size_medium);
   color: var(--form-field-label-color);
@@ -108,7 +102,7 @@
   border: 1px solid $border-color;
   color: $color;
   display: block;
-  clear: both;
+  grid-column: 2;
   border-radius: var(--border-radius_medium);
 }
 

data/app/stylesheets/alchemy/_themes.scss

@@ -29,6 +29,12 @@
   --code-background-color: var(--a-darkest-grey);
   --code-border-color: var(--a-grey);
 
+  /* Dashboard */
+  --dashboard-widget-background-color: var(--a-darkest-grey);
+  --dashboard-widget-box-shadow: none;
+  --table-scroll-fade-color: rgba(0, 0, 0, 0);
+  --table-scroll-shadow-color: rgba(0, 0, 0, 0.6);
+
   /* Datepicker */
   --datepicker-bg-color: var(--a-dark-grey);
   --datepicker-border-color: var(--a-grey);
@@ -82,7 +88,7 @@
   --form-field-background-color: var(--a-darkest-grey);
   --form-field-border-color: var(--border-inset-color);
   --form-field-box-shadow: inset 0 0 1px var(--a-dark-grey);
-  --form-field-label-color: var(--text-color-muted);
+  --form-field-label-color: var(--text-color);
   --form-field-text-color: var(--text-color);
   --form-field-disabled-text-color: var(--form-field-text-color);
   --form-field-disabled-bg-color: transparent;
@@ -315,6 +321,12 @@
   --code-background-color: var(--color-grey_light);
   --code-border-color: var(--border-color);
 
+  /* Dashboard */
+  --dashboard-widget-background-color: var(--color-white);
+  --dashboard-widget-box-shadow: 0px 1px 2px 0px rgba(10, 10, 10, 0.1);
+  --table-scroll-fade-color: rgba(255, 255, 255, 0);
+  --table-scroll-shadow-color: rgba(0, 0, 0, 0.15);
+
   /* Datepicker */
   --datepicker-bg-color: var(--color-white);
   --datepicker-border-color: var(--border-color);