geoblacklight 5.3.0 → 6.0.0.pre.alpha.1

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

@@ -1,11 +1,7 @@
-<div class='category-block col-sm'>
-  <div class='category-icon'>
+<div class="category-block col-md p-3">
+  <div class="category-icon">
     <%= helpers.geoblacklight_icon(@icon) %>
   </div>
   <%= content_tag :h4, t(@label) %>
-  <%- facets = @response.aggregations[@facet_field].items.map { |item|
-    link_to(item.value, search_catalog_path("f[#{@facet_field}][]": item.value), class: 'home-facet-link')
-  } %>
-  <%- facets << link_to('more »', facet_catalog_path(@facet_field), class: 'more_facets_link') %>
-  <%= facets.join(', ').html_safe %>
+  <%= facets %>
 </div>

data/app/components/geoblacklight/homepage_feature_facet_component.rb

@@ -2,12 +2,21 @@
 
 module Geoblacklight
   class HomepageFeatureFacetComponent < ViewComponent::Base
-    def initialize(icon:, label:, facet_field:, response:)
+    def initialize(icon:, label:, facet_field_presenter:, items:)
       @icon = icon
       @label = label
-      @facet_field = facet_field
-      @response = response
+      @facet_field_presenter = facet_field_presenter
+      @items = items
       super()
     end
+
+    def facets
+      links = @items.map do |item|
+        item_presenter = @facet_field_presenter.item_presenter(item)
+        link_to(item_presenter.value, item_presenter.href, class: "home-facet-link")
+      end
+      links << link_to("more »", facet_catalog_path(@facet_field_presenter.key), class: "more_facets_link")
+      safe_join(links, ", ")
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 <%= link_to @href_link, data: {manifest: @manifest}, class: 'float-end' do %>
-  <%=  helpers.geoblacklight_icon('iiif-drag-drop', classes: 'svg_tooltip iiif-icon') %>
-<% end  %>
+  <%= helpers.geoblacklight_icon('iiif-drag-drop', classes: 'svg_tooltip iiif-icon') %>
+<% end %>

data/app/components/geoblacklight/iiif_drag_drop_component.rb

@@ -6,11 +6,11 @@ module Geoblacklight
       super()
       manifest_ref = document.item_viewer&.iiif_manifest
       @manifest = manifest_ref&.endpoint || ""
-      @href_link = Settings.IIIF_DRAG_DROP_LINK&.gsub("@manifest", @manifest)
+      @href_link = Geoblacklight.configuration.iiif_drag_drop_link.gsub("@manifest", @manifest)
     end
 
     def render?
-      Settings.IIIF_DRAG_DROP_LINK.present? && @manifest.present?
+      @manifest.present? && @href_link.present?
     end
   end
 end

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

@@ -1,5 +1,5 @@
-<%= render Geoblacklight::AccordionComponent.new(id: 'index-map-attributes', title: t('geoblacklight.show.table_name')) do  %>
-  <div class='viewer-information px-3'>
+<%= 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>
-<% end %>
+<% end %>

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

@@ -1,14 +1,14 @@
-<div class="index-map-legend pb-2">
+<div class="index-map-legend">
   <div class="index-map-legend-info">
-    <span class="index-map-legend-default" style="background: <%= Settings.LEAFLET.LAYERS.INDEX.DEFAULT.color %>"></span>
-    <p><span class="visually-hidden"><%= Settings.LEAFLET.LAYERS.INDEX.DEFAULT.sr_color_name %> tile indicates </span>Map held by collection</p>
+    <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:DEFAULT, :color) %>"></div>
+    <div><span class="visually-hidden"><%= index_config.dig(:DEFAULT, :sr_color_name) %> tile indicates </span>Map held by collection</div>
   </div>
   <div class="index-map-legend-info">
-    <span class="index-map-legend-unavailable" style="background: <%= Settings.LEAFLET.LAYERS.INDEX.UNAVAILABLE.color %>"></span>
-    <p><span class="visually-hidden"><%= Settings.LEAFLET.LAYERS.INDEX.UNAVAILABLE.sr_color_name %> tile indicates </span>Map not held by collection</p>
+    <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:UNAVAILABLE, :color) %>"></div>
+    <div><span class="visually-hidden"><%= index_config.dig(:UNAVAILABLE, :sr_color_name) %> tile indicates </span>Map not held by collection</div>
   </div>
   <div class="index-map-legend-info">
