geoblacklight 5.3.0 → 6.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9e80f30735f8fa8f8e4c03e0a855b4e709acbf1eb860cad0a14e66dba72064
-  data.tar.gz: 824c5c71fb501807335ab0862522d5a14fec06f31b1f21b09d732338f27e5b89
+  metadata.gz: 667a2a369d04716624d762876de8359effeddac901e1d1f009adbb09791264fb
+  data.tar.gz: 5872171cbac68976a9219cb812a670a8cf5a2e222e809a31f93103deb4d7ab97
 SHA512:
-  metadata.gz: acbee7539ae6c048356e42467b99f4e94c948cc9d5a35ddeeccc721028965808267d33d3d3ce91fc05afdd5992fbee5edeeda1760aa6257dea6420bc83e194ce
-  data.tar.gz: 8395fe82750ac0bfe3dc3de410a7039d0eff671ffee63690f1a0858b88687dc163ed92a711a46a94caf956eb3cdd5b04f7c96cb5a7cf2aedbaec9d74a2136412
+  metadata.gz: f4f52fb72f6dad913341e735ece7a4b828886f70b17816f4c7ca497f4ecca97f7effdeb8f2daf4e33ae1f2ecfce2bd9ef0aec958fbe464a4081225b78e103887
+  data.tar.gz: 0a4d1b12e4a99c47ef0bb253b6bd2c7446c9a960e5f0a2441829dc1cb7c35d261620333ca323520486414e306a300f898e0298af5b0a3a94ea691236e9892bab

data/.engine_cart.yml

@@ -0,0 +1,14 @@
+rails_options:
+  - --skip-docker
+  - --skip-action-cable
+  - --skip-rubocop
+  - --skip-brakeman
+  - --skip-kamal
+  - --skip-solid
+  - --skip-git
+  - --skip-keeps
+  - --skip-test
+  - --skip-decrypted-diffs
+  - --skip-sprockets
+  - --asset-pipeline=propshaft
+  - --javascript=importmap

data/.github/workflows/ruby.yml

@@ -7,27 +7,40 @@ on:
   pull_request:
 
 jobs:
-  linter:
+  standardrb-linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.4
       - name: Install dependencies
         run: bundle install
       - name: Run linter
         run: bundle exec standardrb
 
+  prettier-linter:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - name: Set up Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: "24"
+      - name: Install dependencies
+        run: npm install
+      - name: Run Prettier check
+        run: npm run lint
+
   aardvark-fixture-linter:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.4
       - name: Install json schema validator
         run: gem install json_schemer
       - name: Run json_schemer against aardvark fixtures
@@ -37,19 +50,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ["3.2", "3.3", "3.4"]
+        ruby_version: ["3.3", "3.4", "4.0"]
         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 }}
+    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -57,23 +63,16 @@ jobs:
       - name: Install Ruby dependencies
         run: bundle install
         env:
+          BUNDLE_FORCE_RUBY_PLATFORM: true
           RAILS_VERSION: ${{ matrix.rails_version }}
-      - name: Build and link frontend package, if using vite
-        if: matrix.asset_pipeline == 'vite'
-        run: |
-          yarn install
-          yarn build
-          yarn link
       - name: Run tests
         run: bundle exec rake ci
         env:
+          BUNDLE_FORCE_RUBY_PLATFORM: true
           RAILS_VERSION: ${{ matrix.rails_version }}
-          ASSET_PIPELINE: ${{ matrix.asset_pipeline }}
-          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@v6
-        if: matrix.asset_pipeline == 'vite'
+        uses: actions/upload-artifact@v7
         with:
           name: "coverage-${{ matrix.ruby_version }}-${{ matrix.rails_version }}"
           path: coverage/

data/.gitignore

@@ -32,12 +32,3 @@ package-lock.json
 
 # Ignore IDE files
 .idea
