alchemy_cms 6.0.5 → 6.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5eb21e30df422e1b214dd34d5d6166d8aaf195d393590efdf1e6a16a1247910
-  data.tar.gz: aa579d8246cfc7952a2f2491c86a78e272733eb7c21d993d4302201ee2b1a3f3
+  metadata.gz: ac4238ff0e22f613444f1ae9124a20bf4e884f2f7c4f8fe05c1e8d0bd147cad7
+  data.tar.gz: 02e2877398db81eb4c58a1afbad4c0355020da0fb7505c895d493d40a93223d7
 SHA512:
-  metadata.gz: 4b92efbc92492ccbc49ff95249672d5083499898d6ce70644b68a44fdc49720a716986c138211c308c1e3cf3a7b614db6d04a9463399c81c8167b31622aa1f5c
-  data.tar.gz: 4d297aea832eeea8b51183b234bcad0cacc168283e07f1d83ca180e1a59fb02601756869e74c3348f10b14308a62e660d6dd2b0a04251da51b4c574435e4518a
+  metadata.gz: 2bacfe8d1e126cc3a3e31f5dfdb1346efb1398adf33dac32e4e58731bcfd11580d51544797a59d563361ee28c5d4a37a76a7659b7534651a574c7903820cc994
+  data.tar.gz: '04198e8f916fd87a5a1587129b86480cde12cbab889acfa2baaf23a34ed966292cc24312c1b731648c556e27fc3045b0a5b56d43ab6124abacbcb33cdf05fab2'

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.0.6 (2022-05-30)
+
+- Add task to eagerly generate ingredients pictures thumbnails [#2342](https://github.com/AlchemyCMS/alchemy_cms/pull/2342) ([tvdeyen](https://github.com/tvdeyen))
+- Add spec for ingredients migrator; fix preloading in Rails 6.1+ [#2340](https://github.com/AlchemyCMS/alchemy_cms/pull/2340) ([mamhoff](https://github.com/mamhoff))
+- Extract element ingredient migrator [#2337](https://github.com/AlchemyCMS/alchemy_cms/pull/2337) ([tvdeyen](https://github.com/tvdeyen))
+- Update published_at only after page has been published. [#2331](https://github.com/AlchemyCMS/alchemy_cms/pull/2331) ([pascalbetz](https://github.com/pascalbetz))
+- Add element groups functionality for cleaning up editors [#2124](https://github.com/AlchemyCMS/alchemy_cms/pull/2124) ([dbwinger](https://github.com/dbwinger))
+- Eagerload at the controller or job layer [#2313](https://github.com/AlchemyCMS/alchemy_cms/pull/2313) ([mamhoff](https://github.com/mamhoff))
+
 ## 6.0.5 (2022-05-11)
 
 - Extract element ingredient migrator [#2337](https://github.com/AlchemyCMS/alchemy_cms/pull/2337) ([tvdeyen](https://github.com/tvdeyen))

data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee

@@ -15,6 +15,7 @@ Alchemy.ElementEditors =
   init: ->
     @element_area = $("#element_area")
     @bindEvents()
+    @expandContentGroups()
     return
 
   # Binds click events on several DOM elements from element editors
@@ -36,12 +37,20 @@ Alchemy.ElementEditors =
     # Binds the custom SaveElement event
     @element_area.on "SaveElement.Alchemy", '.element-editor', (e, data) =>
       @onSaveElement(e, data)
+    @element_area.on "click", '[data-toggle-content-group]', (e) =>
+      @onToggleContentGroup(e)
     # Listen to postMessage messages from the preview frame
     window.addEventListener 'message', (e) =>
       @onMessage(e.data)
       true
     return
 
+  # Expands content groups that are stored in sessionStorage as expanded
+  expandContentGroups: ->
+    if $expanded_content_groups = sessionStorage.getItem('Alchemy.expanded_content_groups')
+      for header_id in JSON.parse($expanded_content_groups) then do (header_id) =>
+        $('#' + header_id).closest('.content-group').addClass('expanded');
+
   # Selects and scrolls to element with given id in the preview window.
   #
   focusElementPreview: (element_id) ->
@@ -170,6 +179,23 @@ Alchemy.ElementEditors =
       Alchemy.Buttons.enable($element)
     true
 
+  # Toggle visibility of the content fields in the group
+  onToggleContentGroup: (event) ->
+    $group_div = $(event.currentTarget).closest('.content-group');
+    $group_div.toggleClass('expanded');
+
+    $expanded_content_groups = JSON.parse(sessionStorage.getItem('Alchemy.expanded_content_groups') || '[]');
+    # Add or remove depending on whether this content group is expanded
+    if $group_div.hasClass('expanded')
+      if $expanded_content_groups.indexOf(event.currentTarget.id) == -1
+        $expanded_content_groups.push(event.currentTarget.id);
+    else
+      $expanded_content_groups = $expanded_content_groups.filter (value) ->
+        value != event.currentTarget.id
+
+    sessionStorage.setItem('Alchemy.expanded_content_groups', JSON.stringify($expanded_content_groups))
+    false
+
   # Event handlers
 
   onMessage: (data) ->

data/app/assets/stylesheets/alchemy/elements.scss

@@ -414,6 +414,41 @@
   }
 }
 
+.content-group {
+  width: 100%;
+  padding: $default-padding 0;
+  position: relative;
+  border-bottom: 1px solid $medium-gray;
+
+  &:last-child {
+    border-bottom: none;
+    padding-bottom: 0;
+  }
+
+  .content-group-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-weight: bold;
+    text-decoration: none;
+    padding: $default-padding 1px;
+  }
+
+  .content-group-contents {
+    display: none;
+  }
+
+  &.expanded {
+    .content-group-contents {
+      display: block;
+    }
+
+    .content-group-expand {
+      @extend .fa-angle-up;
+    }
+  }
+}
+
 .element-content-editors,
 .element-ingredient-editors {
   display: flex;

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -324,7 +324,7 @@ module Alchemy
       end
 
       def load_resource
-        @page = Page.find(params[:id])
+        @page = Page.includes(page_includes).find(params[:id])
       end
 
       def pages_from_raw_request
@@ -402,6 +402,10 @@ module Alchemy
       def set_preview_mode
         @preview_mode = true
       end
+
+      def page_includes
+        Alchemy::EagerLoading.page_includes(version: :draft_version)
+      end
     end
   end
 end

data/app/controllers/alchemy/pages_controller.rb

@@ -104,7 +104,14 @@ module Alchemy
     # If no index page and no admin users are present we show the "Welcome to Alchemy" page.
     #
     def load_index_page
-      @page ||= Language.current_root_page
+      @page ||= begin
+        Alchemy::Page.
+          contentpages.
+          language_roots.
+          where(language: Language.current).
+          includes(page_includes).
+          first
+      end
       render template: "alchemy/welcome", layout: false if signup_required?
     end
 
@@ -120,10 +127,13 @@ module Alchemy
     def load_page
       page_not_found! unless Language.current
 
-      @page ||= Language.current.pages.contentpages.find_by(
-        urlname: params[:urlname],
-        language_code: params[:locale] || Language.current.code,
-      )
+      @page ||= begin
+        Alchemy::Page.
+          contentpages.
+          where(language: Language.current).
+          includes(page_includes).
+          find_by(urlname: params[:urlname])
+      end
     end
 
     def enforce_locale
@@ -234,5 +244,9 @@ module Alchemy
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end
+
+    def page_includes
+      Alchemy::EagerLoading.page_includes(version: :public_version)
+    end
   end
 end

data/app/decorators/alchemy/element_editor.rb

@@ -36,6 +36,29 @@ module Alchemy
       element.definition.fetch(:ingredients, []).any?
     end
 
+    # Returns the translated content/ingredient group for displaying in admin editor group headings
+    #
+    # Translate it in your locale yml file:
+    #
+    #   alchemy:
+    #     element_groups:
+    #       foo: Bar
+    #
+    # Optionally you can scope your ingredient role to an element:
+    #
+    #   alchemy:
+    #     element_groups:
+    #       article:
+    #         foo: Baz
+    #
+    def translated_group(group)
+      Alchemy.t(
+        group,
+        scope: "element_groups.#{element.name}",
+        default: Alchemy.t("element_groups.#{group}", default: group.humanize),
+      )
+    end
+
     # CSS classes for the element editor partial.
     def css_classes
       [

data/app/jobs/alchemy/publish_page_job.rb

@@ -4,7 +4,10 @@ module Alchemy
   class PublishPageJob < BaseJob
     queue_as :default
 
-    def perform(page, public_on:)
+    def perform(page_id, public_on:)
+      page = Alchemy::Page.includes(
+        Alchemy::EagerLoading.page_includes(version: :draft_version)
+      ).find(page_id)
       Alchemy::Page::Publisher.new(page).publish!(public_on: public_on)
     end
   end

data/app/models/alchemy/eager_loading.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Alchemy
+  # Eager loading parameters for loading pages
+  class EagerLoading
+    PAGE_VERSIONS = %i[draft_version public_version]
+
+    class << self
+      # Eager loading parameters for {ActiveRecord::Base.includes}
+      #
+      # Pass this to +includes+ whereever you load an {Alchemy::Page}
+      #
+      #     Alchemy::Page.includes(Alchemy::EagerLoading.page_includes).find_by(urlname: "my-page")
+      #
+      # @param version [Symbol] Type of page version to eager load
+      # @return [Array]
+      def page_includes(version: :public_version)
+        raise UnsupportedPageVersion unless version.in? PAGE_VERSIONS
+
+        [
+          :tags,
+          {
+            language: :site,
+            version => {
+              elements: [
+                :page,
+                :touchable_pages,
+                {
+                  ingredients: :related_object,
+                  contents: :essence,
+                },
+              ],
+            },
+          },
+        ]
+      end
+    end
+  end
+end

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

@@ -12,7 +12,9 @@ module Alchemy
 
       # Copies all currently visible elements to the public version of page
       #
-      # Creates a new published version if none exists yet.
+      # Creates a new published version if none exists yet and updates
+      # the `published_at` timestamp of the page.
+      # `published_at` is used as a cache key.
       #
       # Sends a publish notification to all registered publish targets
       #
@@ -32,6 +34,7 @@ module Alchemy
               end
             end
           end
+          page.update(published_at: public_on)
         end
 
         Alchemy.publish_targets.each { |p| p.perform_later(page) }

data/app/models/alchemy/page.rb

@@ -457,15 +457,10 @@ module Alchemy
       end
     end
 
-    # Creates a public version of the page.
-    #
-    # Sets the +published_at+ value to current time
-    #
-    # The +published_at+ attribute is used as +cache_key+.
+    # Creates a public version of the page in the background.
     #
     def publish!(current_time = Time.current)
-      update(published_at: current_time)
-      PublishPageJob.perform_later(self, public_on: current_time)
+      PublishPageJob.perform_later(id, public_on: current_time)
     end
 
     # Sets the public_on date on the published version

data/app/models/alchemy/page_version.rb

@@ -46,7 +46,7 @@ module Alchemy
     end
 
     def element_repository
-      ElementsRepository.new(elements.includes({ contents: :essence }, :tags))
+      ElementsRepository.new(elements)
     end
 
     private

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -23,15 +23,44 @@
         html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
 
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
+
+        <!-- Ingredients -->
         <% if element.has_ingredients_defined? %>
           <div class="element-ingredient-editors">
-            <%= render element.ingredients, element_form: f %>
-          </div>
-        <% else %>
-          <div id="element_<%= element.id %>_content" class="element-content-editors">
-            <%= render element.contents %>
+            <%= render element.ingredients.select { |i| !i.definition[:group] }, element_form: f %>
+
+            <!-- Each ingredient group -->
+            <% element.ingredients.select { |i| i.definition[:group] }.group_by { |i| i.definition[:group] }.each do |group, ingredients| %>
+              <div class="content-group">
+                <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
+                  <%= element.translated_group group %>
+                  <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
+                <% end %>
+                <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
+                  <%= render ingredients, element_form: f %>
+                <% end %>
+              </div>
+            <% end %>
           </div>
         <% end %>
+        <!-- Contents -->
+        <div id="element_<%= element.id %>_content" class="element-content-editors">
+          <%= render element.contents.select { |c| !c.definition[:group] } %>
+
+          <!-- Each content group -->
+          <% element.contents.select { |c| c.definition[:group] }.group_by { |c| c.definition[:group] }.each do |group, contents| %>
+            <div class="content-group">
+              <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
+                <%= element.translated_group group %>
+                <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
+              <% end %>
+              <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
+                <%= render contents, element_form: f %>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+
         <% if element.taggable? %>
           <div class="autocomplete_tag_list">
             <%= f.label :tag_list %>

data/lib/alchemy/errors.rb

@@ -11,7 +11,7 @@ module Alchemy
     # Raised if no default language configuration can be found.
     def message
       "No default language configuration found!" \
-        " Please ensure that you have a 'default_language' defined in Alchemy configuration file."
+      " Please ensure that you have a 'default_language' defined in Alchemy configuration file."
     end
   end
 
@@ -19,7 +19,7 @@ module Alchemy
     # Raised if no default site configuration can be found.
     def message
       "No default site configuration found!" \
-        " Please ensure that you have a 'default_site' defined in Alchemy configuration file."
+      " Please ensure that you have a 'default_site' defined in Alchemy configuration file."
     end
   end
 
@@ -90,4 +90,10 @@ module Alchemy
       "You need to provide a current_user method in your ApplicationController that returns the current authenticated user."
     end
   end
+
+  class UnsupportedPageVersion < StandardError
+    def message
+      "Unknown Version! Please use one of #{Alchemy::EagerLoading::PAGE_VERSIONS.join(", ")}"
+    end
+  end
 end

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -16,7 +16,7 @@ module Alchemy::Upgrader::Tasks
           # eager load all elements that have ingredients defined but no ingredient records yet.
           all_elements = Alchemy::Element
             .named(elements_with_ingredients.map { |d| d[:name] })
-            .includes(contents: :essence)
+            .preload(contents: :essence)
             .left_outer_joins(:ingredients).where(alchemy_ingredients: { id: nil })
             .to_a
           elements_with_ingredients.map do |element_definition|

data/lib/alchemy/version.rb

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

data/lib/tasks/alchemy/thumbnails.rake

@@ -35,5 +35,29 @@ namespace :alchemy do
 
       puts "Done!"
     end
+
+    desc "Generates thumbnails for Alchemy Picture Ingredients (set ELEMENTS=element1,element2 to only generate thumbnails for a subset of elements)."
+    task ingredient_picture_thumbnails: :environment do
+      ingredient_pictures = Alchemy::Ingredients::Picture.
+        joins(:element).
+        preload({ related_object: :thumbs }).
+        merge(Alchemy::Element.available)
+
+      if ENV["ELEMENTS"].present?
+        ingredient_pictures = ingredient_pictures.merge(
+          Alchemy::Element.named(ENV["ELEMENTS"].split(","))
+        )
+      end
+
+      puts "Regenerate #{ingredient_pictures.count} ingredient picture thumbnails."
+      puts "Please wait..."
+
+      ingredient_pictures.find_each do |ingredient_picture|
+        puts ingredient_picture.picture_url
+        puts ingredient_picture.thumbnail_url
+      end
+
+      puts "Done!"
+    end
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.5
+  version: 6.0.6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -916,6 +916,7 @@ files:
 - app/models/alchemy/base_record.rb
 - app/models/alchemy/content.rb
 - app/models/alchemy/content/factory.rb
+- app/models/alchemy/eager_loading.rb
 - app/models/alchemy/element.rb
 - app/models/alchemy/element/definitions.rb
 - app/models/alchemy/element/element_contents.rb