-    <span class="index-map-legend-selected" style="background: <%= Settings.LEAFLET.LAYERS.INDEX.SELECTED.color %>"></span>
-    <p><span class="visually-hidden"><%= Settings.LEAFLET.LAYERS.INDEX.SELECTED.sr_color_name %> tile indicates </span>Selected map tile</p>
+    <div class="index-map-legend-swatch" style="background: <%= index_config.dig(:SELECTED, :color) %>"></div>
+    <div><span class="visually-hidden"><%= index_config.dig(:SELECTED, :sr_color_name) %> tile indicates </span>Selected map tile</div>
   </div>
 </div>

data/app/components/geoblacklight/index_map_legend_component.rb

@@ -13,5 +13,12 @@ module Geoblacklight
     def render?
       @document.item_viewer.index_map
     end
+
+    delegate :configuration, to: :Geoblacklight
+    delegate :leaflet_options, to: :configuration
+
+    def index_config
+      @index_config ||= leaflet_options.layers.index
+    end
   end
 end

data/app/components/geoblacklight/item_map_viewer_component.rb

@@ -46,7 +46,7 @@ module Geoblacklight
     def iiif_manifest_tag
       tag.div(nil,
         id: "mirador",
-        class: "viewer",
+        class: "viewer border",
         data: {
           manifest_url: @document.viewer_endpoint
         })
@@ -57,7 +57,7 @@ module Geoblacklight
     def iiif_image_tag
       tag.div(nil,
         id: "openseadragon",
-        class: "viewer",
+        class: "viewer border",
         data: {
           image_url: @document.viewer_endpoint
         })
@@ -80,7 +80,7 @@ module Geoblacklight
       viewer_name = openlayers? ? "openlayers-viewer" : "leaflet-viewer"
       tag.div(nil,
         id: viewer_name,
-        class: "viewer",
+        class: "viewer border",
         data: {
           "controller" => viewer_name,
           "#{viewer_name}-available-value" => helpers.document_available?(@document),
@@ -89,10 +89,14 @@ module Geoblacklight
           "#{viewer_name}-url-value" => @document.viewer_endpoint,
           "#{viewer_name}-map-geom-value" => @document.geometry.geojson,
           "#{viewer_name}-layer-id-value" => @document.wxs_identifier,
-          "#{viewer_name}-options-value" => helpers.leaflet_options,
+          "#{viewer_name}-options-value" => leaflet_options.to_h,
           "#{viewer_name}-page-value" => params[:action]&.upcase,
           "#{viewer_name}-draw-initial-bounds-value" => true
         }.compact)
     end
+
+    def leaflet_options
+      Geoblacklight.configuration.leaflet_options
+    end
   end
 end

data/app/components/geoblacklight/location_leaflet_map_component.rb

