activeadmin-ajax_filter 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb0afa3a4e5afe9d4b5137f9eabbd6233fd18ec8d251965a79c3ebe79888ffb
-  data.tar.gz: 4170070696e21ee6e4cebdab98cacb591beccf5e35eaa5615b0b5066a2046c13
+  metadata.gz: 6f9fa8d4a1c3de2cacf75f9e29a0e8adddef65db1eb09704f4b079bdac96670c
+  data.tar.gz: f9398372f1435943d3716dbf5498ceeb705dd2e59b2f2ab980a3658f0e57d488
 SHA512:
-  metadata.gz: e402c2aa57874a952fe3184cdfcb62f9b7a17558e089f75bde282b7b422a61a815f65776c4d90bee7932aed71eaa3a97dc3e7b2c2b7186a1e2048b2943837376
-  data.tar.gz: 329120cec955864e4ca477417dbab495ff95379f4498112e912b02da72bdc433e2ff4c371e1ec01ede9ad195e6914b18504d4e8f698ecc340ff65c008e9b5483
+  metadata.gz: f244bf70e1fb6dc726e865e0b7fec4766a75af1b72c1cac071a240a59f353a9b775450474161da3191b818c0506cbcea04d94e8458e131d64a090a7e2626be1f
+  data.tar.gz: 93fa5babb8c7b4b840865b26c7a31cbe23d2f3070c7843e0be9238a8e5eb7745b683186acdd871c4b8a8e7f34465bfa7a28d7b6def4f603ccad9c6f0e612d175

data/.gitignore

