active_admin_filter_extensions 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0443509d93e7b99ed2bc83008c9e5fffe5549792149739800b4f333c33a0636e'
-  data.tar.gz: c656901ee3a0f18e865e9653d34661a6eca3be4bc4dd0cb551c1521cf7f30bd9
+  metadata.gz: 51bc6cafe8895502a79f648a96f6c7e4f28fbb9c3a985eac07c43aa7d86e320f
+  data.tar.gz: 37c3a1beef3da668ac558dc7364b076f8212d980f9efce5da8110213fac3aa22
 SHA512:
-  metadata.gz: 25d494262038dafecea4a3fecba7f7b71f718338392d434b74645f8ca3e9fb81682653a84f383b4ed294530fbc90f5b73086d942a318526dae92d8c8e09f2347
-  data.tar.gz: 3a0ab0e4b77ce5465ccfec957a767fce7ef67a51e166270adae9fb70f3e8cc7671634b7b25710816d7b0dc18b3c18b23f3776fc27bb9b67c1b78236efc13eccc
+  metadata.gz: a4fbb0cfa85464dbee996d124f7fa47120bd618e04a2fe645683b8a32593107921d0eda74ad39cbb8bb3898e23c4816ae9453c13b25e7eb52dfd31740def0535
+  data.tar.gz: d81c7d2722af7494ab5ff73255ea76818ed826d8196b9f04e9b5c94417ac1d29bbc24696311124b80394ab29826e26f58150a5a49f74235d18edb55b65b5a626

data/lib/active_admin_filter_extensions/policies.rb

@@ -232,10 +232,29 @@ module ActiveAdminFilterExtensions
 
       # The filter's own predicate dropdown submits _gt/_lt/_not_eq and friends beside the
       # derived head key; a value policy guarding only the head leaves the same column one
-      # dropdown click from unpoliced. Siblings = request keys naming the same attribute.
+      # dropdown click from unpoliced. Siblings = request keys naming the same attribute,
+      # minus the predicates answered by a boolean rather than by a value of the attribute's
+      # own type: `?q[customer_id_null]=true` carries "true", which `sanitize: :digits`
+      # empties and `validate: :integer` refuses - the reset would then drop a condition a
+      # drill-down link spelled out. A boolean predicate the filter declares itself stays
+      # policed: that one its author asked for.
       def sibling_predicate_keys(q, keys)
         bases = keys.map { |key| strip_ransack_predicate(key) }
-        q.keys.select { |key| bases.include?(strip_ransack_predicate(key)) }
+        declared = keys.map(&:to_s)
+        q.keys.select do |key|
+          next false unless bases.include?(strip_ransack_predicate(key))
+
+          declared.include?(key.to_s) || !boolean_predicate?(key)
+        end
+      end
+
+      def boolean_predicate?(name)
+        # Without Ransack there is nothing to ask - and nothing is stripped either, so a
+        # sibling can only be the declared key itself.
+        return false unless defined?(::Ransack::Predicate)
+
+        predicate = ::Ransack::Predicate.detect_from_string(name.to_s)
+        predicate && ::Ransack::Predicate.named(predicate)&.type == :boolean
       end
 
       def strip_ransack_predicate(name)

data/lib/active_admin_filter_extensions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveAdminFilterExtensions
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/integration/numeric_builtins_spec.rb

@@ -78,6 +78,19 @@ RSpec.describe "built-in numeric policies", type: :feature do
       expect(page).to have_no_content("drop me")
     end
 
+    it "leaves a boolean predicate of the same attribute to Ransack" do
+      # `?q[position_null]=true` is answered by "true", not by a value of the column's own
+      # type: the digits sanitizer would empty it and the integer validator refuse it, and the
+      # reset would drop a condition the admin's own drill-down link spelled out.
+      Post.create!(title: "no position", body: "no position body", status: "draft")
+
+      visit "/admin/integer_posts?q%5Bposition_null%5D=true"
+
+      expect(query_of(page.current_url)["q"]).to eq("position_null" => "true")
+      expect(page).to have_content("no position")
+      expect(page).to have_no_content("keep me")
+    end
+
     it "sanitizes a sibling predicate too" do
       visit "/admin/integer_posts?q%5Bposition_lt%5D=2%200a"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_filter_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Igor Fedoronchuk