blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

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/services/spotlight/validity_checker.rb

@@ -5,16 +5,16 @@ module Spotlight
   # check if a delayed job still needs to run
   class ValidityChecker
     # Return a validity token
-    # @param [ActiveModel::Model]
+    # @param [ActiveJob::Base]
     # @return [Object] any serializable object
-    def mint(_model); end
+    def mint(_job); end
 
     # Check if the token is still valid for the model
-    # @param [ActiveModel::Model]
+    # @param [ActiveJob::Base]
     # @param [Object] the serializable token minted by #mint
     # @return [boolean]
-    def check(_model, _token)
-      true
+    def check(_job, validity_token: nil)
+      validity_token || true
     end
   end
 end

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 Blacklight::HiddenSearchStateComponent.new(params: 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 Blacklight::HiddenSearchStateComponent.new(params: 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 Blacklight::HiddenSearchStateComponent.new(params: 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/catalog/_save_search.html.erb

@@ -13,7 +13,7 @@
         <%= f.text_field :title, label: t(:'spotlight.saved_search.title') %>
         <%= label_tag :id, t(:'spotlight.saved_search.id'), class: 'col-form-label' %>
         <%= select_tag :id, options_for_select(current_exhibit.searches.map { |s| [s.full_title, s.id] }), include_blank: true, class: 'form-control' %>
-        <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:qt, :page, :utf8)) %>
+        <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:qt, :page)) %>
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit nil, class: 'btn btn-primary' %>

data/app/views/spotlight/about_pages/_empty.html.erb

@@ -4,23 +4,23 @@
 
     <ol>
       <li>
-        To add content to this page, click the Edit button above to enter Edit mode.
+        To add content to this page, select the Edit button above to enter edit mode.
       </li>
       <li>
-        In Edit mode, click the plus sign icon to display the widget selection panel. This panel displays a range of widgets, each of which adds a different type of content to the page.
+        In edit mode, select the plus sign icon to display the widget selection panel. This panel displays a range of widgets, each of which adds a different type of content to the page.
       </li>
       <li>
-        Select a widget to configure. Click <strong>Save changes</strong> when you're ready to add it to the page.
+        Select a widget to configure. Select <b>Save changes</b> when you're ready to add it to the page.
       </li>
       <li>
         Repeat the steps above to continue adding widgets to build out the page. To work more efficiently, you can configure multiple widgets before saving the page. Use the icons in the lower right of the widget configuration panel to preview, reorder, or delete widgets.
       </li>
       <li>
-        Use the checkbox in the <strong>Options</strong> tab to publish or unpublish the page.
+        Use the checkbox in the <b>Options</b> tab to publish or unpublish the page.
       </li>
       <li>
         Visit the Spotlight <%= link_to 'documentation pages', 'https://github.com/projectblacklight/spotlight/wiki' %> to learn more about creating exhibit pages.
       </li>
     </ol>
   </div>
-<% end %>
+<% end %>

data/app/views/spotlight/browse/_search.html.erb

@@ -1,6 +1,7 @@
 <%= cache [@exhibit, search, I18n.locale] do %>
+  <% group ||= @group %>
   <div class="col-md-4 col-12 category">
-    <%= link_to spotlight.exhibit_browse_path(@exhibit, search) do %>
+    <%= link_to group.present? ? spotlight.exhibit_browse_group_path(@exhibit, group, search) : spotlight.exhibit_browse_path(@exhibit, search) do %>
       <div class="image-overlay">
         <%= image_tag(search.thumbnail_image_url || 'spotlight/default_browse_thumbnail.jpg', class: 'img-responsive', alt: '') %>
         <div class="text-overlay">

data/app/views/spotlight/browse/_search_box.html.erb

@@ -1,11 +1,11 @@
 <div class="search-box-container">
   <%= form_tag exhibit_browse_path(current_exhibit, search), method: :get, class: 'browse-search-form search-query-form form-horizontal', role: 'search', 'aria-labelledby' => 'browse-search-form' do %>
