chore: the notion of site or page sections don't exist anymore, adapt the rename section type + remove section type services

Author: did

app/services/maglev/remove_section_type.rb

@@ -20,9 +20,8 @@ def call
 
     def remove_sections
       ActiveRecord::Base.transaction do
-        remove_resource_sections(site)
-        site_pages.find_each do |page|
-          remove_resource_sections(page)
+        resources.find_each do |resource|
+          remove_resource_sections(resource)
         end
       end
     end
@@ -43,8 +42,8 @@ def remove_sections_of_type(sections, type)
       original_size - sections.size
     end
 
-    def site_pages
-      Maglev::Page
+    def resources
+      Maglev::SectionsContentStore.all
     end
   end
 end

app/services/maglev/rename_section_type.rb

@@ -14,9 +14,8 @@ def call
       validate_section_types!
 
       ActiveRecord::Base.transaction do
-        rename_resource_sections(site)
-        site_pages.find_each do |page|
-          rename_resource_sections(page)
+        resources.find_each do |resource|
+          rename_resource_sections(resource)
         end
       end
 
@@ -50,8 +49,8 @@ def change_section_type(sections, old_type, new_type)
       end
     end
 
-    def site_pages
-      Maglev::Page
+    def resources
+      Maglev::SectionsContentStore.all
     end
   end
 end

spec/factories/maglev/sections_content_stores.rb

@@ -2,9 +2,7 @@
 
 FactoryBot.define do
   factory :sections_content_store, class: 'Maglev::SectionsContentStore' do
