geoblacklight 5.1.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a533a2028cc4a5d4edc6aba0c532812d5266ce7e94fc290208f0ea26216056
-  data.tar.gz: 4644a2f7c1cae18643207a99c2d7cdbde53a1b27c521a6a94a1e1ff6a7c37e15
+  metadata.gz: 2f9e80f30735f8fa8f8e4c03e0a855b4e709acbf1eb860cad0a14e66dba72064
+  data.tar.gz: 824c5c71fb501807335ab0862522d5a14fec06f31b1f21b09d732338f27e5b89
 SHA512:
-  metadata.gz: 404ed2e84916e9505a22e08979e569b301fb1dbf620d72d1c015e0f49f106183bbc2757d649a7ab3392fe9bec8cdefbe735d0a3ec9ea8b96909b4e5b10267bd2
-  data.tar.gz: 82e33f34850832707b5259c9f356ca5858446474b44672357f05495b517c4bbdd539ff330c557ac143422baf0c7377c4e0ca6dc758be73cce8a7d4b939c2be72
+  metadata.gz: acbee7539ae6c048356e42467b99f4e94c948cc9d5a35ddeeccc721028965808267d33d3d3ce91fc05afdd5992fbee5edeeda1760aa6257dea6420bc83e194ce
+  data.tar.gz: 8395fe82750ac0bfe3dc3de410a7039d0eff671ffee63690f1a0858b88687dc163ed92a711a46a94caf956eb3cdd5b04f7c96cb5a7cf2aedbaec9d74a2136412

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ruby.yml

@@ -10,7 +10,7 @@ jobs:
   linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -23,7 +23,7 @@ jobs:
   aardvark-fixture-linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -38,13 +38,18 @@ jobs:
     strategy:
       matrix:
         ruby_version: ["3.2", "3.3", "3.4"]
-        rails_version: ["7.1.5.1", "7.2.2.1", "8.0.1"]
-        asset_pipeline: ["vite"]
-        additional_engine_cart_rails_options: ["--js rollup"]
+        rails_version: ["7.2.3", "8.1.1"]
+        asset_pipeline: ["importmap"]
+        additional_engine_cart_rails_options: ["--js importmap"]
+        include:
+          - ruby_version: "3.4"
+            rails_version: "8.1.1"
+            asset_pipeline: "vite"
+            additional_engine_cart_rails_options: "--js rollup"
 
     name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / ${{ matrix.asset_pipeline }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -67,8 +72,8 @@ jobs:
           ENGINE_CART_RAILS_OPTIONS: "--skip-docker --skip-action-cable --skip-rubocop --skip-brakeman --skip-kamal --skip-solid -a propshaft --css bootstrap ${{ matrix.additional_engine_cart_rails_options }}"
           SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
       - name: Upload coverage artifacts
-        uses: actions/upload-artifact@v4
-        if: always()
+        uses: actions/upload-artifact@v6
+        if: matrix.asset_pipeline == 'vite'
         with:
           name: "coverage-${{ matrix.ruby_version }}-${{ matrix.rails_version }}"
           path: coverage/

data/app/assets/stylesheets/geoblacklight/modules/item.scss

@@ -49,13 +49,30 @@
     -webkit-line-clamp: 8;
   }
 
-  #table-container{
-    overflow:scroll;
-    max-height: 450px;
+  #table-container {
     margin-bottom: 1rem;
 
     table {
       margin-bottom: 0px;
     }
   }
+
+  .attribute-data {
+    --bs-accordion-active-bg: none;
+  }
+
+  .sidebar-container {
+    width: 25vw;
+    overflow: scroll;
+    overscroll-behavior: contain;
+
+    img {
+      width: 100%;
+    }
+
+    @media screen and (max-width: breakpoint-max(sm)) {
+      width: calc(100vw - 100px);
+      max-height: 20vh!important;
+    }
+  }
 }

data/app/components/geoblacklight/accordion_component.html.erb

@@ -0,0 +1,16 @@
+<div data-sidebar="<%= Settings.LEAFLET.SIDEBAR %>">
+  <div class="accordion attribute-data<% if Settings.LEAFLET.SIDEBAR %> sidebar-container<% end %>">
+    <div class="accordion-item">
+      <h2 class="accordion-header" id="accordionHeading">
+        <button class="accordion-button p-2 border-none bg-none" type="button" data-bs-toggle="collapse" data-bs-target="#<%= @id %>" aria-expanded="true" aria-controls="<%= @id %>">
+          <%= @title %>
+        </button>
+      </h2>
+      <div id="<%= @id %>" class="accordion-collapse collapse show" aria-labelledby="accordionHeading" data-bs-parent="#accordionHeading">
+        <div class="accordion-body p-0">
+          <%= content %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/components/geoblacklight/accordion_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Geoblacklight
+  class AccordionComponent < ViewComponent::Base
+    def initialize(id:, title:)
+      @id = id
+      @title = title
+      super()
+    end
+  end
+end

data/app/components/geoblacklight/attribute_table_component.html.erb