@@ -11,3 +11,4 @@
 /spec/dummy/log/*.log
 /tmp/
 *.sqlite3
+*.gem

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.5

data/.travis.yml

@@ -1,9 +1,8 @@
 sudo: false
 language: ruby
+cache: bundler
 
 rvm:
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
   - ruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activeadmin-ajax_filter (0.4.4)
+    activeadmin-ajax_filter (0.4.6)
       activeadmin (>= 1.0)
       coffee-rails (>= 4.1.0)
       has_scope (>= 0.6.0)
@@ -11,21 +11,21 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.11)
-      actionpack (= 4.2.11)
-      actionview (= 4.2.11)
-      activejob (= 4.2.11)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11)
-      actionview (= 4.2.11)
-      activesupport (= 4.2.11)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11)
-      activesupport (= 4.2.11)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
@@ -42,17 +42,17 @@ GEM
       ransack (>= 1.8.7)
       sass (~> 3.1)
       sprockets (< 4.1)
-    activejob (4.2.11)
-      activesupport (= 4.2.11)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.11)
-      activesupport (= 4.2.11)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.2.11)
-      activemodel (= 4.2.11)
-      activesupport (= 4.2.11)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       arel (~> 6.0)
-    activesupport (4.2.11)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -61,7 +61,7 @@ GEM
     arbre (1.2.1)
       activesupport (>= 3.0.0)
     arel (6.0.4)
-    builder (3.2.3)
+    builder (3.2.4)
     capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
@@ -72,6 +72,7 @@ GEM
     cliver (0.3.2)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -79,8 +80,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -112,56 +113,60 @@ GEM
       has_scope (~> 0.6)
       railties (>= 4.2, < 5.3)
       responders
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.6)
-    kaminari (1.1.1)
+    kaminari (1.2.0)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.0)
+      kaminari-activerecord (= 1.2.0)
+      kaminari-core (= 1.2.0)
+    kaminari-actionview (1.2.0)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.0)
+    kaminari-activerecord (1.2.0)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
+      kaminari-core (= 1.2.0)
+    kaminari-core (1.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    loofah (2.2.3)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    method_source (1.0.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.4)
+    minitest (5.14.0)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     phantomjs (2.1.1.0)
     poltergeist (1.10.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    rack (1.6.11)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (1.6.13)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.11)
-      actionmailer (= 4.2.11)
-      actionpack (= 4.2.11)
-      actionview (= 4.2.11)
-      activejob (= 4.2.11)
-      activemodel (= 4.2.11)
-      activerecord (= 4.2.11)
-      activesupport (= 4.2.11)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11)
+      railties (= 4.2.11.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -169,11 +174,11 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.11)
-      actionpack (= 4.2.11)
-      activesupport (= 4.2.11)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
@@ -182,8 +187,8 @@ GEM
       activerecord (>= 3.0, < 5.2)
       activesupport (>= 3.0, < 5.2)
       i18n
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     request_store (1.4.1)
       rack (>= 1.4)
@@ -216,6 +221,14 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     selectize-rails (0.12.6)
     simplecov (0.11.1)
       docile (~> 1.1.0)
@@ -233,9 +246,10 @@ GEM
     temping (3.3.0)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tilt (2.0.10)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
@@ -257,9 +271,11 @@ DEPENDENCIES
   launchy (~> 2.4.3)
   phantomjs (~> 2.1.1)
   poltergeist (~> 1.10.0)
+  pry
   rake (~> 10.0)
   rspec (~> 3.3, >= 3.3.0)
   rspec-rails (~> 3.3)
+  sassc-rails
   selectize-rails (>= 0.11.2)
   sqlite3 (~> 1.3, >= 1.3.11)
   temping (~> 3.3, >= 3.3.0)

data/README.md

@@ -96,6 +96,24 @@ You can use next parameters in `data` hash:
 * `static_ransack` - hash of ransack predicates which will be applied statically and independently from current input field value
 * `min_chars_count_to_request` - minimal count of chars in the input field to make an AJAX request
 
+### Filter by belongs_to relation fields
+
+```ruby
+class Patient < ApplicationRecord
+  belongs_to :user
+  # ...
+end
+
+f.input :patient, as: :ajax_select, collection: [], data: {
+  display_fields: ['id', 'user.name'],
+  search_fields: ['user.name'],
+  ordering: 'id ASC',
+  url: :filter_admin_patients_path
+}
+```
+Ordering by related fields doesn't work, e.g. this will not work: `ordering: 'user.name ASC'`
+
+
 ## Caveats 
 
 ### Ransack _cont on Integer column

data/activeadmin-ajax_filter.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'coffee-rails', '>= 4.1.0'
   gem.add_dependency 'selectize-rails', '>= 0.12.6'
   gem.add_dependency 'has_scope', '>= 0.6.0' # Force Ruby 2.1.5 support
+  gem.add_development_dependency 'sassc-rails'
   gem.add_development_dependency 'bundler', '~> 1.10'
   gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
@@ -38,4 +39,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'selectize-rails', '>= 0.11.2'
   gem.add_development_dependency 'database_cleaner', '~> 1.5.0'
   gem.add_development_dependency 'launchy', '~> 2.4.3'
+  gem.add_development_dependency 'pry'
 end

data/app/assets/javascripts/activeadmin-ajax_filter.js.coffee

@@ -30,6 +30,7 @@ $ ->
             q: q
             limit: select.data('limit')
             order: ordering
+            searchFields: searchFields
           error: ->
             callback()
           success: (res) ->
@@ -87,16 +88,17 @@ $ ->
         onInitialize: ->
           selectize = this
           selectedValue = select.data('selected-value')
-          selectedRansack = "#{valueField}_eq"
+          selectedRansack = "#{valueField}_in"
 
           if selectedValue
             q = {}
-            q[selectedRansack] = selectedValue
+            q[selectedRansack] = String(selectedValue).split(' ')
 
             loadOptions(q, (res)->
               if res && res.length
-                selectize.addOption(res[0])
-                selectize.addItem(res[0][valueField])
+                for item in res
+                  selectize.addOption(item)
+                  selectize.addItem(item[valueField])
             )
 
           ajaxFields.forEach (field) ->

data/lib/active_admin/ajax_filter.rb

@@ -14,10 +14,32 @@ module ActiveAdmin
       def included(dsl)
         dsl.instance_eval do
           collection_action :filter, method: :get do
-            render plain: apply_collection_decorator(
-              find_collection(except: [:pagination, :collection_decorator])
-                .order(params[:order]).limit(params[:limit] || 10),
-            ).to_json
+            scope = find_collection(except: [:pagination, :collection_decorator])
+              .order(params[:order])
+              .limit(params[:limit] || 10)
+              .distinct
+
+            search_fields = Array(params[:searchFields])
+
+            related_table_search_fields = search_fields
+              .select { |f| f.include?('.') }
+              .map { |f| f.split('.') }
+
+            related_table_search_fields.each do |related_table, _|
+              scope = scope.preload(related_table)
+            end
+
+            res = apply_collection_decorator(scope).map do |item|
+              item_json = item.as_json
+
+              related_table_search_fields.each do |related_table, search_field|
+                item_json[related_table + '.' + search_field] = item.send(related_table).send(search_field)
+              end
+
+              item_json
+            end
+
+            render plain: res.to_json
           end
         end
       end

data/lib/active_admin/ajax_filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module AjaxFilter
-    VERSION = '0.4.4'
+    VERSION = '0.4.6'
   end
 end

data/lib/active_admin/inputs/ajax_core.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
       end
 
       def display_fields
-        ajax_data[:display_fields] || search_fields[0]
+        ajax_data[:display_fields] || search_fields.take(1)
       end
 
       def search_fields
@@ -52,11 +52,11 @@ module ActiveAdmin
       end
 
       def ordering
-        ajax_data[:ordering] || "#{search_fields.first} ASC"
+        ajax_data[:ordering] || "#{display_fields.first} ASC"
       end
 
       def ransack
-        ajax_data[:ransack] || "#{search_fields.join('_or_')}_cont"
+        ajax_data[:ransack] || "#{ransackify(search_fields).join('_or_')}_cont"
       end
 
       def static_ransack
@@ -67,6 +67,11 @@ module ActiveAdmin
         ajax_data[:min_chars_count_to_request] || 1
       end
 
+      def ransackify(field_names)
+        # Map fields refer to related tables user.name -> user_name
+        field_names.map { |f| f.to_s.sub('.', '_') }
+      end
+
       def url
         case (url = ajax_data[:url])
         when nil then "#{method.to_s.pluralize}/filter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-ajax_filter
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Alex Emelyanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: sassc-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +308,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows to define form inputs and filters by relation for ActiveAdmin
   resource pages using Ransacker to dynamicaly load items while user is typing symbols
   in filter
@@ -344,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AJAX filters for ActiveAdmin