@@ -4,7 +4,7 @@ module Geoblacklight
   class LocationLeafletMapComponent < ViewComponent::Base
     def initialize(
       id: "leaflet-viewer",
-      map_geometry: Settings.HOMEPAGE_MAP_GEOM,
+      map_geometry: config.homepage_map_geom,
       classes: "",
       page: nil,
       geosearch: nil
@@ -26,24 +26,37 @@ module Geoblacklight
 
     # Add top-level geosearch control to leaflet options if configured
     def leaflet_options
-      options = helpers.leaflet_options.deep_dup
-      options["CONTROLS"] = {"Geosearch" => @geosearch} if @geosearch
-      options.to_json
+      config.leaflet_options.deep_dup.tap do |options|
+        options.controls = {"Geosearch" => @geosearch} if @geosearch
+      end
+    end
+
+    def config
+      Geoblacklight.configuration
+    end
+
+    # We don't want turbo-permanent on the home page.
+    def data_permanent
+      return {} unless helpers.has_search_parameters?
+      {turbo_permanent: true}
     end
 
     def viewer_tag
-      tag.div(nil,
-        id: @id,
+      tag.div(id: @id,
         class: @classes,
-        data: {
-          "controller" => "leaflet-viewer",
-          "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
-          "leaflet-viewer-map-geom-value" => search_bbox || @map_geometry,
-          "leaflet-viewer-data-map-value" => @data_map,
-          "leaflet-viewer-page-value" => params[:action]&.upcase,
-          "leaflet-viewer-options-value" => leaflet_options,
-          "leaflet-viewer-catalog-base-url-value" => (helpers.search_catalog_url if @geosearch)
-        }.compact)
+        data: data_permanent.merge(leaflet_viewer_data_attributes))
+    end
+
+    def leaflet_viewer_data_attributes
+      {
+        "controller" => "leaflet-viewer",
+        "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
+        "leaflet-viewer-map-geom-value" => search_bbox || @map_geometry,
+        "leaflet-viewer-data-map-value" => @data_map,
+        "leaflet-viewer-page-value" => params[:action]&.upcase,
+        "leaflet-viewer-options-value" => leaflet_options.to_h,
+        "leaflet-viewer-catalog-base-url-value" => (helpers.search_action_path if @geosearch)
+      }.compact
     end
   end
 end

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

@@ -7,14 +7,14 @@
     <% relationship_type_results['docs'][0..2].map { |hash| SolrDocument.new(hash) }.each do |doc| %>
       <li class="list-group-item border-bottom-0">
         <%= link_to solr_document_path(doc) do %>
-          <%= helpers.relations_icon(doc, rel_type_info.icon) unless rel_type_info.icon.nil? %>
+          <%= helpers.geoblacklight_icon(rel_type_info.icon) unless rel_type_info.icon.nil? %>
           <%= doc.title %>
         <% end %>
       </li>
     <% end %>
     <% unless (relationship_type_results['numFound'].to_i <= 3) %>
       <li class="list-group-item border-bottom-0">
-        <%= link_to search_catalog_path({f: {"#{Settings.RELATIONSHIPS_SHOWN.public_send(relationship_type).field}" => [relations.link_id]}}) do %>
+        <%= link_to search_catalog_path({f: {"#{Geoblacklight.configuration.relationships_shown.public_send(relationship_type).field}" => [relations.link_id]}}) do %>
           <%= t('geoblacklight.relations.browse_all', count: relationship_type_results['numFound']) %>
         <% end %>
       </li>

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

@@ -1,4 +1,4 @@
-<%# This template copies from Blacklight's components/document_component.html.erb 
+<%# This template copies from Blacklight's components/document_component.html.erb
       # for the wrapping `content_tag @component` structure
       # and adds custom layout within for the document header, status-icons and more-info areas %>
 
@@ -14,31 +14,33 @@
   itemtype: @document.itemtype,
   class: classes.flatten.join(' ') do %>
 
-    <%= content_tag :div, class: 'documentHeader index-split d-flex flex-grow-1', data: { layer_id: @document.id, geom: @document.geometry.geojson } do %>
-      <h3 class="index_title d-flex flex-grow-1">
-        <span class="document-counter">
-          <%= t('blacklight.search.documents.counter', :counter => @counter) if @counter %>
-        </span>
-        <%= helpers.link_to_document(@document, counter: @counter, itemprop: "name") %>
-      </h3>
+  <%= content_tag :div, class: 'documentHeader index-split', data: { layer_id: @document.id, geom: @document.geometry.geojson } do %>
+    <div class="document-counter">
+      <%= t('blacklight.search.documents.counter', :counter => @counter) if @counter %>
+    </div>
 
-      <span class='status-icons'>
-        <%= render Geoblacklight::HeaderIconsComponent.new(document: @document) %>
-        <button
-            class="btn dropdown-toggle collapsed"
-            data-bs-toggle="collapse"
-            data-bs-target="#doc-<%= @document.id %>-fields-collapse"
-            aria-label="<%= t('geoblacklight.metadata.toggle_summary') %>"
-            aria-expanded="false"
-            aria-controls="doc-<%= @document.id %>-fields-collapse">
-          </button>
-      </span>
-    <% end %>
-  <% end %>
-  <div class='more-info-area border-bottom'>
-    <div id="doc-<%= @document.id %>-fields-collapse" class='collapse'>
-      <small itemprop="description">
-        <%= index_fields_display %>
-      </small>
+    <h3 class="index_title">
+      <%= helpers.link_to_document(@document, counter: @counter, itemprop: "name") %>
+    </h3>
+
+    <div class="status-icons">
+      <%= render Geoblacklight::HeaderIconsComponent.new(document: @document) %>
+      <button
+          class="btn dropdown-toggle collapsed"
+          data-bs-toggle="collapse"
+          data-bs-target="#doc-<%= @document.id %>-fields-collapse"
+          aria-label="<%= t('geoblacklight.metadata.toggle_summary') %>"
+          aria-expanded="false"
+          aria-controls="doc-<%= @document.id %>-fields-collapse">
+      </button>
     </div>
+
+  <% end %>
+<% end %>
+<div class="more-info-area border-bottom">
+  <div id="doc-<%= @document.id %>-fields-collapse" class="collapse">
+    <small itemprop="description">
+      <%= index_fields_display %>
+    </small>
   </div>
+</div>

data/app/components/geoblacklight/search_result_component.rb

@@ -15,8 +15,8 @@ module Geoblacklight
     # @return [String]
     def index_fields_display
       fields_values = []
-      @presenter.configuration.index_fields.each do |_field_name, field_config|
-        val = @presenter.field_value(field_config).to_s
+      @presenter.configuration.index_fields.each_value do |field_config|
+        val = @presenter.field_value(field_config).to_sentence
         if val.present?
           val += "." unless val.end_with?(".")
           fields_values << val

data/app/components/geoblacklight/static_map_component.rb

@@ -10,7 +10,7 @@ module Geoblacklight
     end
 
     def render?
-      Settings.SIDEBAR_STATIC_MAP&.any? { |vp| @document.viewer_protocol == vp }
+      Geoblacklight.configuration.sidebar_static_map&.any? { |vp| @document.viewer_protocol == vp }
     end
 
     def before_render
@@ -18,16 +18,17 @@ module Geoblacklight
     end
 
     def viewer_tag
-      leaflet_options = helpers.leaflet_options.deep_dup
-      leaflet_options.SLEEP.SLEEP = false
+      leaflet_options = Geoblacklight.configuration.leaflet_options.deep_dup
+      leaflet_options.sleep.sleep = false
       tag.div(nil,
         id: "static-map",
+        class: "viewer border",
         data: {
           "controller" => "leaflet-viewer",
           "leaflet-viewer-basemap-value" => helpers.geoblacklight_basemap,
           "leaflet-viewer-page-value" => "STATIC_MAP",
           "leaflet-viewer-map-geom-value" => @document.geometry.geojson,
-          "leaflet-viewer-options-value" => leaflet_options,
+          "leaflet-viewer-options-value" => leaflet_options.to_h,
           "leaflet-viewer-draw-initial-bounds-value" => true
         })
     end

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

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

data/app/components/geoblacklight/viewer_help_text_component.rb

@@ -40,7 +40,7 @@ module Geoblacklight
     end
 
     def render?
-      Settings&.HELP_TEXT&.public_send(@feature)&.include?(@key)
+      Geoblacklight.configuration.help_text.fetch(@feature.to_sym, []).include?(@key)
     end
   end
 end

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

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

data/app/components/geoblacklight/web_services_component.rb

@@ -12,7 +12,7 @@ module Geoblacklight
     end
 
     def render?
-      Settings.WEBSERVICES_SHOWN.include? @type
+      Geoblacklight.configuration.webservices_shown.include? @type
     end
 
     def render_web_services

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

@@ -1,11 +1,11 @@
-<div class='mb-3 web-services-form'>
-  <label for='<%= reference.type%>_webservice'>
-    <%= "#{helpers.formatted_name_reference(reference.type)}" %>
+<div class="mb-3 web-services-form">
+  <label for="<%= reference.type %>_webservice">
+    <%= helpers.formatted_name_reference(reference.type) %>
   </label>
-  <div class='input-group'>  
-    <input type='text' id='<%= reference.type%>_webservice' value='<%= reference.endpoint %>' class='form-control'>
+  <div class="input-group">
+    <input type="text" id="<%= reference.type %>_webservice" value="<%= reference.endpoint %>" class="form-control">
     <div class="input-group-append">
-      <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param='<%= reference.endpoint %>'><%= t('blacklight.modal.copy') %></button>
+      <button button type="button" class="btn btn-primary" data-action="clipboard#copyToClipboard" data-clipboard-value-param="<%= reference.endpoint %>"><%= t('blacklight.modal.copy') %></button>
     </div>
   </div>
 </div>

data/app/components/geoblacklight/web_services_link_component.rb

@@ -2,21 +2,24 @@
 
 module Geoblacklight
   class WebServicesLinkComponent < ViewComponent::Base
-    def initialize(document:)
+    attr_reader :document
+
+    def initialize(document:, **)
       @document = document
       super()
     end
 
-    def render?
-      (Settings.WEBSERVICES_SHOWN & @document.references.refs.map(&:type).map(&:to_s)).any?
+    def call
+      link_to(
+        "Web services",
+        helpers.web_services_solr_document_path(id: document.id),
+        class: "nav-link",
+        data: {blacklight_modal: "trigger"}
+      )
     end
 
-    def web_services_link
-      link_to "Web services",
-        helpers.web_services_solr_document_path(id: @document.id),
-        class: ["btn", "btn-primary", "sidebar-btn"],
-        id: "web-services-button",
-        data: {blacklight_modal: "trigger"}
+    def key
+      "web_services"
     end
   end
 end

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

@@ -1,10 +1,10 @@
 <%= render Geoblacklight::WebServicesDefaultComponent.new(reference:) %>
 <div class="mb-3 d-flex align-items-center">
-  <label for="wfs_abv_webservice" class="me-2"><%= t('geoblacklight.references.wfs_abv')%> <code><%= t('geoblacklight.references.wfs_label')%></code></label>
-  <div class='input-group'>
-    <input id="wfs_abv_webservice" type='text' value='<%= document.wxs_identifier %>' readonly='readonly' class="form-control">
+  <label for="wfs_abv_webservice" class="me-2"><%= t('geoblacklight.references.wfs_abv') %> <code><%= t('geoblacklight.references.wfs_label') %></code></label>
+  <div class="input-group">
+    <input id="wfs_abv_webservice" type="text" value="<%= document.wxs_identifier %>" readonly class="form-control">
     <div class="input-group-append">
-      <button button type="button" class="btn btn-primary"  data-action="clipboard#copyToClipboard" data-clipboard-value-param='<%= document.wxs_identifier %>'><%= t('blacklight.modal.copy') %></button>
+      <button button type="button" class="btn btn-primary"  data-action="clipboard#copyToClipboard" data-clipboard-value-param="<%= document.wxs_identifier %>"><%= t('blacklight.modal.copy') %></button>
     </div>
   </div>
 </div>

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

@@ -1,10 +1,10 @@
 <%= render Geoblacklight::WebServicesDefaultComponent.new(reference:) %>
 <div class="mb-3 d-flex align-items-center">
-  <label for="wms_abv_webservice" class="me-2"><%= t('geoblacklight.references.wms_abv')%> <code><%= t('geoblacklight.references.wms_label')%></code></label>
-  <div class='input-group'>
-    <input id="wms_abv_webservice" type='text' value='<%= document.wxs_identifier %>' class="form-control">
+  <label for="wms_abv_webservice" class="me-2"><%= t('geoblacklight.references.wms_abv') %> <code><%= t('geoblacklight.references.wms_label') %></code></label>
+  <div class="input-group">
+    <input id="wms_abv_webservice" type="text" value="<%= document.wxs_identifier %>" class="form-control">
     <div class="input-group-append">
-      <button button type="button" class="btn btn-primary"  data-action="clipboard#copyToClipboard" data-clipboard-value-param='<%= document.wxs_identifier %>'><%= t('blacklight.modal.copy') %></button>
+      <button button type="button" class="btn btn-primary"  data-action="clipboard#copyToClipboard" data-clipboard-value-param="<%= document.wxs_identifier %>"><%= t('blacklight.modal.copy') %></button>
     </div>
   </div>
 </div>

data/app/controllers/download_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class DownloadController < ApplicationController
-  # include Blacklight::SearchHelper
   include Blacklight::Catalog
 
   rescue_from Geoblacklight::Exceptions::ExternalDownloadFailed do |exception|

data/app/controllers/wms_controller.rb

@@ -12,6 +12,6 @@ class WmsController < ApplicationController
   private
 
   def wms_params
-    params.permit(Settings.GBL_PARAMS)
+    params.permit(Geoblacklight.configuration.gbl_params)
   end
 end

data/app/helpers/geoblacklight_helper.rb

@@ -18,7 +18,6 @@ module GeoblacklightHelper
   # @return [SVG or HTML tag]
   def geoblacklight_icon(name, **args)
     icon_name = name ? name.to_s.parameterize : "none"
-    icon_name = Settings.ICON_MAPPING && Settings.ICON_MAPPING[icon_name] || icon_name
     camel_icon = icon_name.tr("-", "_").camelize.delete(" ")
     begin
       render "Blacklight::Icons::#{camel_icon}Component".constantize.new(name: icon_name, **args)
@@ -53,13 +52,6 @@ module GeoblacklightHelper
     blacklight_config.basemap_provider || "positron"
   end
 
-  ##
-  # Returns a hash of the leaflet plugin settings to pass to the viewer.
-  # @return[Hash]
-  def leaflet_options
-    Settings.LEAFLET
-  end
-
   ##
   # Renders the transformed metadata
   # (Renders a partial when the metadata isn't available)
@@ -95,13 +87,6 @@ module GeoblacklightHelper
     )
   end
 
