maglevcms 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 862336e896c5cea49b17ff58d5837b8d3e301580f8dbe5966d35e9ab378cbf04
-  data.tar.gz: 2d49e3d1f3ddf480906efbffc2477073a65f66694593bfe347b9faf75ec3c798
+  metadata.gz: 91a5ea2feecec6351e3e7042be72418ce8e95374e50108d6a798b2f179d47ee4
+  data.tar.gz: c674bf2fb233c7aec70823875c804e7f7741df83f809a09cc670ac13eedb9d74
 SHA512:
-  metadata.gz: 232bde061cabd3d356e6623cfdddfc4c26c2f82c3a4ace19eafe52667afe1cb94afbf7705d03519ec77a65145ab5a3fddbc41ee9e0ff10960973fe8282fe2010
-  data.tar.gz: 3fc4998c42adb572d2f930eafb255872e90560d4330517181fd6457da0f7d8ea4f09e84ea43669ffba5dcd2b8187b43e0f263d9fa93801e07de79dcaec207d3e
+  metadata.gz: 2f3301ae182676801e8fc2baecbc6774f1c3e10e072fa509a2272185ff6b62aa64c7cdd68a92426679b6545c14a40f376e0be3f038df1cb18d78cd6e55747da1
+  data.tar.gz: a1dce55e8a53f13e394b82f548a6726a06b2a3babe65e6e645d1ee5c00040022d10243f75c9eede599fe957e4b2bb0aafe5fd8a9becc32dfa8b35a3f4767a873

data/app/assets/javascripts/maglev/editor/controllers/app/forms/section_form_controller.js