@@ -1,17 +1,15 @@
-<div class='row'>
-  <div id='table-container' class='col-md-12'>
-    <table id="attribute-table" class="table table-hover table-condensed table-striped table-bordered col-md-12">
-      <thead>
-        <tr>
-          <th><%= t('geoblacklight.show.attribute') %></th>
-          <th><%= t('geoblacklight.show.value') %></th>
-        </tr>
-      </thead>
-      <tbody class='attribute-table-body'>
-        <tr>
-          <td class='default-text' colspan='2'><em><%= t('geoblacklight.show.click_map') %></em></td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>
+<%= render Geoblacklight::AccordionComponent.new(id: 'attribute-table', title: t('geoblacklight.show.table_name')) do  %>
+  <table id="attribute-table" class="table table-hover table-condensed table-striped mb-0 collapse show">
+    <thead>
+      <tr>
+        <th><%= t('geoblacklight.show.attribute') %></th>
+        <th><%= t('geoblacklight.show.value') %></th>
+      </tr>
+    </thead>
+    <tbody class='attribute-table-body'>
+      <tr>
+        <td class='default-text' colspan='2'><em><%= t('geoblacklight.show.click_map') %></em></td>
+      </tr>
+    </tbody>
+  </table>
+<% end %>

data/app/components/geoblacklight/index_map_inspect_component.html.erb

@@ -1,4 +1,5 @@
-<div class='row'>
-  <div class='viewer-information col-sm-12'>
+<%= render Geoblacklight::AccordionComponent.new(id: 'index-map-attributes', title: t('geoblacklight.show.table_name')) do  %>
+  <div class='viewer-information px-3'>
+    <em><%= t('geoblacklight.show.click_map') %></em>
   </div>
-</div>
+<% end %>

data/app/controllers/relation_controller.rb

@@ -2,7 +2,7 @@
 
 class RelationController < ApplicationController
   include Blacklight::Configurable
-  # include Blacklight::SearchHelper
+
   copy_blacklight_config_from(CatalogController)
 
   def index

data/app/javascript/geoblacklight/controllers/downloads_controller.js

