diff --git a/Gemfile b/Gemfile index 9c6290d25..847550c00 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'blacklight_dynamic_sitemap' gem 'blacklight-hierarchy' gem 'blacklight-marc', '~>8.1' # slider limit support -gem 'blacklight_range_limit', '~> 8.2' +gem 'blacklight_range_limit', '~> 9.0.0' gem 'bootstrap', '~> 5.2.0' gem 'psych' # Capistrano diff --git a/Gemfile.lock b/Gemfile.lock index fa3103efe..ae6ea6c82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,9 +144,8 @@ GEM blacklight_dynamic_sitemap (1.0.0) blacklight (> 7.0) rails - blacklight_range_limit (8.5.0) + blacklight_range_limit (9.0.0) blacklight (>= 7.25.2, < 9) - deprecation view_component (>= 2.54, < 4) bootstrap (5.2.3) autoprefixer-rails (>= 9.1.0) @@ -188,7 +187,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) connection_pool (2.5.0) coveralls_reborn (0.28.0) simplecov (~> 0.22.0) @@ -525,7 +524,7 @@ GEM rake (13.2.1) rbs (2.8.4) rbtree (0.4.6) - rdoc (6.10.0) + rdoc (6.11.0) psych (>= 4.0.0) redis (5.3.0) redis-client (>= 0.22.0) @@ -767,7 +766,7 @@ DEPENDENCIES blacklight-hierarchy blacklight-marc (~> 8.1) blacklight_dynamic_sitemap - blacklight_range_limit (~> 8.2) + blacklight_range_limit (~> 9.0.0) bootstrap (~> 5.2.0) capistrano (~> 3.4) capistrano-passenger diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index bb70be089..991ff23f5 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -18,10 +18,8 @@ // // Required by Blacklight //= require blacklight/blacklight -//= require 'blacklight_range_limit' //= require babel/polyfill // -//= require ./custom_range_limit.js //= require ./orangelight.js // Wait for the modal to open diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 55f3e3a85..5abf601b7 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -10,7 +10,6 @@ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new * file per style scope. * - *= require 'blacklight_range_limit' *= require_self */ diff --git a/app/javascript/entrypoints/application.js b/app/javascript/entrypoints/application.js index 193e40439..39d629f8c 100644 --- a/app/javascript/entrypoints/application.js +++ b/app/javascript/entrypoints/application.js @@ -1,5 +1,6 @@ import OrangelightUiLoader from '../orangelight/orangelight_ui_loader.es6'; import { luxImport } from '../orangelight/lux_import'; +import BlacklightRangeLimit from 'blacklight-range-limit'; // boot stuff Blacklight.onLoad(() => { @@ -7,4 +8,6 @@ Blacklight.onLoad(() => { loader.run(); }); +BlacklightRangeLimit.init({ onLoadHandler: Blacklight.onLoad }); + luxImport(); diff --git a/package.json b/package.json index e0dc59d54..118f3d3b9 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "@apollo/client": "^3.7.1", "@babel/preset-stage-3": "^7.8.3", "@vitejs/plugin-vue": "^5.1.2", + "blacklight-range-limit": "^9.0.0", "graphql": "^16.8.1", "jest-environment-jsdom": "^29.4.0", "lux-design-system": "^5.11.0", diff --git a/yarn.lock b/yarn.lock index 980e315ac..464b14c57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1536,6 +1536,11 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" +"@kurkle/color@^0.3.0": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.4.tgz#4d4ff677e1609214fc71c580125ddddd86abcabf" + integrity sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w== + "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" resolved "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz" @@ -2357,6 +2362,13 @@ balanced-match@^2.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== +blacklight-range-limit@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/blacklight-range-limit/-/blacklight-range-limit-9.0.0.tgz#89e1e7d36cef7fef205d0266fa0591006801f05d" + integrity sha512-Qr+3Rr0jOeoSNN5kN3fmZYqggAgpPpu3LX7HAHkCtrkHG5gPKqV+TK8BLvila9zueAs77dbWV7AmucZEvE+IBg== + dependencies: + chart.js "^ 4.4.1" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" @@ -2448,6 +2460,13 @@ char-regex@^1.0.2: resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== +"chart.js@^ 4.4.1": + version "4.4.7" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.7.tgz#7a01ee0b4dac3c03f2ab0589af888db296d896fa" + integrity sha512-pwkcKfdzTMAU/+jNosKhNL2bHtJc/sSmYgVbuGTEDhzkrhmyihmP7vUc/5ZK9WopidMDHNe3Wm7jOd/WhuHWuw== + dependencies: + "@kurkle/color" "^0.3.0" + ci-info@^3.2.0: version "3.9.0" resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz"