maglevcms 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b23017be4bbbf4d06d99cf0f94ede1136e0e0ea343e0fbbef94edb6dc4d112d4
-  data.tar.gz: b6e5d107a2ea7a18091ffdd084a3fed631d0726fe845e0ac0f7100f1fc3e2b60
+  metadata.gz: 248515cbe62cad407de20c6cffc54b333b764b997051916dcc25db54744536ae
+  data.tar.gz: 1d7b14f11bde0e7efb1eb88b8804dc5028b3d55da858e963e538c92640377b5c
 SHA512:
-  metadata.gz: 1b579c11945ca3c28bb48f59d7efc0ea70a6d1608b7275cd507c3044cf30446bf3a342163ad9c468f0f3cf690386be137401e34f6426bbc016b4306af2d701ff
-  data.tar.gz: d4257dfeb8ef1a210fc9147325e4cae5517c4a5f676b7c27637353573ee9c4ba315283edc4b0c97253d06b6327ba48b4fbf25199b4247f21913482b17f53777a
+  metadata.gz: b3409a4c7c5712a9e7bfa0541ca7d683e3ce17ace4a0113f9eaafeb2c3ad0d9a24a5bc07717f6ec2b5942a94539ebb9312a0cf18f3f9c9ec6bf1516e9b560dce
+  data.tar.gz: a72a1e948ef6d9ad0003c987a745959a2da567ad78d0db890e1b207f45c4a50d3c86629537bec27bd891d6f4e48f333a0cef22b9bfa3c72168ec64b9a3a5966e

data/app/controllers/maglev/admin/base_controller.rb

@@ -10,11 +10,10 @@ module Maglev
       private
 
       def maglev_authenticate
-        username = maglev_config.admin_username
-        password = maglev_config.admin_password
-        return if !username || !password
+        return unless Maglev.config.admin_username.present? && Maglev.config.admin_password.present?
 
-        redirect_to main_app.root_path unless authenticate_with_http_basic { |u, p| username == u && password == p }
+        http_basic_authenticate_or_request_with name: Maglev.config.admin_username,
+                                                password: Maglev.config.admin_password
       end
     end
   end

data/app/frontend/editor/assets/remixicons/arrow-up-s-line.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M12 10.828l-4.95 4.95-1.414-1.414L12 8l6.364 6.364-1.414 1.414z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.9997 10.8284L7.04996 15.7782L5.63574 14.364L11.9997 8L18.3637 14.364L16.9495 15.7782L11.9997 10.8284Z"></path></svg>

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

@@ -16,7 +16,7 @@
       v-model="selectedCollectionItem"
     >
       <template v-slot:value>
-        <div class="flex items-center">
+        <div class="flex items-center flex-grow-0 overflow-x-hidden" :title="selectedCollectionItem.label">
           <div
             class="h-10 w-10 bg-gray-400 mr-3"
             v-if="selectedCollectionItem.imageUrl"
@@ -26,15 +26,15 @@
               :src="selectedCollectionItem.imageUrl"
             />
           </div>
-          <span>{{ selectedCollectionItem.label }}</span>
+          <span class="truncate">{{ selectedCollectionItem.label }}</span>
         </div>
       </template>
       <template v-slot:item="{ item }">
-        <div class="flex items-center">
+        <div class="flex items-center" :title="item.label">
           <div class="h-10 w-10 bg-gray-400 mr-3" v-if="item.imageUrl">
             <img class="object-cover w-full h-full" :src="item.imageUrl" />
           </div>
-          <span class="font-bold">{{ item.label }}</span>
+          <span class="truncate font-bold">{{ item.label }}</span>
         </div>
       </template>
     </select-input>

data/app/frontend/editor/components/kit/select-input.vue

@@ -18,24 +18,16 @@
           <span v-else>{{ placeholder }}</span>
           <button
             type="button"
-            class="ml-auto"
+            class="ml-auto flex-shrink-0"
             @click.stop.prevent="clear"
             v-if="canClear"
           >
             <icon name="ri-close-line" />
           </button>
-          <icon
-            name="arrow-up-s-line"
-            size="1.5rem"
-            :class="{ 'ml-1': canClear, 'ml-auto': !canClear }"
-            v-if="isOpen"
-          />
-          <icon
-            name="arrow-down-s-line"
-            size="1.5rem"
-            :class="{ 'ml-1': canClear, 'ml-auto': !canClear }"
-            v-else
-          />
+          <div :class="{ 'flex-shrink-0': true, 'ml-1': canClear, 'ml-auto': !canClear }"> 
+            <icon name="arrow-up-s-line" size="1.5rem" :class="{ 'hidden': !isOpen }" />
+            <icon name="arrow-down-s-line" size="1.5rem" :class="{ 'hidden': isOpen }" />
+          </div>
         </div>
       </button>
       <div

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

@@ -172,6 +172,9 @@ export const getBlockLabel = (block, definition, index) => {
           label = value.text
         }
         break
+      case 'collection_item':
+        if (!label && !isBlank(value?.label)) label = value.label
+        if (!image && !isBlank(value?.imageUrl)) image = value.imageUrl
       default:
         break
     }

data/app/services/maglev/fetch_collection_items.rb

@@ -66,7 +66,7 @@ module Maglev
     end
 
     def item_label(item)
-      item[label_field]
+      label_field && item.respond_to?(label_field) ? item.public_send(label_field) : nil
     end
 
     def item_image(item)

data/lib/maglev/theme_filesystem_loader.rb

@@ -9,7 +9,7 @@ module Maglev
     end
 
     def call(path)
-      theme = add(YAML.safe_load(File.read(path.join('theme.yml'))))
+      theme = add(YAML.safe_load(File.read(path.join('theme.yml')), aliases: true))
       sections = load_sections(theme, Pathname.new(path).join('sections/**/*.yml'))
       theme.sections = Maglev::Section::Store.new(sections)
       theme

data/lib/maglev/version.rb

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

data/lib/tasks/maglev_tasks.rake

@@ -74,8 +74,14 @@ namespace :maglev do
     desc 'Ensure build dependencies like Vite are installed before bundling'
     task install_dependencies: :environment do
       within_engine_folder do
+        install_dev_dependencies = ENV['VITE_RUBY_SKIP_INSTALL_DEV_DEPENDENCIES'] == 'true'
+        # rubocop:disable Style/StringHashKeys
+        install_env_args = install_dev_dependencies ? {} : { 'NODE_ENV' => 'development' }
+        # rubocop:enable Style/StringHashKeys
         cmd = Maglev::Engine.vite_ruby.commands.legacy_npm_version? ? 'npx ci --yes' : 'npx --yes ci'
-        system({ 'NODE_ENV' => 'development' }, cmd)
+        result = system(install_env_args, cmd)
+        # Fallback to `yarn` if `npx` is not available.
+        system(install_env_args, 'yarn install --frozen-lockfile') if result.nil?
       end
     end
 

metadata

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