activeadmin-searchable_select 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f2b11107d464955292c9d5a51629757ff3fb213aafdeb9302b948f421796ee
-  data.tar.gz: 961efac5444a994afac0b8a13437bbd96ec8effedbbc6356b606a9d23bc80849
+  metadata.gz: 7cfe9f36cf136d370ead8ce6227d00057850a5d4f6ee9520cbed52da1c15a3d8
+  data.tar.gz: d5043ace26e5abc0b5a4ee3c58b2fad8243b9cb8c78de93be0013f6c4116b163
 SHA512:
-  metadata.gz: 79b204c1f6af56e2d39c4ee658cfde5af5ca31733ed3d2eb657ab78a8de66511b9e7387dd5fa64a457768095c67858e64f3fd598058ef1458fceba0575880522
-  data.tar.gz: 9bcbd53a3504788a0c18ce8f701efefcc2f0495625eedf277a30c738c5083d4b3a4602fdd95c05ca904ad8b0034e551ea1706a46f077805c5b0146f0121ee2fc
+  metadata.gz: 912517731c734da5286389411fc658c3de99d336b538b8f9c8e6b28640185bcd3b718d7220c3b91d4a1d70f398b0e43bfe606c61403cd66807d441f89eda668d
+  data.tar.gz: 4491ef833bf6b70a2b66008de0507b22ca05dd0d9ff620b76127ec284fd4961c8eb868856ff2f472001d85b904a1e0114509d996c013ff66a81a2f27c8592ee5

data/.github/workflows/tests.yml

@@ -23,6 +23,8 @@ jobs:
         include:
           - ruby-version: '3.0'
             gemfile: gemfiles/rails_6.x_active_admin_2.x.gemfile
+          - ruby-version: '3.0'
+            gemfile: gemfiles/rails_6.x_active_admin_3.x.gemfile
 
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/Appraisals

@@ -16,4 +16,9 @@ end
 appraise 'rails-6.x-active-admin-2.x' do
   gem 'rails', '~> 6.1'
   gem 'activeadmin', '~> 2.0'
-end
+end
+
+appraise 'rails-6.x-active-admin-3.x' do
+  gem 'rails', '~> 6.1'
+  gem 'activeadmin', '~> 3.0'
+end

data/CHANGELOG.md

@@ -1,14 +1,16 @@
 # CHANGELOG
 
-### Version 1.6.0
+### Version 1.8.0
 
-2022-04-05
+2023-08-17
 
