feat: support the forbidden error when persisting a page + rename UILocaleConcern -> UserInterfaceLocaleConcern

Author: did

.ruby-version

@@ -1 +1 @@
-3.2.3
+3.3.5

.yarn/install-state.gz

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Maglev
-  module UiLocaleConcern
+  module UserInterfaceLocaleConcern
     extend ActiveSupport::Concern
 
     included do

app/controllers/concerns/maglev/ui_locale_concern.rb renamed to app/controllers/concerns/maglev/user_interface_locale_concern.rb

@@ -3,7 +3,7 @@
 module Maglev
   class ApiController < ::Maglev::ApplicationController
     include Maglev::JsonConcern
-    include Maglev::UiLocaleConcern
+    include Maglev::UserInterfaceLocaleConcern
     include Maglev::ContentLocaleConcern
 
     before_action :authenticate

app/controllers/maglev/api_controller.rb

@@ -5,7 +5,7 @@ class EditorController < ApplicationController
     include Maglev::AuthenticationConcern
     include Maglev::FetchersConcern
     include Maglev::BackActionConcern
-    include Maglev::UiLocaleConcern
+    include Maglev::UserInterfaceLocaleConcern
     include Maglev::ContentLocaleConcern
 
     before_action :fetch_maglev_site, only: :show

app/controllers/maglev/editor_controller.rb

@@ -0,0 +1,24 @@
+<template>
+  <div class="pt-8 pb-4">
+    <p class="text-gray-600 text-justify">
+      {{ $t('errorModals.forbidden.message') }}
+    </p>
+
+    <div class="mt-4 text-center">
+      <button class="big-submit-button bg-editor-primary" @click="close">
+        {{ $t('errorModals.forbidden.button') }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ForbiddenError',
+  methods: {
+    close() {
+      this.closeModal()
+    },
+  },
+}
+</script>

app/frontend/editor/components/errors/forbidden.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="pt-8 pb-4">
+  <div class="pt-8 pb-4 space-y-4">
     <p class="text-gray-600 text-justify">
       {{ $t('errorModals.staleRecord.message') }}
     </p>
 
-    <div class="mt-8 text-center">
+    <div class="text-center">
       <button class="big-submit-button bg-editor-primary" @click="reloadPage">
         {{ $t('errorModals.staleRecord.button') }}
       </button>

app/frontend/editor/components/errors/stale-record.vue

@@ -236,6 +236,11 @@
       "title": "We are sorry 🙇",
       "message": "We couldn't persist your changes because someone else has updated the content in the meantime.",
       "button": "Please reload your page"
