lato_cms 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f231b3624de0d429fc3f73d0e659d0556543c9a657d54b939308b581ad53b4
-  data.tar.gz: be81b76ce28bc8b5e72345ac640eb4279285a9e70b9bf345f80399f7e4773cfb
+  metadata.gz: 67cc56a05385cb8ed79d06de5407bae73f23444f0872e02021696ebc1dd4000b
+  data.tar.gz: 794483334a4c7906ad00a370448ce488650bc6a94b6755a5f84bd2c909fd3676
 SHA512:
-  metadata.gz: 28b6cc9fe5db40ff256bfed0055470a4c1d0ce1d22e9a601373832b6daac8b8215126555ab9e37d67ac58918e3b1d9c188cb0669716b7fb8370d8262b32c5276
-  data.tar.gz: 7ec553cebf51a13d07823c77fbab3c06043365f30b14753ec86ff9d6847c386955d6536833b199754007e1f91073b0e353ef635e0eee7f87f19843e111ef410e
+  metadata.gz: d020a8b135ea587b61396ed1d8bc8314a9066a165d576e3a31aeb4c127894d0e0652729adf4c3c634a70ef07b075f54de1010d70dcff0ffbdb3f6218e3641fc7
+  data.tar.gz: 20a54bfd7811d1de1acfe2b44af5012fb5d1f810ab9fc2c84b037431e98b9f28541ae9c2a0dc17061db40670c72ce213670404e158ad40b991a35e2f6a534aec

data/app/assets/javascripts/lato_cms/controllers/lato_cms_repeater_controller.js

@@ -1,9 +1,17 @@
 import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
-  static targets = ['items', 'template', 'item', 'position', 'orderInput']
+  static targets = ['items', 'template', 'item', 'position', 'orderInput', 'addButton']
+  static values = { min: { type: Number, default: 0 }, max: { type: Number, default: 0 } }
+
+  connect () {
+    this.refresh()
+  }
 
   add () {
+    // Guard against exceeding max even if the button state is stale.
+    if (this.maxValue > 0 && this.itemTargets.length >= this.maxValue) return
+
     const itemId = window.crypto.randomUUID()
     const html = this.templateTarget.innerHTML
       .replaceAll('NEW_RECORD', itemId)
@@ -14,6 +22,9 @@ export default class extends Controller {
   }
 
   remove (event) {
+    // Block removal below the required minimum.
+    if (this.minValue > 0 && this.itemTargets.length <= this.minValue) return
+
     const item = event.currentTarget.closest('[data-lato-cms-repeater-target="item"]')
     if (!item) return
 
@@ -29,5 +40,22 @@ export default class extends Controller {
       const orderInput = item.querySelector('[data-lato-cms-repeater-target="orderInput"]')
       if (orderInput) orderInput.value = item.dataset.repeaterItemId
     })
+
+    this.updateControls()
+  }
+
+  // Toggle add/remove availability against the min/max constraints.
+  updateControls () {
+    const count = this.itemTargets.length
+
+    if (this.hasAddButtonTarget) {
+      this.addButtonTarget.disabled = this.maxValue > 0 && count >= this.maxValue
+    }
+
+    const disableRemove = this.minValue > 0 && count <= this.minValue
+    this.itemTargets.forEach((item) => {
+      const removeButton = item.querySelector('[data-action~="lato-cms-repeater#remove"]')
+      if (removeButton) removeButton.disabled = disableRemove
+    })
   }
 }

data/app/controllers/lato_cms/pages_controller.rb

@@ -233,6 +233,19 @@ module LatoCms
       component_id = template_component[:component_id]
       item_ids = Array(repeater_order).reject(&:blank?).map(&:to_s)
 
+      # Enforce min/max item count (authoritative check). Missing settings = no constraint.
+      settings = template_component[:settings] || {}
+      min = settings['min'].presence && settings['min'].to_i
+      max = settings['max'].presence && settings['max'].to_i
+      if min && item_ids.size < min
+        errors << { field_id: template_component_id, errors: [t('lato_cms.repeater_min_error', count: min)] }
+        return
+      end
+      if max && item_ids.size > max
+        errors << { field_id: template_component_id, errors: [t('lato_cms.repeater_max_error', count: max)] }
+        return
+      end
+
       order_field = @page.fields.find_or_initialize_by(
         template_id: @page.template_id,
         template_component_id: template_component_id,

data/app/views/lato_cms/pages/_repeater.html.erb

@@ -2,9 +2,14 @@
 <% saved_order = begin; order_field&.value.present? ? JSON.parse(order_field.value) : []; rescue JSON::ParserError; []; end %>
 <% fields_by_item = component_fields.reject(&:repeater_order?).group_by(&:repeater_item_id) %>
 <% item_ids = (saved_order.presence || fields_by_item.keys.compact) %>
-<% item_ids = [SecureRandom.uuid] if item_ids.blank? && tc[:settings]['min'].to_i.positive? %>
+<% min = tc[:settings]['min'].to_i %>
+<% max = tc[:settings]['max'].to_i %>
+<%# Seed `min` empty items when the list is empty, so the minimum is met up front. %>
+<% item_ids = Array.new(min) { SecureRandom.uuid } if item_ids.blank? && min.positive? %>
 
-<div data-controller="lato-cms-repeater">
+<div data-controller="lato-cms-repeater"
+     data-lato-cms-repeater-min-value="<%= min %>"
+     data-lato-cms-repeater-max-value="<%= max %>">
   <div data-lato-cms-repeater-target="items">
     <% item_ids.each_with_index do |item_id, item_index| %>
       <% item_fields = (fields_by_item[item_id] || []).index_by(&:base_field_id) %>
@@ -16,7 +21,7 @@
     <%= render 'lato_cms/pages/repeater_item', tc: tc, item_id: 'NEW_RECORD', item_index: 'NEW_INDEX', item_fields: {} %>
   </template>
 
-  <button type="button" class="btn btn-sm btn-outline-primary" data-action="lato-cms-repeater#add">
+  <button type="button" class="btn btn-sm btn-outline-primary" data-action="lato-cms-repeater#add" data-lato-cms-repeater-target="addButton">
     <i class="bi bi-plus-lg me-1"></i><%= t('lato_cms.repeater_add_item') %>
   </button>
 </div>

data/config/locales/en.yml

@@ -80,6 +80,8 @@ en:
     fields_save_component: Save
     repeater_add_item: Add item
     repeater_remove_item: Remove
+    repeater_min_error: "At least %{count} items are required"
+    repeater_max_error: "At most %{count} items are allowed"
     fields_component_missing_alert_html: "Component <strong>%{component_id}</strong> not found. The component configuration may have been removed."
     fields_previously_saved_data: "Previously saved data:"
     field_file_remove: Remove

data/config/locales/it.yml

@@ -80,6 +80,8 @@ it:
     fields_save_component: Salva
     repeater_add_item: Aggiungi elemento
     repeater_remove_item: Rimuovi
+    repeater_min_error: "Sono richiesti almeno %{count} elementi"
+    repeater_max_error: "Sono ammessi al massimo %{count} elementi"
     fields_component_missing_alert_html: "Componente <strong>%{component_id}</strong> non trovato. La configurazione del componente potrebbe essere stata rimossa."
     fields_previously_saved_data: "Dati salvati in precedenza:"
     field_file_remove: Rimuovi

data/lib/lato_cms/version.rb

@@ -1,3 +1,3 @@
 module LatoCms
-  VERSION = "3.0.9"
+  VERSION = "3.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Gregorio Galante