activeadmin-ajax_filter 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46aa33c1ac28fdf69a6c7a312c77136f5f89f286
-  data.tar.gz: 16ac2160318afdd2cdcb9e56f291d73647128935
+  metadata.gz: 63324cc53660dfec34a886466480f787eb108d04
+  data.tar.gz: 1abc7df986952ceadf6e36ef10d8bc62dde92744
 SHA512:
-  metadata.gz: 7c5771600ec5d2aeb8e0ef815df17e504b85a6ca23539b6aa08a28405d6280e61356d417a9f2a3562c7f7266fbdd05ec0a5ae24562cad14c0e489bed22f4b8e0
-  data.tar.gz: 4f7314e3bb8ebc891bfb5896eda8c9a7be0cab5149749d6a656fb5dc2c9cacf312e246aa17f440fa505dea81110018d5c496e6f729ed32a42bdd7fe2bb7ea16f
+  metadata.gz: 931319352afd8da9f10b6778d857d48afeaf9f82bf11669704a28eb968e72e2ed999848db9334bddf4c6eafaed985d665eabfd7d29e95397601e0bb32e02911f
+  data.tar.gz: 0dd71b339caa76438d8b327b52e655109a3d3be66ed9391de088346565d4535dd36f478c0e4c3b0843ac426360ffcdf6b37163b7b0b8750c3a7341869e58a735

data/README.md

@@ -54,10 +54,20 @@ ActiveAdmin.register User do
 end
 
 # Main resource
+# As a filter
 ActiveAdmin.register Invoice do
   filter :user, as: :ajax_select, data: { search_fields: [:email, :customer_uid], limit: 7 }
   # ...
 end
