activeadmin-ajax_filter 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63324cc53660dfec34a886466480f787eb108d04
-  data.tar.gz: 1abc7df986952ceadf6e36ef10d8bc62dde92744
+  metadata.gz: 3388e55ea6dd77ff8bd2a7431a5b4bb4f0c402bc
+  data.tar.gz: b950b9818a0edb6c6d37df9bc104fef3713dfa8e
 SHA512:
-  metadata.gz: 931319352afd8da9f10b6778d857d48afeaf9f82bf11669704a28eb968e72e2ed999848db9334bddf4c6eafaed985d665eabfd7d29e95397601e0bb32e02911f
-  data.tar.gz: 0dd71b339caa76438d8b327b52e655109a3d3be66ed9391de088346565d4535dd36f478c0e4c3b0843ac426360ffcdf6b37163b7b0b8750c3a7341869e58a735
+  metadata.gz: d1f2c12fcd0bc4dd43f3f93803296056279284f976779965de57c93650a3a75c693d37ad6a2fdab3b402b0b3891b705a4d61d7f6ca85802c256c282b5aaa35cc
+  data.tar.gz: fa69bf317340e2905118a0f2d9b00e6a701b8c55c73f69e09fba59eebaecf4cdd788e82b1d8fb8ea942ed3dd4c33cd2e26d7c78a165fbee8857f1cbfe7b7b955

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

@@ -1,91 +1,99 @@
 $ ->
-  $('.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')
-
-    loadOptions = (q, callback) ->
-      $.ajax
-        url: url
-        type: 'GET'
-        dataType: 'json'
-        data:
-          q: q
-          limit: select.data('limit')
-          order: ordering
-        error: ->
-          callback()
-        success: (res) ->
-          callback(res)
-
-    relatedInput = (field) ->
-      $("[name*=#{field}]", select.parents('form'))
-
-    select.selectize
-      valueField: valueField
-      labelField: searchFields[0]
-      searchField: searchFields
-      sortField: ordering.split(',').map (clause)->
-        c = clause.trim().split(' ')
-        { field: c[0], direction: c[1] }
-      options: []
-      create: false
-      render:
-        option: (item, escape) ->
-          html = searchFields.map (field, index)->
-            value = escape(item[field])
-
-            if index == 0
-              klass = 'primary'
-            else
-              klass = 'secondary'
-
-            "<span class='#{klass}'>#{value}</span>"
-
-          "<div class='item'>#{html.join('')}</div>"
-
-      load: (query, callback) ->
-        if query.length
-          q = {}
-          q[select.data('ransack')] = query
+  apply_filter_ajax_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')
+
+      loadOptions = (q, callback) ->
+        $.ajax
+          url: url
+          type: 'GET'
+          dataType: 'json'
+          data:
+            q: q
+            limit: select.data('limit')
+            order: ordering
+          error: ->
+            callback()
+          success: (res) ->
+            callback(res)
+
+      relatedInput = (field) ->
+        $("[name*=#{field}]", select.parents('form'))
+
+      select.selectize
+        valueField: valueField
+        labelField: searchFields[0]
+        searchField: searchFields
+        sortField: ordering.split(',').map (clause)->
+          c = clause.trim().split(' ')
+          { field: c[0], direction: c[1] }
+        options: []
+        create: false
+        render:
+          option: (item, escape) ->
+            html = searchFields.map (field, index)->
+              value = escape(item[field])
+
+              if index == 0
+                klass = 'primary'
+              else
+                klass = 'secondary'
+
+              "<span class='#{klass}'>#{value}</span>"
+
+            "<div class='item'>#{html.join('')}</div>"
+
+        load: (query, callback) ->
+          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()
+
+        onInitialize: ->
+          selectize = this
+          selectedValue = select.data('selected-value')
+          selectedRansack = "#{valueField}_eq"
+
+          if selectedValue
+            q = {}
+            q[selectedRansack] = selectedValue
+
+            loadOptions(q, (res)->
+              if res.length
+                selectize.addOption(res[0])
+                selectize.addItem(res[0][valueField])
+            )
 
           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()
-
-      onInitialize: ->
-        selectize = this
-        selectedValue = select.data('selected-value')
-        selectedRansack = "#{valueField}_eq"
-
-        if selectedValue
-          q = {}
-          q[selectedRansack] = selectedValue
-
-          loadOptions(q, (res)->
-            if res.length
-              selectize.addOption(res[0])
-              selectize.addItem(res[0][valueField])
-          )
-
-        ajaxFields.forEach (field) ->
-          relatedInput(field).change ->
-            selectize.clearOptions()
+            relatedInput(field).change ->
+              selectize.clearOptions()
+
+  # apply ajax filter to all static inputs
+  apply_filter_ajax_select()
+
+  # apply ajax filter on inputs inside has_many entries
+  $("form.formtastic .has_many_add").click ->
+    setTimeout((-> apply_filter_ajax_select()), 0)

data/lib/active_admin/ajax_filter.rb

@@ -16,7 +16,7 @@ module ActiveAdmin
           collection_action :filter, method: :get do
             scope = collection.ransack(params[:q]).result
 
-            render json: scope.order(params[:order]).limit(params[:limit] || 10)
+            render text: scope.order(params[:order]).limit(params[:limit] || 10).to_json
           end
         end
       end

data/lib/active_admin/ajax_filter/version.rb

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

data/lib/active_admin/inputs/ajax_core.rb

@@ -7,10 +7,6 @@ module ActiveAdmin
         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,
@@ -33,6 +29,10 @@ module ActiveAdmin
         ajax_data[:limit] || DEFAULT_LIMIT
       end
 
+      def collection_from_association
+        super.try(:limit, collection_limit)
+      end
+
       def value_field
         ajax_data[:value_field] || :id
       end

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

@@ -3,10 +3,6 @@ module ActiveAdmin
     module Filters
       class AjaxSelectInput < SelectInput
         include ActiveAdmin::Inputs::AjaxCore
-
-        def collection_from_association
-          super.limit(collection_limit)
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-ajax_filter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alex Emelyanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin