Merge branch 'release/4.13.0'

geobtaa · Jun 21, 2023 · efee480 · efee480
2 parents adc5dbe + 8f3ed21
commit efee480
Show file tree

Hide file tree

Showing 26 changed files with 317 additions and 114 deletions.
diff --git a/Gemfile b/Gemfile
@@ -49,6 +49,7 @@ group :development, :test do
   gem 'byebug'
 
   # RSpec/SolrWrapper
+  gem 'axe-core-api'
   gem 'capybara'
   gem 'capybara-selenium'
   gem 'capybara-screenshot'
@@ -65,7 +66,7 @@ group :development do
   gem 'letter_opener'
 end
 
-gem 'blacklight', '~> 7.30.0'
+gem 'blacklight', '~> 7.33.0'
 
 # BL Advanced Search / Pinned to EWL bug-fix
 # See: https://github.com/projectblacklight/blacklight_advanced_search/issues/127
@@ -76,7 +77,7 @@ gem 'chosen-rails' #  jquery multiselect plugin for advanced search
 gem 'bootstrap', '~> 4.0'
 gem 'popper_js'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
-gem 'geoblacklight', '~> 4.0.0'
+gem 'geoblacklight', '~> 4.1'
 gem "rubyzip", ">= 1.3.0"
 gem "awesome_print"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/cbeer/solr_wrapper.git
-  revision: 1de5aaa7492bad7816509c04f044a0a6dee2e90d
+  revision: 8decbdd1840e14a8b039ceead1060f864891408c
   branch: master
   specs:
     solr_wrapper (4.0.2)
@@ -94,14 +94,21 @@ GEM
       faraday-net_http_persistent
       net-http-persistent
     ansi (1.5.0)
-    appsignal (3.3.7)
+    appsignal (3.4.4)
       rack
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     awesome_print (1.9.2)
+    axe-core-api (4.7.0)
+      dumb_delegator
+      virtus
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
     bcrypt (3.1.18)
     bindex (0.8.1)
-    blacklight (7.30.0)
+    blacklight (7.33.1)
       deprecation
       globalid
       hashdiff
@@ -110,7 +117,7 @@ GEM
       kaminari (>= 0.15)
       ostruct (>= 0.3.2)
       rails (>= 5.1, < 7.1)
-      view_component (~> 2.43)
+      view_component (~> 2.66)
     blacklight_range_limit (7.0.1)
       blacklight
       jquery-rails
@@ -124,7 +131,7 @@ GEM
       sassc-rails (>= 2.0.0)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.38.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -150,6 +157,8 @@ GEM
       sassc-rails (>= 2.1.2)
     chronic (0.10.2)
     coderay (1.1.3)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -158,10 +167,10 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
-    config (4.1.0)
+    config (4.2.1)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
-    connection_pool (2.3.0)
+    connection_pool (2.4.1)
     crass (1.0.6)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
@@ -173,7 +182,9 @@ GEM
     deep_merge (1.2.2)
     deprecation (1.1.0)
       activesupport