-  ## Returns the icon used based off a Settings strategy
-  def relations_icon(document, icon)
-    icon_html = render Geoblacklight::HeaderIconsComponent.new(document: document, fields: [Settings.FIELDS.GEOM_TYPE]) if Settings.USE_GEOM_FOR_RELATIONS_ICON
-    return icon_html unless !Settings.USE_GEOM_FOR_RELATIONS_ICON || icon_html.include?("icon-missing")
-    geoblacklight_icon(icon, **{})
-  end
-
   ## Returns the data-page attribute value used as the JS map selector
   def results_js_map_selector(controller_name)
     case controller_name

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

@@ -1,11 +1,11 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-    static targets = ["alert"];
+  static targets = ["alert"]
 
-    async copyToClipboard(event) {  
-        let text = event.params.value;
-        await navigator.clipboard.writeText(text)
-        this.alertTarget.classList.remove('d-none');
-    }
+  async copyToClipboard(event) {
+    let text = event.params.value
+    await navigator.clipboard.writeText(text)
+    this.alertTarget.classList.remove("d-none")
+  }
 }

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

@@ -2,55 +2,63 @@ import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   download(ev) {
-    ev.preventDefault();
+    ev.preventDefault()
     if (this.downloading) {
-      return;
+      return
     }
-    this.downloading = true;
-    ev.target.classList.add('download-in-progress');
-    const url = ev.target.dataset.downloadPath;
-    ev.target.removeAttribute('href');
-    ev.target.innerHTML = '<div class="spinner-border spinner-border-sm float-end"></div> Preparing download...';
+    this.downloading = true
+    ev.target.classList.add("download-in-progress")
+    const url = ev.target.dataset.downloadPath
+    ev.target.removeAttribute("href")
+    ev.target.innerHTML = '<div class="spinner-border spinner-border-sm float-end"></div> Preparing download...'
 
     fetch(url)
       .then((response) => {
         if (!response.ok) {
           return response.json().then((errorData) => {
-            const exception = new Error("Network response was not ok");
-            exception.data = errorData; // Attach the parsed JSON data to the error object
-            throw exception;
-          });
+            const exception = new Error("Network response was not ok")
+            exception.data = errorData // Attach the parsed JSON data to the error object
+            throw exception
+          })
         }
-        return response.json();
+        return response.json()
       })
       .then((data) => this.complete(data, ev.target))