+
+# As a form input
+ActiveAdmin.register Invoice do
+  form do |f|
+    f.input :language # used by ajax_search_fields
+    f.input :user, as: :ajax_select, data: { search_fields: [:name], static_ransack: { active_eq: true }, ajax_search_fields: [:language_id] }
+    # ...
+  end
+end
 ```
 
 You can use next parameters in `data` hash:
@@ -68,6 +78,8 @@ You can use next parameters in `data` hash:
 * `ordering` - sort string like `email ASC, customer_uid DESC`, by default it uses first value of `search_fields` with `ASC` direction
 * `ransack` - ransack query which will be applied, by default it's builded from `search_fields` with `or` and `contains` clauses, e.g.: `email_or_customer_uid_cont`
 * `url` - url for AJAX query by default is builded from field name
+* `ajax_search_fields` - array of field names. `ajax_select` input depends on `ajax_search_fields` values: e.g. you can scope user by languages.
+* `static_ransack` - hash of ransack predicates which will be applied statically and independently from current input field value
 
 ## Development
 

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

@@ -1,8 +1,16 @@
 $ ->
-  $('.filter_ajax_select select').each (_, select) ->
+  $('.filter_ajax_select select, .ajax_select select').each (_, select) ->
     select = $(select)
     valueField = select.data('value-field')
     searchFields = select.data('search-fields').split(' ')
+    staticRansack = select.data('static-ransack')
+
+    ajaxFields = select.data('ajax-search-fields')
+    if ajaxFields
+      ajaxFields = ajaxFields.split(' ')
+    else
+      ajaxFields = []
+
     ordering = select.data('ordering')
     url = select.data('url')
 
@@ -20,6 +28,9 @@ $ ->
         success: (res) ->
           callback(res)
 
+    relatedInput = (field) ->
+      $("[name*=#{field}]", select.parents('form'))
+
     select.selectize
       valueField: valueField
       labelField: searchFields[0]
@@ -47,6 +58,15 @@ $ ->
         if query.length
           q = {}
           q[select.data('ransack')] = query
+
+          ajaxFields.forEach (field) ->
+            q["#{field}_eq"] = relatedInput(field).val()
+            # clear cache because it wrong with changing values of ajaxFields
+            select.loadedSearches = {}
+
+          for ransack, value of staticRansack
+            q[ransack] = value
+
           loadOptions(q, callback)
         else
           callback()
@@ -64,4 +84,8 @@ $ ->
             if res.length
               selectize.addOption(res[0])
               selectize.addItem(res[0][valueField])
-          )
+          )
+
+        ajaxFields.forEach (field) ->
+          relatedInput(field).change ->
+            selectize.clearOptions()

data/app/assets/stylesheets/activeadmin-ajax_filter.css

@@ -10,4 +10,24 @@
   .primary, .secondary {
     display: block;
   }
+}
+
+.ajax_select {
+  .selectize-input {
+    width: 70%;
+  }
+
+  .selectize-dropdown {
+    .item {
+      border-bottom: light-gray 1px solid;
+    }
+
+    .primary {
+      font-weight: bold;
+    }
+
+    .primary, .secondary {
+      display: block;
+    }
+  }
 }

data/lib/active_admin/ajax_filter.rb

@@ -1,6 +1,8 @@
 require 'active_admin'
 require 'active_admin/ajax_filter/engine'
 require 'active_admin/ajax_filter/version'
+require 'active_admin/inputs/ajax_core'
+require 'active_admin/inputs/ajax_select_input'
 require 'active_admin/inputs/filters/ajax_select_input'
 
 module ActiveAdmin

data/lib/active_admin/ajax_filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module AjaxFilter
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

data/lib/active_admin/inputs/ajax_core.rb

@@ -0,0 +1,71 @@
+module ActiveAdmin
+  module Inputs
+    module AjaxCore
+      DEFAULT_LIMIT = 5
+
+      def pluck_column
+        klass.reorder("#{method} asc").limit(collection_limit).uniq.pluck(method)
+      end
+
+      # def collection_from_association
+      #   super.limit(collection_limit)
+      # end
+
+      def input_html_options
+        super.merge(
+          'data-limit' => collection_limit,
+          'data-value-field' => value_field,
+          'data-search-fields' => search_fields,
+          'data-ajax-search-fields' => ajax_search_fields,
+          'data-ordering' => ordering,
+          'data-ransack' => ransack,
+          'data-static-ransack' => static_ransack,
+          'data-selected-value' => selected_value,
+          'data-url' => url,
+        )
+      end
+
+      def ajax_data
+        options[:data] || {}
+      end
+
+      def collection_limit
+        ajax_data[:limit] || DEFAULT_LIMIT
+      end
+
+      def value_field
+        ajax_data[:value_field] || :id
+      end
+
+      def search_fields
+        ajax_data[:search_fields] || raise(ArgumentError, 'search_fields in required')
+      end
+
+      def ajax_search_fields
+        ajax_data[:ajax_search_fields]
+      end
+
+      def ordering
+        ajax_data[:ordering] || "#{search_fields.first} ASC"
+      end
+
+      def ransack
+        ajax_data[:ransack] || "#{search_fields.join('_or_')}_cont"
+      end
+
+      def static_ransack
+        ajax_data.fetch(:static_ransack, {}).to_json
+      end
+
+      def url
+        ajax_data[:url] || "#{method.to_s.pluralize}/filter"
+      end
+
+      def selected_value
+        if @object
+          @object.try(:send, input_name)
+        end
+      end
+    end
+  end
+end

data/lib/active_admin/inputs/ajax_select_input.rb

@@ -0,0 +1,7 @@
+module ActiveAdmin
+  module Inputs
+    class AjaxSelectInput < ::Formtastic::Inputs::SelectInput
+      include ActiveAdmin::Inputs::AjaxCore
+    end
+  end
+end

data/lib/active_admin/inputs/filters/ajax_select_input.rb

@@ -2,61 +2,11 @@ module ActiveAdmin
   module Inputs
     module Filters
       class AjaxSelectInput < SelectInput
-        DEFAULT_LIMIT = 5
-
-        def pluck_column
-          klass.reorder("#{method} asc").limit(collection_limit).uniq.pluck(method)
-        end
+        include ActiveAdmin::Inputs::AjaxCore
 
         def collection_from_association
           super.limit(collection_limit)
         end
-
-        def input_html_options
-          super.merge(
-            'data-limit' => collection_limit,
-            'data-value-field' => value_field,
-            'data-search-fields' => search_fields,
-            'data-ordering' => ordering,
-            'data-ransack' => ransack,
-            'data-selected-value' => selected_value,
-            'data-url' => url,
-          )
-        end
-
-        def ajax_data
-          options[:data] || {}
-        end
-
-        def collection_limit
-          ajax_data[:limit] || DEFAULT_LIMIT
-        end
-
-        def value_field
-          ajax_data[:value_field] || :id
-        end
-
-        def search_fields
-          ajax_data[:search_fields] || raise(ArgumentError, 'search_fields in required')
-        end
-
-        def ordering
-          ajax_data[:ordering] || "#{search_fields.first} ASC"
-        end
-
-        def ransack
-          ajax_data[:ransack] || "#{search_fields.join('_or_')}_cont"
-        end
-
-        def url
-          ajax_data[:url] || "#{method.to_s.pluralize}/filter"
-        end
-
-        def selected_value
-          if @object
-            @object.try(:send, input_name)
-          end
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-ajax_filter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Emelyanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -178,6 +178,8 @@ files:
 - lib/active_admin/ajax_filter.rb
 - lib/active_admin/ajax_filter/engine.rb
 - lib/active_admin/ajax_filter/version.rb
+- lib/active_admin/inputs/ajax_core.rb
+- lib/active_admin/inputs/ajax_select_input.rb
 - lib/active_admin/inputs/filters/ajax_select_input.rb
 - lib/activeadmin-ajax_filter.rb
 homepage: https://github.com/holyketzer/activeadmin-ajax_filter