lato_cms 3.0.11 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18323c23906137ac104d760d833ca76cd64041f254372a8a7e037bee23a5d5c5
-  data.tar.gz: 5324f43d1305e9aea41bcf19b2b41c96e555edd70ace601b788e649f5cb80b7d
+  metadata.gz: 6fd8416ab840a11e364752d13f21440d8282862df78e4b4b67ef8f69432aa56b
+  data.tar.gz: 544411ddd79120e75f9f3df5cf7136d9d0d940cd3ba15abb0720fbf95ec368f7
 SHA512:
-  metadata.gz: d1c86cbe7a2a9dc66ffad24bb681f5a9022243c86f39ea4f2e8273c5500efec5f5ea20f610979a2f1bc49a4e85e96f1c5471faf00a5d42011b5df02da18cff5a
-  data.tar.gz: eebc417e788f0275c9b6daf1e50777487008358f8b080b75b48cab6f192f1cea94d70f177da537f881ee723b90cf58d365bdcf51f197dc2f9dc0c88c072c9919
+  metadata.gz: b0d6f6b71abf13818513d8921e6daa52254ea32209d9b0a44ff3b25f3d3d1e83e4dc90e262eeefba8f9ac08a7fe5bf65d518f6a3c638dfabcdfb072b238ba28d
+  data.tar.gz: f899bc4fbe56254e67359839b79a29598ba0507d05704d7e8cb8cded33f0675f3499bb6aac33666b0b4f2b5eae8f18614e3b3b0f2f0c68fb00c4b22f136af7ba

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

