activeadmin-searchable_select 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f2b11107d464955292c9d5a51629757ff3fb213aafdeb9302b948f421796ee
-  data.tar.gz: 961efac5444a994afac0b8a13437bbd96ec8effedbbc6356b606a9d23bc80849
+  metadata.gz: afca3ffb2bd7868c51afc6e6793fc4b3080a1fdb0f92a248ccdbe264faa58597
+  data.tar.gz: defeafa115233119aacc2bde15424810bdd1fd05187c2c48536879586b96b00b
 SHA512:
-  metadata.gz: 79b204c1f6af56e2d39c4ee658cfde5af5ca31733ed3d2eb657ab78a8de66511b9e7387dd5fa64a457768095c67858e64f3fd598058ef1458fceba0575880522
-  data.tar.gz: 9bcbd53a3504788a0c18ce8f701efefcc2f0495625eedf277a30c738c5083d4b3a4602fdd95c05ca904ad8b0034e551ea1706a46f077805c5b0146f0121ee2fc
+  metadata.gz: 527c21ae72869785419007a81436186684d589e87abc4aeb64213a8fe46af2ca1701e98296f8d2a9c64c756a9331a625aac166994591a57d1c43c70cf277ccb0
+  data.tar.gz: 71f29f997879afec190f430697d57362dba21802e322b8045d20b247f3c1ef0df8ed8b88b0a84a4e43910dda1ef9221050e8843fac45133b3c9fd15defe028be

data/CHANGELOG.md

@@ -1,14 +1,17 @@
 # CHANGELOG
 
-### Version 1.6.0
+### Version 1.7.0
 
-2022-04-05
+2023-05-03
 
-[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-6-stable...v1.7.0)
 
-- Add option to pass path params for nested resource fetching
-  ([#39](https://github.com/codevise/activeadmin-searchable_select/pull/39))
+- Fix pre-selected item when using belongs_to
+  ([#43](https://github.com/codevise/activeadmin-searchable_select/pull/43),
+   [#44](https://github.com/codevise/activeadmin-searchable_select/pull/44))
+- Improvement the examples in Readme for import npm assets
+  ([#41](https://github.com/codevise/activeadmin-searchable_select/pull/41))
 
 See
-[1-5-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-5-stable/CHANGELOG.md)
+[1-6-stable branch](https://github.com/codevise/activeadmin-searchable_select/blob/1-6-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -1,6 +1,8 @@
 # ActiveAdmin Searchable Select
 
 [![Gem Version](https://badge.fury.io/rb/activeadmin-searchable_select.svg)](http://badge.fury.io/rb/activeadmin-searchable_select)
+[![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.svg?branch=master)](https://github.com/codevise/activeadmin-searchable_select/actions)
 
 Searchable select boxes (via [Select2](https://select2.org/)) for
@@ -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/app/assets/javascripts/active_admin/searchable_select_pack.js

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

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.7.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-searchable_select
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -314,6 +314,7 @@ 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
@@ -330,6 +331,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
@@ -375,7 +377,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.