alchemy_cms 8.1.12 → 8.2.0

data/app/views/alchemy/admin/tinymce/_setup.html.erb

@@ -9,20 +9,13 @@
 <% end %>
 
 <script>
-  // Setting TinyMCE path.
-  var tinyMCEPreInit = {
-    <% if ActionController::Base.config.asset_host %>
-    base: '<%= asset_url(tinymce_base_path, host: ActionController::Base.config.asset_host) %>',
-    <% else %>
-    base: '<%= tinymce_base_path %>',
-    <% end %>
-    suffix: '.min'
-  };
-  // Holds the default Alchemy TinyMCE configuration
-  Alchemy.TinymceDefaults = {
-    plugins: '<%= Alchemy::Tinymce.plugins.join(',') %>',
-    <% Alchemy::Tinymce.init.each do |k, v| %>
-    <%= k %>: <%== v.to_json %>,
-    <% end %>
-  };
+  var tinyMCEPreInit = <%== {
+    base: ActionController::Base.config.asset_host ?
+      asset_url(tinymce_base_path, host: ActionController::Base.config.asset_host) :
+      tinymce_base_path,
+    suffix: ".min"
+  }.to_json %>;
+  Alchemy.TinymceDefaults = <%== Alchemy::Tinymce.init.merge(
+    plugins: Alchemy::Tinymce.plugins.join(",")
+  ).to_json %>;
 </script>

data/app/views/alchemy/admin/uploader/_setup.html.erb

@@ -1,8 +1,3 @@
 <script>
-  Alchemy.uploader_defaults = {
-    file_size_limit: <%= Alchemy.config.uploader.file_size_limit -%>,
-    upload_limit: <%= Alchemy.config.uploader.upload_limit -%>,
-    allowed_filetype_pictures: "<%= Alchemy.config.uploader.allowed_filetypes.alchemy_pictures.join(", ") -%>",
-    allowed_filetype_attachments: "<%= Alchemy.config.uploader.allowed_filetypes.alchemy_attachments.join(", ") -%>",
-  }
+  Alchemy.uploader_defaults = <%== Alchemy.config.uploader.to_json %>
 </script>

data/app/views/alchemy/language_links/_language.html.erb

