Merge branch 'feature/kithe-thumbnails' into develop

geobtaa · Jul 22, 2024 · b48317a · b48317a
2 parents 54159e6 + 027667a
commit b48317a
Show file tree

Hide file tree

Showing 22 changed files with 2,529 additions and 3,087 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: f890e1e7aa9c8495d2a7f4bddeb8cca068d6e8e2
+  branch: develop
   specs:
-    geoblacklight_admin (0.4.0)
+    geoblacklight_admin (0.4.1)
       active_storage_validations (~> 1.0)
       amazing_print
       blacklight (~> 7.33)
@@ -171,6 +171,22 @@ GEM
     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
@@ -423,6 +439,7 @@ 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)
@@ -818,6 +835,7 @@ DEPENDENCIES
   addressable (~> 2.0)
   appsignal
   awesome_print
+  aws-sdk-s3 (~> 1.14)
   axe-core-api
   blacklight (~> 7.33.0)
   blacklight_advanced_search!
@@ -850,6 +868,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/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/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		@@ -7,3 +7,4 @@ require 'solr_wrapper/rake_task'

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