Merge pull request #1811 from datadryad/3544-remove-geoblacklight-fro…

…m-project-and-switch-to-using-blacklight-alone removed geoblacklight gem and references, updated views, updated config
datadryad · Oct 7, 2024 · aa823ca · aa823ca
2 parents 9882a65 + fa230d6
commit aa823ca
Show file tree

Hide file tree

Showing 47 changed files with 194 additions and 360 deletions.
diff --git a/Gemfile b/Gemfile
@@ -50,7 +50,7 @@ gem 'amoeba', '~> 3.2.0'
 gem 'annotate', '~> 3.2'
 gem 'aws-sdk-lambda'
 gem 'aws-sdk-s3', '~> 1.113'
-gem 'blacklight'
+gem 'blacklight', '= 7.37.0'
 gem 'bootsnap', require: false
 gem 'bootstrap', '~> 4.6'
 gem 'charlock_holmes', '~> 0.7.7'
@@ -68,7 +68,6 @@ gem 'exception_notification'
 gem 'ezid-client', '~> 1.9.2'
 gem 'filesize', '~> 0.2.0'
 gem 'font-awesome-sass', '~> 6.1.0'
-gem 'geoblacklight', '~> 3.0'
 gem 'google-apis-gmail_v1', '~> 0.14.0'
 gem 'grover'
 gem 'http', '~> 5.0.4'
@@ -107,7 +106,6 @@ gem 'solr_wrapper', '~> 3.1.3' # was once used in tests, not sure still used
 gem 'stripe', '~> 5.50.0'
 gem 'sync', '~> 0.5.0' # not sure where this is used
 gem 'tins', '~> 1.31.0' # ?? some library that doesn't say what it does aside from stuff that is tiny
-gem 'twitter-typeahead-rails', '0.11.1' # this is in a generator to install blacklight
 gem 'yaml', '~> 0.3.0' # version 0.2.0 breaks Gmail (https://github.com/datadryad/dryad-app/pull/771)
 gem 'zaru', '~> 0.3.0' # for sanitizing file names
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -183,9 +183,6 @@ GEM
       matrix
       ruby-rc4 (>= 0.1.5)
     concurrent-ruby (1.1.10)
-    config (4.2.1)
-      deep_merge (~> 1.2, >= 1.2.1)
-      dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.4.1)
     crack (0.4.5)
       rexml
@@ -203,7 +200,6 @@ GEM
     date (3.3.4)
     debug_inspector (1.1.0)
     declarative (0.0.20)
-    deep_merge (1.2.2)
     delayed_job (4.1.11)
       activesupport (>= 3.0, < 8.0)
     delayed_job_active_record (4.1.7)
@@ -228,38 +224,6 @@ GEM
       railties (>= 5)
     down (5.4.1)
       addressable (~> 2.8)