@@ -1,8 +1,7 @@
 <%= link_to(
   content_tag(:span, language.label(options[:linkname])).html_safe,
   show_alchemy_page_path(
-    language.pages.language_roots.first,
-    locale: prefix_locale?(language.code) ? language.code : nil
+    language.pages.language_roots.first
   ),
   class: [
     language.code,

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

@@ -44,52 +44,9 @@
       <p><%= Alchemy.t(:javascript_disabled_text) %></p>
     </noscript>
     <alchemy-overlay text="<%= Alchemy.t(:please_wait) %>"></alchemy-overlay>
-    <div id="left_menu">
-      <div id="main_navi">
-        <% sorted_alchemy_modules.each do |alchemy_module| %>
-          <%= alchemy_main_navigation_entry(alchemy_module) %>
-        <% end %>
-        <%= yield(:alchemy_main_navigation) %>
-      </div>
-
-      <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: "320x140",
-                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 %>
-        </div>
-      </div>
-    </div>
+    <%= render "alchemy/admin/left_menu" %>
     <% if current_alchemy_user %>
-    <div id="top_menu">
-      <div id="header">
-        <% if @locked_pages.present? %>
-          <div id="locked_pages">
-            <%= render partial: 'alchemy/admin/pages/locked_page', collection: @locked_pages %>
-          </div>
-        <% end %>
-        <div id="user_info">
-          <%= current_alchemy_user_name %>
-          <%= render Alchemy::Admin::LocaleSelect.new %>
-        </div>
-      </div>
-      <div id="toolbar">
-        <%= yield(:toolbar) %>
-      </div>
-    </div>
+      <%= render "alchemy/admin/top_menu", locked_pages: @locked_pages %>
     <% end %>
     <%= render 'alchemy/admin/partials/flash_notices' %>
     <div id="main_content">

data/config/importmap.rb

@@ -12,5 +12,10 @@ pin "shoelace", to: "shoelace.min.js", preload: true
 pin "@rails/ujs", to: "rails-ujs.min.js", preload: true # @7.1.2
 pin "tinymce", to: "tinymce.min.js", preload: true
 
-pin "alchemy_admin", to: "alchemy_admin.js", preload: true
-pin_all_from File.expand_path("../app/javascript/alchemy_admin", __dir__), under: "alchemy_admin", preload: true
+pin "alchemy_admin", to: "alchemy/alchemy_admin.min.js", preload: true
+pin "alchemy_admin/components/remote_select", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/image_cropper", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/image_overlay", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/picture_selector", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/node_tree", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/utils/events", to: "alchemy/alchemy_admin.min.js"

data/config/locales/alchemy.en.yml

@@ -233,6 +233,15 @@ en:
       elements:
         toolbar:
           hide: Hide
+        schedule:
+          visibility_status:
+            public_html: This element is <b>currently visible</b>.
+            hidden_html: This element is <b>currently hidden</b>.
+          public_no_schedule: Set a "visible until" date to automatically hide it.
+          public_scheduled_html: It will be hidden on <b>%{public_until}</b>.
+          hidden_no_schedule: Change dates to make it visible again.
+          hidden_scheduled_html: It will be visible from <b>%{public_on}</b>.
+          hidden_window_html: It will be visible from <b>%{public_on}</b> until <b>%{public_until}</b>.
       pictures:
         sorting_select:
           label: "Sorting"
@@ -390,6 +399,7 @@ en:
     cannot_visit_unpublic_page: "Publish page before visiting it."
     choose_file_to_link: "Please choose a file to link"
     "clear clipboard": "clear clipboard"
+    clear_schedule: Clear Schedule
     click_to_show_all: "Click to show all again."
     confirm_to_delete_element: "Do you really want to delete this element? It cannot be restored!"
     confirm_to_delete_file: "Do you really want to delete this file from the server?"
@@ -446,6 +456,9 @@ en:
     element_hidden: "Hidden"
     element_of_type: "Element"
     element_saved: "Saved element."
+    element_scheduled:
+      public_on: "visible from %{public_on}"
+      public_until: "visible until %{public_until}"
     enter_external_link: "Please enter the URL you want to link with"
     explain_cropping: '<p>Move the frame and change its size with the mouse or arrow keys to adjust the image mask. Click on "apply" when you are satisfied with your selection.</p><p>If you want to return to the original centered image mask like it was defined in the layout, click "reset" and "apply" afterwards.</p>'
     explain_publishing: "Publish current page content"
@@ -596,7 +609,9 @@ en:
       "1024": "iPad Landscape (1024px)"
       "1280": "Laptop (1280px)"
       "1440": "Desktop (1440px)"
+    preview_time: "Preview Time"
     preview_url: Preview
+    now: "Now"
     publish_page_language_not_public: Cannot publish page if language is not public
     publish_page_not_allowed: You have not the permission to publish this page
     recently_uploaded_only: "Recently uploaded only"
@@ -625,6 +640,7 @@ en:
     fulltext_search: "Fulltext search"
     select_element: "Select element"
     seperate_tags_with_comma: "Seperate tags with comma"
+    schedule_element: Schedule visibility
     show_element_content: "Show content of this element."
     show_eq: "Show EQ"
     show_navigation: "Show in navigation"
@@ -635,6 +651,7 @@ en:
     successfully_added_element: "Successfully added new element."
     successfully_deleted_tag: "Successfully deleted tag"
     successfully_saved_element_position: "Element position updated successfully."
+    successfully_scheduled_element: "Successfully scheduled element."
     successfully_updated_tag: "Successfully updated tag"
     swap_image: "Change image"
     insert_image: "Insert image"
@@ -672,6 +689,7 @@ en:
     width: "Width"
     without_tag: "Without tag"
     you_can_rename_this_tag: "You can rename this tag"
+    timezone: "Timezone"
     zoom_image: "Zoom this image"
     "Leave Alchemy": "Leave Alchemy"
     leave: "Leave"
@@ -712,7 +730,7 @@ en:
         text: "required"
         mark: "*"
       error_notification:
-        default_message: "Please review the problems below:"
+        default_message: "Please review the problems below."
 
   # Alchemy date formats
   date:
@@ -724,14 +742,18 @@ en:
   time:
     formats:
       alchemy:
-        default: "%Y-%m-%d %H:%M"
+        default: "%d-%m-%Y %I:%M%P"
         ingredient_date: "%Y-%m-%d"
-        page_status: "%m.%d.%Y %H:%M"
-        short_datetime: "%d %b %H:%M"
-        time: "%H:%M"
+        page_status: "%d %b %Y, %I:%M%P"
+        short_datetime: "%d %b %I:%M%P"
+        time: "%I:%M%P"
+        element_date: "%d %b %Y, %I:%M%P"
 
   # Translations for error messages.
   errors:
+    attributes:
+      public_until:
+        must_be_after_public_on: "must be after visible from date"
     models:
       alchemy/element:
         attributes:
@@ -812,6 +834,12 @@ en:
             base:
               restrict_dependent_destroy:
                 has_many: "There are still %{record} attached to this page. Please remove them first."
+            descendants:
+              still_attached_to_nodes: "The following descendant pages are still attached to menu nodes: %{page_names}. Please remove them first."
+        alchemy/element:
+          attributes:
+            page_version_id:
+              must_match_parent: "must be the same as the parent element's page version"
     models:
       gutentag/tag:
         one: Tag
@@ -867,6 +895,8 @@ en:
         name: "Name"
         public: "visible"
         tag_list: Tags
+        public_on: Visible from
+        public_until: Visible until
       alchemy/ingredient:
         dom_id: Anchor
       alchemy/ingredients/file:

data/lib/alchemy/admin/preview_time.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module PreviewTime
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_preview_time, if: :should_set_preview_time?
+      end
+
+      private
+
+      def set_preview_time
+        Current.preview_time = Time.zone.parse(params[:alchemy_preview_time])
+      end
+
+      def should_set_preview_time?
+        params[:alchemy_preview_time].present? && can?(:edit_content, Alchemy::Page)
+      end
+    end
+  end
+end

data/lib/alchemy/admin/preview_url.rb

@@ -47,10 +47,13 @@ module Alchemy
             port: uri.port,
             path: page.url_path,
             userinfo: userinfo,
-            query: {alchemy_preview_mode: true}.to_param
+            query: {
+              alchemy_preview_mode: true,
+              alchemy_preview_time: preview_time
+            }.compact.to_param
           ).to_s
         else
-          routes.admin_page_path(page)
+          routes.admin_page_path(page, alchemy_preview_time: preview_time)
         end
       end
 
@@ -79,6 +82,14 @@ module Alchemy
         end
       end
 
+      # Returns the preview time as ISO 8601 string if explicitly set.
+      # We use Current.attributes instead of Current.preview_time because
+      # the getter falls back to Time.current, which would freeze a stale
+      # timestamp into the preview URL and hide elements created after page load.
+      def preview_time
+        Current.attributes[:preview_time]&.iso8601
+      end
+
       def userinfo
         auth = @preview_config.auth
         auth.username ? "#{auth["username"]}:#{auth["password"]}" : nil

data/lib/alchemy/admin/timezone.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Admin
+    module Timezone
+      extend ActiveSupport::Concern
+
+      included do
+        around_action :set_timezone, if: -> { can?(:edit_content, Alchemy::Page) }
+      end
+
+      private
+
+      # Sets the timezone for the current request.
+      #
+      # Uses the most preferred timezone or falls back to the server default.
+      #
+      # It respects the server's configured timezone from +config/application.rb+.
+      #
+      def set_timezone(&action)
+        timezone = if timezone_change_needed?
+          resolved_timezone || Time.zone.name
+        else
+          session[:alchemy_timezone]
+        end
+        session[:alchemy_timezone] = timezone
+        Time.use_zone(timezone, &action)
+      end
+
+      # Checks if we need to change the timezone or not.
+      def timezone_change_needed?
+        params[:admin_timezone].present? || session[:alchemy_timezone].blank?
+      end
+
+      # Returns the first valid timezone from the priority chain, or nil.
+      #
+      # The priority order is:
+      #
+      #  * the passed parameter: +params[:admin_timezone]+
+      #  * the user's timezone preference
+      #
+      def resolved_timezone
+        candidates = [params[:admin_timezone], timezone_from_user].compact
+        candidates.detect { |tz| ActiveSupport::TimeZone[tz].present? }
+      end
+
+      # Try to get the timezone from user settings.
+      def timezone_from_user
+        return if !current_alchemy_user
+        return if !current_alchemy_user.respond_to?(:timezone)
+
+        current_alchemy_user.timezone.presence
+      end
+    end
+  end
+end

data/lib/alchemy/configurations/main.rb

@@ -218,7 +218,7 @@ module Alchemy
 
       # The storage adapter for Pictures and Attachments
       #
-      option :storage_adapter, :string, default: "dragonfly"
+      option :storage_adapter, :string, default: "active_storage"
 
       # Define page preview sources
       #
@@ -434,6 +434,18 @@ module Alchemy
       # The path to the page showing the user they're unauthorized
       option :unauthorized_path, :string, default: "/"
 
+      # === Edit User Path
+      #
+      # The path to the edit user form.
+      #
+      # == Example
+      #
+      #     "/admin/users/:id/edit"
+      #
+      # NOTE: The :id placeholder will be replaced with the current_alchemy_user's id.
+      #
+      option :edit_user_path, :string
+
       # === CanCan abilities
       #
       # If your app or your engine has own CanCan abilities you must register them.

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

@@ -4,7 +4,7 @@ FactoryBot.define do
   factory :alchemy_element, class: "Alchemy::Element" do
     name { "article" }
     autogenerate_ingredients { false }
-    association :page_version, factory: :alchemy_page_version
+    page_version { parent_element&.page_version || association(:alchemy_page_version) }
 
     trait :fixed do
       fixed { true }
@@ -21,7 +21,7 @@ FactoryBot.define do
     end
 
     trait :nested do
-      parent_element { build(:alchemy_element, name: "slider", page_version: page_version) }
+      parent_element { association(:alchemy_element, name: "slider") }
       name { "slide" }
     end
 

data/lib/alchemy/test_support/relatable_resource_examples.rb

@@ -1,7 +1,7 @@
 RSpec.shared_examples_for "a relatable resource" do |args|
   it { is_expected.to have_many(:related_ingredients) }
-  it { is_expected.to have_many(:elements).through(:related_ingredients) }
-  it { is_expected.to have_many(:pages).through(:elements) }
+  it { is_expected.to have_many(:related_elements).through(:related_ingredients) }
+  it { is_expected.to have_many(:related_pages).through(:related_elements) }
 
   describe ".deletable" do
     subject { described_class.deletable }

data/lib/alchemy/test_support/shared_publishable_examples.rb

@@ -1,6 +1,25 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples_for "being publishable" do |factory_name|
+  describe "validations" do
+    context "when public_until is older than public_on" do
+      let(:record) do
+        build(
+          factory_name,
+          public_on: Time.current,
+          public_until: Time.current - 1.day
+        )
+      end
+
+      it "is not valid" do
+        expect(record).not_to be_valid
+        expect(record.errors[:public_until]).to include(
+          I18n.t("errors.attributes.public_until.must_be_after_public_on")
+        )
+      end
+    end
+  end
+
   describe ".draft" do
     let!(:draft_versions) { create_list(factory_name, 2, public_on: nil) }
 
@@ -75,7 +94,7 @@ RSpec.shared_examples_for "being publishable" do |factory_name|
       context "and public_until is nil" do
         let(:public_until) { nil }
 
-        it { expect(subject).to be_nil }
+        it { expect(subject).to be(false) }
       end
 
       context "and public_until is in the past" do
@@ -101,7 +120,7 @@ RSpec.shared_examples_for "being publishable" do |factory_name|
       context "and public_until is nil" do
         let(:public_until) { nil }
 
-        it { expect(subject).to be_nil }
+        it { expect(subject).to be(false) }
       end
 
       context "and public_until is in the future" do
@@ -169,5 +188,28 @@ RSpec.shared_examples_for "being publishable" do |factory_name|
 
       it { is_expected.to be(false) }
     end
+
+    context "when Current.preview_time is set" do
+      let(:page_version) do
+        build(factory_name,
+          public_on: Time.zone.parse("2025-06-01 00:00:00"),
+          public_until: Time.zone.parse("2025-06-30 23:59:59"))
+      end
+
+      it "uses preview_time to determine visibility" do
+        Alchemy::Current.preview_time = Time.zone.parse("2025-06-15 12:00:00")
+        expect(page_version.public?).to be(true)
+      end
+
+      it "returns false when preview_time is outside the public range" do
+        Alchemy::Current.preview_time = Time.zone.parse("2025-07-15 12:00:00")
+        expect(page_version.public?).to be(false)
+      end
+
+      it "returns false when preview_time is before public_on" do
+        Alchemy::Current.preview_time = Time.zone.parse("2025-05-15 12:00:00")
+        expect(page_version.public?).to be(false)
+      end
+    end
   end
 end

data/lib/alchemy/upgrader.rb

@@ -32,7 +32,9 @@ module Alchemy
 
     def update_config
       desc "Copy configuration file."
-      @default_config = Alchemy::Configurations::Main.new
+      @default_config = Alchemy::Configurations::Main.new(
+        storage_adapter: "dragonfly"
+      )
       template("templates/alchemy.rb.tt", "config/initializers/alchemy.rb")
     end
 

data/lib/alchemy/version.rb

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

data/lib/alchemy_cms.rb

@@ -23,6 +23,8 @@ require "view_component"
 # Require globally used Alchemy mixins
 require_relative "alchemy/ability_helper"
 require_relative "alchemy/admin/locale"
+require_relative "alchemy/admin/timezone"
+require_relative "alchemy/admin/preview_time"
 require_relative "alchemy/admin/preview_url"
 require_relative "alchemy/auth_accessors"
 require_relative "alchemy/cache_digests/template_tracker"

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

@@ -69,7 +69,8 @@ module Alchemy
           default_language: {
             name: @default_language[:name],
             code: @default_language[:code]
-          }
+          },
+          storage_adapter: "active_storage"
         )
         template "#{__dir__}/templates/alchemy.rb.tt", app_config_path.join("initializers", "alchemy.rb")
       end