@@ -48,8 +48,8 @@ export default class extends Controller {
   renderMessage(message) {
     Object.entries(message).forEach(([idx, msg]) => {
       const flash = document.createElement("div");
-      flash.className = `alert alert-${msg[0]}`;
-      flash.innerHTML = `<button type="button" class="close" data-bs-dismiss="alert" aria-hidden="true">&times;</button>${msg[1]}`;
+      flash.className = `alert alert-${msg[0]} alert-dismissible fade show`;
+      flash.innerHTML = `${msg[1]}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>`;
       document.querySelector("div.flash_messages").appendChild(flash);
     });
   }

data/app/javascript/geoblacklight/controllers/leaflet_viewer_controller.js

@@ -1,5 +1,5 @@
 import { Icon, Control } from "leaflet";
-import "leaflet-fullscreen";
+import { FullScreen } from "leaflet.fullscreen";
 import { layerGroup, polygon, map, tileLayer } from "leaflet";
 import { imageMapLayer } from "esri-leaflet";
 import { Controller } from "@hotwired/stimulus";
@@ -23,6 +23,7 @@ import {
 } from "geoblacklight/leaflet/layers";
 import { geoJSONToBounds } from "geoblacklight/leaflet/utils";
 import { DEFAULT_BOUNDS, DEFAULT_OPACITY, DEFAULT_GEOM_OVERLAY_OPTIONS } from "geoblacklight/leaflet/constants";
+import sidebarControl from "geoblacklight/leaflet/controls/sidebar";
 
 export default class LeafletViewerController extends Controller {
   static values = {
@@ -146,7 +147,7 @@ export default class LeafletViewerController extends Controller {
     if (controlName == "Opacity")
       return new LayerOpacityControl(this.previewOverlay);
     if (controlName == "Fullscreen")
-      return new Control.Fullscreen({ position: "topright", ...controlOptions });
+      return new FullScreen({ position: "bottomleft", ...controlOptions });
     if (controlName == "Geosearch")
       return new GeoSearchControl({ baseUrl: this.catalogBaseUrlValue, ...controlOptions });
     console.error(`Unsupported control name: "${controlName}"`);
@@ -179,10 +180,23 @@ export default class LeafletViewerController extends Controller {
     if (this.boundsOverlay) this.overlay.removeLayer(this.boundsOverlay);
   }
 
+  setUpSidebar() {
+    const sidebar = document.querySelector('[data-sidebar]')
+    if (!sidebar || sidebar.dataset.sidebar != 'true') return;
+    const control = new sidebarControl({
+      position: 'topright',
+      sidebar
+    });
+    this.map.addControl(control);
+  }
+
   addInspection() {
+    const inspectionProtocols = ['Wms', 'FeatureLayer', 'DynamicMapLayer', 'IndexMap']
+    if (!inspectionProtocols.includes(this.protocolValue)) return;
+    this.setUpSidebar();
     if (this.protocolValue == "Wms") return wmsInspection(this.map, this.urlValue, this.layerIdValue, this.previewOverlay);
     if (this.protocolValue == "FeatureLayer") return featureLayerInspection(this.map, this.previewOverlay);
-    if (this.protocolValue  == "DynamicMapLayer") return dynamicMapLayerInspection(this.map, this.previewOverlay, this.layerIdValue)
+    if (this.protocolValue  == "DynamicMapLayer") return dynamicMapLayerInspection(this.map, this.previewOverlay, this.layerIdValue);
     // TODO: TiledMapLayer is converted but seems busted -- see layers.js. Don't know what to test it with, need a fixture.
     // if (this.protocolValue == "TiledMapLayer") return tiledMapLayerInspection(this.map, this.previewOverlay);
   }

data/app/javascript/geoblacklight/leaflet/controls/sidebar.js

@@ -0,0 +1,47 @@
+import { Control } from "leaflet";
+
+export default class sidebarControl extends Control {
+  constructor(options) {
+    const _options = { ...options };
+    super(_options);
+  }
+
+  onAdd(map) {
+    var div = L.DomUtil.create('div', 'leaflet-sidebar');
+    div.setAttribute("tabindex", "0");
+    const sidebarContainer = this.options.sidebar;
+
+    // Disable zoom when the mouse enters the sidebar
+    div.addEventListener('mouseenter', function() {
+      map.scrollWheelZoom.disable();
+    });
+
+    div.addEventListener('touchstart', function() {
+      map.touchZoom.disable();
+      map.dragging.disable();
+    });
+
+    // without this the map will try to find data about whatever is behind the sidebar
+    div.addEventListener('click', function(event) {
+      event.stopPropagation();
+    });
+
+    // Enable zoom when the mouse leaves the sidebar
+    div.addEventListener('touchend', function() {
+      map.touchZoom.enable();
+      map.dragging.enable();
+    });
+
+    // Enable zoom when the mouse leaes the sidebar
+    div.addEventListener('mouseleave', function() {
+      map.scrollWheelZoom.enable();
+    });
+
+    if (!sidebarContainer) { return };
+    // Make sure table height is same as map (with a little padding)
+    sidebarContainer.children[0].style.maxHeight = `${map._container.offsetHeight - 30}px`;
+    div.innerHTML = sidebarContainer.innerHTML;
+    sidebarContainer.remove();
+    return div;
+  }
+}

data/config/importmap.rb

@@ -3,18 +3,12 @@
 # OpenLayers viewer
 pin "ol", to: "https://esm.sh/ol@8.1.0"
 pin "ol/", to: "https://esm.sh/ol@8.1.0/"
-pin "ol-pmtiles", to: "https://cdn.skypack.dev/ol-pmtiles@0.3.0"
+pin "ol-pmtiles", to: "https://cdn.jsdelivr.net/npm/ol-pmtiles@0.3.0/+esm"
 
 # Leaflet viewer
-pin "leaflet", to: "https://cdn.skypack.dev/leaflet@1.9.4"
-pin "esri-leaflet", to: "https://cdn.skypack.dev/esri-leaflet@3.0.12"
-pin "leaflet-fullscreen", to: "https://cdn.skypack.dev/leaflet-fullscreen@1.0.2"
-
-# Clover viewer
-pin "react", to: "https://esm.sh/react@18.3.1"
-pin "react-dom/client", to: "https://esm.sh/react-dom@18.3.1/client"
-pin "@samvera/clover-iiif/viewer", to: "https://esm.sh/@samvera/clover-iiif@2.10.0/dist/viewer"
-pin "@samvera/clover-iiif/image", to: "https://esm.sh/@samvera/clover-iiif@2.10.0/dist/image"
+pin "leaflet", to: "https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet-src.esm.js"
+pin "esri-leaflet", to: "https://cdn.jsdelivr.net/npm/esri-leaflet@3.0.19/+esm"
+pin "leaflet.fullscreen", to: "https://cdn.jsdelivr.net/npm/leaflet.fullscreen@5.3.0/+esm"
 
 # Geoblacklight
 pin_all_from Geoblacklight::Engine.root.join("app", "javascript", "geoblacklight"), under: "geoblacklight"

data/config/locales/geoblacklight.en.yml

@@ -93,6 +93,7 @@ en:
       attribute: 'Attribute'
       value: 'Value'
       click_map: 'Click on map to inspect values'
+      table_name: 'Map data'
     help_text:
       viewer_protocol:
         cog:

data/lib/generators/geoblacklight/assets/importmap_generator.rb

@@ -21,17 +21,19 @@ module Geoblacklight
         delivered via CDN.
       DESCRIPTION
 
-      # If this is a local dev/test build, symlink the frontend package so we
-      # can reference its stylesheets in development
-      def link_frontend
-        run "yarn link @geoblacklight/frontend" if options[:test]
+      # Switch Blacklight's bootstrap and popper imports to ESM versions so we
+      # can import individual modules
+      def use_bootstrap_esm
+        gsub_file "config/importmap.rb", %r{dist/js/bootstrap.js}, "dist/js/bootstrap.esm.js"
+        gsub_file "config/importmap.rb", %r{dist/umd/popper.min.js}, "dist/esm/popper.js"
       end
 
-      # Add the customization overrides and insert before bootstrap import
+      # Add the SCSS customization overrides and insert before bootstrap import
       def add_customizations
         copy_file "assets/_customizations.scss", "app/assets/stylesheets/_customizations.scss"
         gsub_file "app/assets/stylesheets/_customizations.scss", "@geoblacklight/frontend/app/assets/", ""
-        insert_into_file "app/assets/stylesheets/application.bootstrap.scss", "@import 'customizations';\n", before: "@import 'bootstrap/scss/bootstrap';"
+        insert_into_file "app/assets/stylesheets/application.bootstrap.scss", "@import 'customizations';\n",
+          before: "@import 'bootstrap/scss/bootstrap';"
       end
 
       # Add CDN imports for CSS files used by Geoblacklight (leaflet, openlayers)
@@ -39,9 +41,9 @@ module Geoblacklight
         insert_into_file "app/assets/stylesheets/application.bootstrap.scss", before: "@import 'customizations';\n" do
           <<~SCSS
             /* GeoBlacklight dependencies CSS */
-            @import url("https://cdn.skypack.dev/leaflet@1.9.4/dist/leaflet.css");
-            @import url("https://cdn.jsdelivr.net/npm/leaflet-fullscreen@1.0.2/dist/leaflet.fullscreen.css");
-            @import url("https://cdn.skypack.dev/ol@8.1.0/ol.css");
+            @import url("https://cdn.jsdelivr.net/npm/leaflet@1.9.4/dist/leaflet.css");
+            @import url("https://cdn.jsdelivr.net/npm/leaflet.fullscreen@5.3.0/dist/Control.FullScreen.css");
+            @import url("https://cdn.jsdelivr.net/npm/ol@8.1.0/ol.css");
 
           SCSS
         end
@@ -62,17 +64,6 @@ module Geoblacklight
         append_to_file "app/javascript/application.js", "import Geoblacklight from \"geoblacklight\";"
       end
 
-      # Add pins for application dependencies to the importmap
-      def update_importmap
-        gsub_file "config/importmap.rb", "bootstrap.min.js", "https://cdn.skypack.dev/bootstrap@5.3.3"
-        append_to_file "config/importmap.rb" do
-          <<~CONTENT
-            pin "@github/auto-complete-element", to: "https://cdn.skypack.dev/@github/auto-complete-element"
-            pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.8/dist/umd/popper.min.js"
-          CONTENT
-        end
-      end
-
       # Run the build so styles are available for the first load of the app
       def build_styles
         run "yarn build:css"

data/lib/generators/geoblacklight/assets/vite_generator.rb

@@ -16,8 +16,8 @@ module Geoblacklight
       SCSS entrypoint file, which will be bundled by Vite.
 
       Geoblacklight's frontend assets are installed from the npm package. In
-      local development they automatically reference the versions from the
-      outer directory (the Geoblacklight repository) via a yarn symlink.
+      CI they automatically reference the versions from the outer directory
+      (the Geoblacklight repository) via a yarn symlink.
       DESCRIPTION
 
       # Install Vite
@@ -26,6 +26,13 @@ module Geoblacklight
         run "bundle install"
       end
 
+      # Symlink geoblacklight's frontend assets in CI
+      def link_geoblacklight_package
+        if options[:test]
+          run "yarn link @geoblacklight/frontend"
+        end
+      end
+
       # Add our version of the Blacklight base layout with Vite helper tags
       def geoblacklight_base_layout
         copy_file "base.html.erb", "app/views/layouts/blacklight/base.html.erb"
@@ -42,23 +49,13 @@ module Geoblacklight
         run "bundle exec vite install"
       end
 
-      # Pick a version of the frontend asset package and install it.
-      def add_frontend
-        # If a branch was specified (e.g. you are running a template.rb build
-        # against a test branch), use the latest version available on npm
-        if ENV["BRANCH"]
-          run "yarn add @geoblacklight/frontend@latest"
-
-        # Otherwise, pick the version from npm that matches our Geoblacklight
-        # gem version
-        else
-          run "yarn add @geoblacklight/frontend@#{Geoblacklight::VERSION}"
+      # The vite-plugin-ruby package has a breaking change in 5.1.2,
+      # so we need to resolve to a specific version to avoid issues.
+      # Remove after https://github.com/ElMassimo/vite_ruby/issues/586 is fixed.
+      def pin_vite_plugin_ruby
+        inject_into_file "package.json", before: "  \"dependencies\": {" do
+          "  \"resolutions\": { \"vite-plugin-ruby\": \"5.1.1\" },\n"
         end
-
-        # If in local development or CI, also create a link. This will make it so
-        # changes made in the outer directory are picked up automatically.
-        # `yarn link` has to have already been run in the outer directory first.
-        run "yarn link @geoblacklight/frontend" if options[:test]
       end
 
       # The vite_rails gem doesn't currently install the vite-plugin-rails

data/lib/generators/geoblacklight/assets_generator.rb

@@ -4,15 +4,30 @@ module Geoblacklight
   # Run general asset setup and then delegate to the appropriate generator
   # Based on Blacklight::AssetsGenerator
   class AssetsGenerator < Rails::Generators::Base
-    class_option :"asset-pipeline", type: :string, default: ENV.fetch("ASSET_PIPELINE", "vite"), desc: "Choose the asset pipeline to use (vite or importmap)"
+    class_option :"asset-pipeline", type: :string, default: ENV.fetch("ASSET_PIPELINE", "importmap"), desc: "Choose the asset pipeline to use (vite or importmap)"
     class_option :test, type: :boolean, default: ENV.fetch("CI", false), aliases: "-t", desc: "Indicates that app will be installed in a test environment"
 
+    # Pick a version of the frontend asset package and install it.
+    #
+    # If a branch was specified (e.g. you are running a template.rb build
+    # against a test branch), use the latest version available on npm.
+    #
+    # Otherwise, pick the version from npm that matches our Geoblacklight
+    # gem version.
+    def add_frontend
+      if ENV["BRANCH"]
+        run "yarn add @geoblacklight/frontend@latest"
+      else
+        run "yarn add @geoblacklight/frontend@#{Geoblacklight::VERSION}"
+      end
+    end
+
     def run_asset_pipeline_specific_generator
       generated_options = "--test=true" if options[:test]
       generator = if options[:"asset-pipeline"]
         "geoblacklight:assets:#{options[:"asset-pipeline"]}"
       else
-        "geoblacklight:assets:vite"
+        "geoblacklight:assets:importmap"
       end
 
       generate generator, generated_options

data/lib/generators/geoblacklight/templates/assets/application.scss

@@ -2,7 +2,7 @@
 
 // Leaflet, OpenLayers, GeoBlacklight (includes Blacklight and Bootstrap)
 @import "leaflet/dist/leaflet.css";
-@import "leaflet-fullscreen/dist/leaflet.fullscreen.css";
+@import "leaflet.fullscreen/dist/Control.FullScreen.css";
 @import "ol/ol.css";
 @import "~/stylesheets/geoblacklight.scss";
 

data/lib/generators/geoblacklight/templates/settings.yml

@@ -1,5 +1,5 @@
 # ArcGIS Online Base URL
-ARCGIS_BASE_URL: 'https://www.arcgis.com/home/webmap/viewer.html'
+ARCGIS_BASE_URL: 'https://www.arcgis.com/apps/mapviewer/index.html'
 
 # Download path can be configured using this setting
 #DOWNLOAD_PATH: "./tmp/cache/downloads"
@@ -247,6 +247,7 @@ LEAFLET:
     HOVERTOWAKE: false
     MESSAGE: 'Click to Wake'
     BACKGROUND: 'rgba(214, 214, 214, .7)'
+  SIDEBAR: false # set to true to display attribute table as sidebar on map
   LAYERS:
     DETECT_RETINA: true
     INDEX:

data/lib/geoblacklight/download/geojson_download.rb

@@ -14,7 +14,7 @@ module Geoblacklight
       request_params = GEOJSON_DOWNLOAD_PARAMS.merge(typeName: document.wxs_identifier)
       super(document, {
         type: "geojson",
-        extension: "json",
+        extension: "geojson",
         request_params: request_params,
         content_type: "application/json",
         service_type: "wfs"

data/lib/geoblacklight/engine.rb

@@ -32,7 +32,7 @@ module Geoblacklight
       next unless app.config.respond_to?(:importmap) # skip for Vite
 
       app.config.importmap.paths << Engine.root.join("config/importmap.rb")
-      app.config.importmap.cache_sweepers << Engine.root.join("app/assets/javascripts")
+      app.config.importmap.cache_sweepers << Engine.root.join("app/javascript")
     end
   end
 end

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "5.1.0"
+  VERSION = "5.3.0"
 end

data/lib/tasks/geoblacklight.rake

@@ -13,6 +13,7 @@ end
 def with_solr(&block)
   puts "Starting Solr"
   system_with_error_handling "docker compose up -d solr"
+  sleep 5 # give solr a few seconds to load the core config and be ready
   yield
 ensure
   puts "Stopping Solr"
@@ -23,7 +24,7 @@ namespace :geoblacklight do
   desc "Run Solr and GeoBlacklight for interactive development"
   task :server, [:rails_server_args] do |_t, args|
     with_solr do
-      Rake::Task["geoblacklight:internal:seed"].invoke
+      Rake::Task["geoblacklight:index:seed"].invoke
 
       puts "Starting GeoBlacklight (Rails server)"
       puts " "
@@ -35,26 +36,15 @@ namespace :geoblacklight do
     end
   end
 
-  # Local fixtures: bundle exec rake "geoblacklight:index:seed"
-  # Remote fixtures: bundle exec rake "geoblacklight:index:seed[:remote]"
+  # Get fixture items bundled with the gem and index them into Solr
   namespace :index do
     desc "Index GBL test fixture metadata into Solr"
-    task :seed, [:remote] => :environment do |t, args|
-      docs = []
+    task seed: :environment do
+      puts "Indexing test fixtures"
 
-      if args.remote
-        puts "Indexing - Remote test fixtures"
-        JSON.parse(
-          URI.parse("https://api.github.com/repos/geoblacklight/geoblacklight/contents/spec/fixtures/solr_documents").open.read
-        ).each do |fixture|
-          if fixture["name"].include?(".json")
-            docs << JSON.parse(URI.parse(fixture["download_url"]).open.read)
-          end
-        end
-      else
-        puts "Indexing - Local test fixtures"
-        docs = Dir["spec/fixtures/solr_documents/*.json"].map { |f| JSON.parse File.read(f) }.flatten
-      end
+      gem_path = Gem::Specification.find_by_name("geoblacklight").gem_dir
+      fixtures_path = File.join(gem_path, "spec", "fixtures", "solr_documents", "*.json")
+      docs = Dir[fixtures_path].flat_map { |f| JSON.parse(File.read(f)) }
 
       Blacklight.default_index.connection.add docs
       Blacklight.default_index.connection.commit
@@ -71,19 +61,21 @@ namespace :geoblacklight do
       FileUtils.mkdir_p(Rails.root.join("tmp", "cache", "downloads"), verbose: true)
     end
     desc "Precaches a download"
-    task :precache, [:doc_id, :download_type, :timeout] => [:environment] do |_t, args|
+    task :precache, %i[doc_id download_type timeout] => [:environment] do |_t, args|
       unless args[:doc_id] && args[:download_type] && args[:timeout]
-        fail "Please supply required arguments [document_id, download_type and timeout]"
+        raise "Please supply required arguments [document_id, download_type and timeout]"
       end
+
       document = Geoblacklight::SolrDocument.find(args[:doc_id])
-      fail Blacklight::Exceptions::RecordNotFound if document[:id] != args[:doc_id]
+      raise Blacklight::Exceptions::RecordNotFound if document[:id] != args[:doc_id]
+
       download = "Geoblacklight::#{args[:download_type].capitalize}Download"
         .constantize.new(document, timeout: args[:timeout].to_i)
       download.get
       Rails.logger.info "Successfully downloaded #{download.file_name}"
       Rails.logger.info Geoblacklight::ShapefileDownload.file_path.to_s
-    rescue Geoblacklight::Exceptions::ExternalDownloadFailed => error
-      Rails.logger.error error.message + " " + error.url
+    rescue Geoblacklight::Exceptions::ExternalDownloadFailed => e
+      Rails.logger.error e.message + " " + e.url
     rescue NameError
       Rails.logger.error "Could not find that download type \"#{args[:download_type]}\""
     end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@geoblacklight/frontend",
   "type": "module",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -9,8 +9,7 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "watch": "vite build --watch",
-    "test": "vitest"
+    "watch": "vite build --watch"
   },
   "files": [
     "app/assets",
@@ -26,15 +25,13 @@
     "bootstrap": "^5.3.3",
     "esri-leaflet": "^3.0.12",
     "leaflet": "^1.9.4",
-    "leaflet-iiif": "^3.0.0",
-    "leaflet-fullscreen": "^1.0.2",
-    "ol": "8.1.0",
-    "ol-pmtiles": "^0.3.0"
+    "leaflet.fullscreen": "^5.3.0",
+    "ol": "10.7.0",
+    "ol-pmtiles": "^2.0.2"
   },
   "devDependencies": {
-    "jsdom": "^24.1.0",
+    "jsdom": "^27.3.0",
     "rollup-plugin-includepaths": "^0.2.4",
-    "vite": "^5.0.0",
-    "vitest": "^2.0.3"
+    "vite": "^7.2.2"
   }
 }

data/schema/geoblacklight-schema-aardvark.json

@@ -190,8 +190,8 @@
       "type": "string",
       "const": "Aardvark"
     },
-    "gbl_suppressed_b": { "type": "boolean" },
-    "gbl_georeferenced_b": { "type": "boolean" }
+    "gbl_suppressed_b": { "type": ["string", "boolean"] },
+    "gbl_georeferenced_b": { "type": ["string", "boolean"] }
   },
   "required": ["id", "dct_title_s", "gbl_resourceClass_sm", "dct_accessRights_s", "gbl_mdVersion_s"]
 }

data/solr/conf/solrconfig.xml

@@ -94,7 +94,7 @@
   </query>
 
   <requestDispatcher handleSelect="false">
-    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048"/>
+    <requestParsers multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048"/>
     <httpCaching never304="true"/>
    </requestDispatcher>
 

data/spec/features/full_screen_control_spec.rb

@@ -5,20 +5,18 @@ require "spec_helper"
 feature "Leaflet fullscreen control", js: true do
   scenario "WMS layer should have full screen control" do
     visit solr_document_path("stanford-cz128vq0535")
-    expect(page).to have_css(".leaflet-control-fullscreen-button", visible: :all)
+    expect(page).to have_css(".leaflet-control-zoom-fullscreen", visible: :all)
   end
 end
 
-feature "Clover IIIF fullscreen control", js: true do
+feature "IIIF fullscreen control", js: true do
   scenario "IIIF layer should have full screen control" do
-    skip "Clover is disabled" # see https://github.com/geoblacklight/geoblacklight/issues/1675
     visit solr_document_path("princeton-sx61dn82p")
-    expect(page).to have_button("Toggle full page")
+    expect(page).to have_button("Full screen", visible: :all)
   end
 
   scenario "IIIF image should have full screen control" do
-    skip "Clover is disabled" # see https://github.com/geoblacklight/geoblacklight/issues/1675
     visit solr_document_path("princeton-02870w62c")
-    expect(page).to have_css("[data-button='full-page']")
+    expect(page).to have_css("img[alt='Toggle full page']", visible: :all)
   end
 end

data/spec/features/saved_searches_spec.rb

@@ -4,14 +4,7 @@ require "spec_helper"
 
 feature "saved searches" do
   scenario "list spatial search", js: true do
-    visit root_path
-    within "#leaflet-viewer" do
-      find(".search-control a").click
-      expect(page.current_url).to match(/bbox=/)
-    end
-    if Rails.version == "6.1.7.6"
-      visit root_path({bbox: "-180 -89.338214 180 88.918831"})
-    end
+    visit root_path({bbox: "-180 -89.338214 180 88.918831"})
     visit blacklight.search_history_path
     expect(page).to have_css "td.query a", text: /#{I18n.t("geoblacklight.bbox_label")}/
   end

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -11,6 +11,7 @@ describe Geoblacklight::GeojsonDownload do
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq "application/json"
       expect(options[:request_params][:typeName]).to eq "stanford-test"
+      expect(options[:extension]).to eq "geojson"
     end
     it "merges custom options" do
       download = described_class.new(document, timeout: 33)

data/template.rb

@@ -1,29 +1,16 @@
 # frozen_string_literal: true
 
-gem "blacklight", "~> 8.0"
-
-# Ensure the app generates with Propshaft; sprockets is no longer supported
-# https://github.com/geoblacklight/geoblacklight/issues/1265
-ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft --css bootstrap"
-
-# Use importmaps for JS if requested, otherwise default to vite
-ENV["ENGINE_CART_RAILS_OPTIONS"] += if ENV["ASSET_PIPELINE"] == "importmap"
-  " --js importmap"
-else
-  " --js rollup"
-end
-
-# Install latest version of geoblacklight gem if running
-# generator with a development branch.
+# Set BRANCH=<branch_name> to install from a specific branch
 if ENV["BRANCH"]
   gem "geoblacklight", github: "geoblacklight/geoblacklight", branch: ENV["BRANCH"]
 else
-  gem "geoblacklight", "~> 5.0"
+  gem "geoblacklight"
 end
 
 run "bundle install"
 
-generate "blacklight:install", "--devise", "--skip-solr"
-generate "geoblacklight:install", "-f"
-
-rake "db:migrate"
+after_bundle do
+  generate "blacklight:install", ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", "--devise --skip-solr")
+  generate "geoblacklight:install"
+  rails_command "db:migrate"
+end

data/vite.config.ts

@@ -28,8 +28,5 @@ export default defineConfig(() => {
         ],
       },
     },
-    test: {
-      environment: "jsdom",
-    },
   };
 });

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Mike Graves
 - Darren Hardy
 - Eliot Jordan
 - Jack Reed
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-11 00:00:00.000000000 Z
+date: 2026-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -370,8 +369,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
-- ".github/workflows/build-demo-app.yml"
-- ".github/workflows/prune-containers.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".standard.yml"
@@ -485,6 +483,8 @@ files:
 - app/components/blacklight/icons/uva_component.rb
 - app/components/blacklight/icons/web_services_component.rb
 - app/components/blacklight/icons/websites_component.rb
+- app/components/geoblacklight/accordion_component.html.erb
+- app/components/geoblacklight/accordion_component.rb
 - app/components/geoblacklight/arcgis_component.html.erb
 - app/components/geoblacklight/arcgis_component.rb
 - app/components/geoblacklight/attribute_table_component.html.erb
@@ -559,6 +559,7 @@ files:
 - app/javascript/geoblacklight/leaflet/constants.js
 - app/javascript/geoblacklight/leaflet/controls/geosearch.js
 - app/javascript/geoblacklight/leaflet/controls/layer_opacity.js
+- app/javascript/geoblacklight/leaflet/controls/sidebar.js
 - app/javascript/geoblacklight/leaflet/controls/sleep.js
 - app/javascript/geoblacklight/leaflet/inspection.js
 - app/javascript/geoblacklight/leaflet/layer_index_map.js
