activeadmin_favorites 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d95f2a47f409353aaaa307098bf24dc0b94abc2bf116f47101259a81f8e481a
-  data.tar.gz: 9842f18c72d0e9fbe731b934a5d58c0eae9633eb0438849a57b8d09c10b87aaf
+  metadata.gz: 1c6a1ca67243ef7bcf12defce94d288b0afca716511a3a04f6326ecce641e784
+  data.tar.gz: 0150e3932226fe8890a22dac1889d57f8e74fb868928ec8027763a8e07acfc0c
 SHA512:
-  metadata.gz: 52d6fd9962c311fcee1f14c98211478337761a916eb074e83ebb641063370eb16c8b81ad921f45d59af4c8ad0b4e328fa83c6b52e9ef6423fa823ce660d1c9a5
-  data.tar.gz: ba88cae3210e174538ec0dd397f7085f451093e9b86c364219d4ba2453302917fbb0c7d6918843a2d83abffb8a7ea11a1dc765811f2cd160ab70188dded4dbec
+  metadata.gz: 520cd1dec8f6f362b90163d65f8a3d3231f603481a7f95354600cd455cde6fbe37eaaae3bd5b3f26e90cae6bd784075b4dfb4432b4f43747cde70f25ff2ba7fe
+  data.tar.gz: 510d6d7d6b0bc26017bca1d6ff576ba3e835f95215dba7a299ca810d40ea44d541f88e21526449a575f27b41535b1fb1e1e76a5902d9947223a132d3d5984d04

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.1.8 (2026-10-29)
+
+- Fix Active Admin view-path detection so sibling gems such as `activeadmin-command_palette` are not treated as Active Admin. Prefer `ActiveAdmin::Engine.root`, with a fallback that requires a digit version segment after `activeadmin-`.
+- Remove the gem `active_admin/_html_head` override. Hosts must link `activeadmin_favorites/personalization_menu` from their own Active Admin head.
+
+## 0.1.7 (2026-10-29)
+
+- Fix engine view path order so favorites sits immediately before ActiveAdmin and host `app/views` stays ahead of the gem `_html_head`. Rails engines prepend view paths; the previous reorder left favorites first whenever it was already ahead of ActiveAdmin.
+
 ## 0.1.6 (2026-10-27)
 
 - Link the personalization menu stylesheet from Active Admin's HTML head so hosts no longer need a Tailwind `@import` of the Propshaft path.

data/README.md

@@ -61,9 +61,7 @@ When using ActionPolicy, add `save_lens_favorite?` and `reset?` to `ActiveAdmin:
 
 ### Stylesheet
 
-The engine links `activeadmin_favorites/personalization_menu` from Active Admin's HTML head so the cogwheel dropdown can scroll the catalog while keeping action buttons in view. The file is plain CSS served through Propshaft; it does not need Tailwind processing.
-
-If the host overrides `active_admin/_html_head`, add the link there:
+Link `activeadmin_favorites/personalization_menu` from the host Active Admin HTML head so the cogwheel dropdown can scroll the catalog while keeping action buttons in view. The file is plain CSS served through Propshaft; it does not need Tailwind processing. The gem does not ship `active_admin/_html_head`, so customized host heads keep their stylesheet names and extra tags.
 
 ```erb
 <%= stylesheet_link_tag "activeadmin_favorites/personalization_menu" %>

data/lib/activeadmin/favorites/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module Favorites
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/lib/activeadmin/favorites/view_paths.rb

@@ -2,15 +2,16 @@
 
 module ActiveAdmin
   module Favorites
-    # Place this engine's views ahead of ActiveAdmin's so resource index/show
-    # overrides (catalog injection) win, while the host app/views path stays first.
+    # Place this engine's views immediately before ActiveAdmin's so resource
+    # index/show overrides (catalog injection) win. Rails engines prepend their
+    # view paths, so favorites can otherwise sit ahead of the host app/views.
     module ViewPaths
       module_function
 
       def prefer_over_active_admin!(view_paths)
         path_strings = view_paths.to_a.map { |path| path.to_s }
         reordered = reorder_path_strings(path_strings)
