mensa 0.6.15 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9ef2e0b14473937b5da9f4e7d82628501bb106e03dc892c3f055a15e2c562f
-  data.tar.gz: 8b088073a2fcc12813252c42e04ba277b97c44126e786c157a7090c253f4868a
+  metadata.gz: 40f5c40722b8f985ed92ec054bffb1495379772be630b967fae55f6fc77bc8b9
+  data.tar.gz: 1b5e668bb60387b99492c4eaf12f21fe548bdc913c4b6f9ecaa02dd3f8659b44
 SHA512:
-  metadata.gz: 949a19530126d3a298bd4c34b10ea1c3db21c86555565f0ea7db3289cba10067f82a9ca289384c940358a34bf98d1109f364723333e9420e0c663318fffca6f7
-  data.tar.gz: 7670004d48f01f5aeec0e56772f51a4eee30d9b910c9c11bccb57b82d22c56ae62ea4d763d5ae1fbfd99c50ac1486f055774d1bda6af2dcc390b757c534322db
+  metadata.gz: f36c28f26ae32c725cd0f2696e8fcd2bb57fe77cd75552f7daf24e4737e397eb91e8484a1d18b25cf6093cdef3e69a433e756e7815c10592dd29b635e4ee43f2
+  data.tar.gz: 516d7dfe990004a70d878561f8697e46dada6323db733eeb640625a03ff43d7e006f08d7385aaaf89b84f306636cdea2d5d1b2796d5a23aa3ed4ee88d9939cd1

data/.shipkit.yml

@@ -1,2 +1,2 @@
 ---
-previous_version: 0.6.14
+previous_version: 0.6.16

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.6.16
+
+- Custom filter `scope` blocks can take the operator as a second argument,
+  e.g. `scope ->(value, operator) { ... }`, so they can handle `isnt`,
+  `is_empty` and the other operators. Existing `->(value) { ... }` scopes keep
+  working unchanged.
+
 ## 0.6.15
 
 - Custom filter `scope` blocks now work. Applied filters are built from the

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.6.14)
+    mensa (0.6.16)
       csv
       importmap-rails
       pagy (>= 43)

data/README.md

@@ -118,6 +118,59 @@ You can show your tables on the page using the following:
 Custom views are views not defined by the developer (SystemViews) but by the end-user by adding/removing filters.
 When you enable these, they are stored in the database and can be used across sessions, by the user who created them.
 
+### Filters
+
+Add `filter` to a column to let users filter on it. By default Mensa compares the
+column's attribute with the chosen value, using operators that fit the column type.
+The filter block takes these options:
+
+```ruby
+column(:role) do
+  filter do
+    collection -> { User::ROLES }  # Values to choose from (array or proc)
+    multiple true                  # Allow choosing several values
+    operators [:is, :isnt]         # Limit the operators users can pick
+    operator :isnt                 # Default operator
+    having true                    # Filter with HAVING, for aggregate attributes
+  end
+end
+```
+
+The operators are `is`, `isnt`, `matches`, `does_not_match`, `gt`, `gteq`, `lt`,
+`lteq`, `is_duplicate`, `is_current`, `is_empty` and `isnt_empty`.
+
+#### Custom filter scopes
+
+When comparing the attribute isn't enough, give the filter a `scope`. It runs on the
+table's scope and receives the chosen value, an array when `multiple` is set:
+
+```ruby
+column(:account_names) do
+  attribute %((SELECT STRING_AGG(accounts.name, ', ') FROM accounts WHERE accounts.id = ANY(containers.account_ids)))
+  filter do
+    collection -> { Account.order(:name).pluck(:name) }
+    multiple true
+    operators [:is]
+    scope ->(value) { where("containers.account_ids && ARRAY[:ids]::uuid[]", ids: Account.where(name: Array(value)).pluck(:id)) }
+  end
+end
+```
+
+To support more operators, accept the operator (a symbol) as a second argument:
+
+```ruby
+filter do
+  operators [:is, :isnt, :is_empty]
+  scope ->(value, operator) {
+    case operator
+    when :isnt then where.not(account_id: value)
+    when :is_empty then where(account_id: nil)
+    else where(account_id: value)
+    end
+  }
+end
+```
+
 ### Grouping
 
 Rows can be shown in groups, each with a header that shows the group's value and

data/app/tables/mensa/filter.rb

@@ -80,7 +80,7 @@ module Mensa
 
     def filter_scope(record_scope)
       if scope
-        record_scope.instance_exec(normalize(value), &scope)
+        record_scope.instance_exec(*scope_arguments, &scope)
       else
         return apply_duplicate_filter(record_scope) if operator == :is_duplicate
 
@@ -119,6 +119,7 @@ module Mensa
       when :isnt_empty
         (column.type == :string) ? "#{col} IS NOT NULL AND #{col} != ''" : "#{col} IS NOT NULL"
       when :is_current
+        hash[:value] = Current.public_send(column.name)
         "#{col} = :value"
       when :matches
         "#{col} LIKE :value"
@@ -182,6 +183,17 @@ module Mensa
       end
     end
 
+    # Arguments for a custom filter scope: the value and the operator. Lambdas
+    # only get as many as they declare, so `->(value) { ... }` keeps working
+    # next to `->(value, operator) { ... }`. Plain procs ignore extra arguments.
+    def scope_arguments
+      args = [normalize(value), operator]
+      return args unless scope.lambda?
+      return args if scope.parameters.any? { |type, _| type == :rest }
+
+      args.first(scope.parameters.count { |type, _| type == :req || type == :opt })
+    end
+
     def label_for_value(selected_value, options)
       option = options.find { |_label, value| value.to_s == selected_value.to_s }
       option ? option.first : selected_value

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.6.15"
+  VERSION = "0.6.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.17
 platform: ruby
 authors:
 - Tom de Grunt