@@ -27,6 +27,7 @@ export default class extends Controller {
 
     this.inputTarget.value = ''
     this.syncFileInput()
+    this.syncRequired()
   }
 
   remove(event) {
@@ -38,12 +39,14 @@ export default class extends Controller {
       item.remove()
       this.syncFileInput()
       if (!this.multipleValue) this.restoreReplacedItems()
+      this.syncRequired()
       return
     }
 
     item.classList.add('lato-cms-file-field__item--removing')
     item.querySelector('[data-lato-cms-file-field-target="removedNotice"]')?.classList.remove('d-none')
     this.ensureRemoveInput(item)
+    this.syncRequired()
   }
 
   undo(event) {
@@ -53,6 +56,19 @@ export default class extends Controller {
     item.classList.remove('lato-cms-file-field__item--removing')
     item.querySelector('[data-lato-cms-file-field-target="removedNotice"]')?.classList.add('d-none')
     item.querySelector('[data-remove-file-input]')?.remove()
+    this.syncRequired()
+  }
+
+  // The file input only has to be required while nothing survives the next save:
+  // a pending new file or a persisted attachment not marked for removal already
+  // satisfies the field, so keeping `required` would block every re-save (the
+  // form saves via fetch without reload, so the attribute must track state).
+  syncRequired() {
+    const hasActiveAttachment = this.newFileMap.size > 0 ||
+      this.itemTargets.some(item => {
+        return item.dataset.attachmentId && !item.classList.contains('lato-cms-file-field__item--removing')
+      })
+    this.inputTarget.required = this.fieldRequired && !hasActiveAttachment
   }
 
   ensureRemoveInput(item) {
@@ -124,6 +140,7 @@ export default class extends Controller {
       this.itemTargets
         .filter(item => item.querySelector('[data-remove-file-input]'))
         .forEach(item => item.remove())
+      this.syncRequired()
       return
     }
 
@@ -131,6 +148,7 @@ export default class extends Controller {
     field.attachments.forEach(attachment => {
       this.listTarget.appendChild(this.buildExistingItem(attachment))
     })
+    this.syncRequired()
   }
 
   findSavedField(fields) {
@@ -200,4 +218,8 @@ export default class extends Controller {
   get fieldId() {
     return this.element.dataset.fieldId
   }
+
+  get fieldRequired() {
+    return this.element.dataset.fieldRequired === 'true'
+  }
 }

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

@@ -38,6 +38,7 @@ export default class extends Controller {
     // Reset input then sync with DataTransfer
     this.fileInputTarget.value = ''
     this.syncFileInput()
+    this.syncRequired()
   }
 
   // ─── Remove ─────────────────────────────────────────────────────────────────
@@ -62,6 +63,7 @@ export default class extends Controller {
     item.remove()
     this.updateEmpty()
     this.updateOrderInputs()
+    this.syncRequired()
   }
 
   // ─── Drag & drop ─────────────────────────────────────────────────────────────
@@ -126,6 +128,17 @@ export default class extends Controller {
     this.emptyMsgTarget.classList.toggle('d-none', !!hasItems)
   }
 
+  // Required enforcement rides on native form validation: the file input is
+  // `visually-hidden` (not display:none) so the browser can focus it and anchor
+  // the validation bubble on the "Add images" button. `required` must be set
+  // only while no image survives the next save — pending files kept in the
+  // input via DataTransfer or surviving grid items satisfy the field.
+  syncRequired() {
+    const hasActiveItem = this.newFileMap.size > 0 ||
+      !!this.gridTarget.querySelector('[data-gallery-item]')
+    this.fileInputTarget.required = this.fieldRequired && !hasActiveItem
+  }
+
   buildItem(src, attachmentId, fileUid) {
     const div = document.createElement('div')
     div.setAttribute('data-gallery-item', '')
@@ -158,6 +171,7 @@ export default class extends Controller {
     })
     this.updateEmpty()
     this.updateOrderInputs()
+    this.syncRequired()
   }
 
   findSavedField(fields) {
@@ -169,4 +183,8 @@ export default class extends Controller {
   get removeLabel() {
     return this.element.dataset.removeLabel || 'Remove'
   }
+
+  get fieldRequired() {
+    return this.element.dataset.fieldRequired === 'true'
+  }
 }

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

@@ -45,6 +45,7 @@ export default class extends Controller {
     this.currentContainerTarget.classList.add('lato-cms-file-field__item--removing')
     this.removedNoticeTarget.classList.remove('d-none')
     this.ensureRemoveInput()
+    this.syncRequired()
   }
 
   undo() {
@@ -54,6 +55,16 @@ export default class extends Controller {
     this.removedNoticeTarget.classList.add('d-none')
     this.removeInput?.remove()
     this.removeInput = null
+    this.syncRequired()
+  }
+
+  // The file input only has to be required while no attachment survives the next
+  // save: a persisted attachment (not marked for removal) already satisfies the
+  // field, so keeping `required` on the emptied input would block every re-save.
+  syncRequired() {
+    const hasActiveAttachment = this.hasCurrentContainerTarget &&
+      !this.currentContainerTarget.classList.contains('lato-cms-file-field__item--removing')
+    this.inputTarget.required = this.fieldRequired && !hasActiveAttachment
   }
 
   ensureRemoveInput() {
@@ -82,6 +93,7 @@ export default class extends Controller {
     if (attachment) {
       this.element.insertBefore(this.buildCurrentContainer(attachment), this.newPreviewContainerTarget)
     }
+    this.syncRequired()
   }
 
   findSavedField(fields) {
@@ -139,6 +151,10 @@ export default class extends Controller {
     return this.element.dataset.fieldId
   }
 
+  get fieldRequired() {
+    return this.element.dataset.fieldRequired === 'true'
+  }
+
   get removeLabel() {
     return this.element.dataset.removeLabel || 'Remove'
   }

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

@@ -45,6 +45,7 @@ export default class extends Controller {
     this.currentContainerTarget.classList.add('lato-cms-file-field__item--removing')
     this.removedNoticeTarget.classList.remove('d-none')
     this.ensureRemoveInput()
+    this.syncRequired()
   }
 
   undo() {
@@ -54,6 +55,16 @@ export default class extends Controller {
     this.removedNoticeTarget.classList.add('d-none')
     this.removeInput?.remove()
     this.removeInput = null
+    this.syncRequired()
+  }
+
+  // The file input only has to be required while no attachment survives the next
+  // save: a persisted attachment (not marked for removal) already satisfies the
+  // field, so keeping `required` on the emptied input would block every re-save.
+  syncRequired() {
+    const hasActiveAttachment = this.hasCurrentContainerTarget &&
+      !this.currentContainerTarget.classList.contains('lato-cms-file-field__item--removing')
+    this.inputTarget.required = this.fieldRequired && !hasActiveAttachment
   }
 
   ensureRemoveInput() {
@@ -83,6 +94,7 @@ export default class extends Controller {
     if (attachment) {
       this.element.insertBefore(this.buildCurrentContainer(attachment), this.newPreviewContainerTarget)
     }
+    this.syncRequired()
   }
 
   findSavedField(fields) {
@@ -150,6 +162,10 @@ export default class extends Controller {
     return this.element.dataset.fieldId
   }
 
+  get fieldRequired() {
+    return this.element.dataset.fieldRequired === 'true'
+  }
+
   get removeLabel() {
     return this.element.dataset.removeLabel || 'Remove'
   }

data/app/controllers/lato_cms/pages_controller.rb

@@ -9,6 +9,10 @@ module LatoCms
       translations link_translation_action unlink_translation_action
     ].freeze
 
+    # Field types whose value lives in Active Storage attachments instead of
+    # `value`, so `required` must be checked against the attached files.
+    ATTACHMENT_FIELD_TYPES = %w[file image video gallery].freeze
+
     before_action { active_sidebar(:lato_cms_pages) }
     before_action :authenticate_lato_cms_admin, only: ADMIN_ONLY_ACTIONS
 
@@ -288,6 +292,15 @@ module LatoCms
 
       unless field.save
         errors << { field_id: persisted_field_id, errors: field.errors.full_messages }
+        return
+      end
+
+      # Attachments are attached/purged here in the controller, so the model
+      # cannot validate `required` for attachment fields. Backstop the
+      # client-side enforcement: a required field must end the save with at
+      # least one file, otherwise required would be bypassable.
+      if ATTACHMENT_FIELD_TYPES.include?(field_type) && field_config&.dig("required") == true && field.files.reload.empty?
+        errors << { field_id: persisted_field_id, errors: [t("lato_cms.field_required_attachment_error")] }
       end
     end
 
@@ -318,17 +331,20 @@ module LatoCms
       end
     end
 
-    def attach_field_files(field, field_data)
-      return unless field_data[:files].present?
+    # Browsers submit empty entries for file inputs with no selection: strip
+    # them so `attach` never receives a blank value and the required check
+    # sees the field as actually empty.
+    def submitted_files(field_data)
+      Array(field_data[:files]).reject(&:blank?)
+    end
 
-      Array(field_data[:files]).compact.each { |file| field.files.attach(file) }
+    def attach_field_files(field, field_data)
+      submitted_files(field_data).each { |file| field.files.attach(file) }
     end
 
     def assign_file_field_files(field, field_data)
-      if field.field_settings['multiple'] != true && field_data[:files].present?
-        new_file = Array(field_data[:files]).compact.first
-        return unless new_file
-
+      new_file = submitted_files(field_data).first
+      if field.field_settings['multiple'] != true && new_file
         field.files.each(&:purge)
         field.files.attach(new_file)
       else
@@ -346,10 +362,8 @@ module LatoCms
     end
 
     def replace_field_image(field, field_data)
-      if field_data[:files].present?
-        new_file = Array(field_data[:files]).compact.first
-        return unless new_file
-
+      new_file = submitted_files(field_data).first
+      if new_file
         field.files.each(&:purge)
         field.files.attach(new_file)
       else
@@ -361,10 +375,8 @@ module LatoCms
     # video and its auto-generated poster; removing the video drops the poster
     # too. Poster generation runs in a background job to keep the save fast.
     def replace_field_video(field, field_data)
-      if field_data[:files].present?
-        new_file = Array(field_data[:files]).compact.first
-        return unless new_file
-
+      new_file = submitted_files(field_data).first
+      if new_file
         field.files.each(&:purge)
         field.files.attach(new_file)
         LatoCms::GenerateVideoPosterJob.perform_later(field.id)

data/app/views/lato_cms/pages/fields/_file.html.erb

@@ -13,6 +13,7 @@
 
 <div data-controller="lato-cms-file-field"
      data-field-id="<%= field_id %>"
+     data-field-required="<%= required %>"
      data-lato-cms-file-field-multiple-value="<%= multiple %>"
      data-new-badge-label="<%= t('lato_cms.field_file_new_badge') %>"
      data-remove-label="<%= t('lato_cms.field_file_remove') %>"
@@ -49,6 +50,7 @@
     id="<%= input_id %>"
     data-lato-cms-file-field-target="input"
     data-action="change->lato-cms-file-field#addFiles"
+    <%= 'required' if required && !page_field&.files&.attached? %>
     <%= 'multiple' if multiple %>
     <% if accept %>accept="<%= accept %>"<% end %>>
 </div>

data/app/views/lato_cms/pages/fields/_gallery.html.erb

@@ -20,7 +20,7 @@ end %>
   <%= label %><%= ' *' if required %>
 </label>
 
-<div data-controller="lato-cms-gallery-field" data-lato-cms-gallery-field-field-id-value="<%= field_id %>" data-lato-cms-gallery-field-input-name-prefix-value="<%= local_assigns[:input_name_prefix].presence || "fields[#{field_id}]" %>" data-remove-label="<%= t('lato_cms.field_file_remove') %>">
+<div data-controller="lato-cms-gallery-field" data-lato-cms-gallery-field-field-id-value="<%= field_id %>" data-lato-cms-gallery-field-input-name-prefix-value="<%= local_assigns[:input_name_prefix].presence || "fields[#{field_id}]" %>" data-field-required="<%= required %>" data-remove-label="<%= t('lato_cms.field_file_remove') %>">
   <div class="lato-cms-gallery-field__grid mb-2"
        data-lato-cms-gallery-field-target="grid"
        data-action="dragover->lato-cms-gallery-field#onGridDragOver drop->lato-cms-gallery-field#onGridDrop">
@@ -44,13 +44,17 @@ end %>
 
   <label class="btn btn-sm btn-outline-secondary">
     <i class="bi bi-plus-lg me-1"></i><%= t('lato_cms.field_gallery_add_images') %>
+    <%# visually-hidden (not d-none): a required display:none input makes native
+        validation fail silently with a "not focusable" error, while a clipped
+        1px input stays focusable so the browser can anchor its message here. %>
     <input type="file"
-      class="d-none"
+      class="visually-hidden"
       name="<%= files_input_name %>"
       accept="<%= accept %>"
       multiple
       data-lato-cms-gallery-field-target="fileInput"
-      data-action="change->lato-cms-gallery-field#addFiles">
+      data-action="change->lato-cms-gallery-field#addFiles"
+      <%= 'required' if required && ordered_files.empty? %>>
   </label>
   <small class="text-muted ms-2"><%= t('lato_cms.field_gallery_drag_to_reorder') %></small>
 </div>

data/app/views/lato_cms/pages/fields/_image.html.erb

@@ -13,6 +13,7 @@
 
 <div data-controller="lato-cms-image-field"
      data-field-id="<%= field_id %>"
+     data-field-required="<%= required %>"
      data-new-badge-label="<%= t('lato_cms.field_image_new_badge') %>"
      data-remove-label="<%= t('lato_cms.field_image_remove') %>"
      data-remove-pending-label="<%= t('lato_cms.field_image_remove_pending') %>"

data/app/views/lato_cms/pages/fields/_video.html.erb

@@ -14,6 +14,7 @@
 
 <div data-controller="lato-cms-video-field"
      data-field-id="<%= field_id %>"
+     data-field-required="<%= required %>"
      data-new-badge-label="<%= t('lato_cms.field_video_new_badge') %>"
      data-remove-label="<%= t('lato_cms.field_video_remove') %>"
      data-remove-pending-label="<%= t('lato_cms.field_video_remove_pending') %>"

data/config/locales/en.yml

@@ -82,6 +82,7 @@ en:
     repeater_remove_item: Remove
     repeater_min_error: "At least %{count} items are required"
     repeater_max_error: "At most %{count} items are allowed"
+    field_required_attachment_error: "At least one file is required"
     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

@@ -82,6 +82,7 @@ it:
     repeater_remove_item: Rimuovi
     repeater_min_error: "Sono richiesti almeno %{count} elementi"
     repeater_max_error: "Sono ammessi al massimo %{count} elementi"
+    field_required_attachment_error: "È richiesto almeno un file"
     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.11"
+  VERSION = "3.0.12"
 end

metadata

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