@@ -607,9 +608,6 @@ files:
 - lib/generators/geoblacklight/templates/assets/geoblacklight.scss
 - lib/generators/geoblacklight/templates/base.html.erb
 - lib/generators/geoblacklight/templates/catalog_controller.rb
-- lib/generators/geoblacklight/templates/demo-app/Dockerfile
-- lib/generators/geoblacklight/templates/demo-app/compose.yml
-- lib/generators/geoblacklight/templates/demo-app/start-server.sh
 - lib/generators/geoblacklight/templates/settings.yml
 - lib/generators/geoblacklight/templates/vite.config.ts
 - lib/generators/geoblacklight/templates/vite.json
@@ -932,13 +930,11 @@ files:
 - spec/tasks/geoblacklight_spec.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - template.rb
-- test/leaflet/layers.test.js
 - vite.config.ts
 homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -953,8 +949,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files: []

data/.github/workflows/build-demo-app.yml

@@ -1,156 +0,0 @@
-name: Build demo app
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-  schedule:
-    - cron: "0 1 * * SUN"  # every sunday at 1AM
-  workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-  BRANCH: ${{ github.head_ref || github.ref_name }}
-
-jobs:
-  build-app:
-    runs-on: ubuntu-latest
-    outputs:
-      artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.3.4
-
-      - name: Install dependencies
-        run: bundle install
-        env:
-          RAILS_VERSION: "7.2.2.1"
-
-      - name: Build frontend package
-        run: |
-          yarn install
-          yarn build
-          yarn link
-
-      - name: Build
-        run: BRANCH=${{ env.BRANCH }} rails new build -m template.rb -a propshaft --css bootstrap --js rollup
-
-      - name: Cleanup
-        run: rm -rf build/node_modules build/Gemfile.lock build/yarn.lock build/tmp
-
-      - name: Copy Dockerfile
-        run: cp lib/generators/geoblacklight/templates/demo-app/Dockerfile build/.
-
-      - name: Copy demo-app compose.yml
-        run: cp -f lib/generators/geoblacklight/templates/demo-app/compose.yml build/.
-
-      - name: Copy start-server script
-        run: cp lib/generators/geoblacklight/templates/demo-app/start-server.sh build/.
-
-      - name: Copy fixture solr documents
-        run:  mkdir -p build/spec/fixtures && cp -R spec/fixtures/solr_documents build/spec/fixtures/.
-
-      - name: Replace main image tag with pr tag
-        if: github.ref_name != 'main'
-        run: sed -i 's/main/pr-${{ github.event.number }}/g'  build/compose.yml
-
-      - name: Upload app build
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: build-${{ env.BRANCH }}
-          path: build/
-
-  build-docker:
-    runs-on: ubuntu-latest
-    needs:
-      - build-app
-    steps:
-      - name: Download app build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-${{ env.BRANCH }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=sha
-        env:
-          DOCKER_METADATA_PR_HEAD_SHA: true
-
-        # Rebuild base context when triggered by schedule or workflow_dispatch
-      - name: Build and push base Docker image
-        uses: docker/build-push-action@v6
-        if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
-        with:
-          context: "${{ github.workspace }}"
-          file: "${{ github.workspace }}/Dockerfile"
-          push: true
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ghcr.io/geoblacklight/geoblacklight:base
-          target: "base"
-
-        # Build only the app context. Build times are faster because most
-        # gems and node packages are already installed in the base context.
-      - name: Build and push branch Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: "${{ github.workspace }}"
-          file: "${{ github.workspace }}/Dockerfile"
-          push: true
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          target: "app"
-
-  notify:
-    runs-on: ubuntu-latest
-    if: github.ref_name != 'main'
-    needs:
-      - build-app
-      - build-docker
-    permissions:
-      contents: read
-      packages: write
-      pull-requests: write
-    steps:
-      - name: Add artifact link to PR comments
-        uses: mshick/add-pr-comment@v2
-        with:
-          message: |
-            Demo app download link: ${{ needs.build-app.outputs.artifact-url }}
-
-            1. Download demo app and unzip file
-            2. Change into app directory
-                - run `docker compose pull`
-                - run `docker compose up`
-            3. Open in browser
-                - App:  http://127.0.0.1:3001
-                - Solr: http://127.0.0.1:8984

data/.github/workflows/prune-containers.yml

@@ -1,19 +0,0 @@
-name: Prune containers
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * SUN"  # every sunday at midnight
-
-jobs:
-  clean:
-    runs-on: ubuntu-latest
-    name: Delete old images
-    steps:
-      - uses: snok/container-retention-policy@v3.0.0
-        with:
-          account: geoblacklight
-          image-names: geoblacklight
-          token: ${{ secrets.GITHUB_TOKEN }}
-          image-tags: "!main !base"
-          cut-off: 2w

data/lib/generators/geoblacklight/templates/demo-app/Dockerfile

@@ -1,31 +0,0 @@
-# syntax = docker/dockerfile:1
-
-# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.4
-FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
-
-RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y build-essential git pkg-config nodejs npm curl libsqlite3-0
-
-RUN npm install --global yarn
-
-ENV RAILS_ENV="development" \
-    BUNDLE_PATH="/usr/local/bundle"
-
-# Rails app lives here
-WORKDIR /rails
-
-# Install gems and javascript packages
-COPY Gemfile .
-RUN bundle install
-COPY package.json .
-RUN yarn install
-
-FROM ghcr.io/geoblacklight/geoblacklight:base AS app
-
-# Add application code
-COPY . .
-
-# Run the server script by default, this can be overwritten at runtime
-EXPOSE 3000
-CMD ["sh", "start-server"]

data/lib/generators/geoblacklight/templates/demo-app/compose.yml

@@ -1,26 +0,0 @@
-services:
-  app:
-    image: ghcr.io/geoblacklight/geoblacklight:main
-    ports:
-      - "3001:3001"
-    links:
-      - "solr:solr"
-    environment:
-      SOLR_URL: "http://solr:8983/solr/blacklight-core"
-      RAILS_DEVELOPMENT_HOSTS: ".githubpreview.dev,.preview.app.github.dev,.app.github.dev,.csb.app"
-    depends_on:
-      - solr
-    command: sh start-server.sh
-  solr:
-    image: solr:9.6.1
-    volumes:
-      - $PWD/solr/conf:/opt/solr/conf
-    ports:
-      - 8984:8983
-    entrypoint:
-      - docker-entrypoint.sh
-      - solr-precreate
-      - blacklight-core
-      - /opt/solr/conf
-      - "-Xms256m"
-      - "-Xmx512m"

data/lib/generators/geoblacklight/templates/demo-app/start-server.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-bundle install
-yarn install
-
-# Build and Install local copy of @geoblackligt/frontend
-# These steps are included in the docker image instead if the image build script
-# to reduce the size of the layers that docker compose has to pull with each new version.
-gempath=$(bundle exec gem which geoblacklight | sed 's/\/lib\/geoblacklight.rb//')
-if [ ! -d "$gempath/dist/" ]; then
-  cd $gempath
-  yarn install
-  yarn vite build
-  cd -
-fi
-yarn add file:$gempath
-
-# Start the server
-bundle exec rake db:prepare
-bundle exec rake geoblacklight:index:seed
-bundle exec rails server -b 0.0.0.0 -p 3001

data/test/leaflet/layers.test.js

@@ -1,17 +0,0 @@
-import { wmsLayer, wmtsLayer } from "../../app/javascript/leaflet/layers";
-import { describe, expect, it } from "vitest";
-
-describe("leaflet/layers", () => {
-  describe("wmsLayer", () => {
-    it("returns a WMS tile layer", () => {
-      const url = "http://example.com/wms";
-      const layerId = "layerId";
-      const opacity = 0.5;
-      const detectRetina = true;
-      const layer = wmsLayer(url, { layerId, opacity, detectRetina });
-      expect(layer.options.layers).toEqual(layerId);
-      expect(layer.options.opacity).toEqual(opacity);
-      expect(layer.options.detectRetina).toEqual(detectRetina);
-    });
-  });
-});