-        return view_paths if reordered.equal?(path_strings)
+        return view_paths if reordered == path_strings
 
         ActionView::PathSet.new(reordered)
       end
@@ -25,24 +26,47 @@ module ActiveAdmin
 
       def reorder_path_strings(path_strings)
         favorites_root = Engine.root.join("app/views").to_s
-        return path_strings unless path_strings.include?(favorites_root)
+        active_admin_root = active_admin_views_root(path_strings)
+        return path_strings unless path_strings.include?(favorites_root) && active_admin_root
+        return path_strings if already_before_active_admin?(path_strings, favorites_root, active_admin_root)
 
-        active_admin_root = path_strings.find do |path|
-          path.match?(%r{/gems/activeadmin-[^/]+/app/views\z})
-        end
-        return path_strings unless active_admin_root
+        place_before_active_admin(path_strings, favorites_root, active_admin_root)
+      end
+
+      def active_admin_views_root(path_strings)
+        engine_root = active_admin_engine_views_root
+        return engine_root if engine_root && path_strings.include?(engine_root)
+
+        path_strings.find { |path| path.match?(ACTIVE_ADMIN_GEM_VIEWS) }
+      end
+
+      def active_admin_engine_views_root
+        return unless defined?(::ActiveAdmin::Engine)
 
-        favorites_index = path_strings.index(favorites_root)
-        active_admin_index = path_strings.index(active_admin_root)
-        return path_strings if favorites_index < active_admin_index
+        ::ActiveAdmin::Engine.root.join("app/views").to_s
+      end
+
+      def already_before_active_admin?(path_strings, favorites_root, active_admin_root)
+        path_strings.index(favorites_root) == path_strings.index(active_admin_root) - 1
+      end
 
+      def place_before_active_admin(path_strings, favorites_root, active_admin_root)
         moved = path_strings.dup
-        moved.delete_at(favorites_index)
+        moved.delete(favorites_root)
         moved.insert(moved.index(active_admin_root), favorites_root)
         moved
       end
-      module_function :reorder_path_strings
-      private_class_method :reorder_path_strings
+
+      # Versioned Active Admin gem only (`activeadmin-4...`), not siblings such as
+      # `activeadmin-command_palette-...`.
+      ACTIVE_ADMIN_GEM_VIEWS = %r{/gems/activeadmin-\d[^/]*/app/views\z}
+
+      module_function :reorder_path_strings, :active_admin_views_root,
+        :active_admin_engine_views_root, :already_before_active_admin?,
+        :place_before_active_admin
+      private_class_method :reorder_path_strings, :active_admin_views_root,
+        :active_admin_engine_views_root, :already_before_active_admin?,
+        :place_before_active_admin
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_favorites
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Andrei Makarov
@@ -355,7 +355,6 @@ files:
 - app/models/active_admin/favorites/lens_favorite.rb
 - app/models/active_admin/favorites/view_lens/layout.rb
 - app/models/active_admin/favorites/view_lens_default.rb
-- app/views/active_admin/_html_head.html.erb
 - app/views/active_admin/favorites/_lens_catalog_data.html.erb
 - app/views/active_admin/favorites/_macro_fields.html.erb
 - app/views/active_admin/favorites/_personalization_trigger.html.erb

data/app/views/active_admin/_html_head.html.erb

@@ -1,14 +0,0 @@
-<%= stylesheet_link_tag "active_admin" %>
-<%= stylesheet_link_tag ActiveAdmin::Favorites::PERSONALIZATION_MENU_STYLESHEET %>
-<meta name="viewport" content="width=device-width,initial-scale=1">
-<%= csrf_meta_tags %>
-<%= csp_meta_tag %>
-<% # On page load or when changing themes, best to add inline in `head` to avoid FOUC %>
-<%= javascript_tag nonce: true do %>
-  if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
-    document.documentElement.classList.add('dark')
-  } else {
-    document.documentElement.classList.remove('dark')
-  }
-<% end %>
-<%= javascript_importmap_tags "active_admin", importmap: ActiveAdmin.importmap %>