+    },
+    "forbidden": {
+      "title": "We are sorry 🙇",
+      "message": "You're not permitted to do this. Check with your administrator.",
+      "button": "Close"
     }
   },
   "support": {

app/frontend/editor/locales/editor.en.json

@@ -1,4 +1,5 @@
-import StaleRecord from '@/components/errors/stale-record.vue'
+import StaleRecordModal from '@/components/errors/stale-record.vue'
+import ForbiddenModal from '@/components/errors/forbidden.vue'
 
 export default {
   methods: {
@@ -7,9 +8,13 @@ export default {
 
       switch (errorType) {
         case 'staleRecord':
-          ModalComponent = StaleRecord
+          ModalComponent = StaleRecordModal
+          break
+        case 'forbidden':
+          ModalComponent = ForbiddenModal
           break
         default:
+          console.warn("Unknown errorType:", errorType)
           return // unknown error type
       }
 

app/frontend/editor/mixins/error-modal.js

@@ -16,6 +16,10 @@ export default (services) => ({
     services.site
       .publish({ pageId: state.page.id })
       .then((data) => commit('SET_PUBLISH_BUTTON_STATE', data))
+      .catch(({ response: { status } }) => {
+        console.log('[Maglev] could not publish the page', status)
+        if (status === 403) commit('OPEN_ERROR_MODAL', 'forbidden')
+      })
   },
   pollLastPublication({ dispatch }) {
     dispatch('loadPublishButtonState')

app/frontend/editor/store/actions/site.js

@@ -6,12 +6,12 @@ class Section
     include ActiveModel::Serializers::JSON
     include ::Maglev::Section::ContentConcern
 
-    HASH_ATTRIBUTES = %w[id theme name site_scoped singleton viewport_fixed_position insert_button max_width_pane
+    HASH_ATTRIBUTES = %w[id theme name site_scoped scope singleton viewport_fixed_position insert_button max_width_pane
                          insert_at category blocks_label blocks_presentation sample screenshot_timestamp].freeze
 
     ## attributes ##
     attr_accessor :id, :theme, :name, :category,
-                  :site_scoped, :singleton, :viewport_fixed_position,
+                  :site_scoped, :scope, :singleton, :viewport_fixed_position,
                   :insert_button, :insert_at, :max_width_pane,
                   :settings, :blocks, :blocks_label, :blocks_presentation,
                   :sample, :screenshot_timestamp

app/models/maglev/section.rb

@@ -25,6 +25,10 @@ def find_setting(section_id, block_id, setting_id)
       section_setting_types[key]
     end
 
+    def find_scope(section_id)
+      sections.find(section_id)&.scope
+    end
+
     private
 
     def section_setting_types

app/models/maglev/theme.rb

@@ -16,6 +16,7 @@ def call
       ActiveRecord::Base.transaction do
         persist_page!
         persist_site!
+        persist_repositories!
         persist_style!
         page
       end
@@ -45,6 +46,26 @@ def persist_site!
       site.save!
     end
 
+    def persist_repositories!
+      scoped_sections = page_attributes[:sections].each do |section_attributes|
+        type = section_attributes[:type]
+        scope = theme.find_scope(type)
+        next if scope.blank?
+
+        # section 1 (scope = dogs) 
+        # section 2
+        # section 3 (scope = dogs)
+        # section 4 (scope = cats)
+
+        repository = Maglev::SectionRepository.find_or_initialize_by(name: scope)
+        repository.attributes = { sections: [section_attributes] }
+
+        repository.prepare_sections(theme)
+        
+        repository.save!
+      end
+    end
+
     def persist_style!
       return if site_attributes&.dig(:style).blank?
 

app/services/maglev/persist_page.rb

@@ -5,6 +5,16 @@ category: headers
 
 site_scoped: true
 
+# scope: page | site | .......... (section repository)
+
+# modal -> 
+#   SectionRepository
+#     - name 
+#     - list of sections (like page or site)
+#     - optimistic locking on it as well
+
+
+
 # Definition of the settings:
 # A setting type can be one of the following values: text, image, checkbox, link and color.
 # Please visit: https://docs.maglev.dev/concepts/setting for more explanation.

spec/dummy/app/theme/sections/headers/navbar.yml

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2022_06_12_092235) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_31_163058) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -83,6 +83,13 @@
     t.jsonb "og_image_url_translations", default: {}
   end
 
+  create_table "maglev_section_repositories", force: :cascade do |t|
+    t.string "name"
+    t.jsonb "sections_translations", default: {}
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "maglev_sites", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at", null: false

spec/dummy/db/schema.rb

@@ -193,5 +193,18 @@
         ]
       end
     end
+
+    trait :with_ads do
+      sections do
+        [
+          {
+            id: 'uyt',
+            type: 'ads',
+            settings: [{ id: :title, value: 'Buy our nice product' }],
+            blocks: []
+          }
+        ]
+      end
+    end
   end
 end

spec/factories/maglev/pages.rb

@@ -86,6 +86,15 @@
                                                       site_scoped: true,
                                                       settings: [{ label: 'Copyright', id: 'copyright', type: 'text' }],
                                                       blocks: []
+                                                    }.with_indifferent_access),
+                                                    Maglev::Section.build({
+                                                      theme: theme,
+                                                      name: 'Ads',
+                                                      id: 'ads',
+                                                      category: 'features',
+                                                      scope: 'shoes',
+                                                      settings: [{ id: 'title', type: 'text' }],
+                                                      blocks: []
                                                     }.with_indifferent_access)
                                                   ])
     end