From cb8b2acabfb76ae1314cb194ea790a37ac8aa96c Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 26 Oct 2021 10:22:40 -0500 Subject: [PATCH] GBL: v2.4.0 changes Gems: bump to GBL 2.4.0 and lock execjs at 2.7.0 to avoid "TypeError: Cannot read property 'version' of undefined" error. See: https://github.com/rails/execjs/issues/99 SVG: remove title element Blacklight automatically populates the title popover value from the locales or the filename here. JS: remove unused modules Advanced Search: remove BL config try block. Not using in B1G and it tosses a SystemStackError Locales: add v2.4.0 additions Settings: add v2.4.0 additions --- Gemfile | 3 +- Gemfile.lock | 198 ++++++++++-------- app/assets/images/blacklight/citation.svg | 3 - app/assets/javascripts/geoblacklight.js | 2 - .../advanced/_advanced_search_form.html.erb | 10 +- config/locales/geoblacklight.en.yml | 43 ++++ config/settings.yml | 4 + 7 files changed, 157 insertions(+), 106 deletions(-) diff --git a/Gemfile b/Gemfile index 9a1b9e3..5e3f27e 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.7.2' +gem 'execjs', '2.7.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.5' @@ -68,7 +69,7 @@ gem 'blacklight_advanced_search', git: 'https://github.com/projectblacklight/bla gem 'blacklight_range_limit', '~> 7.0.0' gem 'chosen-rails' # jquery multiselect plugin for advanced search -gem 'geoblacklight', '~> 2.3.0' +gem 'geoblacklight', '~> 2.4.0' gem 'rsolr', '>= 1.0', '< 3' gem 'bootstrap', '~> 4.0' gem 'popper_js' diff --git a/Gemfile.lock b/Gemfile.lock index 34196e3..0748674 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,43 +10,43 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.5) - actionpack (= 5.2.5) + actioncable (5.2.6) + actionpack (= 5.2.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) + actionmailer (5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.5) - actionview (= 5.2.5) - activesupport (= 5.2.5) + actionpack (5.2.6) + actionview (= 5.2.6) + activesupport (= 5.2.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.5) - activesupport (= 5.2.5) + actionview (5.2.6) + activesupport (= 5.2.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.5) - activesupport (= 5.2.5) + activejob (5.2.6) + activesupport (= 5.2.6) globalid (>= 0.3.6) - activemodel (5.2.5) - activesupport (= 5.2.5) - activerecord (5.2.5) - activemodel (= 5.2.5) - activesupport (= 5.2.5) + activemodel (5.2.6) + activesupport (= 5.2.6) + activerecord (5.2.6) + activemodel (= 5.2.6) + activesupport (= 5.2.6) arel (>= 9.0) - activestorage (5.2.5) - actionpack (= 5.2.5) - activerecord (= 5.2.5) + activestorage (5.2.6) + actionpack (= 5.2.6) + activerecord (= 5.2.6) marcel (~> 1.0.0) - activesupport (5.2.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -61,13 +61,15 @@ GEM awesome_print (1.8.0) bcrypt (3.1.16) bindex (0.8.1) - blacklight (7.13.2) + blacklight (7.19.2) deprecation globalid + i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) + ostruct (>= 0.3.2) rails (>= 5.1, < 7) - view_component + view_component (>= 2.28.0) blacklight_range_limit (7.0.0) blacklight jquery-rails @@ -119,8 +121,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.8) - config (2.2.1) + concurrent-ruby (1.1.9) + config (3.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) connection_pool (2.2.5) @@ -132,7 +134,7 @@ GEM delayed_job_active_record (4.1.4) activerecord (>= 3.0, < 6.1) delayed_job (>= 3.0, < 5) - deprecation (1.0.0) + deprecation (1.1.0) activesupport devise (4.7.3) bcrypt (~> 3.0) @@ -146,57 +148,67 @@ GEM dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - dry-configurable (0.11.6) + dry-configurable (0.13.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) - dry-container (0.7.2) + dry-core (~> 0.6) + dry-container (0.9.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) + dry-configurable (~> 0.13, >= 0.13.0) + dry-core (0.7.1) concurrent-ruby (~> 1.0) - dry-equalizer (0.3.0) - dry-inflector (0.2.0) + dry-inflector (0.2.1) dry-initializer (3.0.4) - dry-logic (1.0.8) + dry-logic (1.2.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) - dry-schema (1.5.6) + dry-core (~> 0.5, >= 0.5) + dry-schema (1.8.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.8, >= 0.8.3) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) + dry-configurable (~> 0.13, >= 0.13.0) + dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) dry-logic (~> 1.0) - dry-types (~> 1.4) - dry-types (1.4.0) + dry-types (~> 1.5) + dry-types (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) - dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 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.5.6) + dry-validation (1.7.0) concurrent-ruby (~> 1.0) dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) - dry-schema (~> 1.5, >= 1.5.2) + dry-schema (~> 1.8, >= 1.8.0) erubi (1.10.0) exception_notification (4.4.3) actionmailer (>= 4.0, < 7) activesupport (>= 4.0, < 7) execjs (2.7.0) - faraday (1.1.0) + faraday (1.8.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) - ruby2_keywords + 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-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) faraday_middleware (1.0.0) faraday (~> 1.0) ffi (1.13.1) - font-awesome-rails (4.7.0.5) - railties (>= 3.2, < 6.1) + font-awesome-rails (4.7.0.7) + railties (>= 3.2, < 7) foreman (0.87.2) geo_combine (0.5.1) activesupport @@ -206,7 +218,7 @@ GEM rsolr sanitize thor - geoblacklight (2.3.0) + geoblacklight (2.4.0) blacklight (~> 7.0) coderay config @@ -228,12 +240,12 @@ GEM mini_magick (~> 4.9.4) rails (>= 5.2, < 6) statesman (>= 3.4) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) haml (5.2.0) temple (>= 0.8.0) tilt - handlebars_assets (0.23.8) + handlebars_assets (0.23.9) execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) @@ -245,7 +257,7 @@ GEM inline_svg (1.7.1) activesupport (>= 3.0) nokogiri (>= 1.6) - jbuilder (2.10.1) + jbuilder (2.11.2) activesupport (>= 5.0.0) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) @@ -267,21 +279,21 @@ GEM kaminari-core (1.2.1) launchy (2.5.0) addressable (~> 2.7) - loofah (2.9.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) + mime-types-data (3.2021.0901) mimemagic (0.4.3) nokogiri (~> 1) rake mini_magick (4.9.5) - mini_mime (1.1.0) + mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.14.4) msgpack (1.3.3) @@ -295,45 +307,44 @@ GEM nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) orm_adapter (0.5.0) + ostruct (0.5.0) parslet (2.0.0) popper_js (1.16.0) public_suffix (4.0.6) puma (5.5.1) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) - rack-proxy (0.6.5) + rack-proxy (0.7.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.5) - actioncable (= 5.2.5) - actionmailer (= 5.2.5) - actionpack (= 5.2.5) - actionview (= 5.2.5) - activejob (= 5.2.5) - activemodel (= 5.2.5) - activerecord (= 5.2.5) - activestorage (= 5.2.5) - activesupport (= 5.2.5) + rails (5.2.6) + actioncable (= 5.2.6) + actionmailer (= 5.2.6) + actionpack (= 5.2.6) + actionview (= 5.2.6) + activejob (= 5.2.6) + activemodel (= 5.2.6) + activerecord (= 5.2.6) + activestorage (= 5.2.6) + activesupport (= 5.2.6) bundler (>= 1.3.0) - railties (= 5.2.5) + railties (= 5.2.6) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (5.2.5) - actionpack (= 5.2.5) - activesupport (= 5.2.5) + railties (5.2.6) + actionpack (= 5.2.6) + activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.3) + rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -349,12 +360,11 @@ GEM ruby-progressbar (1.10.1) ruby-vips (2.0.17) ffi (~> 1.9) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.5) rubyzip (2.3.0) - sanitize (5.2.1) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -377,7 +387,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - semantic_range (2.3.0) + semantic_range (3.0.0) sidekiq (6.2.1) connection_pool (>= 2.2.2) rack (~> 2.0) @@ -416,8 +426,9 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - view_component (2.22.1) - activesupport (>= 5.0.0, < 7.0) + view_component (2.41.0) + activesupport (>= 5.0.0, < 8.0) + method_source (~> 1.0) warden (1.2.9) rack (>= 2.0.9) web-console (3.7.0) @@ -429,12 +440,12 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - webpacker (5.2.1) + webpacker (5.4.3) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) whenever (1.0.0) @@ -468,8 +479,9 @@ DEPENDENCIES devise-guests (~> 0.6) dotenv-rails exception_notification (~> 4.4.0) + execjs (= 2.7.0) foreman - geoblacklight (~> 2.3.0) + geoblacklight (~> 2.4.0) geoblacklight_sidecar_images (~> 0.6.0) haml inline_svg (~> 1.7.0) diff --git a/app/assets/images/blacklight/citation.svg b/app/assets/images/blacklight/citation.svg index 8c34e95..6145ad4 100644 --- a/app/assets/images/blacklight/citation.svg +++ b/app/assets/images/blacklight/citation.svg @@ -1,6 +1,3 @@ - - bookmark - diff --git a/app/assets/javascripts/geoblacklight.js b/app/assets/javascripts/geoblacklight.js index 691af42..cec8b84 100644 --- a/app/assets/javascripts/geoblacklight.js +++ b/app/assets/javascripts/geoblacklight.js @@ -3,7 +3,6 @@ //= require geoblacklight/basemaps //= require geoblacklight/controls //= require geoblacklight/viewers -//= require geoblacklight/modules/collapse //= require geoblacklight/modules/download //= require geoblacklight/modules/geosearch //= require geoblacklight/modules/help_text @@ -17,7 +16,6 @@ //= require geoblacklight/downloaders //= require leaflet-iiif //= require esri-leaflet -//= require readmore // additional leaflet base layers GeoBlacklight.Basemaps.esri = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}', { diff --git a/app/views/advanced/_advanced_search_form.html.erb b/app/views/advanced/_advanced_search_form.html.erb index 64f394d..e7682c1 100644 --- a/app/views/advanced/_advanced_search_form.html.erb +++ b/app/views/advanced/_advanced_search_form.html.erb @@ -22,18 +22,14 @@

