alchemy_cms 8.3.11 → 8.4.0

data/app/components/alchemy/admin/dashboard/widgets/news_reader.rb

@@ -0,0 +1,54 @@
+module Alchemy
+  module Admin
+    module Dashboard
+      module Widgets
+        class NewsReader < ViewComponent::Base
+          MAX_ENTRIES = 5
+          CACHE_KEY = "alchemy/dashboard/news_reader"
+          CACHE_EXPIRY = 1.hour
+
+          FEED_URL = "https://www.alchemy-cms.com/news"
+
+          def entries
+            # Failed fetches return nil and are skipped (skip_nil), so a transient
+            # outage does not blank the widget for the whole cache duration.
+            @entries ||= Rails.cache.fetch(CACHE_KEY, expires_in: CACHE_EXPIRY, skip_nil: true) do
+              fetch_entries
+            end || []
+          end
+
+          private
+
+          def fetch_entries
+            response = Net::HTTP.get(URI(FEED_URL), {"Accept" => "application/atom+xml"})
+            doc = Nokogiri.parse(response)
+            doc.remove_namespaces!
+            doc.xpath("/feed/entry").first(MAX_ENTRIES).map { |entry| parse_entry(entry) }
+          rescue => error
+            Rails.logger.warn("Alchemy::Admin::Dashboard::Widgets::NewsReader could not load feed: #{error.message}")
+            nil
+          end
+
+          def parse_entry(entry)
+            content = Nokogiri::HTML.fragment(entry.xpath("content").text)
+            {
+              title: entry.xpath("title").text,
+              url: entry.at_xpath("link[@rel='alternate']")&.attr("href") || entry.at_xpath("link")&.attr("href"),
+              author: entry.xpath("author/name").text.presence,
+              image_url: content.at_css("img")&.attr("src"),
+              summary: content.text.squish.presence,
+              published_at: published_at(entry)
+            }
+          end
+
+          def published_at(entry)
+            date = entry.xpath("published").text
+            Alchemy.l(Date.parse(date))
+          rescue ArgumentError
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/dashboard/widgets/online_users.html.erb

@@ -13,7 +13,7 @@
       <tr>
         <td class="name"><%= user.name %></td>
         <td class="right">
-          <small><%= user.human_roles_string %></small>
+          <small><%= user.human_alchemy_roles %></small>
         </td>
       </tr>
     <% end %>

data/app/components/alchemy/admin/dashboard/widgets/recent_pages.html.erb

@@ -31,7 +31,7 @@
             </td>
           <% end %>
           <td class="right">
-            <small><%= l(page.updated_at, format: :'alchemy.short_datetime') %></small>
+            <small><%= Alchemy.l(page.updated_at, format: :'alchemy.short_datetime') %></small>
           </td>
         </tr>
         <% end %>

data/app/components/alchemy/admin/dashboard/widgets/system_info.html.erb

@@ -25,8 +25,16 @@
       </span>
     </span>
 
-    <a href="#legal_info" data-turbo="false">
-      <small><%= Alchemy.t(:legal_info) %></small>
-    </a>
+    <span class="label-with-icon license">
+      <%= render_icon("certificate-2") %>
+      <%= link_to_dialog(
+        license,
+        alchemy.dashboard_license_path,
+        {
+          title: Alchemy.t(:license),
+          size: "620x470"
+        }
+      ) %>
+    </span>
   </div>
 </div>

data/app/components/alchemy/admin/dashboard/widgets/system_info.rb

@@ -5,7 +5,7 @@ module Alchemy
     module Dashboard
       module Widgets
         class SystemInfo < ViewComponent::Base
-          delegate :alchemy, :render_message, to: :helpers
+          delegate :alchemy, :render_message, :render_icon, :link_to_dialog, to: :helpers
 
           def initialize
             @alchemy_version = Alchemy.version
@@ -13,6 +13,11 @@ module Alchemy
 
           private
 
+          def license
+            license_id = Gem.loaded_specs["alchemy_cms"]&.license
+            Alchemy.t(license_id, scope: :licenses) if license_id
+          end
+
           def logo
             @_logo_file ||= File.read(logo_file_path).html_safe
           end

data/app/components/alchemy/admin/element_editor.html.erb

