alchemy-solidus 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83134d605ab6eddb6cebeec22500f75a586bba99cafeb265d5ed87eb59ce46ad
-  data.tar.gz: 7adfa3ac35bf9173eae869797cddba713eb26876229f2cf65ce5d705b017088c
+  metadata.gz: d0871f7a06ef602fcd95d7c20e3caf64016e226fd6741fb00634a1eadf8d1ee0
+  data.tar.gz: 4f8e1ea07ac7881657577aac59f70542aaf292a52c084a05eb56c736d8489156
 SHA512:
-  metadata.gz: 16163761f5f000d13d0485c54b9d1332f2117678e4d631764d1d9198ac0cd2b8f2050813923ca9903bc0b95249289a0296e7bdd0d27caf7f50d38b1068715d99
-  data.tar.gz: e49d6db23f3cd0f366f3497ee312e7bac59fde8f03ea6df12d708d78475caff6b87d1ee2348333c18f7e6683d1d7fee4ba950b9152ed96cc740b41175db917a4
+  metadata.gz: 066107a45e63c075b4fe68ad8588c396d0b60cba2af16e32881078aa29d356e34c72e4338150db683a23bda4489e34f51dc1960f216d74356afeec5e38d758ef
+  data.tar.gz: c92e64257ab9a192086ca5dffbf27f1ce32fb6435c1f82fa6f07994f933489359490002f519d10fe2206de53ff03571d88fb12f62692f0f29b6d718d3941211f

data/config/initializers/spree.rb

@@ -1,3 +1,68 @@
 if defined?(Alchemy::Devise::Engine)
   Spree.user_class = "Alchemy::User"
 end
+
+Spree::Backend::Config.configure do |config|
+  alchemy_menu_item = if Spree.solidus_gem_version >= Gem::Version.new("4.2.0")
+    config.class::MenuItem.new(
+      label: :cms,
+      icon: "copy",
+      condition: -> { can?(:index, :alchemy_admin_dashboard) },
+      url: -> { Alchemy::Engine.routes.url_helpers.admin_dashboard_path },
+      children: [
+        config.class::MenuItem.new(
+          label: :pages,
+          condition: -> { can?(:index, :alchemy_admin_pages) },
+          url: -> { Alchemy::Engine.routes.url_helpers.admin_pages_path },
+          match_path: "/pages"
+        ),
+        config.class::MenuItem.new(
+          label: :languages,
+          condition: -> { can?(:index, :alchemy_admin_sites) },
+          url: -> { Alchemy::Engine.routes.url_helpers.admin_sites_path },
+          match_path: "/languages"
+        ),
+        (if defined?(Alchemy::Devise::Engine)
+            config.class::MenuItem.new(
+              label: :users,
+              condition: -> { can?(:index, :alchemy_admin_users) },
+              url: -> { Alchemy::Engine.routes.url_helpers.admin_users_path },
+              match_path: "/users"
+            )
+          end),
+        config.class::MenuItem.new(
+          label: :tags,
+          condition: -> { can?(:index, :alchemy_admin_tags) },
+          url: -> { Alchemy::Engine.routes.url_helpers.admin_tags_path }
+        ),
+        config.class::MenuItem.new(
+          label: :pictures,
+          condition: -> { can?(:index, :alchemy_admin_pictures) },
+          url: -> { Alchemy::Engine.routes.url_helpers.admin_pictures_path }
+        ),
+        config.class::MenuItem.new(
+          label: :attachments,
+          condition: -> { can?(:index, :alchemy_admin_attachments) },
+          url: -> { Alchemy::Engine.routes.url_helpers.admin_attachments_path }
+        )
+      ].compact
+    )
+  else
+    config.class::MenuItem.new(
+      [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
+      "copy",
+      label: :cms,
+      condition: -> { can?(:index, :alchemy_admin_dashboard) },
+      partial: "spree/admin/shared/alchemy_sub_menu",
+      url: "/admin/pages",
+      match_path: "/pages"
+    )
+  end
+  config.menu_items << alchemy_menu_item
+end
+
+Rails.application.config.after_initialize do
+  if Spree::Backend::Config.menu_items.many? { |menu_item| menu_item.label == :cms }
+    Alchemy::Deprecation.warn("You configured the Alchemy menu items in your app's initializers. We can do that for you now! Please remove the menu item with the label `:cms`.")
+  end
+end

data/lib/alchemy/solidus/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Solidus
-    VERSION = "6.2.0"
+    VERSION = "6.3.0"
   end
 end

data/lib/generators/alchemy/solidus/install/install_generator.rb

@@ -90,27 +90,6 @@ module Alchemy
         end
       end
 
-      def inject_admin_tab
-        inject_into_file "config/initializers/spree.rb",
-                         {
-                           after:
-                             "Spree::Backend::Config.configure do |config|\n"
-                         } do
-          <<~ADMIN_TAB
-            \  # AlchemyCMS admin tabs
-            \  config.menu_items << config.class::MenuItem.new(
-            \    [:pages, :sites, :languages, :tags, :users, :pictures, :attachments],
-            \    'copy',
-            \    label: :cms,
-            \    condition: -> { can?(:index, :alchemy_admin_dashboard) },
-            \    partial: 'spree/admin/shared/alchemy_sub_menu',
-            \    url: '/admin/pages',
-            \    match_path: '/pages'
-            \  )
-          ADMIN_TAB
-        end
-      end
-
       def create_admin_user
         if alchemy_devise_present? && !options[:skip_alchemy_user_generator] &&
              Alchemy::User.count.zero?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-solidus
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms