From bb96ae2a8f6bd6d45251014ad29017333cbb547a Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 13 Mar 2023 14:43:37 -0500 Subject: [PATCH 1/5] Bug fix: Remove "Click to Wake" feature from static maps Set sleep option to false to remove Leaflet.Sleep functionality Fixes #495 --- app/assets/javascripts/geoportal/viewers/b1g_image.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/geoportal/viewers/b1g_image.js b/app/assets/javascripts/geoportal/viewers/b1g_image.js index 3ad8f3cdd..b3a4520e2 100644 --- a/app/assets/javascripts/geoportal/viewers/b1g_image.js +++ b/app/assets/javascripts/geoportal/viewers/b1g_image.js @@ -6,7 +6,8 @@ GeoBlacklight.Viewer.B1gImage = GeoBlacklight.Viewer.extend({ center: [0, 0], crs: L.CRS.Simple, zoom: 0, - zoomControl:false + zoomControl:false, + sleep: false }); this.loadControls(); From aee3d1b154dfe97a1ad4741e11c13749d5461ca9 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 13 Mar 2023 17:13:47 -0500 Subject: [PATCH 2/5] Licensed Resources: Rutgers * Adds Rutgers to helper * Adds Rutger's Shield SVG icon (official will come later) Fixes #500 --- .../rutgers-university-new-brunswick.svg | 41 +++++++++++++++++++ app/helpers/application_helper.rb | 3 +- app/views/catalog/_access_links.html.haml | 2 +- .../btaa_documents/b1g_licensed_data.json | 2 +- 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 app/assets/images/blacklight/rutgers-university-new-brunswick.svg diff --git a/app/assets/images/blacklight/rutgers-university-new-brunswick.svg b/app/assets/images/blacklight/rutgers-university-new-brunswick.svg new file mode 100644 index 000000000..0606d3d1e --- /dev/null +++ b/app/assets/images/blacklight/rutgers-university-new-brunswick.svg @@ -0,0 +1,41 @@ + + +rutgers-university-new-brunswick + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8e6ebcd10..d285c05cd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -68,7 +68,8 @@ def b1g_institution_codes '10'=> 'University of Wisconsin-Madison', '11'=> 'The Ohio State University', '12'=> 'University of Chicago', - '13'=> 'University of Nebraska-Lincoln' + '13'=> 'University of Nebraska-Lincoln', + '14'=> 'Rutgers University-New Brunswick' } end diff --git a/app/views/catalog/_access_links.html.haml b/app/views/catalog/_access_links.html.haml index 1829c82e2..b219ba0c3 100644 --- a/app/views/catalog/_access_links.html.haml +++ b/app/views/catalog/_access_links.html.haml @@ -3,7 +3,7 @@ Licensed Resource %div.access-links.list-group - - b1g_access_links(@document).each do |key,value| + - b1g_access_links(@document).sort.each do |key,value| %a.list-group-item.list-group-item-action{href:value} = blacklight_icon(key.parameterize) = key diff --git a/test/fixtures/files/btaa_documents/b1g_licensed_data.json b/test/fixtures/files/btaa_documents/b1g_licensed_data.json index 9b3665948..e74d5a6ab 100644 --- a/test/fixtures/files/btaa_documents/b1g_licensed_data.json +++ b/test/fixtures/files/btaa_documents/b1g_licensed_data.json @@ -14,7 +14,7 @@ ], "b1g_status_s": "Testing", "b1g_code_s": "99-0001", - "b1g_access_s": "{\"01\":\"https://proxyiub.uits.iu.edu/login?url=https://www.socialexplorer.com\",\"02\":\"http://sfx.carli.illinois.edu/sfxuiu?sfx.ignore_date_threshold=1&rft.object_id=63750000000000353\",\"03\":\"https://uiowa.alma.exlibrisgroup.com/view/action/uresolver.do;jsessionid=1FD9438105E0676AA5EAF51783A60194.app02.na03.prod.alma.dc04.hosted.exlibrisgroup.com:1801?operation=resolveService&package_service_id=16484718570002771&institutionId=2771&customerId=2770\",\"04\":\"http://proxy-um.researchport.umd.edu/login?url=http://www.socialexplorer.com/.\",\"05\":\"https://na01.alma.exlibrisgroup.com/view/action/uresolver.do?operation=resolveService&package_service_id=2262110332520001701&institutionId=1701&customerId=1700\",\"06\":\"http://proxy.lib.umich.edu/login?url=http://www.socialexplorer.com/ezproxy\",\"07\":\"http://ezproxy.msu.edu/login?url=http://www.socialexplorer.com/\",\"09\":\"http://ezaccess.libraries.psu.edu/login?url=https://www.socialexplorer.com/pub/home/home.aspx\",\"10\":\"http://digital.library.wisc.edu/1711.web/socialexplorer\",\"11\":\"http://proxy.lib.ohio-state.edu/login?url=http://www.socialexplorer.com/pub/home/home.aspx\",\"12\":\"http://proxy.uchicago.edu/login?qurl=http%3A%2F%2Fwww.lib.uchicago.edu%2Fh%2Fsocialexplorer\"}", + "b1g_access_s": "{\"01\":\"https://proxyiub.uits.iu.edu/login?url=https://www.socialexplorer.com\",\"02\":\"http://sfx.carli.illinois.edu/sfxuiu?sfx.ignore_date_threshold=1&rft.object_id=63750000000000353\",\"03\":\"https://uiowa.alma.exlibrisgroup.com/view/action/uresolver.do;jsessionid=1FD9438105E0676AA5EAF51783A60194.app02.na03.prod.alma.dc04.hosted.exlibrisgroup.com:1801?operation=resolveService&package_service_id=16484718570002771&institutionId=2771&customerId=2770\",\"04\":\"http://proxy-um.researchport.umd.edu/login?url=http://www.socialexplorer.com/.\",\"05\":\"https://na01.alma.exlibrisgroup.com/view/action/uresolver.do?operation=resolveService&package_service_id=2262110332520001701&institutionId=1701&customerId=1700\",\"06\":\"http://proxy.lib.umich.edu/login?url=http://www.socialexplorer.com/ezproxy\",\"07\":\"http://ezproxy.msu.edu/login?url=http://www.socialexplorer.com/\",\"09\":\"http://ezaccess.libraries.psu.edu/login?url=https://www.socialexplorer.com/pub/home/home.aspx\",\"10\":\"http://digital.library.wisc.edu/1711.web/socialexplorer\",\"11\":\"http://proxy.lib.ohio-state.edu/login?url=http://www.socialexplorer.com/pub/home/home.aspx\",\"12\":\"http://proxy.uchicago.edu/login?qurl=http%3A%2F%2Fwww.lib.uchicago.edu%2Fh%2Fsocialexplorer\",\"14\":\"https://login.proxy.libraries.rutgers.edu/login?qurl=https%3a%2f%2fwww.socialexplorer.com\"}", "b1g_image_ss": "https://se-static-uploads.s3.amazonaws.com/newsletter/Newsletters-Amina/Thumbnaill-SE_NewCopy_small.jpg", "dc_type_sm": [ "Interactive Resource" From ba32108418a3501cfb63c3607b4173180ddb994d Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 13 Mar 2023 17:43:55 -0500 Subject: [PATCH 3/5] Survey Button (#503) Fixes #501 --- app/assets/stylesheets/geoportal/_homepage.scss | 11 +++++++++++ app/views/layouts/blacklight/base.html.erb | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/app/assets/stylesheets/geoportal/_homepage.scss b/app/assets/stylesheets/geoportal/_homepage.scss index 4d3136083..846f9dc72 100644 --- a/app/assets/stylesheets/geoportal/_homepage.scss +++ b/app/assets/stylesheets/geoportal/_homepage.scss @@ -5,6 +5,17 @@ $black: #000000; // 0% $btaa-blue: #005E8E; $radius: 4px; +#survey-button { + position: fixed; + bottom:2rem; + right:2rem; + a { + border: none; + border-radius: 0; + box-shadow: 0 0 0.5rem 0 #005E8E; + } +} + main { background:lighten($black, 12%) asset_url('aerial_photo_dark.jpg') repeat; padding:0px; diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb index ffec81b24..ba2eece0f 100644 --- a/app/views/layouts/blacklight/base.html.erb +++ b/app/views/layouts/blacklight/base.html.erb @@ -64,5 +64,9 @@ <%- if Rails.env.production? %> <%= render partial: 'shared/matomo_analytics' %> <%- end %> + +
+ <%= link_to("+ Help us improve our site".html_safe, "https://arcg.is/0bmW9z0", class: "btn btn-success btn-lg", target: "_blank") %> +
From b8cd740139b037f2db6241561f7fecfbdcd1f68e Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 14 Mar 2023 13:31:25 -0500 Subject: [PATCH 4/5] Gems: bug fixes * Bump GBL Sidecar Images gem to the new v1.0 release * Pin BL Advanced Search to my PR bug fix branch See: Fixes #502 Fixes #498 --- Gemfile | 9 +- Gemfile.lock | 350 ++++++++++++++++++++++++++------------------------- 2 files changed, 182 insertions(+), 177 deletions(-) diff --git a/Gemfile b/Gemfile index f52b488e1..2de6625f1 100644 --- a/Gemfile +++ b/Gemfile @@ -66,7 +66,11 @@ group :development do end gem 'blacklight', '~> 7.30.0' -gem 'blacklight_advanced_search', '~> 7.0.0' + +# BL Advanced Search / Pinned to EWL bug-fix +# See: https://github.com/projectblacklight/blacklight_advanced_search/issues/127 +gem "blacklight_advanced_search", git: "https://github.com/ewlarson/blacklight_advanced_search.git", branch: "bl7-fix-gentle-hands" + gem 'blacklight_range_limit', '~> 7.0.0' gem 'chosen-rails' # jquery multiselect plugin for advanced search gem 'bootstrap', '~> 4.0' @@ -77,7 +81,7 @@ gem "rubyzip", ">= 1.3.0" gem "awesome_print" # Image migration -gem 'geoblacklight_sidecar_images', '~> 0.8.0' +gem 'geoblacklight_sidecar_images', '~> 1.0' gem 'carrierwave', '~> 1.2' gem 'mini_magick', '~> 4.9.4' @@ -119,4 +123,3 @@ group :test do end gem 'rexml' -gem 'faraday_middleware', '1.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 0bcb745b2..34d6c1d48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,6 +9,15 @@ GIT retriable ruby-progressbar +GIT + remote: https://github.com/ewlarson/blacklight_advanced_search.git + revision: c6c7aedeefbad902183b87fc5610518ab8a2f488 + branch: bl7-fix-gentle-hands + specs: + blacklight_advanced_search (7.0.0) + blacklight (~> 7.0) + parslet + GIT remote: https://github.com/geoblacklight/geoblacklight-icons.git revision: 84da81140e7ef93e7241b7753c01d7f709216f2b @@ -19,60 +28,60 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7) - activesupport (= 6.1.7) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -80,14 +89,14 @@ GEM zeitwerk (~> 2.3) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - airrecord (1.0.10) + airrecord (1.0.12) faraday (>= 1.0, < 3.0) faraday-net_http_persistent net-http-persistent ansi (1.5.0) - appsignal (3.1.4) + appsignal (3.3.7) rack - autoprefixer-rails (10.4.7.0) + autoprefixer-rails (10.4.13.0) execjs (~> 2) awesome_print (1.9.2) bcrypt (3.1.18) @@ -102,9 +111,6 @@ GEM ostruct (>= 0.3.2) rails (>= 5.1, < 7.1) view_component (~> 2.43) - blacklight_advanced_search (7.0.0) - blacklight (~> 7.0) - parslet blacklight_range_limit (7.0.1) blacklight jquery-rails @@ -112,13 +118,13 @@ GEM tether-rails bootsnap (1.9.4) msgpack (~> 1.0) - bootstrap (4.6.1) + bootstrap (4.6.2) autoprefixer-rails (>= 9.1.0) - popper_js (>= 1.14.3, < 2) + popper_js (>= 1.16.1, < 2) sassc-rails (>= 2.0.0) builder (3.2.4) byebug (11.1.3) - capybara (3.37.1) + capybara (3.38.0) addressable matrix mini_mime (>= 0.1.3) @@ -133,12 +139,11 @@ GEM capybara-selenium (0.0.6) capybara selenium-webdriver - carrierwave (1.3.2) + carrierwave (1.3.3) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - ssrf_filter (~> 1.0) - childprocess (4.1.0) + ssrf_filter (~> 1.0, < 1.1.0) chosen-rails (1.10.0) coffee-rails (>= 3.2) railties (>= 3.0) @@ -152,22 +157,23 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) - config (4.0.0) + concurrent-ruby (1.2.2) + config (4.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) connection_pool (2.3.0) crass (1.0.6) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) + date (3.3.3) deep_merge (1.2.2) deprecation (1.1.0) activesupport - devise (4.8.1) + devise (4.9.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -184,39 +190,40 @@ GEM railties (>= 3.2) down (4.8.1) addressable (~> 2.5) - dry-configurable (0.15.0) - concurrent-ruby (~> 1.0) - dry-core (~> 0.6) - dry-container (0.10.1) + dry-configurable (1.0.1) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-core (1.0.0) concurrent-ruby (~> 1.0) - dry-core (0.8.1) - concurrent-ruby (~> 1.0) - dry-inflector (0.3.0) + zeitwerk (~> 2.6) + dry-inflector (1.0.0) dry-initializer (3.1.1) - dry-logic (1.2.0) + dry-logic (1.5.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.5, >= 0.5) - dry-schema (1.10.4) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-schema (1.13.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.13, >= 0.13.0) - dry-core (~> 0.5, >= 0.5) + dry-configurable (~> 1.0, >= 1.0.1) + dry-core (~> 1.0, < 2) dry-initializer (~> 3.0) - dry-logic (~> 1.2) - dry-types (~> 1.5) - dry-types (1.5.1) + dry-logic (>= 1.5, < 2) + dry-types (>= 1.7, < 2) + zeitwerk (~> 2.6) + dry-types (1.7.1) concurrent-ruby (~> 1.0) - dry-container (~> 0.3) - dry-core (~> 0.5, >= 0.5) - dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.8.1) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + dry-validation (1.10.0) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.5, >= 0.5) + dry-core (~> 1.0, < 2) dry-initializer (~> 3.0) - dry-schema (~> 1.8, >= 1.8.0) - erubi (1.11.0) - ethon (0.15.0) + dry-schema (>= 1.12, < 2) + zeitwerk (~> 2.6) + erubi (1.12.0) + ethon (0.16.0) ffi (>= 1.15.0) exception_notification (4.4.3) actionmailer (>= 4.0, < 7) @@ -227,41 +234,23 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.10.2) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) + faraday-net_http (3.0.2) + faraday-net_http_persistent (2.1.0) + faraday (~> 2.5) + net-http-persistent (~> 4.0) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake flamegraph (0.9.5) foreman (0.87.2) - geo_combine (0.6.0) + geo_combine (0.7.0) activesupport + faraday-net_http_persistent (~> 2.0) json-schema - net-http-persistent (~> 2.0) nokogiri rsolr sanitize @@ -277,17 +266,19 @@ GEM mime-types rails (>= 6.1, < 7.1) rgeo-geojson - geoblacklight_sidecar_images (0.8.1) - geoblacklight (>= 3.3) + geoblacklight_sidecar_images (1.0.0) + faraday (>= 2.0) + geoblacklight (~> 4.0) image_processing (~> 1.6) mimemagic (~> 0.3) mini_magick (~> 4.9.4) - rails (>= 5.2, < 6.2) + rails (>= 5.2, < 7.1) statesman (>= 3.4) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.1.1) + temple (>= 0.8.2) + thor tilt handlebars_assets (0.23.9) execjs (~> 2.0) @@ -310,7 +301,7 @@ GEM jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.5.0) + jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -332,95 +323,107 @@ GEM addressable (~> 2.3) letter_opener (1.8.1) launchy (>= 2.2, < 3) - listen (3.7.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) llhttp-ffi (0.3.1) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) m (1.5.1) method_source (>= 0.6.7) rake (>= 0.9.2.2) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) matrix (0.4.2) memory_profiler (0.9.14) method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2023.0218.1) mimemagic (0.4.3) nokogiri (~> 1) rake mini_magick (4.9.5) mini_mime (1.1.2) - mini_portile2 (2.8.0) + mini_portile2 (2.8.1) minitar (0.9) - minitest (5.16.3) + minitest (5.18.0) minitest-ci (3.4.0) minitest (>= 5.0.6) - minitest-reporters (1.5.0) + minitest-reporters (1.6.0) ansi builder minitest (>= 5.0) ruby-progressbar - msgpack (1.5.6) - multipart-post (2.2.3) - net-http-persistent (2.9.4) + msgpack (1.6.1) + net-http-persistent (4.0.1) + connection_pool (~> 2.2) + net-imap (0.3.4) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol nio4r (2.5.8) - nokogiri (1.13.8) + nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) orm_adapter (0.5.0) ostruct (0.5.5) parslet (2.0.0) - pg (1.4.3) + pg (1.4.6) pointless_feedback (4.1.5) airrecord (~> 1.0) jquery-rails (>= 4.0) rails (>= 4.0) typhoeus (~> 0.7, >= 0.7.3) - popper_js (1.16.0) + popper_js (1.16.1) public_suffix (3.1.1) puma (5.6.5) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.4) - rack-cors (1.1.1) + racc (1.6.2) + rack (2.2.6.4) + rack-cors (2.0.0) rack (>= 2.0.0) rack-mini-profiler (2.3.4) rack (>= 1.2.0) - rack-proxy (0.7.4) + rack-proxy (0.7.6) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) bundler (>= 1.15.0) - railties (= 6.1.7) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -428,17 +431,17 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (5.0.4) - redis-client (>= 0.7.4) - redis-client (0.8.0) + redis (5.0.6) + redis-client (>= 0.9.0) + redis-client (0.14.0) connection_pool - regexp_parser (2.5.0) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + regexp_parser (2.7.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) retriable (3.1.2) rexml (3.2.5) - rgeo (2.4.0) + rgeo (3.0.0) rgeo-geojson (2.1.1) rgeo (>= 1.0.0) rsolr (2.5.0) @@ -461,12 +464,12 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.0.0) + sanitize (6.0.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass (3.7.4) @@ -489,8 +492,7 @@ GEM sprockets-rails tilt sd_notify (0.1.1) - selenium-webdriver (4.5.0) - childprocess (>= 0.5, < 5.0) + selenium-webdriver (4.8.1) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -502,7 +504,7 @@ GEM sidekiq (>= 4.0.0) sitemap_generator (6.0.2) builder (~> 3.0) - spring (4.0.0) + spring (4.1.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -510,16 +512,17 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.5.0) + sqlite3 (1.6.1) mini_portile2 (~> 2.8.0) - ssrf_filter (1.1.1) - stackprof (0.2.21) + ssrf_filter (1.0.8) + stackprof (0.2.23) statesman (3.4.1) - temple (0.8.2) + temple (0.10.0) tether-rails (1.4.0) rails (>= 3.1) thor (1.2.1) - tilt (2.0.11) + tilt (2.1.0) + timeout (0.3.2) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) @@ -529,15 +532,15 @@ GEM railties (>= 3.1) typhoeus (0.8.0) ethon (>= 0.8.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - view_component (2.74.1) - activesupport (>= 5.0.0, < 8.0) + view_component (2.82.0) + activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) warden (1.2.9) @@ -563,7 +566,7 @@ GEM chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.1) + zeitwerk (2.6.7) PLATFORMS ruby @@ -573,7 +576,7 @@ DEPENDENCIES appsignal awesome_print blacklight (~> 7.30.0) - blacklight_advanced_search (~> 7.0.0) + blacklight_advanced_search! blacklight_range_limit (~> 7.0.0) bootsnap (~> 1.9.3) bootstrap (~> 4.0) @@ -592,12 +595,11 @@ DEPENDENCIES down (~> 4.4) exception_notification (~> 4.4.0) factory_bot_rails - faraday_middleware (= 1.2.0) flamegraph (~> 0.9.5) foreman geoblacklight (~> 4.0.0) geoblacklight-icons! - geoblacklight_sidecar_images (~> 0.8.0) + geoblacklight_sidecar_images (~> 1.0) haml handlebars_assets (~> 0.23.0) jbuilder (~> 2.5) From f450136e39b717d8d3fd9f30c682a250e8dbe33b Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 14 Mar 2023 14:27:39 -0500 Subject: [PATCH 5/5] README: bump for v4.12.0 release --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 471ea585c..f1ad10973 100644 --- a/README.md +++ b/README.md @@ -29,4 +29,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport #### Release Version -B1G Geoportal Version v4.11.0 / GEOMG v0.16.0 / GeoBlacklight v4.0.0 +B1G Geoportal Version v4.12.0 / GEOMG v0.16.0 / GeoBlacklight v4.0.0