@@ -29,7 +29,7 @@
   <% end %>
 
   <% if editable? %>
-    <%= form_for [alchemy, :admin, element], remote: true,
+    <%= form_for [alchemy, :admin, element],
       html: {id: "element_#{id}_form".html_safe, class: 'element-body'} do |f| %>
 
       <div id="element_<%= id %>_errors" class="element_errors hidden">

data/app/components/alchemy/admin/element_select.rb

@@ -12,30 +12,40 @@ module Alchemy
       end
 
       def call
-        content_tag "alchemy-element-select",
-          options: elements_options.to_json,
-          placeholder: Alchemy.t(:select_element) do
-          text_field_tag(field_name, nil, {
-            autofocus:,
-            value: elements.many? ? nil : elements.first&.name,
-            class: "alchemy_selectbox full_width"
-          })
-        end
+        content_tag "select", element_options,
+          is: "alchemy-element-select",
+          id: field_id,
+          name: field_name,
+          required: true,
+          autofocus:,
+          placeholder: Alchemy.t(:select_element)
       end
 
       private
 
-      def elements_options
-        return [] if elements.nil?
-
-        elements.sort_by(&:name).map do |element|
-          {
-            text: Element.display_name_for(element.name),
-            hint: element.hint,
-            icon: element.icon_file,
-            id: element.name
-          }
-        end
+      # Mirror Rails' input id sanitization (as the previous text_field_tag did)
+      # so the form label's `for` attribute keeps targeting the select.
+      def field_id
+        field_name.to_s.delete("]").tr("^-a-zA-Z0-9:.", "_")
+      end
+
+      def element_options
+        return "".html_safe if elements.nil?
+
+        # Preselect the only option, so adding a single available element type
+        # does not require an explicit selection.
+        preselect = !elements.many?
+
+        safe_join(
+          elements.sort_by(&:name).map do |element|
+            tag.option(
+              Element.display_name_for(element.name),
+              value: element.name,
+              selected: preselect,
+              data: {icon: element.icon_file, hint: element.hint}
+            )
+          end
+        )
       end
     end
   end

data/app/components/alchemy/admin/element_status_indicators.html.erb

@@ -0,0 +1,16 @@
+<span class="element-status-icons">
+  <% unless element.public? || element.scheduled? %>
+    <alchemy-icon name="cloud-off" size="1x"></alchemy-icon>
+    <span class="element-hidden-label">
+      <%= Alchemy.t(:element_hidden) %>
+    </span>
+  <% end %>
+  <sl-tooltip
+    class="element-scheduled-icon"
+    content="<%= scheduled_tooltip %>"
+    <%= "hidden" unless element.scheduled? %>
+  >
+    <alchemy-icon name="calendar-schedule" size="1x"></alchemy-icon>
+    <%= scheduled_label %>
+  </sl-tooltip>
+</span>

data/app/components/alchemy/admin/element_status_indicators.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    # Renders the visibility state badges (hidden / scheduled) shown for an
+    # element in the element header.
+    class ElementStatusIndicators < ViewComponent::Base
+      def initialize(element:)
+        @element = element
+      end
+
+      private
+
+      attr_reader :element
+
+      def scheduled_tooltip
+        Alchemy.t(
+          element.public_on&.future? ? :public_on : :public_until,
+          scope: :element_scheduled,
+          public_on: Alchemy.l(element.public_on),
+          public_until: Alchemy.l(element.public_until)
+        )
+      end
+
+      def scheduled_label
+        date = element.public_on&.future? ? element.public_on : element.public_until
+        Alchemy.l(date, format: :"alchemy.short_datetime")
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/link_dialog/external_tab.rb

@@ -33,7 +33,8 @@ module Alchemy
 
         def url_input
           label = label_tag("external_link", "URL", class: "control-label")
-          input = text_field_tag "external_link", is_selected? ? @url : ""
+          input = text_field_tag "external_link", is_selected? ? @url : "",
+            data: {link_url_regexp: link_url_regexp.inspect}
           content_tag("div", label + input, class: "input text")
         end
       end

