blacklight-spotlight 4.3.3 → 4.3.5

data/app/components/spotlight/document_admin_table_component.html.erb

@@ -21,7 +21,7 @@
       </div>
 
       <div class="page-links">
-        <%= helpers.view_link presenter.document, helpers.link_to_document(presenter.document) %> &middot;
+        <%= helpers.view_link presenter.document, helpers.search_state.url_for_document(presenter.document) %> &middot;
         <%= helpers.exhibit_edit_link presenter.document, [:edit, helpers.current_exhibit, presenter.document] %>
       </div>
     </td>

data/app/components/spotlight/solr_document_legacy_embed_component.rb

@@ -1,7 +1,20 @@
 # frozen_string_literal: true
 
-# Render an document suitable for embedding on a feature page.
 module Spotlight
+  # Render an document suitable for embedding on a feature page.
   class SolrDocumentLegacyEmbedComponent < Blacklight::DocumentComponent
+    attr_reader :block_context
+
+    def initialize(*args, block: nil, **kwargs)
+      super
+
+      @block_context = block
+    end
+
+    def before_render
+      set_slot(:embed, nil, block_context: block_context) unless embed
+
+      super
+    end
   end
 end

data/app/views/spotlight/job_trackers/show.html.erb

@@ -3,77 +3,74 @@
   <%= render 'spotlight/shared/exhibit_sidebar' %>
 <% end %>
 
-<div data-blacklight-modal="container">
-
-  <div class="modal-header border-0">
+<%= render Blacklight::System::ModalComponent.new do |c| %>
+  <% c.with_header do %>
     <h2 class="modal-title"><%= job_status_icon(@job_tracker) %> <%= t @job_tracker.job_class, default: @job_tracker.job_class %> <small class="text-monospace font-monospace font-weight-lighter fw-lighter"><%= @job_tracker.job_id&.truncate(8, omission: '') %></small></h2>
+  <% end %>
 
-    <button type="button" class="blacklight-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-      <span aria-hidden="true" class="visually-hidden">&times;</span>
-    </button>
-  </div>
-
-  <div class="modal-body row">
-    <p class="mx-2 text-small">
-      <%= t(:".summary.#{@job_tracker.status}", default: '', last_updated: time_ago_in_words(@job_tracker.updated_at, include_seconds: true), created_at: time_ago_in_words(@job_tracker.updated_at, include_seconds: true), duration: distance_of_time_in_words(@job_tracker.created_at, @job_tracker.updated_at)) %>
-    </p>
-
-    <table class="table table-striped">
-      <thead>
-        <th></th>
-        <th><%= t('.headers.message') %></th>
-        <th><%= t('.headers.details') %></th>
-      </thead>
+  <% c.with_body do %>
+    <div class="modal-body row">
+      <p class="mx-2 text-small">
+        <%= t(:".summary.#{@job_tracker.status}", default: '', last_updated: time_ago_in_words(@job_tracker.updated_at, include_seconds: true), created_at: time_ago_in_words(@job_tracker.updated_at, include_seconds: true), duration: distance_of_time_in_words(@job_tracker.created_at, @job_tracker.updated_at)) %>
+      </p>
 
-      <tbody>
-        <% row_number = 0 %>
-        <tr>
-          <th scope="row" title="<%= l @job_tracker.created_at, format: :long %>"><%= row_number += 1 %></th>
-          <td><%= t('.messages.started') %></td>
-          <td><%= l @job_tracker.updated_at, format: :long %></td>
-        </tr>
+      <table class="table table-striped">
+        <thead>
+          <th></th>
+          <th><%= t('.headers.message') %></th>
+          <th><%= t('.headers.details') %></th>
+        </thead>
 
