maglevcms 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5401431fff19c66c1e16efa7c35c779bd10bd023f869bfe820fffd8afb586830
-  data.tar.gz: e59d727dd373a1a328967ee000e5ea3be1f3af479f3e55d35e9cf3fcb31d0c9e
+  metadata.gz: 7a5b69c183e753d7c6e87e9904d992bbe039901a35d5b0c2cc2c779bb1546469
+  data.tar.gz: '09c9e5973720db3a1038855d0e0e9417f8f9f5d678a7c89651941aa08afff560'
 SHA512:
-  metadata.gz: e718feab604a111fd21a2037f364d6d52a814c42998ee648e004cb6f0f41c24e23ab15861054e064f5c8997076114cd4b938fc4b157295e9cd9f752d8f1a129c
-  data.tar.gz: 13c3563774639c79b5b8da19422a4645ea47ac510080ced169582525c40e05172a41d74b2a35a18769020609924ad953cae073ab30c7289ca24089f210bb9056
+  metadata.gz: c56abbaa2a811d82eeb9894de80a708f640f8c38689c06ffac91a4eb806484f42dfa28123daab5d5651bbc86ab934f68525f00763a339f2395030ae2454311e2
+  data.tar.gz: b08119217e120672a3da43bd56aab08399940521f0052bffe25407e4b7a99eb17fe6b23d2aac72767b02785566acd8105728c7ef21fe5cc2b6aae74a7f94e2ef

data/app/controllers/maglev/api_controller.rb

@@ -14,6 +14,8 @@ module Maglev
     rescue_from ActiveRecord::RecordInvalid, with: :record_errors
     rescue_from ActiveRecord::RecordNotFound, with: :not_found
     rescue_from ActiveRecord::StaleObjectError, with: :stale_record
+    rescue_from Maglev::Errors::UnknownSection, with: :exception_message
+    rescue_from Maglev::Errors::UnknownSetting, with: :exception_message
     rescue_from Maglev::Errors::NotAuthorized, with: :unauthorized
 
     helper_method :maglev_site, :maglev_theme

data/app/frontend/editor/services/__tests__/section.spec.js

@@ -3,6 +3,7 @@ import {
   simpleContentSection,
   navContentSection,
 } from '@/spec/__mocks__/section'
+import { theme } from '@/spec/__mocks__/theme'
 
 describe('SectionService', () => {
   describe('#normalize', () => {

data/app/frontend/editor/services/section.js

@@ -181,4 +181,4 @@ export const getBlockLabel = (block, definition, index) => {
     }
   })
   return [isBlank(label) ? `${definition.name} #${index}` : label, image]
-}
+}

data/app/frontend/editor/services/theme.js

@@ -5,4 +5,4 @@ export const buildCategories = (theme) => {
       .filter((section) => section.category == category.id)
       .sort((a, b) => a.name.localeCompare(b.name)),
   }))
-}
+}

data/app/frontend/editor/spec/__mocks__/services.js

