alchemy_cms 8.3.0 → 8.3.2

data/app/stylesheets/alchemy/admin/image_library.scss

@@ -132,6 +132,16 @@
       .select2-container {
         width: 100%;
       }
+
+      &.tags {
+        .control-label {
+          top: 0;
+        }
+
+        .select2-search-choice {
+          line-height: 12px;
+        }
+      }
     }
   }
 }

data/app/stylesheets/alchemy/admin/lists.scss

@@ -20,6 +20,8 @@ ul.list {
     margin-bottom: 0;
 
     &.list-header {
+      display: flex;
+      justify-content: space-between;
       overflow: hidden;
       background-color: transparent;
       font-weight: bold;
@@ -45,17 +47,15 @@ ul.list {
     display: inline-flex;
     overflow: hidden;
     text-overflow: ellipsis;
-    vertical-align: middle;
+    align-items: center;
   }
 
   .list-primary {
-    float: left;
     max-width: 65%;
   }
 
   .list-secondary,
   .right {
-    float: right;
     text-align: left;
     width: 30%;
     color: var(--color-grey_dark);

data/app/stylesheets/alchemy/admin/sitemap.scss

@@ -252,6 +252,14 @@ alchemy-sitemap {
     position: relative;
     top: 0.1ex;
   }
+
+  .resource_info & {
+    align-items: baseline;
+
+    alchemy-icon {
+      top: 0.3ex;
+    }
+  }
 }
 
 #page_filter_result {

data/app/stylesheets/alchemy/admin/tags.scss

@@ -128,14 +128,9 @@
       padding: var(--spacing-1) 22px;
       background-image: var(--tag-background-image);
       background-repeat: no-repeat;
-      background-position: 6px;
+      background-position: var(--spacing-1);
       background-color: var(--tag-background-color);
       background-size: 1rem;
-
-      > div {
-        position: relative;
-        top: -1px;
-      }
     }
   }
 }

data/app/views/alchemy/admin/attachments/edit.html.erb

@@ -2,7 +2,7 @@
   url: {action: :update, q: search_filter_params[:q], page: params[:page]}) do |f| -%>
   <%= f.input :name, input_html: {autofocus: true} %>
   <%= f.input :file_name, input_html: {autofocus: true}, hint: Alchemy.t(:attachment_filename_notice) %>
-  <div class="input">
+  <div class="input tags">
     <%= f.label :tag_list, class: "control-label" %>
     <%= render Alchemy::Admin::TagsAutocomplete.new do %>
       <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>

data/app/views/alchemy/admin/layoutpages/edit.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag @page do %>
   <%= alchemy_form_for [:admin, @page], url: alchemy.admin_layoutpage_path(@page), class: 'edit_page', remote: false do |f| %>
     <%= f.input :name, autofocus: true %>
-    <div class="input">
+    <div class="input tags">
       <%= f.label :tag_list, class: "control-label" %>
       <%= render Alchemy::Admin::TagsAutocomplete.new do %>
         <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>

data/app/views/alchemy/admin/legacy_page_urls/_table.html.erb

@@ -10,7 +10,6 @@
   <% else %>
     <div class="row even">
       <div class="col"><%= Alchemy.t('No page links for this page found') %></div>
-      <div class="col tools"></div>
     </div>
   <% end %>
 </div>

data/app/views/alchemy/admin/nodes/_page_nodes.html.erb

@@ -2,7 +2,7 @@
   <table class="list">
     <tr>
       <th class="name">
-        <%= Alchemy::Node.model_name.human %>
+        <%= Alchemy::Node.model_name.human(count: @page.nodes.size) %>
       </th>
       <th class="tools"></th>
     </tr>

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -63,7 +63,7 @@
         } %>
     <% end %>
 
-    <div class="input">
+    <div class="input tags">
       <%= f.label :tag_list, class: "control-label" %>
       <%= render Alchemy::Admin::TagsAutocomplete.new do %>
         <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>

data/app/views/alchemy/admin/pages/_locked_page.html.erb

