maglevcms 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d746d7653900e39f4c0a7b45ba3503a5688d37cc45f242943f7187729f607f
-  data.tar.gz: 4d5a6ff5eab5449ada366810c2ffedbde9466600faf1d30c8c4b6c906db24510
+  metadata.gz: d6ebce98e16aca2b48cc0029e9c9168602b29f8bcd320261904c634b4d97132d
+  data.tar.gz: 463986303bb445fdc237f1089186055284ff29cb62773a878a7f4ae1d90ab7a6
 SHA512:
-  metadata.gz: 6395309dbf50aed228ef2143e48bc4fb34f3184f715d9b70b478487567c56485483253b8e66a951a512e592917732be376815f78591a6fc02fae3e730bede303
-  data.tar.gz: 7fd1217aae956ca2b19228fe83c815f9905e18020047db71feccb15c20662ff1b720d9af2dd54874e0217e7ed0f2ef90235e49444c130b6bac24d7b27f92c715
+  metadata.gz: c6d853c3d35076069a0ba22053b8828a8e837eabaf3c715e4ac9955ac2f38663cd6cad9d86b55f759b310633e564b19c8373d2fd06df8c3b6a05b2bb8eeaf026
+  data.tar.gz: f3e2b09342501025517ef5a11ce16f8e2f213fd1b99fb760312edf99b321220cf2e65ea73c3feabf12c6706f27b5dede2482adb0686d160537558334daa76cd7

data/app/controllers/concerns/maglev/fetchers_concern.rb

@@ -80,6 +80,7 @@ module Maglev
       # we drop the path after the "_" segment
       params[:path].split('/').reduce([]) do |memo, segment|
         return memo if segment == '_'
+
         memo.push(segment)
       end
     end

data/app/controllers/concerns/maglev/standalone_sections_concern.rb

@@ -15,6 +15,8 @@ module Maglev
     private
 
     def fetch_maglev_site_scoped_sections
+      return if within_maglev_engine?
+
       fetch_maglev_site
       fetch_maglev_theme
       fetch_maglev_dummy_page
@@ -24,5 +26,9 @@ module Maglev
     def fetch_maglev_dummy_page
       @fetch_maglev_page = ::Maglev::Page.new(title: 'DummyPage', sections: fetch_maglev_site.sections)
     end
+
+    def within_maglev_engine?
+      controller_path.starts_with?('maglev/')
+    end
   end
 end

data/app/frontend/editor/components/dynamic-form/dynamic-input.vue

@@ -80,6 +80,7 @@
       :label="setting.label"
       :name="setting.id"
       v-model="inputValue"
+      :collection-id="options.collectionId"
       v-if="setting.type == 'collection_item'"
     />
   </div>

data/app/frontend/editor/components/kit/collection-item-input.vue

@@ -10,7 +10,7 @@
       :searchEnabled="true"
       :searchPlaceholder="$t(`collectionItemInput.select.searchPlaceholder`)"
       :emptyLabel="$t(`collectionItemInput.select.emptyLabel`)"
-      :fetchList="(q) => services.collectionItem.findAll('products', { q })"
+      :fetchList="(q) => services.collectionItem.findAll(collectionId, { q })"
       :clearEnabled="true"
       buttonClass="h-10"
       v-model="selectedCollectionItem"
@@ -42,18 +42,21 @@
 </template>
 
 <script>