-[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/1-5-stable...v1.6.0)
+[Compare changes](https://github.com/codevise/activeadmin-searchable_select/compare/1-7-stable...v1.8.0)
 
-- Add option to pass path params for nested resource fetching
-  ([#39](https://github.com/codevise/activeadmin-searchable_select/pull/39))
+- Update webdrivers to fix specs for Chrome 115
+  ([#47](https://github.com/codevise/activeadmin-searchable_select/pull/47))
+- Add support for Active Admin 3.0
+  ([#45](https://github.com/codevise/activeadmin-searchable_select/pull/45))
 
 See
-[1-5-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-5-stable/CHANGELOG.md)
+[1-7-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-7-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -1,7 +1,9 @@
 # ActiveAdmin Searchable Select
 
 [![Gem Version](https://badge.fury.io/rb/activeadmin-searchable_select.svg)](http://badge.fury.io/rb/activeadmin-searchable_select)
-[![Build Status](https://github.com/codevise/activeadmin-searchable_select.svg?branch=master)](https://github.com/codevise/activeadmin-searchable_select/actions)
+[![NPM Version](https://badge.fury.io/js/@codevise%2Factiveadmin-searchable_select.svg)](https://badge.fury.io/js/@codevise%2Factiveadmin-searchable_select)
+[![npm](https://img.shields.io/npm/dm/@codevise/activeadmin-searchable_select)](https://www.npmjs.com/package/@codevise/activeadmin-searchable_select)
+[![Build Status](https://github.com/codevise/activeadmin-searchable_select/actions/workflows/tests.yml/badge.svg)](https://github.com/codevise/activeadmin-searchable_select/actions)
 
 Searchable select boxes (via [Select2](https://select2.org/)) for
 ActiveAdmin forms and filters. Extends the ActiveAdmin resource DSL to
@@ -15,6 +17,7 @@ Add `activeadmin-searchable_select` to your Gemfile:
    gem 'activeadmin-searchable_select'
 ```
 
+##### Using assets via Sprockets
 Import stylesheets and require javascripts:
 
 ```scss
@@ -27,6 +30,39 @@ Import stylesheets and require javascripts:
 //= require active_admin/searchable_select
 ```
 
+##### Using assets via Webpacker (or any other assets bundler) as a NPM module (Yarn package)
+
+Execute:
+
+    $ npm i @codevise/activeadmin-searchable_select
+
+Or
+
+    $ yarn add @codevise/activeadmin-searchable_select
+
+Or add manually to `package.json`:
+
+```json
+"dependencies": {
+  "@codevise/activeadmin-searchable_select": "1.6.0"
+}
+```
+and execute:
+
+    $ yarn
+
+Add the following line into `app/javascript/active_admin.js`:
+
+```javascript
+import '@codevise/activeadmin-searchable_select';
+```
+
+Add the following line into `app/javascript/stylesheets/active_admin.scss`:
+
+```css
+@import '@codevise/activeadmin-searchable_select';
+```
+
 ## Usage
 
 ### Making Select Boxes Searchable

data/activeadmin-searchable_select.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'capybara', '~> 3.9'
   spec.add_development_dependency 'puma', '~> 5.0'
-  spec.add_development_dependency 'selenium-webdriver', '~> 3.6'
-  spec.add_development_dependency 'webdrivers', '~> 4.0'
+  spec.add_development_dependency 'selenium-webdriver', '~> 4.1'
+  spec.add_development_dependency 'webdrivers', '= 5.3.0'
 
   spec.add_development_dependency 'coffee-rails'
   spec.add_development_dependency 'rails'
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'semmy', '~> 1.0'
   spec.add_development_dependency 'sprockets', '~> 3.7'
 
-  spec.add_runtime_dependency 'activeadmin', ['>= 1.x', '< 3']
+  spec.add_runtime_dependency 'activeadmin', ['>= 1.x', '< 4']
   spec.add_runtime_dependency 'jquery-rails', ['>= 3.0', '< 5']
   spec.add_runtime_dependency 'select2-rails', '~> 4.0'
 end

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

@@ -0,0 +1,2 @@
+import 'select2';
+import './searchable_select/init';

data/gemfiles/rails_6.x_active_admin_3.x.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sass-rails"
+gem "rails", "~> 6.1"
+gem "activeadmin", "~> 3.0"
+
+gemspec path: "../"

data/lib/activeadmin/searchable_select/select_input_extension.rb

@@ -84,7 +84,7 @@ module ActiveAdmin
       end
 
       def option_collection_scope
-        option_collection.scope(template, ajax_params)
+        option_collection.scope(template, path_params.merge(ajax_params))
       end
 
       def option_collection

data/lib/activeadmin/searchable_select/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module SearchableSelect
-    VERSION = '1.6.0'.freeze
+    VERSION = '1.8.0'.freeze
   end
 end

data/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "@codevise/activeadmin-searchable_select",
+  "version": "1.7.0",
+  "description": "Use searchable selects based on Select2 in Active Admin forms and filters.",
+  "main": "src/searchable_select.js",
+  "style": "src/searchable_select.scss",
+  "repository": "git@github.com:codevise/activeadmin-searchable_select.git",
+  "author": "Codevise Solutions Ltd <info@codevise.de>",
+  "license": "MIT",
+  "private": false,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/codevise/activeadmin-searchable_select.git"
+  },
+  "bugs": {
+    "url": "https://github.com/codevise/activeadmin-searchable_select/issues"
+  },
+  "homepage": "https://github.com/codevise/activeadmin-searchable_select#readme",
+  "keywords": [
+    "select2",
+    "active",
+    "admin",
+    "searchable",
+    "select"
+  ],
+  "dependencies": {
+    "jquery": ">= 3.0, < 5",
+    "select2": "~> 4.0"
+  },
+  "files": [
+    "src/**/*"
+  ],
+  "scripts": {
+    "prepare_javascripts_src": "rm -rf src && cp -R app/assets/javascripts/active_admin/ src && mv src/searchable_select_pack.js src/searchable_select.js",
+    "prepare_stylesheets_src": "cp -R app/assets/stylesheets/active_admin/* src",
+    "prepublishOnly": "npm run prepare_javascripts_src && npm run prepare_stylesheets_src"
+  }
+}

data/spec/features/end_to_end_spec.rb

@@ -180,6 +180,22 @@ RSpec.describe 'end to end', type: :feature, js: true do
         expect(select_box_items.size).to eq(15)
       end
     end
+
+    describe 'edit page with searchable select filter' do
+      it 'preselects item' do
+        option_type = OptionType.create(name: 'Color')
+        ot = OptionType.create(name: 'Size')
+        option_value = OptionValue.create(value: 'Black', option_type: option_type)
+        OptionValue.create(value: 'Orange', option_type: option_type)
+        OptionValue.create(value: 'M', option_type: ot)
+        product = Product.create(name: 'Cap', option_type: option_type)
+        variant = Variant.create(product: product, option_value: option_value)
+
+        visit "/admin/products/#{product.id}/variants/#{variant.id}/edit"
+
+        expect(select_box_selected_item_text).to eq('Black')
+      end
+    end
   end
 
   def expand_select_box
@@ -198,6 +214,10 @@ RSpec.describe 'end to end', type: :feature, js: true do
     all('.select2-dropdown li').map(&:text)
   end
 
+  def select_box_selected_item_text
+    find('.select2-selection').text
+  end
+
   def wait_for_ajax
     Timeout.timeout(Capybara.default_max_wait_time) do
       sleep 0.1

data/spec/support/models.rb

@@ -4,6 +4,10 @@ class User < ActiveRecord::Base; end
 
 class Category < ActiveRecord::Base
   belongs_to :created_by, class_name: 'User'
+
+  def self.ransackable_attributes(_auth_object = nil)
+    ['name']
+  end
 end
 
 class Post < ActiveRecord::Base
@@ -11,6 +15,10 @@ class Post < ActiveRecord::Base
   belongs_to :user
 
   scope(:published, -> { where(published: true) })
+
+  def self.ransackable_attributes(_auth_object = nil)
+    %w(category_id title)
+  end
 end
 
 module RGB
@@ -24,6 +32,10 @@ module Internal
   class TagName < ActiveRecord::Base
     self.table_name = :internal_tag_names
     belongs_to :color, class_name: 'RGB::Color', foreign_key: :color_id
+
+    def self.ransackable_attributes(_auth_object = nil)
+      ['color_id']
+    end
   end
 end
 
@@ -31,6 +43,10 @@ class OptionType < ActiveRecord::Base; end
 
 class OptionValue < ActiveRecord::Base
   belongs_to :option_type
+
+  def self.ransackable_attributes(_auth_object = nil)
+    ['value']
+  end
 end
 
 class Product < ActiveRecord::Base

data/src/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/src/searchable_select.js

@@ -0,0 +1,2 @@
+import 'select2';
+import './searchable_select/init';

data/src/searchable_select.scss

@@ -0,0 +1,5 @@
+@import "select2";
+
+.searchable_select.input .select2-container {
+  min-width: 30%;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-searchable_select
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,28 +148,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,7 @@ dependencies:
         version: 1.x
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -259,7 +259,7 @@ dependencies:
         version: 1.x
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -314,12 +314,14 @@ files:
 - activeadmin-searchable_select.gemspec
 - app/assets/javascripts/active_admin/searchable_select.js
 - app/assets/javascripts/active_admin/searchable_select/init.js
+- app/assets/javascripts/active_admin/searchable_select_pack.js
 - app/assets/stylesheets/active_admin/searchable_select.scss
 - bin/rspec
 - gemfiles/rails_5.1_active_admin_1.x.gemfile
 - gemfiles/rails_5.x_active_admin_1.x.gemfile
 - gemfiles/rails_5.x_active_admin_2.x.gemfile
 - gemfiles/rails_6.x_active_admin_2.x.gemfile
+- gemfiles/rails_6.x_active_admin_3.x.gemfile
 - lib/activeadmin-searchable_select.rb
 - lib/activeadmin/inputs/filters/searchable_select_input.rb
 - lib/activeadmin/inputs/searchable_select_input.rb
@@ -330,6 +332,7 @@ files:
 - lib/activeadmin/searchable_select/resource_extension.rb
 - lib/activeadmin/searchable_select/select_input_extension.rb
 - lib/activeadmin/searchable_select/version.rb
+- package.json
 - spec/features/ajax_params_spec.rb
 - spec/features/end_to_end_spec.rb
 - spec/features/filter_input_spec.rb
@@ -353,6 +356,9 @@ files:
 - spec/support/models.rb
 - spec/support/pluck_polyfill.rb
 - spec/support/reset_settings.rb
+- src/searchable_select.js
+- src/searchable_select.scss
+- src/searchable_select/init.js
 homepage: https://github.com/codevise/activeadmin-searchable_select
 licenses:
 - MIT
@@ -375,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Use searchable selects based on Select2 in Active Admin forms and filters.