@@ -5,7 +5,7 @@
     <%= link_to alchemy.edit_admin_page_path(locked_page) do %>
       <%= render 'alchemy/admin/pages/page_infos', page: locked_page %>
     <% end %>
-    <%= form_tag(alchemy.unlock_admin_page_path(locked_page), remote: true) do %>
+    <%= form_tag(alchemy.unlock_admin_page_path(locked_page)) do %>
       <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
         <%= render_icon(:close, size: '1x') %>
       </button>

data/app/views/alchemy/admin/pages/unlock.turbo_stream.erb

@@ -0,0 +1,20 @@
+<alchemy-growl><%= @notice %></alchemy-growl>
+<%= turbo_stream.remove "locked_page_#{@page.id}" %>
+<% if @page.layoutpage %>
+  <%= turbo_stream.replace "page_#{@page.id}" do %>
+    <%= render "alchemy/admin/layoutpages/layoutpage", layoutpage: @page %>
+  <% end %>
+<% else %>
+  <%= turbo_stream.replace "alchemy_pages_tree" do %>
+    <%= turbo_frame_tag "alchemy_pages_tree", src: alchemy.tree_admin_pages_path do %>
+      <alchemy-spinner></alchemy-spinner>
+    <% end %>
+  <% end %>
+<% end %>
+<% ["LockedPages", "RecentPages"].each do |widget| %>
+  <%= turbo_stream.replace widget do %>
+    <%= turbo_frame_tag widget, src: alchemy.admin_dashboard_widget_path(id: widget) do %>
+      <alchemy-spinner size="small"></alchemy-spinner>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/alchemy/admin/pictures/_form.html.erb

@@ -11,7 +11,7 @@
     class: "picture-form" do |f| %>
     <%= f.input :name %>
     <%= render "alchemy/admin/pictures/picture_description_field", f: f %>
-    <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
+    <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input tags") do %>
       <%= f.label :tag_list %>
       <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>
       <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>

data/app/views/alchemy/admin/pictures/edit_multiple.html.erb

@@ -12,7 +12,7 @@
     <%= text_field_tag :pictures_name %>
   </div>
 
-  <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input") do %>
+  <%= render Alchemy::Admin::TagsAutocomplete.new(additional_class: "input tags") do %>
     <%= label_tag :pictures_tag_list, Alchemy.t(:tags), class: 'control-label' %>
     <%= text_field_tag :pictures_tag_list, @tags %>
     <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>

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

@@ -18,7 +18,7 @@
     <% end %>
   <% end %>
   <% if f.object.respond_to?(:tag_list) %>
-    <div class="input">
+    <div class="input tags">
       <%= f.label :tag_list, class: "control-label" %>
       <%= render Alchemy::Admin::TagsAutocomplete.new do %>
         <%= f.text_field :tag_list, value: f.object.tag_list.join(",") %>

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

@@ -151,7 +151,7 @@
     <select is="alchemy-select" class="full_width" data-allow-clear placeholder="Please choose">
       <option value="1">Option 1</option>
       <option value="2">Option 2</option>
-      <option value="3">Option 3</option>
+      <option value="3">Option 3 with a very long name that exceeds the max-width very easily.</option>
       <option value="4">Option 4</option>
       <option value="5">Option 5</option>
       <option value="6">Option 6</option>
@@ -164,7 +164,7 @@
     <select is="alchemy-select" multiple class="full_width" placeholder="Pick Options" data-allow-clear>
       <option value="1">Option 1</option>
       <option value="2">Option 2</option>
-      <option value="3">Option 3</option>
+      <option value="3">Option 3 with a very long name that exceeds the max-width very easily.</option>
       <option value="4">Option 4</option>
       <option value="5">Option 5</option>
       <option value="6">Option 6</option>

data/config/importmap.rb

@@ -16,6 +16,11 @@ pin "tom-select", to: "tom-select.min.js", 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/components/page_select", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/components/attachment_select", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/components/element_select", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/components/tags_autocomplete", to: "alchemy/alchemy_admin.min.js"
+pin "alchemy_admin/components/tinymce", 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"

data/config/locales/alchemy.en.yml

@@ -277,7 +277,7 @@ en:
     "Confirm new password": "Confirm new password"
     "Copy": "Copy"
     "Could not load Adobe Flash® Plugin!": "Could not load Adobe Flash® Plugin!"
-    "Create node on parent:": "Create node on parent:"
+    "Create node on parent:": "Attach to menu"
     "Currently locked pages": "Currently locked pages"
     "Default language has to be public": "Default language has to be public"
     "Delete image": "Delete image"
@@ -429,7 +429,7 @@ en:
     "Create site": "Create a new site"
     create_language_tree_heading: "Create new homepage"
     create_menu: "Add a menu"
-    create_node: "Add a menu node"
+    create_node: "Add to menu"
     create_page: "Create a new subpage"
     currently_edited_by: "This page is locked by"
     custom_color: "Custom color"

data/lib/alchemy/test_support/relatable_resource_examples.rb

@@ -3,16 +3,21 @@ RSpec.shared_examples_for "a relatable resource" do |args|
   it { is_expected.to have_many(:related_elements).through(:related_ingredients) }
   it { is_expected.to have_many(:related_pages).through(:related_elements) }
 
+  let(:resource_factory_name) { args[:resource_factory_name] || "alchemy_#{args[:resource_name]}" }
+  let(:ingredient_factory_name) { args[:ingredient_factory_name] || "alchemy_ingredient_#{args[:ingredient_type]}" }
+  let(:update_attribute) { args[:update_attribute] || :name }
+
   describe ".deletable" do
     subject { described_class.deletable }
 
-    let!(:assigned_resource) { create(:"alchemy_#{args[:resource_name]}") }
-    let!(:unassigned_resource) { create(:"alchemy_#{args[:resource_name]}") }
-    let!(:ingredient1) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object: assigned_resource) }
-    let!(:ingredient2) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object: nil) }
+    let!(:assigned_resource) { create(resource_factory_name) }
+    let!(:unassigned_resource) { create(resource_factory_name) }
+    let!(:ingredient1) { create(ingredient_factory_name, related_object: assigned_resource) }
+    let!(:ingredient2) { create(ingredient_factory_name, related_object: nil) }
 
     it "should return all records that are not assigned to an ingredient" do
-      is_expected.to eq [unassigned_resource]
+      is_expected.to include(unassigned_resource)
+      is_expected.to_not include(assigned_resource)
     end
   end
 
@@ -20,9 +25,9 @@ RSpec.shared_examples_for "a relatable resource" do |args|
     subject { resource.related_ingredients }
 
     context "with other related resources with same id" do
-      let!(:resource) { create(:"alchemy_#{args[:resource_name]}") }
-      let!(:ingredient1) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object: resource) }
-      let!(:ingredient2) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object_type: "Event", related_object_id: resource.id) }
+      let!(:resource) { create(resource_factory_name) }
+      let!(:ingredient1) { create(ingredient_factory_name, related_object: resource) }
+      let!(:ingredient2) { create(ingredient_factory_name, related_object_type: "Event", related_object_id: resource.id) }
 
       it "are not included" do
         is_expected.to eq [ingredient1]
@@ -30,9 +35,9 @@ RSpec.shared_examples_for "a relatable resource" do |args|
     end
 
     context "with other related resources with same type" do
-      let!(:resource) { create(:"alchemy_#{args[:resource_name]}") }
-      let!(:ingredient1) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object: resource) }
-      let!(:ingredient2) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object_type: described_class) }
+      let!(:resource) { create(resource_factory_name) }
+      let!(:ingredient1) { create(ingredient_factory_name, related_object: resource) }
+      let!(:ingredient2) { create(ingredient_factory_name, related_object_type: described_class) }
 
       it "are not included" do
         is_expected.to eq [ingredient1]
