maglevcms 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3061afa4c3b8ce916e981ea025e8db6b63102287b152163369813ec9ac172b5e
-  data.tar.gz: 484f90090316bd4a319e4223b5d86d5c673260f56808386f2f792a1b12613331
+  metadata.gz: 862336e896c5cea49b17ff58d5837b8d3e301580f8dbe5966d35e9ab378cbf04
+  data.tar.gz: 2d49e3d1f3ddf480906efbffc2477073a65f66694593bfe347b9faf75ec3c798
 SHA512:
-  metadata.gz: 2c2df97bdeee5ff72c3c2fb7796e3d14b23169a71c68bb91879a002aa944e678f8fe1461ada1b3512394bf5f4ba848c35636345023026549fe15c964527d28ea
-  data.tar.gz: 56665addc22ceb997563182a3217ebfc6fcfdefa9a619ea34ed6e1dcdbe3c7a3fc5aef6f14c041df2e081cbc78f9abb11bd7f3121ee21681c62f5b16b8309b5e
+  metadata.gz: 232bde061cabd3d356e6623cfdddfc4c26c2f82c3a4ace19eafe52667afe1cb94afbf7705d03519ec77a65145ab5a3fddbc41ee9e0ff10960973fe8282fe2010
+  data.tar.gz: 3fc4998c42adb572d2f930eafb255872e90560d4330517181fd6457da0f7d8ea4f09e84ea43669ffba5dcd2b8187b43e0f263d9fa93801e07de79dcaec207d3e

data/app/assets/builds/maglev/tailwind.css

@@ -55,9 +55,7 @@
     --container-xl: 36rem;
     --container-2xl: 42rem;
     --container-3xl: 48rem;
-    --container-4xl: 56rem;
     --container-5xl: 64rem;
-    --container-6xl: 72rem;
     --container-7xl: 80rem;
     --text-xs: 0.75rem;
     --text-xs--line-height: calc(1 / 0.75);
@@ -739,6 +737,9 @@
   .max-w-xs {
     max-width: var(--container-xs);
   }
+  .min-w-0 {
+    min-width: calc(var(--spacing) * 0);
+  }
   .min-w-64 {
     min-width: calc(var(--spacing) * 64);
   }
@@ -2717,36 +2718,16 @@
       display: flex;
     }
   }
-  .lg\:w-2xl {
-    @media (width >= 64rem) {
-      width: var(--container-2xl);
-    }
-  }
   .lg\:w-3xl {
     @media (width >= 64rem) {
       width: var(--container-3xl);
     }
   }
-  .lg\:w-4xl {
-    @media (width >= 64rem) {
-      width: var(--container-4xl);
-    }
-  }
-  .lg\:w-5xl {
-    @media (width >= 64rem) {
-      width: var(--container-5xl);
-    }
-  }
   .lg\:grid-cols-2 {
     @media (width >= 64rem) {
       grid-template-columns: repeat(2, minmax(0, 1fr));
     }
   }