data/app/components/alchemy/admin/main_navigation/entry.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module MainNavigation
+      class Entry < ViewComponent::Base
+        erb_template <<~ERB
+          <%= content_tag :"alchemy-main-navi-entry", class: css_classes, data: data_attributes do %>
+            <%= link_to item.path(helpers) do %>
+              <% if item.image %>
+                <%= image_tag(item.image) %>
+              <% elsif item.inline_image %>
+                <%== item.inline_image %>
+              <% elsif item.icon %>
+                <%= content_tag :"alchemy-icon", nil,
+                  name: item.icon,
+                  "icon-style": item.icon_style %>
+              <% else %>
+                <%= render_icon :table %>
+              <% end %>
+              <label><%= Alchemy.t(item.title) %></label>
+            <% end %>
+            <%= render Alchemy::Admin::MainNavigation::SubNavigation.new(item) %>
+          <% end %>
+        ERB
+
+        with_collection_parameter :item
+
+        delegate :render_icon, to: :helpers
+
+        attr_reader :item
+
+        def initialize(item:)
+          @item = item
+        end
+
+        def before_render
+          item.validate_controller_existence!
+        end
+
+        def render?
+          item.visible?(helpers)
+        end
+
+        private
+
+        def css_classes
+          [
+            "main_navi_entry",
+            ("active" if item.active?(helpers)),
+            ("has_sub_navigation" if item.children.any?)
+          ].compact
+        end
+
+        def data_attributes
+          {turbo: false} unless item.turbo
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/main_navigation/menu.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module MainNavigation
+      class Menu < ViewComponent::Base
+        erb_template <<~ERB
+          <div id="main_navi">
+            <%= render Alchemy::Admin::MainNavigation::Entry.with_collection(items) %>
+            <%= helpers.content_for(:alchemy_main_navigation) %>
+          </div>
+        ERB
+
+        def items
+          positioned, unpositioned = Alchemy.config.menu.partition(&:position)
+          positioned.sort_by(&:position) + unpositioned
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/main_navigation/sub_navigation.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module MainNavigation
+      class SubNavigation < ViewComponent::Base
+        erb_template <<~ERB
+          <div class="sub_navigation">
+            <% item.children.each do |child| %>
+              <% if child.visible?(helpers) %>
+                <div class="subnavi_tab<%= " active" if child.active?(helpers) %>">
+                  <%= link_to Alchemy.t(child.title), child.path(helpers) %>
+                </div>
+              <% end %>
+            <% end %>
+          </div>
+        ERB
+
+        attr_reader :item
+
+        def initialize(item)
+          @item = item
+        end
+
+        def render?
+          item.children.any?
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/page_node.html.erb

@@ -65,7 +65,7 @@
       </div>
 
       <div class="page_infos">
-        <%= render Alchemy::Admin::PageStatusIndicators.new(page: @page) %>
+        <%= render Alchemy.config.admin_components.page_status_indicators.new(page: @page) %>
       </div>
 
       <div class="sitemap_right_tools">

data/app/components/alchemy/admin/page_permitted_roles_select.html.erb

@@ -0,0 +1,11 @@
+<alchemy-conditional-field control="page_restricted">
+  <%= form.input :permitted_roles,
+    collection: role_options,
+    include_blank: false,
+    wrapper_html: {class: "input-column"},
+    input_html: {
+      multiple: true,
+      is: "alchemy-select",
+      disabled: disabled?
+    } %>
+</alchemy-conditional-field>

data/app/components/alchemy/admin/page_permitted_roles_select.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    # Renders the multi select of roles that are permitted to read a restricted
+    # page.
+    #
+    # Only visible while the +restricted+ checkbox is checked. While hidden the
+    # select is disabled, so it does not submit and clear the stored roles.
+    #
+    class PagePermittedRolesSelect < ViewComponent::Base
+      def initialize(page:, form:)
+        @page = page
+        @form = form
+      end
+
+      private
+
+      attr_reader :form
+
+      def disabled?
+        !@page.restricted? || @page.attribute_fixed?(:restricted)
+      end
+
+      # The configured user roles. Only configured roles are selectable, and a
+      # validation rejects any unknown role, so the select offers these only.
+      #
+      def role_options
+        @_role_options ||= Alchemy.config.user_roles.map do |role|
+          [Alchemy.t(role, scope: :user_roles, default: role.humanize), role]
+        end
+      end
+    end
+  end
+end

data/app/components/alchemy/admin/page_select.rb

