blacklight-spotlight 3.0.0.rc4 → 3.0.0.rc5

data/app/services/spotlight/etl/executor.rb

@@ -47,9 +47,7 @@ module Spotlight
       #
       # @return [Number]
       def estimated_size
-        @estimated_size ||= begin
-          compile_steps(sources).sum { |source| source.call(context).count }
-        end
+        @estimated_size ||= compile_steps(sources).sum { |source| source.call(context).count }
       end
 
       ##

data/app/services/spotlight/iiif_resource_resolver.rb

@@ -57,7 +57,7 @@ module Spotlight
 
     def response
       @response ||= begin
-                      Faraday.get(iiif_manifest_url).body
+                      Spotlight::Resources::IiifService.http_client.get(iiif_manifest_url).body
                     rescue Faraday::Error => e
                       Rails.logger.warn("#{self.class.name} failed to fetch #{iiif_manifest_url} with: #{e}")
                       '{}'

data/app/uploaders/spotlight/bulk_updates_uploader.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Spotlight
+  class BulkUpdatesUploader < CarrierWave::Uploader::Base
+    storage Spotlight::Engine.config.uploader_storage
+  end
+end

data/app/uploaders/spotlight/featured_image_uploader.rb

@@ -6,7 +6,7 @@ module Spotlight
   class FeaturedImageUploader < CarrierWave::Uploader::Base
     storage Spotlight::Engine.config.uploader_storage
 
-    def extension_whitelist
+    def extension_allowlist
       Spotlight::Engine.config.allowed_upload_extensions
     end
 

data/app/views/catalog/_add_tags.html.erb