<%= t('blacklight_advanced_search.form.limit_criteria_heading_html')%>

- <% if blacklight_config.try(:advanced_search).try {|h| h[:form_facet_partial] } %> - <%= render blacklight_config.advanced_search[:form_facet_partial] %> - <% else %> - <%= render 'advanced_search_facets_as_select' %> - <% end %> + <%= render 'advanced_search_facets_as_select' %>
- - <%= link_to t('blacklight_advanced_search.form.start_over'), blacklight_advanced_search_engine.advanced_search_path, :class =>"btn btn-primary pull-right clear-form" %> + + <%= link_to t('blacklight_advanced_search.form.start_over'), blacklight_advanced_search_engine.advanced_search_path, :class =>"btn btn-primary pull-right clear-form" %> <%= render 'advanced_search_submit_btns' %>
diff --git a/config/locales/geoblacklight.en.yml b/config/locales/geoblacklight.en.yml index 243009f..02772db 100644 --- a/config/locales/geoblacklight.en.yml +++ b/config/locales/geoblacklight.en.yml @@ -1,6 +1,8 @@ en: geoblacklight: bbox_label: 'Bounding Box' + citation: + retrieved_from: 'Retrieved from %{document_url}' download: download: 'Download' download_link: 'Download %{download_format}' @@ -40,6 +42,8 @@ en: jpg: 'JPG' esri_geodatabase: 'ESRI Geodatabase' sqlite_database: 'SQLite Database' + map: + label: 'Zoomable map' references: wms: 'Web Mapping Service (WMS)' wms_abv: 'WMS' @@ -105,3 +109,42 @@ en: wms: title: Web Map Service (WMS) content: A Web Map Service displays a geospatial dataset as map images. + blacklight: + icon: + arrow-circle-down: Arrow within a circle, pointing down + baruch-cuny: Baruch College + berkeley: University of California, Berkeley + cd-rom: CD-Rom + chicago: The University of Chicago + columbia: Columbia University + cornell: Cornell University + dvd-rom: DVD-Rom + esri-globe: Esri Global + harvard: Harvard University + illinois: University of Illinois + indiana: Indiana University + iowa: University of Iowa + lewis-clark: Lewis & Clark + maryland: University of Maryland + massgis: MassGIS + michigan-state: Michigan State University + michigan: University of Michigan + minnesota: University of Minnesota + mit: Massachusetts Institute of Technology + multilinestring: Multi-line string + multipoint: Multi-point + multipolygon: Multi-polygon + nyu: New York University + ohio-state: The Ohio State University + penn-state: Penn State University + princeton: Princeton University + public: Public content + purdue: Purdue University + restricted: Restricted content + sms: SMS + stanford: Stanford University + texas: The University of Texas at Austin + tufts: Tufts University + ucla: University of California, Los Angeles + uva: University of Virginia + wisconsin: University of Wisconsin diff --git a/config/settings.yml b/config/settings.yml index ab48141..6c93cb1 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -38,6 +38,7 @@ FIELDS: :TEMPORAL: 'dct_temporal_sm' :TITLE: 'dc_title_s' :SOURCE: 'dc_source_sm' + :ISSUED: 'dct_issued_s' :SUPPLEMENTAL: 'uw_supplemental_s' :NOTICE: 'uw_notice_s' @@ -63,6 +64,9 @@ TIMEOUT_DOWNLOAD: 16 # (For WMS inspection) timeout and open_timeout parameters for Faraday TIMEOUT_WMS: 4 +# Use the geometry type for the data relations icon +USE_GEOM_FOR_RELATIONS_ICON: false + # Web services shown in tool panel WEBSERVICES_SHOWN: - 'wms'