-      .catch((error) => this.error(error, ev.target));
+      .catch((error) => this.error(error, ev.target))
   }
 
   complete(data, target) {
-    this.downloading = false;
-    target.classList.remove('download-in-progress');
-    target.classList.add('download-complete');
-    target.innerHTML = `Download ready (${target.dataset.downloadType})`;
-    target.href = data[1];
-    this.renderMessage(data[0]);
+    this.downloading = false
+    target.classList.remove("download-in-progress")
+    target.classList.add("download-complete")
+    target.innerHTML = `Download ready (${target.dataset.downloadType})`
+    target.href = data[1]
+    this.renderMessage(data[0])
     //target.click();
   }
 
   error(exception, target) {
-    this.downloading = false;
-    target.classList.remove('download-in-progress');
-    target.classList.add('download-complete');
-    target.innerHTML = `Download failed (${target.dataset.downloadType})`;
-    this.renderMessage(exception.data[0]);
+    this.downloading = false
+    target.classList.remove("download-in-progress")
+    target.classList.add("download-complete")
+    target.innerHTML = `Download failed (${target.dataset.downloadType})`
+    console.log(exception)
+
+    this.renderMessage(exception.data[0])
   }
 
   renderMessage(message) {
+    let flashContainer = document.querySelector("div.flash_messages")
+    if (!flashContainer) {
+      flashContainer = document.createElement("div")
+      flashContainer.className = "flash_messages"
+      document.getElementById("document").prepend(flashContainer)
+    }
     Object.entries(message).forEach(([idx, msg]) => {
-      const flash = document.createElement("div");
-      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);
-    });
+      const flash = document.createElement("div")
+      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>`
+      flashContainer.appendChild(flash)
+    })
   }
 }