+import { camelizeKeys } from '@/misc/utils'
+
 export default {
   name: 'CollectionItemInput',
   props: {
     label: { type: String, default: 'Label' },
     name: { type: String, default: 'image' },
     value: { default: () => null },
+    collectionId: { type: String },
     isFocused: { type: Boolean, default: false },
   },
   computed: {
     selectedCollectionItem: {
       get() {
-        return this.value
+        return camelizeKeys(this.value)
       },
       set(collectionItem) {
         this.$emit('input', collectionItem ? { ...collectionItem } : null)

data/app/frontend/editor/misc/utils.js

@@ -8,11 +8,28 @@ export const isBlank = (object) => {
 }
 
 export const camelize = (str) => {
+  if (!str.includes('_')) return str
   return str
     .toLowerCase()
     .replace(/[^a-zA-Z0-9]+(.)/g, (m, chr) => chr.toUpperCase())
 }
 
+export const camelizeKeys = (obj) => {
+  if (Array.isArray(obj)) {
+    return obj.map(v => camelizeKeys(v));
+  } else if (obj != null && obj.constructor === Object) {
+    return Object.keys(obj).reduce(
+      (result, key) => ({
+        ...result,
+        [camelize(key)]: camelizeKeys(obj[key]),
+      }),
+      {},
+    );
+  }
+  return obj;
+}
+
+
 export const numberToHumanSize = (size, i18n) => {
   if (isBlank(size)) return null
 

data/app/models/maglev/section/setting.rb

@@ -21,6 +21,7 @@ class Maglev::Section::Setting
     when :image then build_default_image_content(default)
     when :link then build_default_link_content(default)
     when :checkbox then build_default_checkbox_content(default)
+    when :collection_item then build_default_collection_item_content(default)
     else
       default || label
     end
@@ -42,6 +43,10 @@ class Maglev::Section::Setting
     default.presence || false
   end
 
+  def build_default_collection_item_content(default)
+    { id: default }
+  end
+
   ## class methods ##
   def self.build(hash)
     attributes = hash.slice('id', 'label', 'type', 'default')

data/app/services/concerns/maglev/get_page_sections/transform_collection_item_concern.rb

@@ -3,7 +3,7 @@
 # rubocop:disable Style/ClassAndModuleChildren
 module Maglev::GetPageSections::TransformCollectionItemConcern
   def transform_collection_item_content_setting(content, setting)
-    item_id = content.dig('value', 'id')
+    item_id = content&.dig('value', 'id')
     return if item_id.blank?
 
     item = fetch_collection_items.call(

data/app/services/maglev/fetch_collection_items.rb

@@ -33,7 +33,7 @@ module Maglev
 
     def fetch_item
       build_item(
-        fetch_original_items.find_by(id: id)
+        id == 'any' ? fetch_original_items.first : fetch_original_items.find_by(id: id)
       )
     end
 
@@ -78,7 +78,11 @@ module Maglev
     end
 
     def collection
-      config.collections[collection_id.to_sym]
+      config.collections[collection_id.to_sym].tap do |collection|
+        next if collection
+
+        raise "[Maglev] unregistered '#{collection_id}' collection in the Maglev configuration."
+      end
     end
 
     def build_item(original_item)

data/db/migrate/20210830085101_create_maglev_page_paths.rb

@@ -1,4 +1,4 @@
-class CreateMaglevPagePaths < ActiveRecord::Migration[6.1]
+class CreateMaglevPagePaths < ActiveRecord::Migration[6.0]
   def change
     create_table :maglev_page_paths do |t|
       t.references :maglev_page

data/db/migrate/20210906102712_add_canonical_to_pages.rb

@@ -1,4 +1,4 @@
-class AddCanonicalToPages < ActiveRecord::Migration[6.1]
+class AddCanonicalToPages < ActiveRecord::Migration[6.0]
   def change
     add_column :maglev_page_paths, :canonical, :boolean, null: true, default: true
     add_index :maglev_page_paths, %i[canonical maglev_page_id locale], unique: true, name: 'canonical_uniqueness'

data/db/migrate/20211008064437_add_locales_to_sites.rb

@@ -1,4 +1,4 @@
-class AddLocalesToSites < ActiveRecord::Migration[6.1]
+class AddLocalesToSites < ActiveRecord::Migration[6.0]
   def change
     add_column :maglev_sites, :locales, :jsonb, default: []
   end

data/db/migrate/20211013210954_translate_section_content.rb

@@ -1,4 +1,4 @@
-class TranslateSectionContent < ActiveRecord::Migration[6.1]
+class TranslateSectionContent < ActiveRecord::Migration[6.0]
   def change
     remove_column :maglev_sites, :sections, :jsonb, default: []
     add_column :maglev_sites, :sections_translations, :jsonb, default: {}

data/db/migrate/20211101205001_add_lock_version_to_maglev_pages.rb

@@ -1,4 +1,4 @@
-class AddLockVersionToMaglevPages < ActiveRecord::Migration[6.1]
+class AddLockVersionToMaglevPages < ActiveRecord::Migration[6.0]
   def change
     add_column :maglev_sites, :lock_version, :integer
     add_column :maglev_pages, :lock_version, :integer

data/db/migrate/20211116161121_better_page_path_canonical_indices.rb

@@ -1,4 +1,4 @@
-class BetterPagePathCanonicalIndices < ActiveRecord::Migration[6.1]
+class BetterPagePathCanonicalIndices < ActiveRecord::Migration[6.0]
   def change
     remove_index :maglev_page_paths, [:value, :locale], unique: true
     remove_index :maglev_page_paths, %i[canonical maglev_page_id locale], unique: true, name: 'canonical_uniqueness'

data/db/migrate/20211124101005_fix_page_path_indices.rb

@@ -1,4 +1,4 @@
-class FixPagePathIndices < ActiveRecord::Migration[6.1]
+class FixPagePathIndices < ActiveRecord::Migration[6.0]
   def change
     remove_index :maglev_page_paths, %i[canonical maglev_page_id locale value], unique: true, name: 'canonical_uniqueness'
     add_index :maglev_page_paths, %i[canonical maglev_page_id locale], name: 'scoped_canonical_speed'

data/db/migrate/20211203224112_add_open_graph_tags_to_pages.rb

@@ -1,4 +1,4 @@
-class AddOpenGraphTagsToPages < ActiveRecord::Migration[6.1]
+class AddOpenGraphTagsToPages < ActiveRecord::Migration[6.0]
   def change
     change_table :maglev_pages do |t|
       t.jsonb :og_title_translations, default: {}

data/db/migrate/20220612092235_add_style_to_sites.rb

@@ -1,4 +1,4 @@
-class AddStyleToSites < ActiveRecord::Migration[6.1]
+class AddStyleToSites < ActiveRecord::Migration[6.0]
   def change
     change_table :maglev_sites do |t|
       t.jsonb :style, default: []

data/lib/generators/maglev/section_generator.rb

@@ -113,6 +113,7 @@ module Maglev
         when 'color' then '#E5E7EB'
         when 'radio', 'select' then 'option_1'
         when 'icon' then 'default-icon-class'
+        when 'collection_item' then 'any'
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/generators/maglev/templates/section/app/theme/sections/%category%/%file_name%.yml.tt

@@ -40,6 +40,8 @@ settings:
     value: option_2
   <%- when 'color' -%>
   presets: ['#E5E7EB', '#FECACA', '#FDE68A', '#A7F3D0', '#BFDBFE']
+  <%- when 'collection_item' -%>
+  collection_id: products # check your config/initializers/maglev.rb to register your collection
   <%- end -%>
   <% if setting.value? -%>default: <%= setting.default %><% end -%>
 
@@ -69,6 +71,8 @@ blocks: <%- if blocks.blank? -%>[]
       value: option_1
     - label: Option 2
       value: option_2
+    <%- when 'collection_item' -%>
+    collection_id: products # check your config/initializers/maglev.rb to register your collection
     <%- end -%>
     <%- if setting.value? -%>
     default: <%= setting.default %>

data/lib/maglev/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglevcms
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder