alchemy_cms 8.3.1 → 8.3.2

data/app/javascript/alchemy_admin/components/attachment_select.js

@@ -1,6 +1,6 @@
 import { RemoteSelect } from "alchemy_admin/components/remote_select"
 
-class AttachmentSelect extends RemoteSelect {
+export class AttachmentSelect extends RemoteSelect {
   _renderResult(item) {
     return this._renderListEntry(item)
   }

data/app/javascript/alchemy_admin/components/element_select.js

@@ -20,7 +20,7 @@ const formatItem = (icon, text, hint) => {
   `
 }
 
-class ElementSelect extends HTMLElement {
+export class ElementSelect extends HTMLElement {
   #select2 = null
 
   connectedCallback() {

data/app/javascript/alchemy_admin/components/page_select.js

@@ -1,6 +1,6 @@
 import { RemoteSelect } from "alchemy_admin/components/remote_select"
 
-class PageSelect extends RemoteSelect {
+export class PageSelect extends RemoteSelect {
   get pageId() {
     return this.selection ? JSON.parse(this.selection)["id"] : undefined
   }

data/app/javascript/alchemy_admin/components/tags_autocomplete.js

@@ -1,6 +1,6 @@
 import { setupSelectLocale } from "alchemy_admin/i18n"
 
-class TagsAutocomplete extends HTMLElement {
+export class TagsAutocomplete extends HTMLElement {
   #select2 = null
 
   async connectedCallback() {

data/app/javascript/alchemy_admin/components/tinymce.js

@@ -4,7 +4,7 @@ import { currentLocale } from "alchemy_admin/i18n"
 const DARK_THEME = "alchemy-dark"
 const LIGHT_THEME = "alchemy"
 
-class Tinymce extends HTMLElement {
+export class Tinymce extends HTMLElement {
   #min_height = null
 
   /**

data/app/javascript/alchemy_admin.js

@@ -53,6 +53,11 @@ document.addEventListener("turbo:load", Initializer)
 
 // Public API for extensions
 export { RemoteSelect } from "alchemy_admin/components/remote_select"
+export { PageSelect } from "alchemy_admin/components/page_select"
+export { AttachmentSelect } from "alchemy_admin/components/attachment_select"
+export { ElementSelect } from "alchemy_admin/components/element_select"
+export { TagsAutocomplete } from "alchemy_admin/components/tags_autocomplete"
+export { Tinymce } from "alchemy_admin/components/tinymce"
 export { on } from "alchemy_admin/utils/events"
 
 // Page-specific modules - bundled to avoid dual-loading

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

@@ -42,7 +42,11 @@ 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? }
+      # Fires on both updates and touches (touch flags the update callback),
+      # so element caches are invalidated whenever the resource changes.
+      # Deferring to after_commit avoids enqueuing on rollback and coalesces
+      # repeated touches within a transaction into a single job.
+      after_commit :touch_related_ingredients, on: :update, if: -> { related_ingredients.exists? }
     end
 
     # Returns true if object is not assigned to any ingredient.

data/app/stylesheets/alchemy/admin/_tom-select.scss

@@ -65,6 +65,9 @@
       margin: 0;
       line-height: 21px;
       max-width: 90%;
+      overflow-x: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
 
     > input {
@@ -151,10 +154,13 @@
         background: var(--tag-background-color);
         border: 0 none;
         border-radius: var(--border-radius_medium);
+        max-width: unset;
+        white-space: normal;
 
         .remove {
           display: inline-flex;
           align-items: center;
+          align-self: start;
           padding: 0 var(--spacing-0);
           color: var(--icon-color);
           text-decoration: none;

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/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/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.1"
+  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.1
+  version: 8.3.2
 platform: ruby
 authors:
 - Thomas von Deyen