solidus_backend 4.2.0 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446da00d68eea2ecd5c9f92943a96b4663868aa3fbb931fe8eb5b8d401510a54
-  data.tar.gz: 37c7134261f8ce21ff8d89bd94e9328c4f4f317806cfb12c93f4f1075e0c2123
+  metadata.gz: 4e6afe37aa6cfa084e6d9dc12d006659668e0090a34d1de2bd978bb75760b95d
+  data.tar.gz: 67dc657454bd6ff95dc4ae1d5553a66e59715a5ea965eb50cd7dba0e324657a0
 SHA512:
-  metadata.gz: 0bd4b77be0965e74550da6733dd296d7e8e93e26708a3bb7a6c97e5764a1d61fa7248b834c47ab77779ace06dff102c353f989b5d16651743553a44263d4c25b
-  data.tar.gz: d770c7c7f94467799cc0ca88a608dc1ebf9f91cb981d76126ebb1211c54edb20f7851430b3638e10d1e8e5c18457027145621f0f031c7cacb380f6250108e4e9
+  metadata.gz: 4a7df5d2d01ecd14aef6c6bf0b8abc09a3abcb61080ce3fc98d516f627aa8c12d2615a445c482eda9c27c0e2576d77b581ea7ce841f958cbc1a39e4422e56d93
+  data.tar.gz: ace130bfb583fc816364d812e19c4dd21e920221fbc40dc17708fc83864a6f9ef3eff25d63d34e2fdc7bd4e6a8e2eda06282941ad2a570e3bdf3520de2082772

data/Rakefile

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
+require 'bundler/gem_tasks'
 
 require 'solidus_backend'
 require 'spree/testing_support/dummy_app/rake_tasks'

data/app/assets/javascripts/spree/backend/components/admin_nav.js