@@ -9,8 +9,10 @@ export default class extends Controller {
   static debounces = ['afterSettingUpdate']
 
   connect() {
-    useDebounce(this)    
+    useDebounce(this)
+    
     this.sourceId = this.sectionBlockIdValue !== '' ?  this.sectionBlockIdValue : this.sectionIdValue
+    
     requestAnimationFrame(() => {
       this.dispatch('connected', { bubbles: true, detail: { 
         sectionId: this.sectionIdValue, 
@@ -18,6 +20,12 @@ export default class extends Controller {
           lockVersion: this.sectionLockVersionValue } 
         })
     })
+
+    // we need to keep track of the submitting state to avoid multiple requests being sent with a wrong lock version
+    this.submitting = false
+    this.element.addEventListener('turbo:submit-end', (event) => {
+      if (!event.detail.success) this.submitting = false
+    })
   }
 
   onSettingChange(event) {
@@ -33,15 +41,32 @@ export default class extends Controller {
   onPersist(event) {
     log('[SectionForm::onPersist]', event.detail, typeof event.detail)
     this.lockVersionTarget.value = event.detail.lockVersion
+
+    // we are done submitting, so we can reset the submitting flag
+    this.submitting = false
   }
 
-  async afterSettingUpdate(event) {
+  afterSettingUpdate(event) {    
+    // if the request is still running (flight), we need to debounce the call
+    // to avoid multiple requests being sent with a wrong lock version
+    if (this.submitting) {
+      this.afterSettingUpdate(event)
+      return
+    }
+
     log('[SectionForm::afterSettingUpdate] 🙌🙌', event.detail)
-    await this.element.requestSubmit()
-    
+
+    // we couldn't update the content just by modifying the DOM, so we have to refresh the whole section.
+    // The right time to do this is when the request is finished, so we listen for the turbo:submit-end event.
     if (!event.detail.updated) {
-      // we couldn't update the content just by modifying the DOM, so we have to refresh the whole section
-      this.dispatch('updateSection', { detail: { sectionId: this.sectionIdValue } })
+      this.element.addEventListener('turbo:submit-end', () => {
+        this.dispatch('updateSection', { detail: { sectionId: this.sectionIdValue } })
+      }, { once: true })
     }
+    
+    // better to set it to true instead of relying on the turbo:submit-start event
+    this.submitting = true
+
+    this.element.requestSubmit()
   }
 }

data/app/assets/javascripts/maglev/editor/controllers/app/page_preview_controller.js

@@ -164,13 +164,14 @@ export default class extends Controller {
 
   setupTransformations() {
     this.calculateTransformations = this.calculateTransformations.bind(this)
-    this.ro = new ResizeObserver(this.calculateTransformations)
-    
+    this.scheduleTransformations = this.scheduleTransformations.bind(this)
+    this.resizeObserver = new ResizeObserver(this.scheduleTransformations)
+
     const sidebar = this.appLayoutSidebar
     const pageLayout = document.querySelector('#page-layout')
-    if (sidebar) this.ro.observe(this.appLayoutSidebar())
-    if (pageLayout) this.ro.observe(pageLayout)
-    this.ro.observe(document.documentElement)
+    if (sidebar) this.resizeObserver.observe(this.appLayoutSidebar())
+    if (pageLayout) this.resizeObserver.observe(pageLayout)
+    this.resizeObserver.observe(document.documentElement)
 
     // Recompute on page layout toggles / VT renders
     addEventListener("turbo:render", this.calculateTransformations)
@@ -180,7 +181,11 @@ export default class extends Controller {
   }
 
   teardownTransformations() {
-    this.ro?.disconnect()
+    if (this.transformationsFrame) {
+      cancelAnimationFrame(this.transformationsFrame)
+      this.transformationsFrame = null
+    }
+    this.resizeObserver?.disconnect()
     removeEventListener("turbo:render", this.calculateTransformations)
     removeEventListener("turbo:before-render", this.calculateTransformations)
   }
@@ -230,6 +235,15 @@ export default class extends Controller {
     this.dispatch('scale-ratio-updated', { detail: {  value: scaleRatio } })
   }
 
+  scheduleTransformations() {
+    if (this.transformationsFrame) return
+
+    this.transformationsFrame = requestAnimationFrame(() => {
+      this.transformationsFrame = null
+      this.calculateTransformations()
+    })
+  }
+
   calculateTransformX() {
     if (!this.hasExpandedPageLayout()) return 0
     return this.expandedPageLayout().offsetWidth - this.appLayoutSidebarWidth()

data/app/controllers/concerns/maglev/editor/errors_concern.rb

@@ -26,7 +26,7 @@ module Maglev
 
       def handle_stale_object
         respond_to do |format|
-          format.turbo_stream { render 'maglev/editor/shared/errors/stale_object_error' }
+          format.turbo_stream { render 'maglev/editor/shared/errors/stale_object_error', status: :conflict }
           format.html { redirect_to editor_root_path }
         end
       end

data/app/controllers/concerns/maglev/editor/lock_version_concern.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Editor
+    module LockVersionConcern
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :source_lock_version
+      end
+
+      private
+
+      def lock_source
+        @section.site_scoped? ? maglev_site : current_maglev_page
+      end
+
+      def source_lock_version
+        lock_source.lock_version || 0
+      end
+
+      def reload_lock_source
+        lock_source.reload if @section.site_scoped?
+      end
+    end
+  end
+end

data/app/controllers/maglev/editor/section_blocks_controller.rb

@@ -3,8 +3,9 @@
 module Maglev
   module Editor
     class SectionBlocksController < Maglev::Editor::BaseController
+      include Maglev::Editor::LockVersionConcern
+
       helper Maglev::Editor::SettingsHelper
-      helper_method :source_lock_version
 
       before_action :set_section
       before_action :set_section_block, only: %i[edit update destroy]
@@ -32,6 +33,7 @@ module Maglev
 
       def update
         update_section_block
+        reload_lock_source
         flash.now[:notice] = flash_t(:success)
       end
 
@@ -77,14 +79,6 @@ module Maglev
         )
       end
 
-      def lock_source
-        @section.site_scoped? ? maglev_site : current_maglev_page
-      end
-
-      def source_lock_version
-        lock_source.lock_version || 0
-      end
-
       def redirect_to_section_blocks_path(success: true)
         flash = case success
                 when true then { notice: flash_t(:success) }

data/app/controllers/maglev/editor/sections_controller.rb

@@ -3,8 +3,9 @@
 module Maglev
   module Editor
     class SectionsController < Maglev::Editor::BaseController
+      include Maglev::Editor::LockVersionConcern
+
       helper Maglev::Editor::SettingsHelper
-      helper_method :source_lock_version
 
       before_action :ensure_turbo_frame_request, only: [:new]
       before_action :set_section, only: %i[edit update]
@@ -39,6 +40,7 @@ module Maglev
 
       def update
         update_section
+        reload_lock_source
         flash.now[:notice] = flash_t(:success)
       end
 
@@ -95,14 +97,6 @@ module Maglev
         headers['X-Section-Position'] = flash[:position]
       end
 
-      def lock_source
-        @section.site_scoped? ? maglev_site : current_maglev_page
-      end
-
-      def source_lock_version
-        lock_source.lock_version || 0
-      end
-
       def redirect_to_sections_path
         redirect_to editor_sections_path_with_context, notice: flash_t(:success), status: :see_other
       end

data/app/services/concerns/maglev/content/helpers_concern.rb

@@ -58,7 +58,7 @@ module Maglev
 
       def update_setting_value(setting, current_content)
         setting_content = current_content.find { |s| s['id'] == setting.id }
-        value = content[setting.id.to_sym]
+        value = setting.cast_value(content[setting.id.to_sym])
 
         if setting_content.nil?
           current_content.push({ id: setting.id, value: value })

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -359,6 +359,7 @@ files:
 - app/controllers/concerns/maglev/back_action_concern.rb
 - app/controllers/concerns/maglev/content_locale_concern.rb
 - app/controllers/concerns/maglev/editor/errors_concern.rb
+- app/controllers/concerns/maglev/editor/lock_version_concern.rb
 - app/controllers/concerns/maglev/editor/preview_urls_concern.rb
 - app/controllers/concerns/maglev/editor/turbo_concern.rb
 - app/controllers/concerns/maglev/errors_concern.rb