@@ -41,12 +46,12 @@ RSpec.shared_examples_for "a relatable resource" do |args|
   end
 
   describe "#deletable?" do
-    let(:resource) { create(:"alchemy_#{args[:resource_name]}") }
+    let(:resource) { create(resource_factory_name) }
 
     subject { resource.deletable? }
 
     context "if related to ingredient" do
-      let!(:ingredient) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object: resource) }
+      let!(:ingredient) { create(ingredient_factory_name, related_object: resource) }
 
       it { is_expected.to be(false) }
     end
@@ -56,11 +61,11 @@ RSpec.shared_examples_for "a relatable resource" do |args|
     end
   end
 
-  describe "after_touch" do
-    let(:related_object) { create(:"alchemy_#{args[:resource_name]}") }
+  describe "after_commit on touch" do
+    let(:related_object) { create(resource_factory_name) }
 
     context "when related ingredients exist" do
-      let!(:ingredient) { create(:"alchemy_ingredient_#{args[:ingredient_type]}", related_object:) }
+      let!(:ingredient) { create(ingredient_factory_name, related_object:) }
 
       it "enqueues InvalidateElementsCacheJob" do
         expect {
@@ -75,4 +80,24 @@ RSpec.shared_examples_for "a relatable resource" do |args|
       end
     end
   end
+
+  describe "after_commit on update" do
+    let(:related_object) { create(resource_factory_name) }
+
+    context "when related ingredients exist" do
+      let!(:ingredient) { create(ingredient_factory_name, related_object:) }
+
+      it "enqueues InvalidateElementsCacheJob" do
+        expect {
+          related_object.update(update_attribute => "Updated name")
+        }.to have_enqueued_job(Alchemy::InvalidateElementsCacheJob).with(described_class.name, related_object.id)
+      end
+    end
+
+    context "when no related ingredients exist" do
+      it "does not enqueue InvalidateElementsCacheJob" do
+        expect { related_object.update(update_attribute => "Updated name") }.to_not have_enqueued_job(Alchemy::InvalidateElementsCacheJob)
+      end
+    end
+  end
 end

data/lib/alchemy/version.rb

@@ -3,7 +3,7 @@
 module Alchemy
   extend self
 
-  VERSION = "8.3.0"
+  VERSION = "8.3.2"
 
   def version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -1207,7 +1207,7 @@ files:
 - app/views/alchemy/admin/pages/publish.turbo_stream.erb
 - app/views/alchemy/admin/pages/show.html.erb
 - app/views/alchemy/admin/pages/tree.html.erb
-- app/views/alchemy/admin/pages/unlock.js.erb
+- app/views/alchemy/admin/pages/unlock.turbo_stream.erb
 - app/views/alchemy/admin/pages/update.turbo_stream.erb
 - app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb
 - app/views/alchemy/admin/partials/_flash_notices.html.erb

data/app/views/alchemy/admin/pages/unlock.js.erb

@@ -1,20 +0,0 @@
-(function() {
-  var locked_page_icon_content
-  var locked_page_tab = document.querySelector('#locked_page_<%= @page.id -%>')
-  var locked_page_icon = document.querySelector(
-    '#page_<%= @page.id -%> > .sitemap_page > .sitemap_left_images .like-hint-tooltip'
-  ) || document.querySelector('[data-page-id="<%= @page.id -%>"] i.icon')
-  if (locked_page_tab) {
-    locked_page_tab.remove()
-  }
-  if (locked_page_icon) {
-    if (locked_page_icon.parentElement.classList.contains("handle")) {
-      locked_page_icon_content = '<span class="handle"><alchemy-icon name="file" size="xl"></alchemy-icon></span>'
-    } else {
-      locked_page_icon_content = '<alchemy-icon name="file" size="xl"></alchemy-icon>'
-    }
-    locked_page_icon.outerHTML = locked_page_icon_content
-  }
-  document.querySelector("#page_<%= @page.id -%> .page_status.locked")?.remove()
-  Alchemy.growl('<%= flash[:notice] -%>')
-})()