Merge branch 'release/5.10.0'

geobtaa · Jul 31, 2024 · 211c100 · 211c100
2 parents 9d7f9cc + 1364d65
commit 211c100
Show file tree

Hide file tree

Showing 25 changed files with 2,588 additions and 3,122 deletions.
diff --git a/Gemfile b/Gemfile
@@ -82,10 +82,11 @@ gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'geoblacklight', '4.4'
 
 # GBL Admin
-gem 'geoblacklight_admin', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "feature/vite"
+gem 'geoblacklight_admin', git: "https://github.com/geobtaa/geoblacklight_admin.git", branch: "develop"
 gem 'git', ">= 1.13"
 gem "rubyzip", ">= 1.3.0"
 gem "awesome_print"
+gem "hashdiff"
 
 # GBL Admin dependencies _not_ automatically loading...
 gem 'active_storage_validations'
@@ -153,3 +154,6 @@ gem 'rexml'
 
 gem "stimulus-rails"
 gem "vite_rails", "~> 3.0"
+
+# Shrine
+gem "aws-sdk-s3", "~> 1.14"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -41,10 +41,10 @@ GIT
 
 GIT
   remote: https://github.com/geobtaa/geoblacklight_admin.git
-  revision: 73b175f1f28d70ec3fe6c3ff6f04fe192e6baa91
-  branch: feature/vite
+  revision: 2f64866b128a16699c6cebe31c9fff4a307d6678
+  branch: develop
   specs:
-    geoblacklight_admin (0.4.0)
+    geoblacklight_admin (0.4.1)
       active_storage_validations (~> 1.0)
       amazing_print
       blacklight (~> 7.33)
@@ -155,22 +155,38 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
     airrecord (1.0.12)
       faraday (>= 1.0, < 3.0)
       faraday-net_http_persistent
       net-http-persistent
     amazing_print (1.6.0)
     ansi (1.5.0)
-    appsignal (3.7.6)
+    appsignal (3.12.0)
       rack
     attr_json (2.3.1)
       activerecord (>= 6.0.0, < 7.2)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     awesome_print (1.9.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.944.0)
+    aws-sdk-core (3.197.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.83.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.152.2)
+      aws-sdk-core (~> 3, >= 3.197.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     axe-core-api (4.9.1)
       dumb_delegator
       virtus
@@ -258,7 +274,7 @@ GEM
     csv (3.3.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
@@ -290,14 +306,14 @@ GEM
       railties (>= 3.2)
     down (5.4.2)
       addressable (~> 2.8)
-    dry-cli (1.0.0)
-    dry-configurable (1.1.0)
+    dry-cli (1.1.0)
+    dry-configurable (1.2.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
+    dry-inflector (1.1.0)
     dry-initializer (3.1.1)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
@@ -325,7 +341,7 @@ GEM
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
     dumb_delegator (1.0.0)
-    erubi (1.12.0)
+    erubi (1.13.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     execjs (2.9.1)
@@ -334,9 +350,10 @@ GEM
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faraday (2.9.1)
+    faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+      logger
+    faraday-net_http (3.1.1)
       net-http
     faraday-net_http_persistent (2.1.0)
       faraday (~> 2.5)
@@ -353,7 +370,7 @@ GEM
     fx (0.8.0)
       activerecord (>= 6.0.0)
       railties (>= 6.0.0)
-    geo_combine (0.9.0)
+    geo_combine (0.9.1)
       activesupport
       faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.2)
@@ -422,11 +439,12 @@ GEM
     jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
+    jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json-schema (4.3.0)
+    json-schema (4.3.1)
       addressable (>= 2.8)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -440,7 +458,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    kithe (2.13.0)
+    kithe (2.14.0)
       attr_json (~> 2.0)
       fastimage (~> 2.0)
       fx (>= 0.6.0, < 1)
@@ -472,6 +490,7 @@ GEM
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -495,33 +514,34 @@ GEM
     method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0604)
+    mime-types-data (3.2024.0702)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_magick (4.9.5)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitar (0.9)
-    minitest (5.23.1)
+    minitest (5.24.1)
     minitest-ci (3.4.0)
       minitest (>= 5.0.6)
-    minitest-reporters (1.6.1)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     msgpack (1.7.2)
+    multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    net-ftp (0.3.6)
+    net-ftp (0.3.7)
       net-protocol
       time
     net-http (0.4.1)
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.12)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -531,7 +551,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     noticed (1.6.3)
@@ -552,15 +572,15 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.6)
+    pg (1.5.7)
     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.1)
     process_executer (1.1.0)
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
     puma (5.6.8)
       nio4r (~> 2.0)
     qa (5.11.0)
@@ -572,7 +592,7 @@ GEM
       nokogiri (~> 1.6)
       rails (>= 5.0, < 7.2)
       rdf