-    dry-configurable (1.1.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-initializer (3.1.1)
-    dry-logic (1.5.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
-      zeitwerk (~> 2.6)
-    dry-schema (1.13.3)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 1.0, >= 1.0.1)
-      dry-core (~> 1.0, < 2)
-      dry-initializer (~> 3.0)
-      dry-logic (>= 1.4, < 2)
-      dry-types (>= 1.7, < 2)
-      zeitwerk (~> 2.6)
-    dry-types (1.7.1)
-      concurrent-ruby (~> 1.0)
-      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-core (~> 1.0, < 2)
-      dry-initializer (~> 3.0)
-      dry-schema (>= 1.12, < 2)
-      zeitwerk (~> 2.6)
     ed25519 (1.3.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
@@ -312,26 +276,6 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    geo_combine (0.6.0)
-      activesupport
-      json-schema
-      net-http-persistent (~> 2.0)
-      nokogiri
-      rsolr
-      sanitize
-      thor
-    geoblacklight (3.7.0)
-      blacklight (~> 7.8)
-      coderay
-      config
-      deprecation
-      faraday (~> 1.0)
-      faraday_middleware (~> 1.0.0.rc1)
-      geo_combine (~> 0.4)
-      handlebars_assets
-      mime-types
-      rails (>= 5.2.4, < 7.1)
-      rgeo-geojson
     globalid (1.1.0)
       activesupport (>= 5.0)
     google-apis-core (0.11.1)
@@ -369,10 +313,6 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    handlebars_assets (0.23.9)
-      execjs (~> 2.0)
-      sprockets (>= 2.0.0)
-      tilt (>= 1.2)
     hashdiff (1.0.1)
     hashie (3.6.0)
     http (5.0.4)
@@ -405,8 +345,6 @@ GEM
       railties (>= 3.1.0)
       turbolinks
     json (2.7.2)
-    json-schema (4.0.0)
-      addressable (>= 2.8)
     jwt (2.3.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -474,7 +412,6 @@ GEM
     net-ftp (0.3.4)
       net-protocol
       time
-    net-http-persistent (2.9.4)
     net-imap (0.4.11)
       date
       net-protocol
@@ -531,7 +468,7 @@ GEM
       omniauth (>= 1.0.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    ostruct (0.5.5)
+    ostruct (0.6.0)
     parallel (1.23.0)
     parallel_tests (4.2.1)
       parallel
@@ -630,9 +567,6 @@ GEM
     retriable (3.1.2)
     rexml (3.3.6)
       strscan
-    rgeo (3.0.0)
-    rgeo-geojson (2.1.1)
-      rgeo (>= 1.0.0)
     rinku (2.0.6)
     rsolr (2.5.0)
       builder (>= 2.1.2)
@@ -685,9 +619,6 @@ GEM
     ruby_parser (3.20.3)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
-    sanitize (6.0.2)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -770,10 +701,6 @@ GEM
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    twitter-typeahead-rails (0.11.1)
-      actionpack (>= 3.1)
-      jquery-rails
-      railties (>= 3.1)
     typesafe_enum (0.1.9)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -785,7 +712,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     version_gem (1.1.3)
-    view_component (2.83.0)
+    view_component (3.13.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -831,7 +758,7 @@ DEPENDENCIES
   bcrypt_pbkdf (= 1.1.0)
   bigdecimal
   binding_of_caller
-  blacklight
+  blacklight (= 7.37.0)
   bootsnap
   bootstrap (~> 4.6)
   byebug
@@ -863,7 +790,6 @@ DEPENDENCIES
   filesize (~> 0.2.0)
   font-awesome-sass (~> 6.1.0)
   fuubar
-  geoblacklight (~> 3.0)
   google-apis-gmail_v1 (~> 0.14.0)
   grover
   guard
@@ -938,7 +864,6 @@ DEPENDENCIES
   timecop
   tins (~> 1.31.0)
   turbolinks
-  twitter-typeahead-rails (= 0.11.1)
   uglifier (~> 4.2.0)
   web-console
   webmock

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -5,4 +5,4 @@
 //= link_directory ../stylesheets .css
 //= link_directory ../stylesheets/stash_engine .css
 //= link_directory ../stylesheets/stash_datacite .css
-//= link_directory ../stylesheets/geoblacklight .css
+//= link_directory ../stylesheets/blacklight .css
diff --git a/app/assets/javascripts/stash_engine/geobl_application.js b/app/assets/javascripts/stash_engine/geobl_application.js
@@ -18,10 +18,10 @@
 // Required by Blacklight
 //= require popper
 // Twitter Typeahead for autocomplete
-//= require twitter/typeahead
 //= require bootstrap
 //= require blacklight/blacklight
 //= require_tree
-Blacklight.doSearchContextBehavior = function(){
-  console.log("Redefining doSearchContextBehavior so as not to intercept search results.")
+
+Blacklight.doSearchContextBehavior = function () {
+  console.log('Redefining doSearchContextBehavior so as not to intercept search results.');
 };
diff --git a/app/assets/javascripts/stash_engine/geoblacklight.js b/app/assets/javascripts/stash_engine/geoblacklight.js
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -20,7 +20,7 @@ body, body#yes-really {
 	padding: 10px;
 	font-family: 'KievitWeb', sans-serif;
 
-	/* Blacklight/geoblacklight resets */
+	/* Blacklight resets */
 	font-size: initial;
 	font-size: 1.1rem;
 
@@ -136,4 +136,4 @@ a[role='button']:focus-visible, a[class*='button']:focus-visible {
 @import 'scss/review';
 @import 'scss/search-results';
 @import 'scss/upload';
-@import 'scss/geoblacklight-icons';
+@import 'scss/blacklight-icons';
diff --git a/...tylesheets/geoblacklight/application.scss → ...s/stylesheets/blacklight/application.scss b/...tylesheets/geoblacklight/application.scss → ...s/stylesheets/blacklight/application.scss
@@ -9696,10 +9696,20 @@ a.catalog_startOverLink:hover {
 button[data-toggle='collapse'] {
   display:none
 }
+.category-icon .blacklight-icons {
+  height: 100px;
+  display: block;
+}
+
 .category-icon .blacklight-icons svg {
   width:4.5rem;
   margin:1rem 0 .3rem
 }
+.category-icon .blacklight-icons i {
+  height: 57px;
+  margin: 1.3rem 0 .6rem;
+  color: #6C757D;
+}
 .documents-list .document {
   padding-bottom:0.5rem
 }

diff --git a/...tylesheets/scss/_geoblacklight-icons.scss → ...s/stylesheets/scss/_blacklight-icons.scss b/...tylesheets/scss/_geoblacklight-icons.scss → ...s/stylesheets/scss/_blacklight-icons.scss
@@ -1,4 +1,4 @@
-// ##### Geoblacklight Icons##### //
+// ##### Blacklight Icons##### //
 
 
 .c-category__globe {

diff --git a/app/assets/stylesheets/scss/_header.scss b/app/assets/stylesheets/scss/_header.scss
@@ -47,11 +47,11 @@
 
 
 .c-header__dash-logo-svg {
-  /* Blacklight/geoblacklight resets */
+  /* Blacklight resets */
   box-sizing: content-box;
   max-height: 2rem;
 
-  @include bp(screen3) {  
+  @include bp(screen3) {
     max-height: 3rem;
   }
 }
@@ -64,7 +64,7 @@
   @media (max-width: $screen-lg-min) {
     .hide-mobile {
       display: none !important;
-    } 
+    }
   }
   @include bp(screen3) {
     display: flex;
@@ -96,7 +96,7 @@
     align-items: baseline;
     margin: 0 -10px 2px;
     background-color: $lightest-blue;
-    
+
     @include bp(screen1) {
       margin: 0 -20px 2px;
     }
@@ -134,7 +134,7 @@
   text-align: center;
   text-decoration: none;
 
-  
+
 
   @include bp(screen3) {
     flex: 0 1 auto;
@@ -267,7 +267,8 @@
   display: flex;
   margin: 0;
   padding: 0 15px;
-
+  background-color: white;
+
   a:link, a:visited {
     color: $link-body-color;
     text-decoration: none;
@@ -299,15 +300,15 @@
   &.is-open {
     padding-bottom: 10px;
     margin-bottom: -10px;
-  }    
+  }
 }
 
 .c-second__nav-item {
   position: relative;
   @include c-header__nav-item;
 }
 
-#mobile-nav-bar .c-header__nav-item, 
+#mobile-nav-bar .c-header__nav-item,
 #site-menu .c-header__nav-item {
   position: relative;
 
@@ -425,4 +426,4 @@
   &[aria-expanded="true"] {
     color: white;
   }
-}
+}
diff --git a/app/assets/stylesheets/scss/_links.scss b/app/assets/stylesheets/scss/_links.scss
@@ -84,10 +84,11 @@ a {
   @extend %o-link__secondary;
 }
 
-// Links in Geoblacklight UI:
+// Links in Blacklight UI:
 
 .category-block .more_facets_link {
   @extend %o-link__primary;
+  white-space: nowrap;
 }
 
 .facet-values .more_facets_link {
@@ -139,7 +140,7 @@ a {
   z-index: 15;
   padding: $spacing-sm;
   transition: opacity 0.5s;
-  opacity: 0;  
+  opacity: 0;
 
   &:focus {
     top: $spacing-sm;
@@ -182,4 +183,4 @@ a {
   i.fa-check {
     color: $dark-green;
   }
-}
+}