Skip to content

Commit

Permalink
upgrade to 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mradamcox committed Jun 30, 2023
1 parent 4633da0 commit f8a7c28
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 34 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
nohup.out
*.log
tmp

Expand Down
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
java openjdk-11.0.2
ruby 3.2.1
nodejs 18.6.0
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ group :test do
gem "webdrivers"
end
gem "blacklight", "~> 7.0"
gem "geoblacklight", "~> 4.0"
gem "geoblacklight", "~> 4.1"
gem "sprockets", "< 4.0"

group :development, :test do
Expand Down
27 changes: 16 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ GEM
xpath (~> 3.2)
coderay (1.1.3)
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)
date (3.3.3)
debug (1.7.1)
Expand Down Expand Up @@ -132,12 +132,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)
Expand Down Expand Up @@ -165,25 +165,29 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
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)
rgeo-geojson
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
globalid (1.1.0)
activesupport (>= 5.0)
handlebars_assets (0.23.9)
Expand Down Expand Up @@ -211,7 +215,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json-schema (3.0.0)
json-schema (4.0.0)
addressable (>= 2.8)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -246,7 +250,7 @@ GEM
minitar (0.9)
minitest (5.18.0)
msgpack (1.6.1)
net-http-persistent (4.0.1)
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
net-imap (0.3.4)
date
Expand Down Expand Up @@ -298,6 +302,7 @@ GEM
thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.0.6)
rchardet (1.8.0)
regexp_parser (2.7.0)
responders (3.1.0)
actionpack (>= 5.2)
Expand Down Expand Up @@ -393,7 +398,7 @@ DEPENDENCIES
debug
devise
devise-guests (~> 0.8)
geoblacklight (~> 4.0)
geoblacklight (~> 4.1)
importmap-rails
jbuilder
jquery-rails
Expand Down
1 change: 1 addition & 0 deletions app/controllers/catalog_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class CatalogController < ApplicationController
# remove the lines deleting and re-adding the :show partial
config.show.display_type_field = 'format'
config.show.partials.delete(:show)
config.show.partials << "show_default_display_note"
config.show.partials << 'show_default_viewer_container'
config.show.partials << 'show_default_attribute_table'
config.show.partials << 'show_default_viewer_information'
Expand Down
5 changes: 4 additions & 1 deletion config/locales/blacklight.en.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
en:
blacklight:
application_name: 'GeoBlacklight'
application_name: 'SDOH Place Project'
geoblacklight:
home:
headline: 'Find SDOH data...'
88 changes: 67 additions & 21 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,25 @@ FIELDS:
:TITLE: 'dct_title_s'
:VERSION: 'dct_isVersionOf_sm'
:WXS_IDENTIFIER: 'gbl_wxsIdentifier_s'
:DISPLAY_NOTE: 'gbl_displayNote_sm'

DISPLAY_NOTES_SHOWN:
danger:
bootstrap_alert_class: alert-danger
icon: fire-solid
note_prefix: "Danger: "
info:
bootstrap_alert_class: alert-info
icon: circle-info-solid
note_prefix: "Info: "
tip:
bootstrap_alert_class: alert-success
icon: lightbulb-solid
note_prefix: "Tip: "
warning:
bootstrap_alert_class: alert-warning
icon: triangle-exclamation-solid
note_prefix: "Warning: "

# Institution deployed at
INSTITUTION: 'Stanford'
Expand Down Expand Up @@ -121,51 +140,78 @@ WEBSERVICES_SHOWN:

# Relationships to display
RELATIONSHIPS_SHOWN:
MEMBER_OF:
MEMBER_OF_ANCESTORS:
field: pcdm_memberOf_sm
icon: parent-item
inverse: :MEMBER_OF_DESCENDANTS
label: geoblacklight.relations.member_of_ancestors
query_type: ancestors
icon: nil
label: geoblacklight.relations.member_of
MEMBER_OF_DESCENDANTS:
field: pcdm_memberOf_sm
icon: child-item
inverse: :MEMBER_OF_ANCESTORS
label: geoblacklight.relations.member_of_descendants
query_type: descendants
PART_OF_ANCESTORS:
field: dct_isPartOf_sm
query_type: ancestors
icon: nil
icon: parent-item
inverse: :PART_OF_DESCENDANTS
label: geoblacklight.relations.part_of_ancestors
query_type: ancestors
PART_OF_DESCENDANTS:
field: dct_isPartOf_sm
query_type: descendants
icon: child-item
inverse: :PART_OF_ANCESTORS
label: geoblacklight.relations.part_of_descendants
RELATION:
query_type: descendants
RELATION_ANCESTORS:
field: dct_relation_sm
icon: nil
inverse: :RELATION_DESCENDANTS
label: geoblacklight.relations.relation_ancestors
query_type: ancestors
RELATION_DESCENDANTS:
field: dct_relation_sm
icon: nil
label: geoblacklight.relations.relation
REPLACES:
inverse: :RELATION_ANCESTORS
label: geoblacklight.relations.relation_descendants
query_type: descendants
REPLACES_ANCESTORS:
field: dct_replaces_sm
icon: nil
inverse: :REPLACES_DESCENDANTS
label: geoblacklight.relations.replaces_ancestors
query_type: ancestors
REPLACES_DESCENDANTS:
field: dct_replaces_sm
icon: nil
label: geoblacklight.relations.replaces
REPLACED_BY:
field: dct_isReplacedBy_sm
inverse: :REPLACES_ANCESTORS
label: geoblacklight.relations.replaces_descendants
query_type: descendants
icon: nil
label: geoblacklight.relations.replaced_by
SOURCE_ANCESTORS:
field: dct_source_sm
query_type: ancestors
icon: parent-item
label: geoblacklight.relations.ancestor
inverse: :SOURCE_DESCENDANTS
label: geoblacklight.relations.source_ancestors
query_type: ancestors
SOURCE_DESCENDANTS:
field: dct_source_sm
query_type: descendants
icon: child-item
label: geoblacklight.relations.descendant
VERSION_OF:
inverse: :SOURCE_ANCESTORS
label: geoblacklight.relations.source_descendants
query_type: descendants
VERSION_OF_ANCESTORS:
field: dct_isVersionOf_sm
icon: parent-item
inverse: :VERSION_OF_DESCENDANTS
label: geoblacklight.relations.version_of_ancestors
query_type: ancestors
VERSION_OF_DESCENDANTS:
field: dct_isVersionOf_sm
icon: child-item
inverse: :VERSION_OF_ANCESTORS
label: geoblacklight.relations.version_of_descendants
query_type: descendants
icon: nil
label: geoblacklight.relations.version_of

# WMS Parameters
WMS_PARAMS:
Expand Down

0 comments on commit f8a7c28

Please sign in to comment.