@@ -3,12 +3,13 @@ module Alchemy
     class PageSelect < ViewComponent::Base
       delegate :alchemy, to: :helpers
 
-      def initialize(page = nil, url: nil, allow_clear: false, placeholder: Alchemy.t(:search_page), query_params: nil)
+      def initialize(page = nil, url: nil, allow_clear: false, placeholder: Alchemy.t(:search_page), query_params: nil, multiple: false)
         @page = page
         @url = url
         @allow_clear = allow_clear
         @placeholder = placeholder
         @query_params = query_params
+        @multiple = multiple
       end
 
       def call
@@ -27,18 +28,27 @@ module Alchemy
 
         options = options.merge({"allow-clear": @allow_clear}) if @allow_clear
         options = options.merge({"query-params": @query_params.to_json}) if @query_params
+        options = options.merge({multiple: true}) if @multiple
 
-        if @page
-          selection = {
-            id: @page.id,
-            name: @page.name,
-            url_path: @page.url_path
-          }
-          options = options.merge({selection: selection.to_json})
+        if @multiple
+          if @page.present?
+            selection = Array(@page).map { |page| page_selection(page) }
+            options = options.merge({selection: selection.to_json})
+          end
+        elsif @page
+          options = options.merge({selection: page_selection(@page).to_json})
         end
 
         options
       end
+
+      def page_selection(page)
+        {
+          id: page.id,
+          name: page.name,
+          url_path: page.url_path
+        }
+      end
     end
   end
 end

data/app/components/alchemy/admin/preview_time_select.rb

@@ -39,7 +39,7 @@ module Alchemy
           future_public_until = elements.where("public_until > ?", now).pluck(:public_until)
           times = (future_public_on | future_public_until)
           times.sort!
-          times.map { |time| [l(time, format: :"alchemy.element_date"), time.iso8601] }
+          times.map { |time| [Alchemy.l(time, format: :"alchemy.element_date"), time.iso8601] }
         end
       end
 

data/app/components/alchemy/admin/toolbar_button.rb

@@ -32,23 +32,6 @@ module Alchemy
     #   Skip the permission check. NOT RECOMMENDED!
     #
     class ToolbarButton < ViewComponent::Base
-      erb_template <<-ERB
-        <div class="toolbar_button" id="<%= id %>">
-          <sl-tooltip content="<%= label %>" placement="<%= tooltip_placement %>" <%= "disabled" if disabled? %>>
-            <% if disabled? %>
-              <%= tag.a(render_icon(icon, style: icon_style), class: css_classes + ["disabled"], tabindex: "-1") %>
-            <% else %>
-              <%= link_to(render_icon(icon, style: icon_style), url, {
-                class: css_classes,
-                "data-dialog-options" => dialog ? dialog_options.to_json : nil,
-                "data-alchemy-hotkey" => hotkey,
-                :is => dialog ? "alchemy-dialog-link" : nil
-              }.merge(link_options)) %>
-            <% end %>
-          </sl-tooltip>
-        </div>
-      ERB
-
       delegate :cannot?, :link_to, :link_to_dialog, :render_icon, to: :helpers
 
       attr_reader :url,
@@ -63,7 +46,8 @@ module Alchemy
         :link_options,
         :id,
         :icon_style,
-        :tooltip_placement
+        :tooltip_placement,
+        :primary
 
       def initialize(
         url:,
@@ -79,7 +63,8 @@ module Alchemy
         link_options: {},
         id: nil,
         icon_style: "line",
-        tooltip_placement: "top-start"
+        tooltip_placement: "top-start",
+        primary: false
       )
         @url = url
         @icon = icon
@@ -94,15 +79,53 @@ module Alchemy
         @id = id
         @icon_style = icon_style
         @tooltip_placement = tooltip_placement
+        @primary = primary
+      end
+
+      def call
+        tag.div class: "toolbar_button", id: do
+          if primary
+            link_tag
+          else
+            content_tag "sl-tooltip", content: label, placement: tooltip_placement, disabled: disabled? do
+              link_tag
+            end
+          end
+        end
       end
 
       private
 