@@ -0,0 +1,28 @@
+<div class="modal fade" id="add-tags-modal" tabindex="-1" role="dialog" aria-labelledby="add-tag-modal" aria-hidden="true">
+  <div class="modal-dialog">
+  <%= bootstrap_form_for([:visibility, current_exhibit], url: add_tags_exhibit_bulk_actions_path(current_exhibit), method: 'post') do |f| %>
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="add-tag-modal"><%= t(:'spotlight.bulk_actions.add_tags.heading') %></h4>
+        <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p>
+          <%= t(:'spotlight.bulk_actions.add_tags.description', count: @response.total) %>
+        </p>
+        <div class="form-group">
+          <%= label_tag :tags, t(:'spotlight.bulk_actions.add_tags.label') %>
+          <%= text_field_tag :tags, '', class: 'form-control', data: { autocomplete_tag: true, autocomplete_url: exhibit_tags_path(current_exhibit, format: 'json')} %>
+        </div>
+        <%= render_hash_as_hidden_fields(search_state.params_for_search) %>
+      </div>
+      <div class="modal-footer d-flex flex-row-reverse justify-content-start">
+        <%= f.submit t(:'spotlight.bulk_actions.add'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm') } %>
+        <button type="button" class="btn btn-link" data-dismiss="modal"><%= t :cancel %></button>
+      </div>
+    </div>
+    <% end %>
+  </div>
+</div>

data/app/views/catalog/_bulk_actions.html.erb

@@ -0,0 +1,12 @@
+<div class="dropdown bulk-actions-dropdown">
+  <button class="btn btn-secondary dropdown-toggle" type="button" id="bulk-actions-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <%= t(:'spotlight.bulk_actions.label') %>
+  </button>
+  <div class="dropdown-menu" aria-labelledby="bulk-actions-button">
+    <% blacklight_config.bulk_actions.each do |key, _config| %>
+      <%= link_to t("spotlight.bulk_actions.#{key}.heading"), '#', class: 'dropdown-item', data: {toggle:"modal", target:"##{key.to_s.dasherize}-modal"} %>
+    <% end %>
+  </div>
+</div>
+
+<%= render_filtered_partials(blacklight_config.bulk_actions) %>

data/app/views/catalog/_change_visibility.html.erb

@@ -0,0 +1,35 @@
+<div class="modal fade" id="change-visibility-modal" tabindex="-1" role="dialog" aria-labelledby="save-modal-label" aria-hidden="true">
+  <div class="modal-dialog">
+  <%= bootstrap_form_for([:change_visibility, current_exhibit], url: change_visibility_exhibit_bulk_actions_path(current_exhibit), method: 'post') do |f| %>
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="save-modal-label"><%= t(:'spotlight.bulk_actions.change_visibility.heading') %></h4>
+        <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p>
+          <%= t(:'spotlight.bulk_actions.change_visibility.description', count: @response.total) %>
+        </p>
+        <div class="form-check-label">
+          <%= t(:'spotlight.bulk_actions.change_visibility.label') %>
+        </div>
+        <% ['public', 'private'].each do |key| %>
+          <div class="form-check">
+            <%= label_tag "visibility_#{key}", class: 'form-check-label'  do %>
+              <%= radio_button_tag :visibility, key, {}, class: 'form-check-input' %>
+              <%= t(:"spotlight.bulk_actions.change_visibility.#{key}") %>
+            <% end %>
+          </div>
+        <% end %>
+        <%= render_hash_as_hidden_fields(search_state.params_for_search) %>
+      </div>
+      <div class="modal-footer d-flex flex-row-reverse justify-content-start">
+        <%= f.submit t(:'spotlight.bulk_actions.change'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm') } %>
+        <button type="button" class="btn btn-link" data-dismiss="modal"><%= t :cancel %></button>
+      </div>
+    </div>
+    <% end %>
+  </div>
+</div>

data/app/views/catalog/_curator_actions.html.erb

@@ -0,0 +1,3 @@
+<div class="curator-actions">
+  <%= render_filtered_partials(blacklight_config.curator_actions) %>
+</div>

data/app/views/catalog/_remove_tags.html.erb

@@ -0,0 +1,37 @@
+<div class="modal fade" id="remove-tags-modal" tabindex="-1" role="dialog" aria-labelledby="remove-tag-modal" aria-hidden="true">
+  <div class="modal-dialog">
+  <%= bootstrap_form_for([:visibility, current_exhibit], url: remove_tags_exhibit_bulk_actions_path(current_exhibit), method: 'post') do |f| %>
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="remove-tag-modal"><%= t(:'spotlight.bulk_actions.remove_tags.heading') %></h4>
+        <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <%= t(:'spotlight.bulk_actions.remove_tags.description_html', count: @response.total) %>
+        <% facet = @response.aggregations[blacklight_config.facet_fields['exhibit_tags'].field] %>
+
+        <% if facet.items.any? %>
+          <h5><%= t(:'spotlight.bulk_actions.remove_tags.assigned') %></h5>
+        <% end %>
+        <% facet.items.each do |facet_item| %>
+          <div class="badge badge-info">
+            <%= "#{facet_item.value} (#{facet_item.hits})" %>
+          </div>
+        <% end %>
+
+        <div class="form-group mt-4">
+          <%= label_tag :tags, t(:'spotlight.bulk_actions.remove_tags.label') %>
+          <%= text_field_tag :tags, '', class: 'form-control', data: { autocomplete_tag: true, autocomplete_url: exhibit_tags_path(current_exhibit, format: 'json')} %>
+        </div>
+        <%= render_hash_as_hidden_fields(search_state.params_for_search) %>
+      </div>
+      <div class="modal-footer d-flex flex-row-reverse justify-content-start">
+        <%= f.submit t(:'spotlight.bulk_actions.remove'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm') } %>
+        <button type="button" class="btn btn-link" data-dismiss="modal"><%= t :cancel %></button>
+      </div>
+    </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spotlight/bulk_updates/_download.html.erb

@@ -0,0 +1,23 @@
+<p class="instructions"><%= t('.instructions_html') %></p>
+
+<%= bootstrap_form_with(url: download_template_exhibit_bulk_updates_path, local: true, target: '_blank') do |f| %>
+  <div class="row">
+    <div class="col col-sm-3">
+      <%= f.form_group(:reference_fields, label: { text: t('.reference_fields.heading'), class: 'font-weight-bold' }) do %>
+        <%= f.check_box('reference_fields[item_id]', label: t('.item_id'), checked: true, disabled: true) %>
+        <%= f.check_box('reference_fields[item_title]', label: t('.item_title')) %>
+      <% end %>
+    </div>
+    <div class="col col-sm-3">
+      <%= f.form_group(:updatable_fields, label: { text: t('.updatable_fields.heading'), class: 'font-weight-bold' }) do %>
+        <%= f.check_box('updatable_fields[visibility]', checked: true, label: t('.visibility')) %>
+        <%= f.check_box('updatable_fields[tags]', label: t('.tags')) %>
+      <% end %>
+    </div>
+    <div class="col col-sm-3 download-csv">
+      <%= f.submit t('.submit'), class: 'btn btn-primary'  %>
+    </div>
+  </div>
+<% end %>
+
+<%= t('.guidelines_html') %>

data/app/views/spotlight/bulk_updates/_overview.html.erb

@@ -0,0 +1 @@
+<%= t('.instructions_html') %>

data/app/views/spotlight/bulk_updates/_progress_panel.html.erb

@@ -0,0 +1,19 @@
+<div class="card index-status border-info mb-3" style='display:none;'>
+  <h3 class="card-header bg-info text-white h4"><%= t('.heading') %></h3>
+  <div class="card-body">
+    <p data-behavior='monitor-start'>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.begin_html') %>
+    </p>
+    <p data-behavior='monitor-completed'>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.completed_html') %>
+    </p>
+
+    <p class="bg-warning" data-behavior='monitor-error' style='display:none;'>
+      <%= t('.error') %>
+    </p>
+
+    <div class="progress">
+      <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="" aria-valuemin="0" aria-valuemax=""></div>
+    </div>
+  </div>
+</div>

data/app/views/spotlight/bulk_updates/_upload.html.erb

@@ -0,0 +1,12 @@
+<p class="instructions"><%= t('.instructions') %></p>
+
+<%= bootstrap_form_with(url: exhibit_bulk_updates_path, method: :patch, multipart: true, layout: :inline) do |f| %>
+  <%= f.label :file, t('.file_label'), class: 'col-form-label col-md-3' %>
+  <%= file_field_tag :file, class: 'form-control', accept: '.csv,text/csv', 'aria-described-by' => 'bulk-update-form-help' %>
+  <%= f.submit t('.submit'), class: 'btn btn-primary ml-2' %>
+<% end %>
+<div class="row">
+  <div class="offset-md-3">
+    <p id="bulk-update-form-help" class="form-text text-muted ml-2"><%= t('.form_help') %></p>
+  </div>
+</div>

data/app/views/spotlight/bulk_updates/edit.html.erb

@@ -0,0 +1,37 @@
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= curation_page_title t(:".header") %>
+
+<div data-behavior='progress-panel' data-monitor-url="<%= monitor_exhibit_bulk_updates_path(current_exhibit) %>">
+  <%= render 'progress_panel' %>
+</div>
+
+<div role="tabpanel">
+  <ul class="nav nav-tabs" role="tablist">
+    <li role="presentation" class="nav-item">
+      <a href="#overview" aria-controls="overview" role="tab" data-toggle="tab" class="nav-link active"><%= t(:'.overview.heading') %></a>
+    </li>
+    <li role="presentation" class="nav-item">
+      <a href="#download" aria-controls="download" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.download.heading') %></a>
+    </li>
+    <li role="presentation" class="nav-item">
+      <a href="#upload" aria-controls="upload" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.upload.heading') %></a>
+    </li>
+  </ul>
+
+  <div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="overview">
+      <%= render 'overview' %>
+    </div>
+
+    <div role="tabpanel" class="tab-pane" id="download">
+      <%= render 'download' %>
+    </div>
+
+    <div role="tabpanel" class="tab-pane" id="upload">
+      <%= render 'upload' %>
+    </div>
+  </div>
+</div>

data/app/views/spotlight/catalog/_admin_header.html.erb

@@ -1,5 +1,5 @@
 <% if can? :manage, Spotlight::Resource.new(exhibit: current_exhibit) %>
-  <div data-behavior='reindex-monitor' data-monitor-url="<%= monitor_exhibit_resources_path(current_exhibit) %>">
+  <div data-behavior='progress-panel' data-monitor-url="<%= monitor_exhibit_resources_path(current_exhibit) %>">
     <%= render 'reindex_progress_panel' %>
   </div>
   <div class="add-items-nav clearfix">

data/app/views/spotlight/catalog/_edit_default.html.erb

@@ -13,12 +13,12 @@
 
   <% if can? :tag, current_exhibit %>
   <div class="edit-tags">
-  <%= f.text_field :exhibit_tag_list, value: f.object.sidecar(current_exhibit).tags_from(current_exhibit).to_s, 'data-autocomplete_url' => exhibit_tags_path(current_exhibit, format: 'json') %>
+  <%= f.text_field :exhibit_tag_list, value: f.object.sidecar(current_exhibit).tags_from(current_exhibit).to_s, data: { autocomplete_tag: true, autocomplete_url: exhibit_tags_path(current_exhibit, format: 'json')} %>
   </div>
   <% end %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]) %>
+      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]), class: 'btn-sizing' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
       </div>
   </div>