-    racc (1.8.0)
+    racc (1.8.1)
     rack (2.2.9)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
@@ -615,8 +635,9 @@ GEM
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    rdf (3.3.1)
+    rdf (3.3.2)
       bcp47_spec (~> 0.2)
+      bigdecimal (~> 3.1, >= 3.1.5)
       link_header (~> 0.0, >= 0.0.8)
     rdf-vocab (3.3.1)
       rdf (~> 3.3)
@@ -628,10 +649,11 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.3.0)
+    rexml (3.3.2)
       strscan
     rgeo (3.0.1)
-    rgeo-geojson (2.1.1)
+    rgeo-geojson (2.2.0)
+      multi_json (~> 1.15)
       rgeo (>= 1.0.0)
     rsolr (2.6.0)
       builder (>= 2.1.2)
@@ -655,11 +677,12 @@ GEM
     rspec-support (3.9.4)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
-    ruby-vips (2.2.1)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
+      logger
     rubyzip (2.3.2)
     safely_block (0.4.0)
-    sanitize (6.1.0)
+    sanitize (6.1.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sass (3.7.4)
@@ -683,8 +706,9 @@ GEM
       tilt
     scrub_rb (1.0.1)
     sd_notify (0.1.1)
-    selenium-webdriver (4.21.1)
+    selenium-webdriver (4.23.0)
       base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -731,7 +755,7 @@ GEM
       rails (>= 3.1)
     thor (1.3.1)
     thread_safe (0.3.6)
-    tilt (2.3.0)
+    tilt (2.4.0)
     time (0.3.0)
       date
     timeout (0.4.1)
@@ -777,7 +801,7 @@ GEM
     vite_rails (3.0.17)
       railties (>= 5.1, < 8)
       vite_ruby (~> 3.0, >= 3.2.2)
-    vite_ruby (3.6.0)
+    vite_ruby (3.7.0)
       dry-cli (>= 0.7, < 2)
       rack-proxy (~> 0.6, >= 0.6.1)
       zeitwerk (~> 2.2)
@@ -793,7 +817,7 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    websocket (1.2.10)
+    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -802,7 +826,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yell (2.2.2)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby
@@ -813,6 +837,7 @@ DEPENDENCIES
   addressable (~> 2.0)
   appsignal
   awesome_print
+  aws-sdk-s3 (~> 1.14)
   axe-core-api
   blacklight (~> 7.33.0)
   blacklight_advanced_search!
@@ -845,6 +870,7 @@ DEPENDENCIES
   git (>= 1.13)
   haml
   handlebars_assets (~> 0.23.0)
+  hashdiff
   image_processing (>= 1.2)
   inline_svg
   jbuilder (~> 2.5)

diff --git a/Procfile b/Procfile
@@ -1,2 +1,2 @@
-sidekiq:     bundle exec sidekiq -q priority -q devise -q default
+sidekiq:     bundle exec sidekiq -q priority -q devise -q default -q low_priority
 sidekiq_web: bundle exec puma sidekiq.ru
diff --git a/README.md b/README.md
@@ -30,4 +30,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport
 
 #### Release Version
 
-B1G Geoportal Version v5.9.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)
+B1G Geoportal Version v5.10.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (develop branch)
diff --git a/Rakefile b/Rakefile
@@ -7,3 +7,4 @@ require 'solr_wrapper/rake_task'
 
 Rails.application.load_tasks
 require 'blacklight/allmaps/rake_task'
+require "geoblacklight_admin/rake_task"
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -1,12 +1,14 @@
 # -*- encoding : utf-8 -*-
 require 'blacklight/catalog'
-# require 'kithe/blacklight_tools/bulk_loading_search_service'
+require 'kithe/blacklight_tools/bulk_loading_search_service'
 
 class CatalogController < ApplicationController
   include BlacklightAdvancedSearch::Controller
   include BlacklightRangeLimit::ControllerOverride
   include Blacklight::Catalog
-  # self.search_service_class = Kithe::BlacklightTools::BulkLoadingSearchService
+
+  # GBL Admin
+  self.search_service_class = Kithe::BlacklightTools::BulkLoadingSearchService
 
   configure_blacklight do |config|
     # default advanced config values

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -69,7 +69,8 @@ def b1g_institution_codes
       '11'=> 'The Ohio State University',
       '12'=> 'University of Chicago',
       '13'=> 'University of Nebraska-Lincoln',
-      '14'=> 'Rutgers University-New Brunswick'
+      '14'=> 'Rutgers University-New Brunswick',
+      "15" => "Northwestern University"
     }
   end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport

		#### Release Version

		B1G Geoportal Version v5.9.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)
		B1G Geoportal Version v5.10.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (develop branch)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ require 'solr_wrapper/rake_task'

		Rails.application.load_tasks
		require 'blacklight/allmaps/rake_task'
		require "geoblacklight_admin/rake_task"