-  .lg\:grid-cols-3 {
-    @media (width >= 64rem) {
-      grid-template-columns: repeat(3, minmax(0, 1fr));
-    }
-  }
   .lg\:space-x-32 {
     @media (width >= 64rem) {
       :where(& > :not(:last-child)) {
@@ -2787,11 +2768,6 @@
       width: var(--container-5xl);
     }
   }
-  .xl\:w-6xl {
-    @media (width >= 80rem) {
-      width: var(--container-6xl);
-    }
-  }
   .xl\:grid-cols-3 {
     @media (width >= 80rem) {
       grid-template-columns: repeat(3, minmax(0, 1fr));

data/app/assets/javascripts/maglev/client/dom-operations.js

@@ -35,7 +35,13 @@ export const start = () => {
 
 const addSection = (event) => {
   const { sectionId, insertAt } = event.detail
-  debouncedUpdatePreviewDocument({ sectionId, insertAt, scrollToSection: true })
+  
+  // Do not use debouncedUpdatePreviewDocument: it is shared with section:update and block
+  // refreshes. A follow-up call within the debounce window only passes { sectionId }, which
+  // replaces this invocation and drops insertAt — the new section is then appended.
+  void updatePreviewDocument({ sectionId, insertAt, scrollToSection: true }).catch((err) => {
+    log('[DOM Operations] addSection failed', err)
+  })
 }
 
 const moveSections = (event) => {
@@ -221,6 +227,8 @@ const updatePreviewDocument = async ({ sectionId, insertAt = undefined, scrollTo
     scrollToSectionOrBlock(targetElement)
 }
 
+// Shared debouncer: last invocation within 150ms wins. A later call with a narrower payload
+// (e.g. only { sectionId }) replaces a pending one and drops extra args — see addSection().
 const debouncedUpdatePreviewDocument = debounce(updatePreviewDocument, 150)
 
 const insertSectionInDOM = (element, insertAt) => {

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

@@ -79,10 +79,16 @@ export default class extends Controller {
   // === SECTIONS ===
 
   addSection(event) {
-    log('addSection', event.detail.fetchResponse.response.headers.get('X-Section-Id'), event.detail.fetchResponse.response.headers.get('X-Section-Position'))
-    const sectionId = event.detail.fetchResponse.response.headers.get('X-Section-Id')
-    const position = event.detail.fetchResponse.response.headers.get('X-Section-Position')
-    this.postMessage('section:add', { sectionId, insertAt: parseInt(position) })
+    if (!event.detail.success) return
+
+    const res = event.detail.fetchResponse.response
+    log('addSection', res.headers.get('X-Section-Id'), res.headers.get('X-Section-Position'))
+    
+    const sectionId = res.headers.get('X-Section-Id')
+    const position = res.headers.get('X-Section-Position')
+    const insertAt = position === null || position === '' ? undefined : parseInt(position, 10)
+    
+    this.postMessage('section:add', { sectionId, insertAt })
   }
 
   deleteSection(event) {

data/app/components/maglev/uikit/app_layout/topbar/page_info_component.html.erb

@@ -3,9 +3,9 @@
 <% else %>
   <div class="flex flex-row items-center h-full w-full px-4 overflow-hidden">
     <div class="flex flex-col leading-none overflow-hidden">
-      <div class="flex items-center">
-        <%= helpers.maglev_page_icon(page, size: '1.1rem', wrapper_class_names: 'text-gray-900') %>
-        <div class="text-base font-semibold truncate ml-1 mr-3">
+      <div class="flex items-center overflow-hidden">
+        <%= helpers.maglev_page_icon(page, size: '1.1rem', wrapper_class_names: 'text-gray-900 shrink-0') %>
+        <div class="text-base font-semibold truncate ml-1 mr-3 min-w-0">
           <%= page.title.presence || page.default_title %>
         </div>
 
@@ -16,8 +16,8 @@
         %>
       </div>
 
-      <div class="text-xs text-gray-500 flex items-center space-x-1">
-        <p class="truncate text-gray-700">
+      <div class="text-xs text-gray-500 flex items-center space-x-1 overflow-hidden">
+        <p class="truncate text-gray-700 min-w-0">
           <span class="text-gray-900 font-semibold">/</span><%= page_path %>
         </p>
       </div>

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

@@ -39,6 +39,7 @@ module Maglev
       def track_maglev_error(error)
         Rails.logger.error "[Maglev] Error: #{error.message}"
         Rails.logger.error error.backtrace.join("\n")
+        Rails.error.report(error, handled: true)
       end
     end
   end

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

@@ -43,12 +43,12 @@ module Maglev
       end
 
       def sort
-        current_maglev_page.reorder_sections(params[:item_ids], params[:lock_version])
-        if current_maglev_page.save
-          redirect_to_sections_path
-        else
-          render_index_with_error
-        end
+        services.sort_sections.call(
+          page: current_maglev_page,
+          section_ids: params[:item_ids],
+          lock_version: params[:lock_version]
+        )
+        redirect_to_sections_path
       end
 
       def destroy

data/app/controllers/maglev/studio/section_preview_controller.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Studio
+    # Renders a single section from default theme content on an in-memory page (no DB page load).
+    # :slug is the theme section type (e.g. "showcase"). Disabled outside +Rails.env.local?+.
+    class SectionPreviewController < ApplicationController
+      include Maglev::RenderingConcern
+      include Maglev::ServicesConcern
+      include Maglev::ContentLocaleConcern
+
+      rescue_from ActiveRecord::RecordNotFound, with: :respond_not_found
+      rescue_from Maglev::Errors::UnknownSection, with: :respond_not_found
+
+      before_action :fetch_maglev_site
+      around_action :with_default_site_locale
+
+      def show
+        render_maglev_page
+      end
+
+      private
+
+      def fetch_maglev_site
+        super.tap do |site|
+          raise ActiveRecord::RecordNotFound if site.nil?
+
+          maglev_services.context.site = site
+        end
+      end
+
+      def fetch_maglev_page
+        @fetch_maglev_page ||= build_preview_page
+      end
+
+      def build_preview_page
+        theme = fetch_maglev_theme
+        section_content = build_section_content_for_preview(theme)
+
+        Maglev::Page.new(title: 'Section preview', path: 'index').tap do |page|
+          page.sections = [section_content]
+          page.prepare_sections(theme)
+        end
+      end
+
+      def build_section_content_for_preview(theme)
+        definition = theme.sections.find(params[:slug].to_s)
+        raise Maglev::Errors::UnknownSection unless definition
+
+        definition.build_default_content.with_indifferent_access
+      end
+
+      def fetch_maglev_page_sections(*)
+        section_id = fetch_maglev_page.sections.first.fetch('id')
+
+        @fetch_maglev_page_sections ||= maglev_services.get_page_sections.call(
+          page: fetch_maglev_page,
+          section_id: section_id,
+          locale: content_locale
+        )
+      end
+
+      def maglev_rendering_mode
+        :section
+      end
+
+      def with_default_site_locale(&block)
+        Maglev::I18n.with_locale(maglev_site.default_locale_prefix, &block)
+      end
+
+      def respond_not_found
+        head :not_found
+      end
+    end
+  end
+end

data/app/helpers/maglev/application_helper.rb

@@ -19,6 +19,31 @@ module Maglev
       maglev_importmap_tags(:client, 'maglev-client')
     end
 
+    # Use this helper in your theme layout instead of calling javascript_importmap_tags
+    # and maglev_client_javascript_tags separately.
+    #
+    # Firefox (unlike Chrome) strictly follows the HTML spec which only allows a single
+    # <script type="importmap"> per document and ignores any subsequent ones. When both
+    # the theme and the Maglev client each emit their own importmap, Firefox silently
+    # discards the second one, causing `import "maglev-client"` to fail with:
+    #   "The specifier 'maglev-client' was a bare specifier, but was not remapped to anything."
+    #
+    # This helper solves the problem by merging the Maglev client importmap entries into
+    # the theme's importmap so that only one <script type="importmap"> is ever emitted.
+    # Once browsers universally support multiple importmaps (Chrome already does),
+    # this helper can be simplified back to two separate calls.
+    def maglev_javascript_importmap_tags(entry_point = 'application', importmap: Rails.application.importmap)
+      return javascript_importmap_tags(entry_point, importmap: importmap) unless maglev_rendering_mode == :editor
+
+      safe_join [
+        javascript_inline_importmap_tag(maglev_merged_importmap_json(importmap)),
+        javascript_importmap_module_preload_tags(importmap, entry_point: entry_point),
+        javascript_importmap_module_preload_tags(Maglev::Engine.importmaps[:client], entry_point: 'maglev-client'),
+        javascript_import_module_tag(entry_point),
+        javascript_import_module_tag('maglev-client')
+      ], "\n"
+    end
+
     def maglev_importmap_tags(namespace, entry_point)
       safe_join [
         javascript_inline_importmap_tag(Maglev::Engine.importmaps[namespace].to_json(resolver: self)),
@@ -176,6 +201,15 @@ module Maglev
       # rubocop:enable Layout/LineLength
       maglev_client_javascript_tags
     end
+
+    private
+
+    def maglev_merged_importmap_json(theme_importmap)
+      theme_map = JSON.parse(theme_importmap.to_json(resolver: self))
+      client_map = JSON.parse(Maglev::Engine.importmaps[:client].to_json(resolver: self))
+      theme_map['imports'].merge!(client_map['imports'])
+      theme_map.to_json
+    end
   end
 end
 # rubocop:enable Metrics/ModuleLength

data/app/helpers/maglev/studio/section_preview_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Studio
+    module SectionPreviewHelper
+      include Maglev::PagePreviewHelper
+    end
+  end
+end

data/app/models/concerns/maglev/sections_concern.rb

@@ -33,12 +33,6 @@ module Maglev::SectionsConcern
     sections&.find_all { |section| section['type'] == type } || []
   end
 
-  def reorder_sections(sorted_section_ids, lock_version)
-    self.lock_version = lock_version
-    sections_translations_will_change!
-    sections.sort! { |a, b| sorted_section_ids.index(a['id']) <=> sorted_section_ids.index(b['id']) }
-  end
-
   def delete_section(section_id)
     sections_translations_will_change!
     sections.delete_if { |section| section['id'] == section_id }

data/app/services/maglev/app_container.rb

@@ -57,6 +57,8 @@ module Maglev
                                             depends_on: %i[fetch_site fetch_theme]
     dependency :delete_section,             class: Maglev::Content::DeleteSectionService,
                                             depends_on: %i[fetch_site fetch_theme]
+    dependency :sort_sections,              class: Maglev::Content::SortSectionsService,
+                                            depends_on: %i[fetch_site fetch_theme]
 
     dependency :add_section_block,          class: Maglev::Content::AddSectionBlockService,
                                             depends_on: %i[fetch_site fetch_theme]

data/app/services/maglev/content/sort_sections_service.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Content
+    class SortSectionsService
+      include Injectable
+
+      dependency :fetch_theme
+      dependency :fetch_site
+
+      argument :page
+      argument :section_ids
+      argument :lock_version, default: nil
+
+      def call
+        check_lock_version!
+        sort_sections!
+      end
+
+      private
+
+      def sort_sections!
+        sorted_ids = normalized_section_ids
+        page.sections_translations_will_change!
+        page.sections.sort! { |a, b| sorted_ids.index(a['id']) <=> sorted_ids.index(b['id']) }
+        page.save!
+      end
+
+      def check_lock_version!
+        return if lock_version.blank?
+
+        current_version = page.lock_version.to_i
+        page.lock_version = lock_version.to_i
+
+        return if current_version == lock_version.to_i
+
+        raise ActiveRecord::StaleObjectError.new(page, 'sort_sections')
+      end
+
+      def normalized_section_ids
+        # For site-scoped sections, transform_if_site_scoped replaces the page-local ID
+        # with the site section's ID at render time, so the client sends site IDs.
+        # Legacy pages (created before IDs were unified) store a different page-local ID.
+        # Build a mapping: display_id (what the client sends) → page_id (what page.sections stores).
+        id_map = page.sections.each_with_object({}) do |page_section, map|
+          display_id = site_display_id_for(page_section) || page_section['id']
+          map[display_id] = page_section['id']
+        end
+        section_ids.map { |id| id_map[id] || id }
+      end
+
+      def site_display_id_for(page_section)
+        return unless theme.sections.find(page_section['type'])&.site_scoped?
+
+        site.find_section(page_section['type'])&.dig('id')
+      end
+
+      def theme
+        @theme ||= fetch_theme.call
+      end
+
+      def site
+        @site ||= fetch_site.call
+      end
+    end
+  end
+end

data/app/services/maglev/fetch_section_screenshot_path.rb

@@ -10,8 +10,18 @@ module Maglev
     argument :absolute, default: false
 
     def call
-      path = "#{fetch_sections_path.call(theme: theme)}/#{section.category}/#{section.id}.jpg"
+      path = "#{base_path}.#{extension}"
       absolute ? Rails.root.join("public/#{path}").to_s : "/#{path}"
     end
+
+    private
+
+    def base_path
+      "#{fetch_sections_path.call(theme: theme)}/#{section.category}/#{section.id}"
+    end
+
+    def extension
+      File.exist?(Rails.root.join("public/#{base_path}.webp")) ? 'webp' : 'jpg'
+    end
   end
 end

data/app/views/maglev/editor/assets/_list.html.erb

@@ -30,5 +30,4 @@
     <div class="flex items-center pt-3">
       <%= render Maglev::Uikit::PaginationComponent.new(pagy: @pagy, hidden_if_single_page: false) %>
     </div>
-  </div>
 <% end %>

data/app/views/maglev/editor/assets/index.html.erb

@@ -13,7 +13,10 @@
             options: {
               placeholder: t('maglev.editor.image_library.search_placeholder'),
               data: { turbo_frame: 'asset-search-results' }
-            }) %>
+            }) do %>
+            <%= hidden_field_tag :picker, params[:picker] if params[:picker].present? %>
+            <%= hidden_field_tag :source, params[:source] if params[:source].present? %>
+          <% end %>
           
         </div>
         <div class="ml-auto">

data/config/routes/maglev/studio.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Studio-only utilities (controllers reject requests outside +Rails.env.local?+).
+namespace :studio, path: 'studio' do
+  get 'section_preview/:slug', to: 'section_preview#show', as: :section_preview
+end

data/config/routes.rb

@@ -9,6 +9,9 @@ Maglev::Engine.routes.draw do
   # Preview
   draw 'maglev/preview'
 
+  # Studio (for local usage)
+  draw 'maglev/studio' if Rails.env.local?
+
   # Public Assets
   draw 'maglev/assets'
 

data/lib/generators/maglev/templates/theme/app/views/theme/layout.html.erb.tt

@@ -11,7 +11,7 @@
 
   <%%= render_maglev_alternate_links %>
 
-  <%%= maglev_client_javascript_tags %>
+  <%%= maglev_javascript_importmap_tags %>
   
   <%%=
     javascript_include_tag(

data/lib/maglev/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -391,6 +391,7 @@ files:
 - app/controllers/maglev/published_page_preview_controller.rb
 - app/controllers/maglev/site_controller.rb
 - app/controllers/maglev/sitemap_controller.rb
+- app/controllers/maglev/studio/section_preview_controller.rb
 - app/helpers/maglev/admin/sections/previews_helper.rb
 - app/helpers/maglev/admin/themes_helper.rb
 - app/helpers/maglev/application_helper.rb
@@ -399,6 +400,7 @@ files:
 - app/helpers/maglev/editor/settings_helper.rb
 - app/helpers/maglev/page_preview_helper.rb
 - app/helpers/maglev/sitemap_helper.rb
+- app/helpers/maglev/studio/section_preview_helper.rb
 - app/jobs/maglev/application_job.rb
 - app/lib/maglev/form/form_builder.rb
 - app/lib/maglev/form/inputs/check_box.rb
@@ -462,6 +464,7 @@ files:
 - app/services/maglev/content/delete_section_block_service.rb
 - app/services/maglev/content/delete_section_service.rb
 - app/services/maglev/content/sort_section_blocks_service.rb
+- app/services/maglev/content/sort_sections_service.rb
 - app/services/maglev/content/update_section_block_service.rb
 - app/services/maglev/content/update_section_service.rb
 - app/services/maglev/create_page_service.rb
@@ -579,6 +582,7 @@ files:
 - config/routes/maglev/editor.rb
 - config/routes/maglev/preview.rb
 - config/routes/maglev/public_preview.rb
+- config/routes/maglev/studio.rb
 - db/migrate/20200824085207_create_maglev_sites.rb
 - db/migrate/20200824104648_create_maglev_pages.rb
 - db/migrate/20200831101942_create_maglev_section_content.rb