diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b58374f63..e856a1d9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,12 +69,13 @@ jobs: bin/rails db:migrate RAILS_ENV=test - name: Rails - Run tests - run: bundle exec rake ci env: + RAILS_ENV: test rails_version: 6.1.5 ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test' SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core FARADAY_VERSION: ${{ matrix.faraday_version }} + run: bundle exec rake geoportal:ci --trace - name: Artifacts - Upload coverage uses: actions/upload-artifact@v2 diff --git a/README.md b/README.md index ebe6d8d53..8031d2393 100644 --- 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.0.2 / GeoBlacklight v4.1.0 / GeoBlacklight Admin v0.3.0 +B1G Geoportal Version v5.1.0 / GeoBlacklight v4.1.0 / GeoBlacklight Admin v0.3.2 diff --git a/app/assets/javascripts/geoportal/modules/home.js b/app/assets/javascripts/geoportal/modules/home.js index 9e62487ad..eed15b47f 100644 --- a/app/assets/javascripts/geoportal/modules/home.js +++ b/app/assets/javascripts/geoportal/modules/home.js @@ -49,7 +49,7 @@ Blacklight.onLoad(function() { // Oboe - SAX steam JSON results from Solr /export // oboe('http://localhost:8983/solr/geoportal/export?fl=uuid_sdv,dc_title_sdv,centroid_sdv&indent=on&q=*:*&wt=json&sort=dc_title_sdv%20asc&rows=10000') - oboe('/centroids.json') + oboe('./centroids.json') .node('*', function( doc ){ if(typeof doc.c != 'undefined'){ var latlng = doc.c.split(",") diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 825f1f70e..0ae0dddfd 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -311,7 +311,6 @@ class CatalogController < ApplicationController # Custom tools for GeoBlacklight config.add_show_tools_partial :more_details, partial: 'more_details', if: proc { |_context, _config, options| options[:document] && (!options[:document].references.nil? & !options[:document].references.url.nil?)} config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? } - config.add_show_tools_partial :carto, partial: 'carto', if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? } config.add_show_tools_partial :arcgis, partial: 'arcgis', if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? } config.add_show_tools_partial :data_dictionary, partial: 'data_dictionary', if: proc { |_context, _config, options| options[:document] && options[:document].data_dictionary_download.present? } config.add_show_tools_partial(:citation, if: proc { |_context, _config, options| options[:document] && (options[:document].resource_class != 'Collections')}) diff --git a/app/views/shared/_javascript_behaviors.html.erb b/app/views/shared/_javascript_behaviors.html.erb index b6003cd55..37c84bb28 100644 --- a/app/views/shared/_javascript_behaviors.html.erb +++ b/app/views/shared/_javascript_behaviors.html.erb @@ -1,5 +1,6 @@