activeadmin-searchable_select 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e45366aab36050f1bacd26cf7c7e083f73366337
-  data.tar.gz: 41b977d5f33c903293d2cccccfcabf2de910c71a
+SHA256:
+  metadata.gz: 8e5f2ce9146eca37e95d909b912c1ef5afe9fc511ac736b3d118e81c05c937a4
+  data.tar.gz: 206673047e75f7a79c369c2a5a4a4532b5f336cc4035b817d313775095f227e9
 SHA512:
-  metadata.gz: 48d3f353accca041a2bc5d533cc8574d6f895f7b04fca7354b5d10e6fc73c3ae276b555ed031ea8226bcfc0a68f70c49657f737df9c51fb0f6f316700d34c2a4
-  data.tar.gz: 1114951d8895a4a25a1e56162d099c9fc60592241ec79b9ee8c573fed3db93e427b3137f41d555c3a658eef3f0df6cecf2a3f4034e8102a8a4280cfa97336a8e
+  metadata.gz: 80c69cf8baa62dac91cbf3f0ff073d5b967f87b5966d547cddc984790e63d99754e5e78acb999512f92bee49e996e3b7edb4272dd32356ea101b1ada17b6fc72
+  data.tar.gz: 931f1f0653de38ef169d0664ebf69396dc4819ee2c3eafd4f33a63ca476b658aaa60c9888903919d1f2ed5c43c5c153b7473e7cef2aaa4533dbbc42852268d9f

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+### Version 1.0.1
+
+2018-01-19
+
+[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/v1.0.0...v1.0.1)
+
+- Use zero based pagination parameter
+  ([#2](https://github.com/codevise/activeadmin-searchable_select/pull/2))
+
 ### Version 1.0.0
 
 2017-10-23

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
+# Required for select2-rails to work with Active Admin 1.1
+# see https://github.com/activeadmin/activeadmin/issues/5226
+gem 'sass-rails'
+
 gemspec

data/activeadmin-searchable_select.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'activeadmin/searchable_select/version'

data/app/assets/javascripts/active_admin/searchable_select.js

@@ -0,0 +1,3 @@
+//= require select2
+
+//= require_tree ./searchable_select

data/app/assets/javascripts/active_admin/searchable_select/init.js

@@ -0,0 +1,46 @@
+(function() {
+  function initSearchableSelects(inputs, extra) {
+    inputs.each(function() {
+      var item = $(this);
+
+      // reading from data allows <input data-searchable_select='{"tags": ['some']}'>
+      // to be passed to select2
+      var options = $.extend(extra || {}, item.data('searchableSelect'));
+      var url = item.data('ajaxUrl');
+
+      if (url) {
+        $.extend(options, {
+          ajax: {
+            url: url,
+            dataType: 'json',
+
+            data: function (params) {
+              return {
+                term: params.term,
+                page: pageParamWithBaseZero(params)
+              };
+            }
+          }
+        });
+      }
+
+      item.select2(options);
+    });
+  }
+
+  function pageParamWithBaseZero(params) {
+    return params.page ? params.page - 1 : undefined;
+  }
+
+  $(document).on('has_many_add:after', '.has_many_container', function(e, fieldset) {
+    initSearchableSelects(fieldset.find('.searchable-select-input'));
+  });
+
+  $(document).on('page:load turbolinks:load', function() {
+    initSearchableSelects($(".searchable-select-input"), {placeholder: ""});
+  });
+
+  $(function() {
+    initSearchableSelects($(".searchable-select-input"));
+  });
+}());

data/gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "sass-rails"
 gem "rails", "~> 4.2"
 gem "activeadmin", "1.0.0.pre4"
 gem "jquery-ui-rails", "~> 5.0"

data/gemfiles/rails_5.1_active_admin_1.0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "sass-rails"
 gem "rails", "~> 5.1"
 gem "activeadmin", "~> 1.0"
 

data/gemfiles/rails_5.1_active_admin_1.1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "sass-rails"
 gem "rails", "~> 5.1"
 gem "activeadmin", "~> 1.1"
 

data/lib/activeadmin/searchable_select/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module SearchableSelect
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/spec/features/end_to_end_spec.rb

@@ -24,35 +24,42 @@ RSpec.describe 'end to end', type: :feature, js: true do
   end
 
   describe 'index page with searchable select filter' do
-    before(:each) do
-      music_category = Category.create(name: 'Music')
-      travel_category = Category.create(name: 'Travel')
-
-      Post.create(title: 'Best songs',
-                  category: music_category)
-      Post.create(title: 'Best places',
-                  category: travel_category)
-    end
-
     it 'loads filter input options' do
+      Category.create(name: 'Music')
+      Category.create(name: 'Travel')
+
       visit '/admin/posts'
 
       expand_select_box
+      wait_for_ajax
 
       expect(select_box_items).to eq(%w(Music Travel))
     end
 
     it 'allows filtering options by term' do
+      Category.create(name: 'Music')
+      Category.create(name: 'Travel')
+
       visit '/admin/posts'
 
       expand_select_box
-
-      wait_for_ajax do
-        enter_search_term('T')
-      end
+      enter_search_term('T')
+      wait_for_ajax
 
       expect(select_box_items).to eq(%w(Travel))
     end
+
+    it 'loads more items when scrolling down' do
+      15.times { |i| Category.create(name: "Category #{i}") }
+      visit '/admin/posts'
+
+      expand_select_box
+      wait_for_ajax
+      scroll_select_box_list
+      wait_for_ajax
+
+      expect(select_box_items.size).to eq(15)
+    end
   end
 
   def expand_select_box
@@ -63,21 +70,21 @@ RSpec.describe 'end to end', type: :feature, js: true do
     find('.select2-dropdown input').send_keys(term)
   end
 
+  def scroll_select_box_list
+    page.execute_script '$(".select2-container ul").scrollTop(1000)'
+  end
+
   def select_box_items
     all('.select2-dropdown li').map(&:text)
   end
 
-  def wait_for_ajax(count = 1)
-    page.execute_script 'window._ajaxCalls = 0'
-    page.execute_script 'window._ajaxCompleteCounter = function() { window._ajaxCalls += 1; }'
-    page.execute_script '$(document).ajaxComplete(window._ajaxCompleteCounter)'
-
-    yield
-
-    sleep(0.5) until finished_all_ajax_requests?(count)
+  def wait_for_ajax
+    Timeout.timeout(Capybara.default_max_wait_time) do
+      loop until finished_all_ajax_requests?
+    end
   end
 
-  def finished_all_ajax_requests?(count)
-    page.evaluate_script('window._ajaxCalls') == count
+  def finished_all_ajax_requests?
+    page.evaluate_script('jQuery.active').zero?
   end
 end

data/spec/internal/app/assets/stylesheets/active_admin.scss

@@ -1,2 +1,4 @@
 @import "active_admin/mixins";
 @import "active_admin/base";
+
+@import "active_admin/searchable_select";

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-searchable_select
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -244,8 +244,8 @@ files:
 - README.md
 - Rakefile
 - activeadmin-searchable_select.gemspec
-- app/assets/javascripts/active_admin/searchable_select.js.coffee
-- app/assets/javascripts/active_admin/searchable_select/init.js.coffee
+- app/assets/javascripts/active_admin/searchable_select.js
+- app/assets/javascripts/active_admin/searchable_select/init.js
 - app/assets/stylesheets/active_admin/searchable_select.scss
 - bin/rspec
 - gemfiles/rails_4.2_active_admin_1.0.0.pre4.gemfile
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Use searchable selects based on Select2 in Active Admin forms and filters.

data/app/assets/javascripts/active_admin/searchable_select.js.coffee

@@ -1,3 +0,0 @@
-#= require select2
-
-#= require_tree ./searchable_select

data/app/assets/javascripts/active_admin/searchable_select/init.js.coffee

@@ -1,29 +0,0 @@
-'use strict';
-
-initSearchableSelects = (inputs, extra = {}) ->
-  inputs.each ->
-    item = $(this)
-    # reading from data allows <input data-searchable_select='{"tags": ['some']}'>
-    # to be passed to select2
-    options = $.extend(extra, item.data('searchableSelect'))
-    url = item.data('ajaxUrl');
-
-    if url
-      $.extend(
-        options,
-        ajax: {
-          url: url,
-          dataType: 'json'
-        }
-      )
-
-    item.select2(options)
-
-$(document).on 'has_many_add:after', '.has_many_container', (e, fieldset) ->
-  initSearchableSelects(fieldset.find('.searchable-select-input'))
-
-$(document).on 'page:load turbolinks:load', ->
-  initSearchableSelects($(".searchable-select-input"), placeholder: "")
-  return
-
-$(-> initSearchableSelects($(".searchable-select-input")))