lato_cms 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29cb78070d1a03bb67b5c2ad9c06b212303ae2c390e3b3a2f17b07bbae26f949
-  data.tar.gz: 82dd11dac19e77c935a037561d668be95b6d4cc0a6cb08d53ce1e4eec81445b4
+  metadata.gz: cdc7dae92de55a7a6e1e1290ee957bbf0b63fdf16404524c3f1803bd68123d0e
+  data.tar.gz: 1bc853f4846e25c41db7bddc0d53ac55f05699a06cf97a221abf6b7573458a7e
 SHA512:
-  metadata.gz: e07ea70a61268187c94a66ad273339bed785d0cc3e6f5562624b4924b6e721ff6f01d039e47a1ca9f18de58681b051ac50bbc03bc1ceeefa79dd351f94ff8250
-  data.tar.gz: b39a29416a88c3cace9b780a4a0582b721b5d038df0c0e7b14d6814b48612db14530c8e6bc8259a7fdca30febd8a70e8a290a3fb9ad33b6e4289333c4556e8ad
+  metadata.gz: 0117c7af5986170ce154bee821263a5ac8da6759d71a8fd682624e59b84d31a4f368d15d8c12d05549cd38d08baee38aa5a09550cad85a2bfaf9e30071baa50a
+  data.tar.gz: f18ef5c8dcaf4c2a3e2cd66e031bd2853eca12e69fc9aab6afcbe93989a90de362948317a526a45c08fe0ba38a647220505f95282e7e2b1910bc32c864386ca0

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

@@ -6,8 +6,16 @@ export default class extends Controller {
   connect () {
     this.handleComponentChange = this.handleComponentChange.bind(this)
     this.handleIframeLoad = this.handleIframeLoad.bind(this)
+    this.handleMorph = this.handleMorph.bind(this)
 
     document.addEventListener('lato-cms:component-change', this.handleComponentChange)
+    // Actions that re-render the editor server-side (cloning a component from
+    // another locale, editing the page settings) redirect back to this same
+    // URL, which Turbo treats as a page refresh and applies by morphing. Morph
+    // leaves an unchanged <iframe> exactly as it is — the element is never
+    // recreated, so the preview kept showing pre-clone content until a manual
+    // reload. The refresh is asked for explicitly here.
+    document.addEventListener('turbo:morph', this.handleMorph)
 
     if (this.hasIframeTarget) {
       this.iframeTarget.addEventListener('load', this.handleIframeLoad)
@@ -26,6 +34,7 @@ export default class extends Controller {
 
   disconnect () {
     document.removeEventListener('lato-cms:component-change', this.handleComponentChange)
+    document.removeEventListener('turbo:morph', this.handleMorph)
 
     if (this.hasIframeTarget) {
       this.iframeTarget.removeEventListener('load', this.handleIframeLoad)
@@ -109,6 +118,10 @@ export default class extends Controller {
     this.postActiveComponent()
   }
 
+  handleMorph () {
+    this.refresh()
+  }
+
   syncInitiallyOpenComponent () {
     const openCollapse = document.querySelector('#components-accordion .accordion-collapse.show')
     if (!openCollapse) return

data/app/controllers/lato_cms/pages_controller.rb

@@ -114,7 +114,12 @@ module LatoCms
       respond_to do |format|
         if errors.empty?
           format.html { redirect_to lato_cms.pages_show_path(@page), notice: t('lato_cms.fields_saved') }
-          format.json { render json: { message: t('lato_cms.fields_saved'), fields: @page.fields.reload.map(&:as_json) } }
+          # Only the saved component's fields: the editor repaints its media
+          # fields from this list, matching them by persisted field id, which is
+          # unique within a component but not across the page (two components
+          # can both have an "image" field). Handing it the whole page let a
+          # field adopt another component's media, and the next save stored it.
+          format.json { render json: { message: t('lato_cms.fields_saved'), fields: @page.fields.reload.select { |field| field.template_component_id == template_component_id.to_s }.map(&:as_json) } }
         else
           error_messages = errors.map { |e| "#{e[:field_id]}: #{e[:errors].join(', ')}" }.join('; ')
           format.html { redirect_to lato_cms.pages_show_path(@page), alert: error_messages }

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

@@ -104,10 +104,20 @@
                 <% page_field = component_fields.find { |f| f.field_id == field_id } %>
 
                 <div class="mb-3">
+                  <%# The dom id prefix carries the template component: every
+                      component of the page is rendered at once, and two of them
+                      can expose the same field id (a template mounting one
+                      component twice, or two components both calling their
+                      image field "image"). Without it they shared input ids —
+                      and, for media fields, the picker frame id the selection
+                      event is correlated by, so a media picked in one component
+                      landed in the other as well. Input *names* stay
+                      component-agnostic: each form posts its own component. %>
                   <%= lato_cms_render_field(
                       field_id: field_id,
                       field_config: field_config,
-                      page_field: page_field
+                      page_field: page_field,
+                      dom_id_prefix: "fields_#{tc[:template_component_id]}_#{field_id}"
                     ) %>
                 </div>
               <% end %>

data/lib/lato_cms/version.rb

@@ -1,3 +1,3 @@
 module LatoCms
-  VERSION = "3.2.5"
+  VERSION = "3.2.6"
 end

metadata

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