-    transient do
-      page { nil }
-    end
+    page { nil }
 
     handle { "main#{page ? "-#{page.id}" : ''}" }
 

spec/factories/maglev/sites.rb

@@ -5,54 +5,6 @@
     name { 'My awesome site' }
     locales { [{ label: 'English', prefix: 'en' }, { label: 'French', prefix: 'fr' }] }
 
-    # trait :empty do
-    #   sections { [] }
-    # end
-
-    # trait :with_navbar do
-    #   sections do
-    #     [
-    #       {
-    #         type: 'navbar',
-    #         id: 'yyy',
-    #         settings: [
-    #           { id: :logo, value: 'mynewlogo.png' }
-    #         ],
-    #         blocks: [
-    #           {
-    #             type: 'menu_item',
-    #             id: 'zzz',
-    #             settings: [
-    #               { id: 'label', value: 'Home' },
-    #               {
-    #                 id: 'link',
-    #                 value: {
-    #                   link_type: 'url', open_new_window: true, href: 'https://www.nocoffee.fr'
-    #                 }
-    #               }
-    #             ]
-    #           }
-    #         ]
-    #       }
-    #     ]
-    #   end
-    # end
-
-    # trait :with_footer do
-    #   sections do
-    #     [
-    #       {
-    #         type: 'footer',
-    #         id: 'footer',
-    #         settings: [
-    #           { id: :copyright, value: '(c) 2022 NoCoffee SARL' }
-    #         ],
-    #         blocks: []
-    #       }
-    #     ]
-    #   end
-    # end
-
     trait :with_style do
       style do
         [
@@ -61,50 +13,6 @@
         ]
       end
     end
-
-    # trait :page_links do
-    #   after :build do |record|
-    #     record.find_section('navbar')['blocks'][0]['settings'][1]['value'] = {
-    #       link_type: 'page',
-    #       link_id: '42',
-    #       open_new_window: true,
-    #       href: '/path-to-something'
-    #     }
-    #   end
-    # end
-
-    # trait :with_preset_navbar do
-    #   sections do
-    #     [
-    #       {
-    #         type: 'navbar',
-    #         settings: [
-    #           { id: :logo, value: 'mynewlogo.png' }
-    #         ],
-    #         blocks: [
-    #           {
-    #             type: 'menu_group',
-    #             settings: [],
-    #             children: [
-    #               {
-    #                 type: 'menu_item',
-    #                 settings: [
-    #                   { id: 'label', value: 'Home' },
-    #                   {
-    #                     id: 'link',
-    #                     value: {
-    #                       link_type: 'url', open_new_window: true, href: 'https://www.nocoffee.fr'
-    #                     }
-    #                   }
-    #                 ]
-    #               }
-    #             ]
-    #           }
-    #         ]
-    #       }
-    #     ]
-    #   end
-    # end
   end
 end
 

spec/models/maglev/page/path_spec.rb

@@ -26,9 +26,8 @@
     end
 
     it "doesn't allow creating a page with a path which is not a valid path" do
-      page = described_class.new(title: 'Hello world', path: 'foo bar')
+      page = described_class.new(title: 'Hello world', path: 'foo bar', layout_id: 'default')
       expect(page).to be_invalid
-      pp page.errors
       expect(page.errors.full_messages).to eq(['Path is not a valid path'])
     end
   end

spec/services/maglev/add_site_locale_spec.rb

@@ -27,7 +27,8 @@
     it 'sets a default content to all the pages in the new locale' do
       subject
       Maglev::I18n.with_locale(:fr) do
-        expect(page.reload.title).to eq 'Home'
+        page = Maglev::Page.first
+        expect(page.title).to eq 'Home'
         expect(page.path).to eq 'index'
         expect(Maglev::SectionsContentStore.first.sections).not_to be_empty
       end

spec/services/maglev/remove_section_type_spec.rb

@@ -6,20 +6,21 @@
   subject { described_class.call(site: site, type: type) }
 
   let(:site) { create(:site, locales: [{ label: 'English', prefix: 'en' }, { label: 'French', prefix: 'fr' }]) }
+  let(:global_store) { create(:sections_content_store) }
   let(:type) { 'hero' }
 
-  describe 'when the site has sections of the specified type' do
+  describe 'when the site has global sections of the specified type' do
     before do
-      site.update!(sections_translations: {
-                     en: [
-                       { type: 'hero', settings: [{ value: 'Hello' }] },
-                       { type: 'footer', settings: [{ value: 'Footer' }] }
-                     ],
-                     fr: [
-                       { type: 'hero', settings: [{ value: 'Bonjour' }] },
-                       { type: 'footer', settings: [{ value: 'Pied de page' }] }
-                     ]
-                   })
+      global_store.update!(sections_translations: {
+                             en: [
+                               { type: 'hero', settings: [{ value: 'Hello' }] },
+                               { type: 'footer', settings: [{ value: 'Footer' }] }
+                             ],
+                             fr: [
+                               { type: 'hero', settings: [{ value: 'Bonjour' }] },
+                               { type: 'footer', settings: [{ value: 'Pied de page' }] }
+                             ]
+                           })
     end
 
     it 'removes the sections of the specified type in all locales and returns the count' do
@@ -28,15 +29,15 @@
 
       # Check English locale
       Maglev::I18n.with_locale(:en) do
-        sections = site.reload.sections
+        sections = global_store.reload.sections
         expect(sections.length).to eq(1)
         expect(sections.first['type']).to eq('footer')
         expect(sections.first['settings'].first['value']).to eq('Footer')
       end
 
       # Check French locale
       Maglev::I18n.with_locale(:fr) do
-        sections = site.reload.sections
+        sections = global_store.reload.sections
         expect(sections.length).to eq(1)
         expect(sections.first['type']).to eq('footer')
         expect(sections.first['settings'].first['value']).to eq('Pied de page')
@@ -46,26 +47,26 @@
 
   describe 'when the site has no sections of the specified type' do
     before do
-      site.update!(sections_translations: {
-                     en: [{ type: 'footer', settings: [{ value: 'Footer' }] }],
-                     fr: [{ type: 'footer', settings: [{ value: 'Pied de page' }] }]
-                   })
+      global_store.update!(sections_translations: {
+                             en: [{ type: 'footer', settings: [{ value: 'Footer' }] }],
+                             fr: [{ type: 'footer', settings: [{ value: 'Pied de page' }] }]
+                           })
     end
 
     it 'does not modify the sections and returns zero' do
       expect(subject).to eq(0)
 
       # Check English locale
       Maglev::I18n.with_locale(:en) do
-        sections = site.reload.sections
+        sections = global_store.reload.sections
         expect(sections.length).to eq(1)
         expect(sections.first['type']).to eq('footer')
         expect(sections.first['settings'].first['value']).to eq('Footer')
       end
 
       # Check French locale
       Maglev::I18n.with_locale(:fr) do
-        sections = site.reload.sections
+        sections = global_store.reload.sections
         expect(sections.length).to eq(1)
         expect(sections.first['type']).to eq('footer')
         expect(sections.first['settings'].first['value']).to eq('Pied de page')
@@ -74,19 +75,20 @@
   end
 
   describe 'when removing all sections of a type' do
-    let!(:page) { create(:page) }
+    let(:page) { create(:page) }
+    let(:page_store) { page.stores.first }
 
     before do
       # Set up sections for both site and page
-      site.update!(sections_translations: {
-                     en: [{ type: 'hero' }, { type: 'footer' }],
-                     fr: [{ type: 'hero' }, { type: 'footer' }]
-                   })
-
-      page.update!(sections_translations: {
-                     en: [{ type: 'hero' }, { type: 'banner' }],
-                     fr: [{ type: 'hero' }, { type: 'banner' }]
-                   })
+      global_store.update!(sections_translations: {
+                             en: [{ type: 'hero' }, { type: 'footer' }],
+                             fr: [{ type: 'hero' }, { type: 'footer' }]
+                           })
+
+      page_store.update!(sections_translations: {
+                           en: [{ type: 'hero' }, { type: 'banner' }],
+                           fr: [{ type: 'hero' }, { type: 'banner' }]
+                         })
     end
 
     it 'removes the sections from both site and pages and returns total count' do
@@ -95,12 +97,12 @@
 
       # Check site sections
       Maglev::I18n.with_locale(:en) do
-        expect(site.reload.sections.map { |s| s['type'] }).to eq(['footer'])
+        expect(global_store.reload.sections.map { |s| s['type'] }).to eq(['footer'])
       end
 
       # Check page sections
       Maglev::I18n.with_locale(:en) do
-        expect(page.reload.sections.map { |s| s['type'] }).to eq(['banner'])
+        expect(page_store.reload.sections.map { |s| s['type'] }).to eq(['banner'])
       end
     end
   end