@@ -1,25 +1,27 @@
 Spree.ready(function() {
-  if (window.screen.width <= 1024 && !document.cookie.includes("admin_nav_hidden")) {
-    // Set default nav to collapse on small screens - but don't override user preference
-    document.body.classList.add("admin-nav-hidden");
-    document.cookie = "admin_nav_hidden=true; expires=Fri, 31 Dec 9999 23:59:59 GMT";
-  }
-
-  var adminNavToggle = document.querySelector("#admin-nav-toggle");
-
-  if (adminNavToggle) {
-    adminNavToggle.addEventListener("click", function(e) {
-      e.preventDefault();
-      document.body.classList.toggle("admin-nav-hidden");
-      $(document.body).trigger("sticky_kit:recalc");
-      adminNavToggle.classList.toggle("fa-chevron-circle-left");
-      adminNavToggle.classList.toggle("fa-chevron-circle-right");
-      document.cookie = "admin_nav_hidden=" + document.body.classList.contains("admin-nav-hidden") + "; expires=Fri, 31 Dec 9999 23:59:59 GMT";
-    });
-  }
-
-  if (document.body.classList.contains('admin-nav-hidden')) {
-    $(adminNavToggle).removeClass('fa-chevron-circle-left').addClass('fa-chevron-circle-right');
+  if (!document.querySelector(".solidus-admin--nav")) {
+    if (window.screen.width <= 1024 && !document.cookie.includes("admin_nav_hidden")) {
+      // Set default nav to collapse on small screens - but don't override user preference
+      document.body.classList.add("admin-nav-hidden");
+      document.cookie = "admin_nav_hidden=true; expires=Fri, 31 Dec 9999 23:59:59 GMT";
+    }
+
+    var adminNavToggle = document.querySelector("#admin-nav-toggle");
+
+    if (adminNavToggle) {
+      adminNavToggle.addEventListener("click", function(e) {
+        e.preventDefault();
+        document.body.classList.toggle("admin-nav-hidden");
+        $(document.body).trigger("sticky_kit:recalc");
+        adminNavToggle.classList.toggle("fa-chevron-circle-left");
+        adminNavToggle.classList.toggle("fa-chevron-circle-right");
+        document.cookie = "admin_nav_hidden=" + document.body.classList.contains("admin-nav-hidden") + "; expires=Fri, 31 Dec 9999 23:59:59 GMT";
+      });
+    }
+
+    if (document.body.classList.contains('admin-nav-hidden')) {
+      $(adminNavToggle).removeClass('fa-chevron-circle-left').addClass('fa-chevron-circle-right');
+    }
   }
 
   let solidusAdminSwitch = document.querySelector("#solidus-admin-switch");

data/lib/spree/backend_configuration/menu_item.rb

@@ -54,7 +54,7 @@ module Spree
         end
 
         @condition = condition || -> { true }
-        @sections = sections
+        @sections = sections || []
         @icon = icon
         @label = label
         @partial = partial
@@ -78,27 +78,26 @@ module Spree
       end
 
       def match_path?(request)
-        if match_path.is_a? Regexp
-          request.fullpath =~ match_path
-        elsif match_path.respond_to?(:call)
-          match_path.call(request)
-        elsif match_path
-          request.fullpath.starts_with?("#{spree.admin_path}#{match_path}")
-        else
-          request.fullpath.to_s.starts_with?(url.to_s)
-        end
+        matches =
+          if match_path.is_a? Regexp
+            request.fullpath =~ match_path
+          elsif match_path.respond_to?(:call)
+            match_path.call(request)
+          elsif match_path
+            request.fullpath.starts_with?("#{spree.admin_path}#{match_path}")
+          end
+        matches ||= request.fullpath.to_s.starts_with?(url.to_s) if url.present?
+        matches ||= @sections.include?(request.controller_class.controller_name.to_sym) if @sections.present?
+
+        matches
       end
 
       def url
-        if @url.respond_to?(:call)
-          @url.call
-        elsif @url.is_a?(Symbol)
-          spree.public_send(@url)
-        elsif @url.nil? && @label
-          spree.send("admin_#{@label}_path")
-        else
-          @url
-        end
+        url = @url.call if @url.respond_to?(:call)
+        url ||= spree.public_send(@url) if @url.is_a?(Symbol) && spree.respond_to?(@url)
+        url ||= spree.send("admin_#{@label}_path") if @url.nil? && @label && spree.respond_to?("admin_#{@label}_path")
+        url ||= @url.to_s
+        url
       end
 
       private

data/lib/spree/backend_configuration.rb

@@ -16,7 +16,7 @@ module Spree
 
     # @!attribute [rw] theme
     #   @return [String] Default admin theme name
-    versioned_preference :theme, :string, initial_value: 'classic', boundaries: { "4.1.0.a" => "solidus_admin" }
+    versioned_preference :theme, :string, initial_value: 'classic', boundaries: { "4.2.0" => "solidus_admin" }
 
     def theme_path(user_theme = nil)
       user_theme ? themes.fetch(user_theme.to_sym) : themes.fetch(theme.to_sym)
@@ -25,8 +25,7 @@ module Spree
     # @!attribute [rw] admin_updated_navbar
     #   @return [Boolean] Should the updated navbar be used in admin (default: +false+)
     #
-    # TODO: Update boundaries before merging to `main`
-    versioned_preference :admin_updated_navbar, :boolean, initial_value: false, boundaries: { "4.1.0.a" => true }
+    versioned_preference :admin_updated_navbar, :boolean, initial_value: false, boundaries: { "4.2.0" => true }
 
     preference :frontend_product_path,
       :proc,
@@ -40,7 +39,7 @@ module Spree
 
     # @!attribute [rw] prefer_menu_item_partials
     #   @return [Boolean] Whether or not to prefer menu item partials when both a partial and children are present.
-    preference :prefer_menu_item_partials, :boolean, default: false
+    versioned_preference :prefer_menu_item_partials, :boolean, initial_value: true, boundaries: { "4.2.0" => false }
 
     autoload :ORDER_TABS, 'spree/backend_configuration/deprecated_tab_constants'
     autoload :PRODUCT_TABS, 'spree/backend_configuration/deprecated_tab_constants'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -930,7 +930,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.3.23
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.