Skip to content

Remove geoblacklight image sidecars and update thumbnail logic #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tpendragon merged 3 commits into from
Sep 9, 2026
Merged

Remove geoblacklight image sidecars and update thumbnail logic #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8c179e
Update PUL fixtures
eliotjordan Sep 9, 2026
3267211
Remove geoblacklight image sidecars and update thumbnail logic
eliotjordan Sep 9, 2026
9e8cd4d
Remove Geoserver Controller
eliotjordan Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@ gem "devise-guests"
gem "faraday"
gem "font-awesome-rails"
gem "geoblacklight", "4.5.1"
gem "geoblacklight_sidecar_images", "1.1.2"
gem "geo_combine"
gem "google-cloud-storage", "~> 1.11"
gem "health-monitor-rails"
gem "honeybadger"
gem "jquery-rails"
gem "lograge"
gem "logstash-event"
gem "loofah"
gem "mail_form"
gem "mimemagic", "0.3.10"
gem "modernizr-rails"
gem "omniauth-cas", "~> 3.0"
gem "omniauth-rails_csrf_protection", "~> 2.0"
Expand Down
80 changes: 0 additions & 80 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ GEM
msgpack
datadog-ruby_core_source (3.5.5)
date (3.5.1)
declarative (0.0.20)
deep_merge (1.2.2)
deprecation (1.1.0)
activesupport
Expand All @@ -185,8 +184,6 @@ GEM
devise-guests (0.8.3)
devise
diff-lcs (1.6.2)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
drb (2.2.3)
dry-cli (1.4.1)
dumb_delegator (1.1.0)
Expand All @@ -204,8 +201,6 @@ GEM
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-follow_redirects (0.5.0)
faraday (>= 1, < 3)
faraday-net_http (3.4.4)
net-http (~> 0.5)
faraday-net_http_persistent (2.3.1)
Expand Down Expand Up @@ -246,51 +241,13 @@ GEM
rgeo-geojson
sprockets-rails (~> 3.0)
vite_rails (~> 3.0)
geoblacklight_sidecar_images (1.1.2)
faraday (>= 2.0)
geoblacklight (~> 4.0)
image_processing (~> 1.6)
mimemagic (~> 0.3)
mini_magick (~> 4.9.4)
rails (>= 5.2, < 8.2)
statesman (>= 3.4)
git (5.1.0)
activesupport (>= 5.0)
addressable (~> 2.8)
process_executer (~> 4.0)
rchardet (~> 1.9)
globalid (1.4.0)
activesupport (>= 6.1)
google-apis-core (1.2.5)
addressable (~> 2.9)
faraday (~> 2.13)
faraday-follow_redirects (~> 0.3)
googleauth (~> 1.14)
mini_mime (~> 1.1)
multi_json (~> 1.11)
representable (~> 3.0)
retriable (>= 3.1, < 5.0)
google-apis-iamcredentials_v1 (0.28.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.66.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.9.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.4.0)
base64 (~> 0.2)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.7.0)
google-cloud-storage (1.62.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-core (>= 0.18, < 2)
google-apis-iamcredentials_v1 (~> 0.18)
google-apis-storage_v1 (>= 0.42)
google-cloud-core (~> 1.6)
googleauth (~> 1.9)
mini_mime (~> 1.0)
google-logging-utils (0.2.0)
google-protobuf (4.36.0)
bigdecimal
rake (~> 13.3)
Expand All @@ -314,14 +271,6 @@ GEM
rake (~> 13.3)
googleapis-common-protos-types (1.23.0)
google-protobuf (~> 4.26)
googleauth (1.17.4)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
jwt (>= 1.4, < 4.0)
os (>= 0.9, < 2.0)
pstore (~> 0.1)
signet (>= 0.16, < 2.a)
handlebars_assets (0.23.10)
execjs (~> 2.0)
sprockets (>= 2.0.0)
Expand All @@ -336,9 +285,6 @@ GEM
ostruct
i18n (1.15.2)
concurrent-ruby (~> 1.0)
image_processing (1.14.0)
mini_magick (>= 4.9.5, < 6)
ruby-vips (>= 2.0.17, < 3)
io-console (0.9.2)
irb (1.18.0)
pp (>= 0.6.0)
Expand All @@ -356,8 +302,6 @@ GEM
json-schema (6.2.0)
addressable (~> 2.8)
bigdecimal (>= 3.1, < 5)
jwt (3.2.0)
base64
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand Down Expand Up @@ -416,10 +360,6 @@ GEM
logger
mime-types-data (~> 3.2025, >= 3.2025.0507)
mime-types-data (3.2026.0701)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_magick (4.9.5)
mini_mime (1.1.5)
minitest (6.0.6)
drb (~> 2.0)
Expand Down Expand Up @@ -651,7 +591,6 @@ GEM
opentelemetry-semantic_conventions (1.44.0)
opentelemetry-api (~> 1.0)
orm_adapter (0.5.0)
os (1.1.4)
ostruct (0.6.3)
parallel (2.1.0)
parser (3.3.12.0)
Expand All @@ -678,7 +617,6 @@ GEM
pry-byebug (3.12.0)
byebug (~> 13.0)
pry (>= 0.13, < 0.17)
pstore (0.2.1)
public_suffix (7.0.5)
puma (8.0.2)
nio4r (~> 2.0)
Expand Down Expand Up @@ -751,16 +689,11 @@ GEM
regexp_parser (2.12.0)
reline (0.7.0)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
request_store (1.7.0)
rack (>= 1.4)
responders (3.2.0)
actionpack (>= 7.0)
railties (>= 7.0)
retriable (4.2.0)
rexml (3.4.4)
rgeo (3.1.0)
rgeo-geojson (2.2.0)
Expand Down Expand Up @@ -815,9 +748,6 @@ GEM
rubocop-performance (>= 1.24)
rubocop-rails (>= 2.30)
ruby-progressbar (1.13.0)
ruby-vips (2.3.0)
ffi (~> 1.12)
logger
rubyzip (3.5.0)
sanitize (7.0.0)
crass (~> 1.0.2)
Expand Down Expand Up @@ -846,10 +776,6 @@ GEM
rack (>= 3.2.0)
redis-client (>= 0.29.0)
sigdump (0.2.5)
signet (0.22.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 4.0)
simple_form (5.4.1)
actionpack (>= 7.0)
activemodel (>= 7.0)
Expand Down Expand Up @@ -882,13 +808,11 @@ GEM
ostruct
sshkit-interactive (0.3.0)
sshkit (~> 1.12)
statesman (13.3.0)
thor (1.5.0)
tilt (2.9.0)
timecop (0.9.11)
timeout (0.6.1)
track_open_instances (0.1.15)
trailblazer-option (0.1.2)
tsort (0.2.0)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
Expand All @@ -899,7 +823,6 @@ GEM
railties (>= 3.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.2.0)
Expand Down Expand Up @@ -978,16 +901,13 @@ DEPENDENCIES
font-awesome-rails
geo_combine
geoblacklight (= 4.5.1)
geoblacklight_sidecar_images (= 1.1.2)
google-cloud-storage (~> 1.11)
health-monitor-rails
honeybadger
jquery-rails
lograge
logstash-event
loofah
mail_form
mimemagic (= 0.3.10)
modernizr-rails
omniauth-cas (~> 3.0)
omniauth-rails_csrf_protection (~> 2.0)
Expand Down
2 changes: 0 additions & 2 deletions app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
//= require jquery
//= require rails-ujs
//= require twitter/typeahead
//= require aload

// Required by Blacklight
//= require popper
Expand All @@ -25,7 +24,6 @@

//= stub modules/results
//= require modules/map
//= require modules/thumbnail
//= require modules/autocomplete
//= require Leaflet.ExtraMarkers

Expand Down
3 changes: 0 additions & 3 deletions app/assets/javascripts/modules/results.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ Blacklight.onLoad(function () {
$('form.search-query-form.form-inline.home-search.navbar-form').prepend($doc.find('input[name=bbox]')[0])
}

// Reload thumbnail images
aload()

// Reload markers and listeners
placeMarkers()
setHoverListeners()
Expand Down
4 changes: 0 additions & 4 deletions app/assets/javascripts/modules/thumbnail.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@
@import 'geoblacklight';
@import 'pulmap';
@import 'leaflet-geosearch';
@import 'geoblacklight_sidecar_images/gblsci';
34 changes: 34 additions & 0 deletions app/assets/stylesheets/components/results.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,40 @@
margin: 0;
padding: 0;
}

.index_title {
font-size: 1rem;
}

.status-icons {
display: inline-block;

span {
min-width: 0px;
}
}

.thumbnail {
height: 100px;
width: 100px;
margin-left: auto;
margin-right: auto;

img {
max-height: 160px;
width: inherit;
}
}

.icon .blacklight-icons {
height: 4.5rem;
width: 4.5rem;

svg {
height: 95%;
width: 95%;
}
}
}

.documentHeader.row {
Expand Down
9 changes: 0 additions & 9 deletions app/assets/stylesheets/components/thumbnail.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@
margin-top: 10px;
}

// hides icon placeholder when thumbnail image is loaded
.thumbnail {
img[src]+span{
display: none;
}
}

.media {
display: -webkit-flex; /* Safari */
-webkit-flex-direction: row-reverse; /* Safari 6.1+ */
Expand All @@ -60,8 +53,6 @@
}
}

[data-aload] { background-image: none !important; }

.more-info-area {
width: 90px;
float: right;
Expand Down
Loading
Loading