-
-# Vite Ruby
-/public/vite*
-/public/geoblacklight-vite*
-node_modules
-app/assets/javascripts/geoblacklight
-# Vite uses dotenv and suggests to ignore local-only env files. See
-# https://vitejs.dev/guide/env-and-mode.html#env-files
-*.local

data/.prettierignore

@@ -0,0 +1,4 @@
+node_modules
+coverage
+.internal_test_app
+vendor

data/.prettierrc

@@ -0,0 +1,5 @@
+{
+  "semi": false,
+  "trailingComma": "all",
+  "printWidth": 120
+}

data/CONTRIBUTING.md

@@ -4,10 +4,8 @@ GeoBlacklight is a collaborative, open source project where contributions are :s
 ### Who can contribute?
 **Anyone** is welcome to contribute to GeoBlacklight. We follow a set of contribution practices to maintain a technically sustainable and stable software project for everyone. We expect all contributors to adhere to our [Code of Conduct](https://github.com/geoblacklight/geoblacklight/blob/main/CODE_OF_CONDUCT.md).
 
-### Join the community
-See the [community page](https://geoblacklight.org/community/) on our website for information about our community calendar, slack, volunteer opportunities, and more.
-
-If you have questions or want to get more involved, join [GeoBlacklight Slack](https://geoblacklight.slack.com/join/shared_invite/zt-1p7dcay40-Ye_WTt5_iCqU8rDjzhkoWw#/shared-invite/email) or email the [GeoBlacklight Community](https://groups.google.com/g/geoblacklight-community) at [geoblacklight-community@googlegroups.com](mailto:geoblacklight-community@googlegroups.com).
+### How to contact us
+See the [community page](https://geoblacklight.org/community/) on our website for information about our community calendar, volunteer opportunities, and more. This page links to our Slack and Google Group so you can reach us if you have questions or want to get more involved.
 
 ## Issues
 Issues are used in the GeoBlacklight community as a convenient way to document bugs, propose new functionality and enhancements, and discuss important code changes.

data/Gemfile

@@ -1,13 +1,15 @@
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in geoblacklight.gemspec
-gemspec
+gemspec path: File.expand_path(".")
 
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 2.6.0
 # engine_cart stanza: 2.5.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV["ENGINE_CART_DESTINATION"] || ENV["RAILS_ROOT"] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+file = File.expand_path("Gemfile",
+  ENV["ENGINE_CART_DESTINATION"] || ENV["RAILS_ROOT"] || File.expand_path(".internal_test_app",
+    File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file

data/README.md

@@ -8,12 +8,12 @@ of the [Blacklight](https://projectblacklight.org) Solr-powered discovery interf
 multi-institutional [OpenGeoportal](http://opengeoportal.io/) and [OpenGeoMetadata](https://github.com/opengeometadata) federated metadata sharing
 communities. We're actively looking for community input and development partners.
 
-### Documentation
+## Documentation
 
-Our full [GeoBlacklight Documentation](https://geoblacklight.org/docs/) has how-to guides for installing, customizing, and maintaining a GeoBlacklight instance.
+Our full [GeoBlacklight Documentation](https://geoblacklight.org/latest/docs/) has how-to guides for installing, customizing, and maintaining a GeoBlacklight instance.
 
-See the [Quick Start](https://geoblacklight.org/docs/geoblacklight_quick_start/) section to create a new GeoBlacklight application, or see [For Developers](https://geoblacklight.org/docs/developers/) for more information about setting up a development environment.
+See the [Quick Start](https://geoblacklight.org/latest/docs/geoblacklight_quick_start/) section to create a new GeoBlacklight application, or see [For Developers](https://geoblacklight.org/latest/docs/developers/) for more information about setting up a development environment.
 
-### Contributing
+## Contributing
 
 Interested in contributing to GeoBlacklight? Please see [CONTRIBUTING.md](./CONTRIBUTING.md).

data/Rakefile

@@ -12,18 +12,6 @@ require "engine_cart/rake_task"
 require "rspec/core/rake_task"
 require "open3"
 
-# 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"
-
-# Ensure the app generates with the correct javascript pipeline; rollup
-# (for Vite) is the default
-ENV["ENGINE_CART_RAILS_OPTIONS"] += if ENV["ASSET_PIPELINE"] == "importmap"
-  " --js importmap"
-else
-  " --js rollup"
-end
-
 def system_with_error_handling(*args)
   Open3.popen3(*args) do |_stdin, stdout, stderr, thread|
     puts stdout.read
@@ -45,21 +33,11 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = false
 end
 
-desc "Run JavaScript unit tests"
-task :javascript_tests do
-  system "/bin/bash -c yarn test"
-end
-
 desc "Run test suite"
 task :ci do
   with_solr do
     Rake::Task["geoblacklight:internal:seed"].invoke
-
-    # Run RSpec tests with Coverage
     Rake::Task["geoblacklight:coverage"].invoke
-
-    # Run JavaScript tests
-    Rake::Task["javascript_tests"].invoke
   end
 end
 

data/app/assets/stylesheets/geoblacklight/global.css

@@ -0,0 +1,7 @@
+/* Styles applied on every page */
+
+/* Icons */
+.blacklight-icons svg {
+  width: 1em;
+  height: 1em;
+}

data/app/assets/stylesheets/geoblacklight/home.css

@@ -0,0 +1,22 @@
+/* Homepage styles */
+
+/* Category blocks */
+.category-icon {
+  .blacklight-icons {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    svg {
+      width: 6rem;
+      height: 6rem;
+    }
+  }
+}
+
+/* Version display */
+#geoblacklight-version {
+  font-family: monospace;
+  position: absolute;
+  bottom: 0.5rem;
+  right: 0.5rem;
+}

data/app/assets/stylesheets/geoblacklight/index_maps.css

@@ -0,0 +1,36 @@
+/* Styles for index maps */
+
+/* Outline the border of the clickable areas to improve contrast */
+.viewer[data-leaflet-viewer-protocol-value="IndexMap"] {
+  .leaflet-interactive {
+    stroke: black;
+  }
+}
+
+/* Index map legend */
+.index-map-legend {
+  margin-bottom: 0.5em;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: flex-start;
+  gap: 0.5em;
+
+  @media(min-width: 992px) {
+    flex-direction: row;
+    gap: 1em;
+  }
+}
+
+.index-map-legend-info {
+  display: flex;
+  flex: 0 0 auto;
+  gap: 0.5em;
+}
+
+.index-map-legend-swatch {
+  display: inline-block;
+  border: var(--bs-border-width) solid var(--bs-border-color);
+  width: 1.5em;
+  height: 1.5em;
+}

data/app/assets/stylesheets/geoblacklight/record.css

@@ -0,0 +1,39 @@
+/* Record show page styles */
+
+/* Document header */
+.documentHeader {
+  h1 {
+    margin-bottom: 0.5em;
+    & > * {
+      vertical-align: middle;
+    }
+  }
+
+  .blacklight-icons {
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    height: 1em;
+  }
+}
+
+/* Attribute table */
+[data-sidebar="false"] .attribute-data {
+  margin-top: 1rem;
+}
+
+/* Metadata */
+.document-metadata {
+  margin-top: 1rem;
+}
+
+/* Sidebar */
+.page-sidebar {
+  .card + .card {
+    margin-top: 1rem;
+  }
+
+  .card-header {
+    font-weight: 500;
+  }
+}

data/app/assets/stylesheets/geoblacklight/search.css

@@ -0,0 +1,56 @@
+/* Search page styles */
+
+/* Search result header */
+.documents-list {
+  --bl-results-document-margin-top: 0;
+
+  .document {
+    border: 0;
+    padding-bottom: var(--bl-results-document-padding-top);
+  }
+}
+
+.blacklight-catalog-index {
+  .documentHeader {
+    flex: auto;
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    font-size: 1.25rem;
+    line-height: 1.25;
+    gap: 0.25em;
+
+    .status-icons {
+      flex: none;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      gap: 0.2em;
+    }
+
+    /* More info dropdown and area */
+    .dropdown-toggle {
+      width: 1.5em;
+      height: 1.5em;
+    }
+
+    .dropdown-toggle::after {
+      vertical-align: top;
+      margin-left: -0.25em;
+      margin-top: 0.25em;
+    }
+  }
+
+  .index_title {
+    margin: 0 0 0 0.25em;
+    font-size: 1.25rem;
+    flex-grow: 1;
+    flex-shrink: 1;
+  }
+}
+
+.more-info-area > div {
+  padding-left: var(--bl-results-document-padding-top);
+  padding-right: var(--bl-results-document-padding-top);
+  padding-bottom: var(--bl-results-document-padding-top);
+}

data/app/assets/stylesheets/geoblacklight/viewers.css

@@ -0,0 +1,50 @@
+/* Styles for map viewers */
+
+/* Geo viewers */
+#leaflet-viewer,
+#openlayers-viewer {
+  height: 500px;
+}
+
+/* Hide attribution and controls and disable interaction on the static map */
+#static-map {
+  height: 250px;
+  pointer-events: none;
+  cursor: default;
+
+  .leaflet-interactive {
+    pointer-events: none;
+    cursor: default;
+  }
+
+  .leaflet-control-container {
+    display: none;
+  }
+}
+
+/* Prevent transparency of Leaflet's affiliations display to improve contrast */
+.leaflet-container .leaflet-control-attribution {
+  background: white;
+}
+
+/* Fix text color on buttons inside the map to match Bootstrap */
+.leaflet-control-container {
+  .search-control {
+    a {
+      color: var(--bs-btn-color);
+    }
+  }
+}
+
+/* Blur the background of the dynamic search toggle to improve contrast */
+#gbl-dynamic-button {
+  background: rgba(255, 255, 255, 0.7);
+  backdrop-filter: blur(5px);
+}
+
+/* IIIF viewers */
+#mirador,
+#openseadragon {
+  position: relative;
+  height: 500px;
+}

data/app/assets/stylesheets/geoblacklight.css

@@ -0,0 +1,14 @@
+/* This is the default Geoblacklight theme. */
+
+/* GBL dependencies 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");
+
+/* GBL CSS */
+@import url("geoblacklight/global.css");
+@import url("geoblacklight/viewers.css");
+@import url("geoblacklight/index_maps.css");
+@import url("geoblacklight/record.css");
+@import url("geoblacklight/home.css");
+@import url("geoblacklight/search.css");

data/app/components/blacklight/icons/web_services_component.rb

@@ -7,9 +7,9 @@ module Blacklight
 
       def svg
         <<~SVG
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28">
-          	<title>#{title}</title>
-          	<path fill="#6c757d" d="M22 14.5v5a4.5 4.5 0 0 1-4.5 4.5h-13A4.5 4.5 0 0 1 0 19.5v-13A4.5 4.5 0 0 1 4.5 2h11c.28 0 .5.22.5.5v1a.5.5 0 0 1-.5.5h-11A2.5 2.5 0 0 0 2 6.5v13A2.5 2.5 0 0 0 4.5 22h13a2.5 2.5 0 0 0 2.5-2.5v-5c0-.28.22-.5.5-.5h1c.28 0 .5.22.5.5zM28 1v8a1 1 0 0 1-1 1 .99.99 0 0 1-.7-.3l-2.75-2.75-10.19 10.19c-.1.1-.23.16-.36.16s-.26-.07-.36-.16l-1.78-1.78c-.1-.1-.15-.23-.15-.36s.06-.27.15-.36L21.05 4.45 18.3 1.7A1 1 0 0 1 18 1a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1z"/>
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+            <title>#{title}</title>
+            <path fill="#6c757d" d="M14.11 21h-8.61c-3.037 0-5.5-2.463-5.5-5.5 0-2.702 1.951-4.945 4.521-5.408.212-3.951 3.473-7.092 7.479-7.092 3.634 0 6.646 2.587 7.335 6.017-.624-.03-1.164-.011-1.978.186-.669-2.558-2.712-4.203-5.357-4.203-3.359 0-5.734 2.562-5.567 6.78-1.954-.113-4.433.923-4.433 3.72 0 1.93 1.57 3.5 3.5 3.5h7.186c.356.749.837 1.426 1.424 2zm.607-6.667c1.306 0 1.398.905 1.691 1.755.129.373.164.56.275.56.13 0 .177-.23.324-.691.204-.633.509-1.628 1.22-1.628.685 0 .978.91 1.235 1.669.137.406.191.65.308.65.122 0 .202-.245.339-.65.248-.747.516-1.669 1.205-1.669.678 0 .985.891 1.171 1.479.256.814.332 1.025.806 1.025h.635c.045-.271.074-.548.074-.833 0-2.761-2.238-5-5-5-2.177 0-4.023 1.392-4.711 3.333h.428zm8.992 3.334c-.687 1.941-2.532 3.333-4.709 3.333-2.762 0-5-2.239-5-5 0-.285.029-.562.074-.833h.684c.458 0 .503.196.755 1.014.171.553.484 1.479 1.171 1.479.694 0 .988-.941 1.253-1.722.145-.423.176-.598.291-.598.123 0 .158.195.3.622.256.771.55 1.698 1.243 1.698.622 0 .92-.765 1.136-1.379.247-.702.282-.964.408-.964.128 0 .152.228.373.864.358 1.026.586 1.485 1.543 1.485h.478z"/>
           </svg>
         SVG
       end

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

@@ -1,5 +1,5 @@
-<div data-sidebar="<%= Settings.LEAFLET.SIDEBAR %>">
-  <div class="accordion attribute-data<% if Settings.LEAFLET.SIDEBAR %> sidebar-container<% end %>">
+<div data-sidebar="<%= sidebar? %>">
+  <div class="accordion attribute-data<% if 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 %>">
@@ -13,4 +13,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

data/app/components/geoblacklight/accordion_component.rb

@@ -7,5 +7,9 @@ module Geoblacklight
       @title = title
       super()
     end
+
+    def sidebar?
+      Geoblacklight.configuration.leaflet_options.sidebar
+    end
   end
 end

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

@@ -1,3 +1,3 @@
-<%= link_to(arcgis_link) do %>
+<%= link_to arcgis_link, class: 'nav-link' do %>
   <%= helpers.geoblacklight_icon('esri-globe') %><%= t('geoblacklight.tools.open_arcgis') %>
 <% end %>

data/app/components/geoblacklight/arcgis_component.rb

@@ -15,7 +15,7 @@ module Geoblacklight
       params = URI.encode_www_form(
         urls: document.arcgis_urls
       )
-      Settings.ARCGIS_BASE_URL + "?" + params
+      Geoblacklight.configuration.arcgis_base_url + "?" + params
     end
 
     def key

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

@@ -1,4 +1,4 @@
-<%= render Geoblacklight::AccordionComponent.new(id: 'attribute-table', title: t('geoblacklight.show.table_name')) do  %>
+<%= 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>
@@ -6,9 +6,9 @@
         <th><%= t('geoblacklight.show.value') %></th>
       </tr>
     </thead>
-    <tbody class='attribute-table-body'>
+    <tbody class="attribute-table-body">
       <tr>
-        <td class='default-text' colspan='2'><em><%= t('geoblacklight.show.click_map') %></em></td>
+        <td class="default-text" colspan="2"><em><%= t('geoblacklight.show.click_map') %></em></td>
       </tr>
     </tbody>
   </table>

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

@@ -1,3 +1,3 @@
-<%= link_to document.data_dictionary_download[:data_dictionary] do %>
+<%= link_to document.data_dictionary_download[:data_dictionary], class: 'nav-link' do %>
     <%= helpers.geoblacklight_icon('book', aria_hidden: true) %><%= t('geoblacklight.references.data_dictionary') %>
 <% end %>

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

@@ -1 +1 @@
-<%= @display_note %>
+<%= @display_note %>

data/app/components/geoblacklight/display_note_component.rb

@@ -41,7 +41,8 @@ module Geoblacklight
     end
 
     def prefixes
-      Settings.DISPLAY_NOTES_SHOWN.map { |key, value| [value.note_prefix, [value.bootstrap_alert_class, value.icon]] }.to_h
+      Geoblacklight.configuration.display_notes_shown
+        .map { |key, value| [value.note_prefix, [value.bootstrap_alert_class, value.icon]] }.to_h
     end
   end
 end

data/app/components/geoblacklight/document/citation_component.html.erb

@@ -1 +1 @@
-<%= citation %>
+<%= citation %>

data/app/components/geoblacklight/document/sidebar_component.html.erb

@@ -2,7 +2,7 @@
 <%= render_show_tools %>
 
 <div class="sidebar-buttons">
-  <% sidebar_buttons.each do | sidebar_button |  %>
+  <% sidebar_buttons.each do | sidebar_button | %>
     <%= render sidebar_button %>
   <% end %>
 </div>

data/app/components/geoblacklight/document/sidebar_component.rb

@@ -9,7 +9,6 @@ module Geoblacklight
 
       def sidebar_buttons
         [
-          Geoblacklight::WebServicesLinkComponent.new(document:),
           Geoblacklight::DownloadLinksComponent.new(document:),
           Geoblacklight::LoginLinkComponent.new(document:)
         ]

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

@@ -12,6 +12,7 @@
     <%= body %>
   <% else %>
     <div class="document-main-section">
+      <%= title %>
       <% @document.display_note.each do |display_note| %>
         <%= render Geoblacklight::DisplayNoteComponent.new(display_note: display_note) %>
       <% end %>
@@ -23,8 +24,6 @@
       </div>
       <%= render Geoblacklight::AttributeTableComponent.new(document: @document) %>
       <%= render Geoblacklight::IndexMapInspectComponent.new(document: @document) %>
-      <% title.with_after_title { render Geoblacklight::HeaderIconsComponent.new(document: @document) } %>
-      <%= title %>
       <%= embed %>
       <%= content %>
       <%= metadata %>

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

@@ -1,14 +1,14 @@
 <header>
   <%= top_bar %>
   <% if landing_page? %>
-  <div class='p-5 bg-light jumbotron'>
-    <div class='d-flex justify-content-center'>
+  <div class="p-5 bg-light jumbotron">
+    <div class="d-flex justify-content-center">
       <%= content_tag :h1, t('geoblacklight.home.headline'), class: 'text-center display-5 fw-bold' %>
     </div>
-    <div class='d-flex justify-content-center'>
+    <div class="d-flex justify-content-center">
       <%= content_tag :h2, t('geoblacklight.home.search_heading'), class: 'text-center fs-4' %>
     </div>
   </div>
-  <% end %>  
+  <% end %>
   <%= search_bar %>
 </header>

data/app/components/geoblacklight/header_icons_component.rb

@@ -4,14 +4,16 @@ module Geoblacklight
   class HeaderIconsComponent < ViewComponent::Base
     attr_reader :document, :fields
 
-    def initialize(document:, fields: [Settings.FIELDS.RESOURCE_CLASS, Settings.FIELDS.PROVIDER, Settings.FIELDS.ACCESS_RIGHTS])
+    def initialize(document:,
+      fields: [Geoblacklight.configuration.fields.resource_class,
+        Geoblacklight.configuration.fields.access_rights])
       @document = document
       @fields = fields
       super()
     end
 
     def icon(field)
-      return resource_icon if field == Settings.FIELDS.RESOURCE_CLASS
+      return resource_icon if field == Geoblacklight.configuration.fields.resource_class
 
       helpers.geoblacklight_icon(@document[field], classes: "svg_tooltip")
     end