-    devise (4.9.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -202,12 +213,12 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-schema (1.13.0)
+    dry-schema (1.13.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (>= 1.5, < 2)
+      dry-logic (>= 1.4, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
     dry-types (1.7.1)
@@ -222,6 +233,7 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
+    dumb_delegator (1.0.0)
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
@@ -234,7 +246,7 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.4)
+    faraday (2.7.6)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
@@ -247,21 +259,22 @@ GEM
       rake
     flamegraph (0.9.5)
     foreman (0.87.2)
-    geo_combine (0.7.0)
+    geo_combine (0.8.0)
       activesupport
       faraday-net_http_persistent (~> 2.0)
+      git
       json-schema
       nokogiri
       rsolr
       sanitize
       thor
-    geoblacklight (4.0.0)
-      blacklight (~> 7.12)
+    geoblacklight (4.1.0)
+      blacklight (~> 7.33)
       coderay
       config
       deprecation
       faraday (>= 1.0)
-      geo_combine (~> 0.4)
+      geo_combine (~> 0.8)
       handlebars_assets
       mime-types
       rails (>= 6.1, < 7.1)
@@ -274,6 +287,8 @@ GEM
       mini_magick (~> 4.9.4)
       rails (>= 5.2, < 7.1)
       statesman (>= 3.4)
+    git (1.11.0)
+      rchardet (~> 1.8)
     globalid (1.1.0)
       activesupport (>= 5.0)
     haml (6.1.1)
@@ -293,8 +308,9 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -329,9 +345,9 @@ GEM
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     m (1.5.1)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -352,7 +368,7 @@ GEM
       rake
     mini_magick (4.9.5)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     minitar (0.9)
     minitest (5.18.0)
     minitest-ci (3.4.0)
@@ -362,10 +378,10 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    msgpack (1.6.1)
-    net-http-persistent (4.0.1)
+    msgpack (1.7.1)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -374,14 +390,14 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     ostruct (0.5.5)
     parslet (2.0.0)
-    pg (1.4.6)
+    pg (1.5.3)
     pointless_feedback (4.1.5)
       airrecord (~> 1.0)
       jquery-rails (>= 4.0)
@@ -391,9 +407,9 @@ GEM
     public_suffix (3.1.1)
     puma (5.6.5)
       nio4r (~> 2.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
-    rack-cors (2.0.0)
+    racc (1.7.1)
+    rack (2.2.7)
+    rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
@@ -419,8 +435,9 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     railties (6.1.7.3)
       actionpack (= 6.1.7.3)
       activesupport (= 6.1.7.3)
@@ -431,11 +448,12 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rchardet (1.8.0)
     redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.14.0)
+    redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.1)
     responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
@@ -492,7 +510,7 @@ GEM
       sprockets-rails
       tilt
     sd_notify (0.1.1)
-    selenium-webdriver (4.8.1)
+    selenium-webdriver (4.10.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -512,16 +530,17 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.6.1)
+    sqlite3 (1.6.3)
       mini_portile2 (~> 2.8.0)
     ssrf_filter (1.0.8)
-    stackprof (0.2.23)
+    stackprof (0.2.25)
     statesman (3.4.1)
-    temple (0.10.0)
+    temple (0.10.2)
     tether-rails (1.4.0)
       rails (>= 3.1)
-    thor (1.2.1)
-    tilt (2.1.0)
+    thor (1.2.2)
+    thread_safe (0.3.6)
+    tilt (2.2.0)
     timeout (0.3.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
@@ -543,6 +562,10 @@ GEM
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
+    virtus (2.0.0)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -566,7 +589,7 @@ GEM
       chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -575,7 +598,8 @@ DEPENDENCIES
   addressable (~> 2.5.0)
   appsignal
   awesome_print
-  blacklight (~> 7.30.0)
+  axe-core-api
+  blacklight (~> 7.33.0)
   blacklight_advanced_search!
   blacklight_range_limit (~> 7.0.0)
   bootsnap (~> 1.9.3)
@@ -597,7 +621,7 @@ DEPENDENCIES
   factory_bot_rails
   flamegraph (~> 0.9.5)
   foreman
-  geoblacklight (~> 4.0.0)
+  geoblacklight (~> 4.1)
   geoblacklight-icons!
   geoblacklight_sidecar_images (~> 1.0)
   haml

diff --git 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.12.0 / GEOMG v0.16.0 / GeoBlacklight v4.0.0
+B1G Geoportal Version v4.13.0 / GEOMG v0.16.0 / GeoBlacklight v4.1.0
diff --git a/app/assets/javascripts/Leaflet/leaflet.sleep/Leaflet.Sleep.js b/app/assets/javascripts/Leaflet/leaflet.sleep/Leaflet.Sleep.js
@@ -177,7 +177,7 @@ L.Map.Sleep = L.Handler.extend({
     }
 
     L.DomUtil.setOpacity( this._map._container, this._map.options.sleepOpacity);
-    this.sleepNote.style.opacity = this._map.options.sleepNoteStyle && this._map.options.sleepNoteStyle.opacity ? this._map.options.sleepNoteStyle.opacity : .6;
+    this.sleepNote.style.opacity = this._map.options.sleepNoteStyle && this._map.options.sleepNoteStyle.opacity ? this._map.options.sleepNoteStyle.opacity : .9;
     this._addSleepingListeners();
   },
 

diff --git a/app/assets/javascripts/geoportal.js b/app/assets/javascripts/geoportal.js
@@ -3,7 +3,7 @@ if (!window.B1G){ B1G={}; }
 
 B1G.baseLayerMap = {
   "Default (Esri)": 'esri',
-  "OpenStreetMaps": 'openstreetmapStandard',
+  "OpenStreetMap": 'openstreetmapStandard',
   "World Imagery (Esri)": 'esri_world_imagery'
 }
 

diff --git a/app/assets/javascripts/geoportal/modules/results.js b/app/assets/javascripts/geoportal/modules/results.js
@@ -1,6 +1,7 @@
 Blacklight.onLoad(function() {
   var historySupported = !!(window.history && window.history.pushState);
 
+
   if (historySupported) {
     History.Adapter.bind(window, 'statechange', function() {
       var state = History.getState();
@@ -79,6 +80,9 @@ Blacklight.onLoad(function() {
     GeoBlacklight.Home.setHoverListeners();
   });
 
+  // Remove Leaflet Attribute
+  $('.leaflet-control-attribution').hide()
+
   function setHoverListeners() {
     $('[data-map="index"]').each(function(i, element) {
       $('#content')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport

		#### Release Version

		B1G Geoportal Version v4.12.0 / GEOMG v0.16.0 / GeoBlacklight v4.0.0
		B1G Geoportal Version v4.13.0 / GEOMG v0.16.0 / GeoBlacklight v4.1.0