data/app/views/spotlight/catalog/_reindex_progress_panel.html.erb

@@ -5,7 +5,7 @@
       <span class="text-muted" data-behavior='date'></span> <%= t('.begin_html') %>
     </p>
     <p data-behavior='monitor-current'>
-      <span class="text-muted" data-behavior='date'></span> <%= t('.completed_html') %>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.current_html') %>
     </p>
 
     <p class="bg-warning" data-behavior='monitor-error' style='display:none;'>

data/app/views/spotlight/custom_fields/_form.html.erb

@@ -15,7 +15,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to t(:"cancel"), edit_exhibit_metadata_configuration_path(current_exhibit) %>
+      <%= link_to t(:"cancel"), edit_exhibit_metadata_configuration_path(current_exhibit), class: 'btn-sizing' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/custom_search_fields/_form.html.erb

@@ -6,7 +6,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to t(:"cancel"), edit_exhibit_search_configuration_path(current_exhibit) %>
+      <%= link_to t(:"cancel"), edit_exhibit_search_configuration_path(current_exhibit), class: 'btn-sizing' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/dashboards/_reindexing_activity.html.erb

@@ -18,7 +18,7 @@
         <td class="col-3"><%= tracker.user.email if tracker.user %></td>
         <td class="col-1"><%= tracker.progress %></td>
         <td class="col-3"><%= distance_of_time_in_words tracker.created_at, tracker.updated_at, include_seconds: true if tracker.completed? || tracker.failed? %></td>