-    <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :exhibit_id, :browse_q, :qt, :page, :utf8)) %>
+    <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :exhibit_id, :qt, :page)) %>
     <div class="form-group row">
       <label id="browse-search-form" class="col-sm-4 col-form-label h6" for="browse_q"><%= t(:'.label') %></label>
       <div class="col-sm-6">
         <div class="input-group">
-          <%= text_field_tag :browse_q, params[:browse_q], placeholder: t(:'.placeholder'), class: "form-control", id: "browse_q" %>
+          <%= text_field_tag :q, params[:q], placeholder: t(:'.placeholder'), class: "form-control", id: "browse_q" %>
             <span class="input-group-btn input-group-append">
               <button class="btn btn-reset btn-sm" type="reset">
                 <span class="sr-only"><%= t(:'.reset') %></span>
@@ -20,20 +20,20 @@
       </div>
     </div>
   <% end %>
-  <% if params[:browse_q]%>
+  <% if params[:q].present? %>
     <div class="browse-search-expand">
-      <% if search.count > 0 %>
-        <p><%= t(:'.success.result_number_html', search_size: search.count, parent_search_count: parent_search_count) %></p>
+      <% if @response.size > 0 %>
+        <p><%= t(:'.success.result_number_html', search_size: @response.size, parent_search_count: parent_search_count) %></p>
         <p><%= t(:'.success.expand_html',
-                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:browse_q]),
-                  browse_query: params[:browse_q]) %>
+                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:q]),
+                  browse_query: params[:q]) %>
         </p>
       <% else %>
         <p><%= t(:'.zero_results.result_number') %></p>
         <p><%= t(:'.zero_results.expand_html',
                   clear_search_url: exhibit_browse_path(current_exhibit, search),
-                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:browse_q]),
-                  browse_query: params[:browse_q])%>
+                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:q]),
+                  browse_query: params[:q])%>
         </p>
       <% end %>
     </div>

data/app/views/spotlight/browse/index.html.erb

@@ -2,6 +2,19 @@
 <% set_html_page_title(title) %>
 <h1 class="sr-only"><%= title %></h1>
 
+<% if @groups.any? # active %>
+  <ul class="browse-group-navigation nav nav-pills justify-content-center">
+    <li class="nav-item">
+      <%= link_to t('spotlight.exhibits.groups.all'), exhibit_browse_index_path(current_exhibit), class: "nav-link #{'active' if @group.blank?}" %>
+    </li>
+    <% @groups.each do |group| %>
+      <li class="nav-item">
+        <%= link_to group.title, exhibit_browse_groups_path(current_exhibit, group), class: "nav-link #{'active' if @group.present? && @group.id == group.id}" %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
 <div class="browse-landing row">
   <%= render collection: @searches, partial: 'spotlight/browse/search' %>
 </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/_admin_index_header_default.html.erb

@@ -15,7 +15,7 @@
         <%= t('blacklight.search.documents.counter', counter: counter) %>
       </span>
     <% end %>
-    <%= link_to_document document, document_show_link_field(document), counter: counter %>
+    <%= link_to_document document, counter: counter %>
   </h5>
 
   <%= document_actions %>

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

@@ -1,5 +1,6 @@
-<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, { alt: '' }, 'aria-hidden': true, tabindex: -1, counter: document_counter_with_offset(document_counter)) %>
+<% doc_presenter = document_presenter(document) %>
+<%- if doc_presenter.thumbnail.exists? %>
   <div class="document-thumbnail spotlight-admin-thumbnail">
-    <%= tn %>
+    <%= doc_presenter.thumbnail.thumbnail_tag({ alt: '' }, 'aria-hidden': true, tabindex: -1, counter: document_counter_with_offset(document_counter)) %>
   </div>
 <%- end %>

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

@@ -1,4 +1,2 @@
-<% # copied from blacklight; rails tries to render spotlight/catalog/document explicitly.. -%>
-<div class="document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
-  <%= render_document_partials document, blacklight_config.view_config(document_index_view_type).partials, :document_counter => document_counter %>
-</div>
+<% # try to render the blacklight provided catalog/document partial; rails tries to render spotlight/catalog/document explicitly.. -%>
+<%= render 'catalog/document', local_assigns  %>

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>