+      def link_tag
+        if disabled?
+          tag.a(link_text, class: css_classes, tabindex: "-1")
+        else
+          link_to link_text, url, {
+            :class => css_classes,
+            "data-dialog-options" => dialog ? dialog_options.to_json : nil,
+            "data-alchemy-hotkey" => hotkey,
+            :is => dialog ? "alchemy-dialog-link" : nil
+          }.merge(link_options)
+        end
+      end
+
+      def link_text
+        primary ? icon_tag + label : icon_tag
+      end
+
+      def icon_tag = render_icon(icon, style: icon_style)
+
       def disabled?
         @_disabled ||= !skip_permission_check && cannot?(*permission_options)
       end
 
-      def css_classes = ["icon_button", active && "active"].compact
+      def css_classes
+        [
+          primary ? "button with_icon" : "icon_button",
+          disabled? ? "disabled" : nil,
+          active ? "active" : nil
+        ].compact
+      end
 
       def permission_options = if_permitted_to.presence || permissions_from_url
 

data/app/components/alchemy/admin/uploader_button.rb

@@ -0,0 +1,66 @@
+module Alchemy
+  module Admin
+    class UploaderButton < ViewComponent::Base
+      delegate :alchemy, to: :helpers
+
+      attr_reader :object, :file_attribute, :accept, :dropzone, :redirect_url, :layout, :inline_label
+
+      def initialize(object:, file_attribute:, redirect_url:, accept: nil, dropzone: nil, label: nil, layout: nil, inline_label: false)
+        @object = object
+        @file_attribute = file_attribute
+        @redirect_url = redirect_url
+        @dropzone = dropzone || "#main_content"
+        @label = label
+        @layout = layout
+        @accept = accept || ((file_types.to_a == ["*"]) ? nil : file_types.map { |type| ".#{type}" }.join(", "))
+        @inline_label = inline_label
+      end
+
+      def call
+        content_tag "alchemy-uploader", "redirect-url": redirect_url, dropzone:, layout: do
+          form_for [alchemy, :admin, object], html: {multipart: true, class: "upload-button"} do |f|
+            safe_join([upload_hash_field(f), file_input(f), upload_label(f)].compact)
+          end
+        end
+      end
+
+      private
+
+      def upload_hash_field(f)
+        return unless object.respond_to?(:upload_hash)
+
+        f.hidden_field(:upload_hash, name: "#{f.object_name}[upload_hash]", value: Time.current.hash)
+      end
+
+      def file_input(f)
+        f.file_field file_attribute,
+          class: "fileupload fileupload--field", multiple: true, accept: accept,
+          name: "#{f.object_name}[#{file_attribute}]", tabindex: "-1"
+      end
+
+      def upload_label(f)
+        f.label file_attribute, data: {alchemy_hotkey: "alt+n"} do
+          if inline_label
+            tag.span class: "button with_icon", tabindex: "0" do
+              render(Alchemy::Admin::Icon.new("upload-2")) + tooltip
+            end
+          else
+            content_tag "sl-tooltip", content: tooltip, placement: "top-start" do
+              tag.span class: "icon_button", tabindex: "0" do
+                render Alchemy::Admin::Icon.new("upload-2")
+              end
+            end
+          end
+        end
+      end
+
+      def tooltip
+        @label.presence || Alchemy.t(:button_label, scope: [:uploader, object.class.model_name.i18n_key])
+      end
+
+      def file_types
+        Alchemy.config.uploader.allowed_filetypes[object.class.model_name.collection] || ["*"]
+      end
+    end
+  end
+end

data/app/components/alchemy/ingredients/base_editor.rb

@@ -37,6 +37,7 @@ module Alchemy
           concat ingredient_id_field
           concat ingredient_label
           concat input_field
+          concat validation_error
         end
       end
 
@@ -101,10 +102,18 @@ module Alchemy
           partial_name,
           ingredient.deprecated? ? "deprecated" : nil,
           settings[:linkable] ? "linkable" : nil,
-          settings[:anchor] ? "with-anchor" : nil
+          settings[:anchor] ? "with-anchor" : nil,
+          ingredient.errors[:value].any? ? "validation_failed" : nil
         ].compact
       end
 
+      # Renders the inline validation error shown below a failing ingredient input.
+      def validation_error
+        return if ingredient.errors[:value].empty?
+
+        tag.small(ingredient.errors[:value].to_sentence, class: "error")
+      end
+
       def data_attributes
         {
           ingredient_id: ingredient.id,