-        <td class="col-2"><%= t "reindexing_log.status.#{tracker.status}" %></td>
+        <td class="col-2"><%= link_to_if can?(:read, tracker), t("spotlight.job_trackers.status.#{tracker.status}"), [current_exhibit, tracker], data: { blacklight_modal: 'trigger' } %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/spotlight/exhibits/_exhibit_card.html.erb

@@ -2,7 +2,7 @@
   <div class="card exhibit-card">
     <%= link_to exhibit, aria: { hidden: true  }, tabindex: '-1' do %>
       <% if exhibit.thumbnail.present? && exhibit.thumbnail.iiif_url %>
-        <%= image_tag(exhibit.thumbnail.iiif_url, class: 'card-img',  alt: '', role: 'presentation') %>
+        <%= image_tag(exhibit.thumbnail.iiif_url, class: 'card-img',  alt: '', role: 'presentation', skip_pipeline: true) %>
       <% else %>
         <%= image_tag 'spotlight/default_thumbnail.jpg', class: 'card-img default-thumbnail',  alt: '', role: 'presentation' %>
       <% end %>

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

@@ -0,0 +1,79 @@
+<%= page_title 'Job details' %>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<div data-blacklight-modal="container">
+
+  <div class="modal-header border-0">
+    <h2 class="modal-title"><%= job_status_icon(@job_tracker) %> <%= t @job_tracker.job_class, default: @job_tracker.job_class %> <small class="text-monospace font-weight-lighter"><%= @job_tracker.job_id&.truncate(8, omission: '') %></small></h2>
+
+    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true">&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>
+
+      <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>
+
+        <% 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>
+          </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>
+          </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>
+
+        <% 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>
+</div>

data/app/views/spotlight/pages/_form.html.erb

@@ -50,7 +50,7 @@
 
       <% if @page.respond_to? :thumbnail %>
       <div role="tabpanel" class="tab-pane" id="page-thumbnail">
-        <%= f.fields_for :thumbnail, (@page.thumbnail || @page.build_thumbnail) do |m| %>
+        <%= f.fields_for :thumbnail, (@page.thumbnail || @page.build_thumbnail), include_id: false do |m| %>
           <p class="instructions"><%= t(:'.thumbnail.help') %></p>
           <%= render '/spotlight/featured_images/form', f: m, initial_crop_selection: Spotlight::Engine.config.featured_image_thumb_size, crop_type: :thumbnail %>
         <% end %>
@@ -61,7 +61,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to(t('cancel'), :back, data: (@page.lock && @page.lock.current_session? ? { lock: url_for([spotlight, @page.exhibit, @page.lock]) } : {})) %>
+      <%= link_to(t('cancel'), :back, data: (@page.lock && @page.lock.current_session? ? { lock: url_for([spotlight, @page.exhibit, @page.lock]) } : {}), class: 'btn-sizing') %>
       <%= f.submit class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/resources/_form.html.erb

@@ -2,7 +2,7 @@
   <%= f.text_field :url  %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+      <%= cancel_link @resource, :back, class: 'btn-sizing' %>
       <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
     </div>
   </div>