-        <% if @job_tracker.user %>
-        <tr>
-          <th scope="row" title="<%= l @job_tracker.created_at, format: :long %>"><%= row_number += 1 %></th>
-          <td><%= t('.messages.created_by', user: @job_tracker.user.email) %></td>
-          <td></td>
-        </tr>
-        <% end %>
-
-        <% @job_tracker.events.order(:created_at, :collation_key).find_each do |e| %>
-          <tr class="<%= job_tracker_event_table_row_class(e) %>">
-            <th scope="row" title="<%= l e.created_at, format: :long %>"><%= row_number += 1 %></th>
-            <td><%= e.data[:message] %></td>
-            <td><pre><%= JSON.pretty_generate(e.data.except(:message)) %></pre></td>
+        <tbody>
+          <% row_number = 0 %>
+          <tr>
+            <th scope="row" title="<%= l @job_tracker.created_at, format: :long %>"><%= row_number += 1 %></th>
+            <td><%= t('.messages.started') %></td>
+            <td><%= l @job_tracker.updated_at, format: :long %></td>
           </tr>
-        <% end %>
 
-        <% @job_tracker.subevents.where.not(type: :summary).order(:created_at, :collation_key).find_each do |e| %>
-          <tr class="<%= job_tracker_event_table_row_class(e) %>">
-            <th scope="row" title="<%= l e.created_at, format: :long %>"><%= row_number += 1 %></th>
-            <td><%= e.data[:message] %></td>
-            <td><pre><%= JSON.pretty_generate(e.data.except(:message)) %></pre></td>
+          <% if @job_tracker.user %>
+          <tr>
+            <th scope="row" title="<%= l @job_tracker.created_at, format: :long %>"><%= row_number += 1 %></th>
+            <td><%= t('.messages.created_by', user: @job_tracker.user.email) %></td>
+            <td></td>
           </tr>
-        <% end %>
+          <% end %>
+
+          <% @job_tracker.events.order(:created_at, :collation_key).find_each do |e| %>
+            <tr class="<%= job_tracker_event_table_row_class(e) %>">
+              <th scope="row" title="<%= l e.created_at, format: :long %>"><%= row_number += 1 %></th>
+              <td><%= e.data[:message] %></td>
+              <td><pre><%= JSON.pretty_generate(e.data.except(:message)) %></pre></td>
+            </tr>
+          <% end %>
 
-        <% error_count = @job_tracker.subevents.where(type: :summary).find_each.sum { |e| e.data[:errors] } %>
-        <tr>
-          <th scope="row" title="<%= l @job_tracker.updated_at, format: :long %>"><%= row_number += 1 %></th>
-          <td>
-            <%= t('.messages.progress', progress: @job_tracker.progress, total: @job_tracker.total, errors: (t('.messages.errors', count: error_count) if error_count.positive?)) %>
-          </td>
-          <td></td>
-        </tr>
+          <% @job_tracker.subevents.where.not(type: :summary).order(:created_at, :collation_key).find_each do |e| %>
+            <tr class="<%= job_tracker_event_table_row_class(e) %>">
+              <th scope="row" title="<%= l e.created_at, format: :long %>"><%= row_number += 1 %></th>
+              <td><%= e.data[:message] %></td>
+              <td><pre><%= JSON.pretty_generate(e.data.except(:message)) %></pre></td>
+            </tr>
+          <% end %>
 
-        <% unless @job_tracker.in_progress? %>
+          <% error_count = @job_tracker.subevents.where(type: :summary).find_each.sum { |e| e.data[:errors] } %>
           <tr>
             <th scope="row" title="<%= l @job_tracker.updated_at, format: :long %>"><%= row_number += 1 %></th>
-            <td><%= t(@job_tracker.status, scope: 'spotlight.job_trackers.show.messages.status', default: :'spotlight.job_trackers.show.messages.status.missing') %></td>
-            <td><%= l @job_tracker.updated_at, format: :long %></td>
+            <td>
+              <%= t('.messages.progress', progress: @job_tracker.progress, total: @job_tracker.total, errors: (t('.messages.errors', count: error_count) if error_count.positive?)) %>
+            </td>
+            <td></td>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-</div>
+
+          <% unless @job_tracker.in_progress? %>
+            <tr>
+              <th scope="row" title="<%= l @job_tracker.updated_at, format: :long %>"><%= row_number += 1 %></th>
+              <td><%= t(@job_tracker.status, scope: 'spotlight.job_trackers.show.messages.status', default: :'spotlight.job_trackers.show.messages.status.missing') %></td>
+              <td><%= l @job_tracker.updated_at, format: :long %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% end %>
+<% end %>

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '4.3.3'
+  VERSION = '4.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.5
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -1586,7 +1586,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections