Skip to content

Commit

Permalink
Merge pull request #150 from UWM-Libraries/feature/v4.4.0
Browse files Browse the repository at this point in the history
Bump GeoBlacklight Version to v4.4.0
  • Loading branch information
srappel authored Apr 5, 2024
2 parents 34f7406 + 05b7b3e commit 79ba219
Show file tree
Hide file tree
Showing 58 changed files with 1,985 additions and 18 deletions.
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ gem "bootsnap", require: false
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
# gem "image_processing", "~> 1.2"

# vite rails
gem "vite_rails", "~> 3.0"

group :production do
gem "mysql2"
gem "passenger", ">= 5.0.25", require: "phusion_passenger/rack_handler"
Expand Down Expand Up @@ -91,7 +94,7 @@ gem "blacklight", "~> 7.35"
# See: https://github.com/projectblacklight/blacklight_advanced_search/issues/127
gem "blacklight_advanced_search", git: "https://github.com/ewlarson/blacklight_advanced_search.git",
branch: "bl7-fix-gentle-hands"
gem "geoblacklight", "4.1"
gem "geoblacklight", "~> 4.4"
gem "geoblacklight_sidecar_images", "~> 1.0"
gem "mini_magick", "~> 4.0"
gem "sprockets", "< 4.0"
Expand Down
49 changes: 32 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ GEM
connection_pool (2.4.1)
crass (1.0.6)
date (3.3.4)
debug (1.9.1)
debug (1.9.2)
irb (~> 1.10)
reline (>= 0.3.8)
deep_merge (1.2.2)
Expand All @@ -157,6 +157,7 @@ GEM
dotenv-rails (3.1.0)
dotenv (= 3.1.0)
railties (>= 6.1)
dry-cli (1.0.0)
ed25519 (1.3.0)
erubi (1.12.0)
exception_notification (4.5.0)
Expand Down Expand Up @@ -186,17 +187,19 @@ GEM
rsolr
sanitize
thor
geoblacklight (4.1.0)
blacklight (~> 7.33)
geoblacklight (4.4.0)
blacklight (~> 7.0)
coderay
config
deprecation
faraday (>= 1.0)
geo_combine (~> 0.8)
faraday (~> 2.0)
geo_combine (~> 0.9)
handlebars_assets
mime-types
rails (>= 6.1, < 7.1)
rails (>= 6.1, < 7.2)
rgeo-geojson
sprockets-rails (~> 3.0)
vite_rails (~> 3.0)
geoblacklight_sidecar_images (1.0.0)
faraday (>= 2.0)
geoblacklight (~> 4.0)
Expand Down Expand Up @@ -249,7 +252,7 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.7.1)
json-schema (4.2.0)
json-schema (4.3.0)
addressable (>= 2.8)
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand Down Expand Up @@ -310,10 +313,10 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-smtp (0.4.0.1)
net-smtp (0.5.0)
net-protocol
net-ssh (7.2.1)
nio4r (2.7.0)
net-ssh (7.2.3)
nio4r (2.7.1)
nokogiri (1.16.3-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand All @@ -329,11 +332,13 @@ GEM
popper_js (1.16.1)
psych (5.1.2)
stringio
public_suffix (5.0.4)
public_suffix (5.0.5)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.9)
rack-proxy (0.7.7)
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8.1)
Expand Down Expand Up @@ -365,16 +370,16 @@ GEM
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.1.0)
rake (13.2.0)
rchardet (1.8.0)
rdoc (6.6.3.1)
psych (>= 4.0.0)
redis (5.1.0)
redis-client (>= 0.17.0)
redis-client (0.21.0)
redis-client (0.21.1)
connection_pool
regexp_parser (2.9.0)
reline (0.4.3)
reline (0.5.0)
io-console (~> 0.5)
responders (3.1.1)
actionpack (>= 5.2)
Expand Down Expand Up @@ -440,15 +445,17 @@ GEM
minitar
retriable
ruby-progressbar
sprockets (3.7.2)
sprockets (3.7.3)
base64
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.7.3-x86_64-linux)
sshkit (1.22.0)
sshkit (1.22.1)
base64
mutex_m
net-scp (>= 1.1.2)
net-sftp (>= 2.1.2)
Expand Down Expand Up @@ -491,6 +498,13 @@ GEM
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.5.0)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.1)
Expand Down Expand Up @@ -536,7 +550,7 @@ DEPENDENCIES
ed25519 (>= 1.2, < 2.0)
exception_notification (~> 4.5)
geo_combine (>= 0.9)
geoblacklight (= 4.1)
geoblacklight (~> 4.4)
geoblacklight_sidecar_images (~> 1.0)
haml
importmap-rails
Expand All @@ -563,6 +577,7 @@ DEPENDENCIES
turbo-rails
twitter-typeahead-rails (= 0.11.1)
tzinfo-data
vite_rails (~> 3.0)
web-console
webdrivers
whenever (~> 1.0.0)
Expand Down
5 changes: 5 additions & 0 deletions app/javascript/entrypoints/clover.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { CloverInitializer } from '@geoblacklight/frontend'

document.addEventListener('DOMContentLoaded', () => {
new CloverInitializer().run()
})
6 changes: 6 additions & 0 deletions app/javascript/entrypoints/ol.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import '@geoblacklight/frontend/dist/style.css'
import { OlInitializer } from '@geoblacklight/frontend'

document.addEventListener('DOMContentLoaded', () => {
new OlInitializer().run()
})
7 changes: 7 additions & 0 deletions app/views/layouts/blacklight/base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v6.1.1/css/all.css">
<%= javascript_include_tag "application", "data-turbo-track": "reload" %>
<%= vite_client_tag %>
<% if openlayers_container? %>
<%= vite_javascript_tag 'ol' %>
<% elsif iiif_manifest_container? %>
<%= vite_javascript_tag 'clover' %>
<% end %>

<!-- GeoSearch -->
<link href="https://unpkg.com/leaflet-geosearch@latest/assets/css/leaflet.css" rel="stylesheet" />
<script src="https://unpkg.com/leaflet-geosearch@latest/dist/bundle.min.js"></script>
Expand Down
4 changes: 4 additions & 0 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ WEBSERVICES_SHOWN:
- 'tiled_map_layer'
- 'dynamic_map_layer'
- 'image_map_layer'
- 'cog'
- 'pmtiles'

# Relationships to display
RELATIONSHIPS_SHOWN:
Expand Down Expand Up @@ -245,3 +247,5 @@ HELP_TEXT:
- 'wms'
- 'tms'
- 'oembed'
- 'pmtiles'
- 'cog'
17 changes: 17 additions & 0 deletions config/vite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"all": {
"sourceCodeDir": "app/javascript",
"watchAdditionalPaths": []
},
"development": {
"autoBuild": true,
"publicOutputDir": "vite-dev",
"port": 3036
},
"test": {
"autoBuild": true,
"publicOutputDir": "vite-test",
"port": 3037
}
}

11 changes: 11 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"dependencies": {
"@geoblacklight/frontend": "^4.4"
},
"devDependencies": {
"vite": "^5.1.5",
"vite-plugin-ruby": "^5.0.0",
"vite-plugin-rails": "^0.5.0"
}
}

1 change: 1 addition & 0 deletions public/vite-dev/.vite/manifest-assets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Binary file added public/vite-dev/.vite/manifest-assets.json.br
Binary file not shown.
Binary file added public/vite-dev/.vite/manifest-assets.json.gz
Binary file not shown.
130 changes: 130 additions & 0 deletions public/vite-dev/.vite/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"../../node_modules/@geoblacklight/frontend/dist/decoder-b0JuKe3x.js": {
"file": "assets/decoder-b0JuKe3x-CaSv2t6h.js",
"name": "decoder-b0JuKe3x",
"src": "../../node_modules/@geoblacklight/frontend/dist/decoder-b0JuKe3x.js",
"isDynamicEntry": true,
"integrity": "sha384-16TFme9yTmIxkkyjFo8gAt0yhcOQ+Jn3OUgtxDzzctA5UBZlVu2Lw0vmcsazFTuQ"
},
"../../node_modules/@geoblacklight/frontend/dist/deflate-vcCR2g03.js": {
"file": "assets/deflate-vcCR2g03-uJvqLAd5.js",
"name": "deflate-vcCR2g03",
"src": "../../node_modules/@geoblacklight/frontend/dist/deflate-vcCR2g03.js",
"isDynamicEntry": true,
"imports": [
"_pako.esm-BSHzuB9t-DQSVoCko.js",
"_basedecoder-PFIibI7U-gdlnpIMU.js"
],
"integrity": "sha384-k0l/vYu09x29flsb2O1nbKvtv1C7n7rSfRmoSLqETyGLHSivCcvsrVDCIDgsWS5d"
},
"../../node_modules/@geoblacklight/frontend/dist/jpeg-cL5qbLGO.js": {
"file": "assets/jpeg-cL5qbLGO-DsQ9NELO.js",
"name": "jpeg-cL5qbLGO",
"src": "../../node_modules/@geoblacklight/frontend/dist/jpeg-cL5qbLGO.js",
"isDynamicEntry": true,
"imports": [
"_basedecoder-PFIibI7U-gdlnpIMU.js"
],
"integrity": "sha384-XUDi9Q/s6wr9i1c9zoCoWy43i3ap+FmRKKkD8mwhr1Nv8Ex6dDcmuppK988b+CDH"
},
"../../node_modules/@geoblacklight/frontend/dist/lerc-uk49vBKp.js": {
"file": "assets/lerc-uk49vBKp-C2xrmYNa.js",
"name": "lerc-uk49vBKp",
"src": "../../node_modules/@geoblacklight/frontend/dist/lerc-uk49vBKp.js",
"isDynamicEntry": true,
"imports": [
"_pako.esm-BSHzuB9t-DQSVoCko.js",
"_index-pmp42xxj-DHbdtNrf.js",
"_basedecoder-PFIibI7U-gdlnpIMU.js"
],
"integrity": "sha384-UmoNL3q+EfEUpSnmymDe/IZM2hOPYfzZWouLth2aGVr+QeDZ0m2hkyhc8Nc7AZVO"
},
"../../node_modules/@geoblacklight/frontend/dist/lzw-5BnjP5Zu.js": {
"file": "assets/lzw-5BnjP5Zu-Rtm9pMoi.js",
"name": "lzw-5BnjP5Zu",
"src": "../../node_modules/@geoblacklight/frontend/dist/lzw-5BnjP5Zu.js",
"isDynamicEntry": true,
"imports": [
"_basedecoder-PFIibI7U-gdlnpIMU.js"
],
"integrity": "sha384-BwT5MhSmyk8s/M+1hjjUFK2iVRFMQiRVe9Y3MT8RrPh+u3FQrJMjlAlz1Gr1BGde"
},
"../../node_modules/@geoblacklight/frontend/dist/packbits-QLsyzNt2.js": {
"file": "assets/packbits-QLsyzNt2-BPOn6aoD.js",
"name": "packbits-QLsyzNt2",
"src": "../../node_modules/@geoblacklight/frontend/dist/packbits-QLsyzNt2.js",
"isDynamicEntry": true,
"imports": [
"_basedecoder-PFIibI7U-gdlnpIMU.js"
],
"integrity": "sha384-s5KDJZyZ6n7H25TD5O9sYB+VJZmYheMjY9VN890oP7Bco8/hqIgzp4XYhJQdk0+h"
},
"../../node_modules/@geoblacklight/frontend/dist/raw-_eObXrMO.js": {
"file": "assets/raw-_eObXrMO-z93--tm9.js",
"name": "raw-_eObXrMO",
"src": "../../node_modules/@geoblacklight/frontend/dist/raw-_eObXrMO.js",
"isDynamicEntry": true,
"imports": [
"_basedecoder-PFIibI7U-gdlnpIMU.js"
],
"integrity": "sha384-MpX9l6+E4I6yXX3BKvK0bY98KcLCpm2mg/wHA3rKb7Fb/4ZWQuKadoNfGG14YSTz"
},
"../../node_modules/@geoblacklight/frontend/dist/webimage-Hf-HYtMO.js": {
"file": "assets/webimage-Hf-HYtMO-Cer-ofJO.js",
"name": "webimage-Hf-HYtMO",
"src": "../../node_modules/@geoblacklight/frontend/dist/webimage-Hf-HYtMO.js",
"isDynamicEntry": true,
"imports": [
"_basedecoder-PFIibI7U-gdlnpIMU.js"
],
"integrity": "sha384-IJZnDVa5u9eyVWlTf52XU6R05xZymUQURDhyUkEQ0zYnwbFspaNP6DSjbiakDodY"
},
"_basedecoder-PFIibI7U-gdlnpIMU.js": {
"file": "assets/basedecoder-PFIibI7U-gdlnpIMU.js",
"name": "basedecoder-PFIibI7U",
"integrity": "sha384-iu0Q5sffMrWYW50SIciWaM3q4lOWOpYpd6RLb6qeLGxpb/UpnSciLpRulbRswdc4"
},
"_index-pmp42xxj-DHbdtNrf.js": {
"file": "assets/index-pmp42xxj-DHbdtNrf.js",
"name": "index-pmp42xxj",
"dynamicImports": [
"../../node_modules/@geoblacklight/frontend/dist/raw-_eObXrMO.js",
"../../node_modules/@geoblacklight/frontend/dist/lzw-5BnjP5Zu.js",
"../../node_modules/@geoblacklight/frontend/dist/jpeg-cL5qbLGO.js",
"../../node_modules/@geoblacklight/frontend/dist/deflate-vcCR2g03.js",
"../../node_modules/@geoblacklight/frontend/dist/packbits-QLsyzNt2.js",
"../../node_modules/@geoblacklight/frontend/dist/lerc-uk49vBKp.js",
"../../node_modules/@geoblacklight/frontend/dist/webimage-Hf-HYtMO.js",
"../../node_modules/@geoblacklight/frontend/dist/decoder-b0JuKe3x.js"
],
"integrity": "sha384-o50+0E6WvzBgYhVkwISFR86hojzGc4dAN/NEGY9V/EIC95AHaVc0ZDaUUFKARmt7"
},
"_pako.esm-BSHzuB9t-DQSVoCko.js": {
"file": "assets/pako.esm-BSHzuB9t-DQSVoCko.js",
"name": "pako.esm-BSHzuB9t",
"integrity": "sha384-R6RhceprSqGv4DaVx8YQZEpcrBUrgFIxlt99XxVtqqcu3uC+okJxUkzYnNGJWDRA"
},
"entrypoints/clover.js": {
"file": "assets/clover-Dn1nVu0D.js",
"name": "entrypoints/clover.js",
"src": "entrypoints/clover.js",
"isEntry": true,
"imports": [
"_index-pmp42xxj-DHbdtNrf.js"
],
"integrity": "sha384-auUG40/Ox/wwvyfaEsPCBaAH+qW08lpy1vm3S53mBS4XK0tYyAhn0IYFjj2qGJ6e"
},
"entrypoints/ol.js": {
"file": "assets/ol-CZCByJ0B.js",
"name": "entrypoints/ol.js",
"src": "entrypoints/ol.js",
"isEntry": true,
"imports": [
"_index-pmp42xxj-DHbdtNrf.js"
],
"css": [
"assets/ol-BxkN_WYY.css"
],
"integrity": "sha384-0ULbdyNwidvVa1PyrcZlSPr/FcV57RNj0Snng4HaUeaSo++KquvbfKOGF040lPKV"
}
}
Binary file added public/vite-dev/.vite/manifest.json.br
Binary file not shown.
Binary file added public/vite-dev/.vite/manifest.json.gz
Binary file not shown.
1 change: 1 addition & 0 deletions public/vite-dev/assets/basedecoder-PFIibI7U-gdlnpIMU.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions public/vite-dev/assets/clover-Dn1nVu0D.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import{C as e}from"./index-pmp42xxj-DHbdtNrf.js";document.addEventListener("DOMContentLoaded",()=>{new e().run()});
Binary file added public/vite-dev/assets/clover-Dn1nVu0D.js.br
Binary file not shown.
Binary file added public/vite-dev/assets/clover-Dn1nVu0D.js.gz
Binary file not shown.
1 change: 1 addition & 0 deletions public/vite-dev/assets/decoder-b0JuKe3x-CaSv2t6h.js

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions public/vite-dev/assets/deflate-vcCR2g03-uJvqLAd5.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import{b as e}from"./pako.esm-BSHzuB9t-DQSVoCko.js";import{g as o}from"./basedecoder-PFIibI7U-gdlnpIMU.js";class f extends o{decodeBlock(r){return e(new Uint8Array(r)).buffer}}export{f as default};
Binary file not shown.
Binary file not shown.
314 changes: 314 additions & 0 deletions public/vite-dev/assets/index-pmp42xxj-DHbdtNrf.js

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 79ba219

Please sign in to comment.