@@ -14,7 +14,7 @@ const siteService = {
 }
 
 const themeService = {
-  buildCategories: vi.fn(),
+  buildCategories: vi.fn()
 }
 
 const pageService = {

data/app/frontend/editor/store/getters.js

@@ -33,6 +33,7 @@ export default (services) => ({
       sections,
       blocks: sectionBlocks,
     })
+
     const siteSections = pageContent.sections.filter(
       (sectionContent) => getSectiondefinition(sectionContent).siteScoped,
     )
@@ -58,7 +59,7 @@ export default (services) => ({
     ({ theme }) =>
     (sectionContent) => {
       return theme.sections.find(
-        (definition) => definition['id'] === sectionContent['type'],
+        (definition) => definition['id'] === sectionContent['type']
       )
     },
   sectionSettings:

data/app/frontend/editor/store/index.js

@@ -19,8 +19,8 @@ const store = new Vuex.Store({
 
 store.dispatch('fetchEditorSettings')
 store.dispatch('fetchSite', true)
-store.dispatch('setPage', window.page)
 store.dispatch('setTheme', window.theme)
+store.dispatch('setPage', window.page)
 store.dispatch('setLocale', window.locale)
 
 if (store.state.editorSettings.sitePublishable)

data/app/models/maglev/setting_types/link.rb

@@ -6,7 +6,7 @@ class Maglev::SettingTypes::Link < Maglev::SettingTypes::Base
     if value.is_a?(String)
       { text: 'Link', link_type: 'url', href: value }
     else
-      { text: 'Link', link_type: 'url', href: '#' }.merge(value)
+      { text: 'Link', link_type: 'url', href: '#' }.merge(value.symbolize_keys)
     end
   end
 end

data/app/services/maglev/get_page_sections.rb

@@ -23,7 +23,7 @@ module Maglev
     def call
       (page_sections || page.sections || []).map do |section|
         transform_section(section.dup)
-      end
+      end.compact
     end
 
     protected
@@ -39,7 +39,7 @@ module Maglev
     def transform_section(section)
       definition = theme.sections.find(section['type'])
 
-      raise "Unknown Maglev section type (#{section['type']})" unless definition
+      raise_unknown_section_error(section['type']) unless definition
 
       transform_if_site_scoped(section, definition)
       transform_section_blocks(section['blocks'], definition)
@@ -76,8 +76,11 @@ module Maglev
     end
 
     def transform_section_settings(section, definition)
+      remove_unused_settings(section, definition)
+
       definition.settings.each do |setting|
         section_setting = find_section_setting(section, setting.id)
+
         next unless section_setting
 
         transform_content_setting(section_setting, setting)
@@ -95,9 +98,23 @@ module Maglev
       end
     end
 
+    def remove_unused_settings(section, definition)
+      section['settings'].select! do |setting|
+        definition.settings.any? do |definition_setting|
+          definition_setting.id == setting['id']
+        end
+      end
+    end
+
     def find_section_setting(section, setting_id)
       # NOTE: works for both sections and blocks
       section['settings'].find { |setting| setting['id'] == setting_id }
     end
+
+    def raise_unknown_section_error(type)
+      raise ::Maglev::Errors::UnknownSection, "Unknown Maglev section type (#{type})" unless Rails.env.production?
+
+      Rails.logger.warn "[#{theme.id}] unknown Maglev section type (#{type})"
+    end
   end
 end

data/lib/maglev/version.rb

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

data/package.json

@@ -37,8 +37,8 @@
     "prettier": "^3.1.0",
     "sass": "^1.69.5",
     "tailwindcss": "^3.4.1",
-    "vite": "^5.0.12",
-    "vite-plugin-ruby": "^5.0.0",
+    "vite": "^5.4.5",
+    "vite-plugin-ruby": "^5.1.0",
     "vite-plugin-vue2-svg": "^0.4.0",
     "vitest": "^0.34.6",
     "vue-template-compiler": "^2.7.16"
@@ -52,7 +52,7 @@
     "minimist": "^1.2.6",
     "eventsource": "^1.1.1",
     "async": "^2.6.4",
-    "vite": "^5.0.5"
+    "vite": "^5.4.5"
   },
   "packageManager": "yarn@4.4.0"
 }

data/yarn.lock

@@ -2570,8 +2570,8 @@ __metadata:
     tiptap-extensions: "npm:^1.34.0"
     turbolinks: "npm:^5.2.0"
     v-tooltip: "npm:^2.1.3"
-    vite: "npm:^5.0.12"
-    vite-plugin-ruby: "npm:^5.0.0"
+    vite: "npm:^5.4.5"
+    vite-plugin-ruby: "npm:^5.1.0"
     vite-plugin-vue2-svg: "npm:^0.4.0"
     vitest: "npm:^0.34.6"
     vue: "npm:^2.7.15"
@@ -3235,7 +3235,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.14, postcss@npm:^8.4.23, postcss@npm:^8.4.40, postcss@npm:^8.4.41":
+"postcss@npm:^8.4.14, postcss@npm:^8.4.23, postcss@npm:^8.4.40":
   version: 8.4.41
   resolution: "postcss@npm:8.4.41"
   dependencies:
@@ -3246,6 +3246,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:^8.4.43":
+  version: 8.4.45
+  resolution: "postcss@npm:8.4.45"
+  dependencies:
+    nanoid: "npm:^3.3.7"
+    picocolors: "npm:^1.0.1"
+    source-map-js: "npm:^1.2.0"
+  checksum: 10c0/ad6f8b9b1157d678560373696109745ab97a947d449f8a997acac41c7f1e4c0f3ca4b092d6df1387f430f2c9a319987b1780dbdc27e35800a88cde9b606c1e8f
+  languageName: node
+  linkType: hard
+
 "prelude-ls@npm:^1.2.1":
   version: 1.2.1
   resolution: "prelude-ls@npm:1.2.1"
@@ -4320,15 +4331,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-ruby@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "vite-plugin-ruby@npm:5.0.0"
+"vite-plugin-ruby@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "vite-plugin-ruby@npm:5.1.0"
   dependencies:
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
   peerDependencies:
     vite: ">=5.0.0"
-  checksum: 10c0/2ff117e6c39339b8954e4ba1a4b0e0a8960f646e355b9c196d2e29a3768a32ce70fa5a303065b2268929c018a38d46ac6ac7928b85e85e765dead60c9bdadcc4
+  checksum: 10c0/4c4b3193ee506a5054adbf9c08d38519b04522f88603f80c7822d2073b53bf1e3f3a3ec9459b76cb613b4eafce0991baa781fdeb297ea4acb68a7c1e2eeea0de
   languageName: node
   linkType: hard
 
@@ -4344,13 +4355,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.5":
-  version: 5.4.2
-  resolution: "vite@npm:5.4.2"
+"vite@npm:^5.4.5":
+  version: 5.4.5
+  resolution: "vite@npm:5.4.5"
   dependencies:
     esbuild: "npm:^0.21.3"
     fsevents: "npm:~2.3.3"
-    postcss: "npm:^8.4.41"
+    postcss: "npm:^8.4.43"
     rollup: "npm:^4.20.0"
   peerDependencies:
     "@types/node": ^18.0.0 || >=20.0.0
@@ -4383,7 +4394,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/23e347ca8aa6f0a774227e4eb7abae228f12c6806a727b046aa75e7ee37ffc2d68cff74360e12a42c347f79adc294e2363bc723b957bf4b382b5a8fb39e4df9d
+  checksum: 10c0/89c6459452fc238cdf8e99681b30996af171c9c557af476f96408a18a639fb5a0a6ee2d2257e005b21dc284edceb604595c34920cd4a007ad18f7ebafb654c76
   languageName: node
   linkType: hard
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-30 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder