blacklight-spotlight 3.0.0.rc4 → 3.0.2

data/app/jobs/spotlight/remove_tags_job.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ###
+  class RemoveTagsJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+    include Spotlight::GatherDocuments
+    with_job_tracking(resource: ->(job) { job.arguments.last[:exhibit] })
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def perform(solr_params:, exhibit:, tags:, **)
+      @errors = 0
+
+      each_document(solr_params, exhibit) do |document|
+        sidecar = document.sidecar(exhibit)
+        all_tags = sidecar.all_tags_list
+        all_tags -= tags
+        exhibit.tag(document.sidecar(exhibit), with: all_tags, on: :tags)
+        document.reindex(update_params: {})
+        progress&.increment
+      rescue StandardError => e
+        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        @errors += 1
+        mark_job_as_failed!
+      end
+      exhibit.blacklight_config.repository.connection.commit
+      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  end
+end

data/app/jobs/spotlight/rename_sidecar_field_job.rb

@@ -6,6 +6,7 @@ module Spotlight
   # need to update the sidecars that may contain that field
   class RenameSidecarFieldJob < Spotlight::ApplicationJob
     include Spotlight::JobTracking
+    with_job_tracking(resource: ->(job) { job.arguments.first })
 
     def perform(exhibit, old_field, new_field, old_slug = nil, new_slug = nil)
       exhibit.solr_document_sidecars.find_each do |s|

data/app/jobs/spotlight/rename_tags_job.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Spotlight
+  ###
+  class RenameTagsJob < Spotlight::ApplicationJob
+    include Spotlight::JobTracking
+
+    with_job_tracking(resource: ->(job) { job.arguments.first })
+
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def perform(exhibit, tag, to: nil, **)
+      @errors = 0
+
+      tag.taggings.owned_by(exhibit).find_each do |tagging|
+        sidecar = tagging.taggable
+        all_tags = sidecar.all_tags_list
+        all_tags -= [tag.name]
+        all_tags += [to] unless to.nil?
+
+        exhibit.tag(sidecar, with: all_tags, on: :tags)
+        sidecar.document.reindex(update_params: {})
+      rescue StandardError => e
+        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        @errors += 1
+        mark_job_as_failed!
+      end
+
+      exhibit.blacklight_config.repository.connection.commit
+      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  end
+end

data/app/models/concerns/spotlight/browse_category_search_builder.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Enforce exhibit visibility for index queries
+  module BrowseCategorySearchBuilder
+    extend ActiveSupport::Concern
+
+    included do
+      self.default_processor_chain = %i[apply_browse_category_defaults] +
+                                     default_processor_chain +
+                                     %i[fix_up_browse_category_defaults fix_up_browse_category_queries]
+    end
+
+    # Adds a filter that excludes resources that have been marked as not-visible
+    def apply_browse_category_defaults(solr_params)
+      return unless current_browse_category
+
+      solr_params.merge!(browse_category_search_builder.to_hash)
+    end
+
+    def fix_up_browse_category_defaults(solr_params)
+      return if current_browse_category.nil? || search_state.send(:sort_field_key).present?
+
+      solr_params[:sort] = browse_category_search_builder.sort
+    end
+
+    def fix_up_browse_category_queries(solr_params)
+      return unless solr_params.dig(:json, :query, :bool, :must) && blacklight_params[:q]
+
+      # This replicates existing spotlight 2.x search behavior, more or less. It
+      # doesn't take into account the possibility that the browse category query
+      # could use a different search field (which.. doesn't have an existing UI
+      # control.. and may require additional upstream work to properly encapsulate
+      # the two query parameters)
+      solr_params[:json][:query][:bool][:must].map! do |q|
+        q.is_a?(String) ? { edismax: { query: q } } : q
+      end
+    end
+
+    private
+
+    def current_exhibit
+      blacklight_config.current_exhibit
+    end
+
+    def current_browse_category
+      return unless current_exhibit && blacklight_params[:browse_category_id].present?
+
+      @current_browse_category ||= current_exhibit.searches.find(blacklight_params[:browse_category_id])
+    end
+
+    def browse_category_search_builder
+      @browse_category_search_builder ||= begin
+        search_builder = self.class.new(@processor_chain, @scope)
+        search_builder.with(current_browse_category.query_params)
+      end
+    end
+  end
+end

data/app/models/concerns/spotlight/exhibit_analytics.rb

@@ -8,18 +8,14 @@ module Spotlight
       return OpenStruct.new unless analytics_provider&.enabled?
 
       @analytics ||= {}
-      @analytics[start_date] ||= begin
-        analytics_provider.exhibit_data(path || self, start_date: start_date.ago)
-      end
+      @analytics[start_date] ||= analytics_provider.exhibit_data(path || self, start_date: start_date.ago)
     end
 
     def page_analytics(start_date = 1.month, path = nil)
       return [] unless analytics_provider&.enabled?
 
       @page_analytics ||= {}
-      @page_analytics[start_date] ||= begin
-        analytics_provider.page_data(path || self, start_date: start_date.ago)
-      end
+      @page_analytics[start_date] ||= analytics_provider.page_data(path || self, start_date: start_date.ago)
     end
 
     def analytics_provider

data/app/models/concerns/spotlight/exhibit_documents.rb

@@ -23,12 +23,12 @@ module Spotlight
       end
     end
 
-    private
-
     def exhibit_search_builder
       blacklight_config.search_builder_class.new(exhibit_search_builder_context).except(:apply_permissive_visibility_filter)
     end
 
+    private
+
     def exhibit_search_builder_context
       OpenStruct.new(blacklight_config: blacklight_config.tap { |x| x.current_exhibit = self })
     end

data/app/models/concerns/spotlight/resources/web.rb

@@ -30,7 +30,7 @@ module Spotlight
       def self.fetch(url)
         Faraday.new(url) do |b|
           b.use FaradayMiddleware::FollowRedirects
-          b.adapter :net_http
+          b.adapter Faraday.default_adapter
         end.get
       end
     end

data/app/models/concerns/spotlight/search_builder.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Enforce exhibit visibility for index queries
+  module SearchBuilder
+    extend ActiveSupport::Concern
+
+    include Spotlight::AccessControlsEnforcementSearchBuilder
+    include Spotlight::BrowseCategorySearchBuilder
+  end
+end

data/app/models/concerns/spotlight/solr_document.rb

@@ -24,7 +24,7 @@ module Spotlight
 
       def reindex(id)
         find(id).reindex
-      rescue Blacklight::Exceptions::InvalidSolrID => e
+      rescue Blacklight::Exceptions::RecordNotFound => e
         Rails.logger.debug "Unable to find document #{id}: #{e}"
       end
 

data/app/models/concerns/spotlight/solr_document/atomic_updates.rb

@@ -5,12 +5,12 @@ module Spotlight
     ##
     # Solr indexing strategy using Solr's Atomic Updates
     module AtomicUpdates
-      def reindex
+      def reindex(update_params: { commitWithin: 500 })
         return unless write?
 
         data = hash_for_solr_update(to_solr)
 
-        blacklight_solr.update params: { commitWithin: 500 }, data: data.to_json, headers: { 'Content-Type' => 'application/json' } unless data.empty?
+        blacklight_solr.update params: update_params, data: data.to_json, headers: { 'Content-Type' => 'application/json' } unless data.empty?
       end
 
       def write?

data/app/models/concerns/spotlight/user.rb

@@ -19,7 +19,11 @@ module Spotlight
     end
 
     def exhibit_roles
-      roles.where(resource_type: 'Spotlight::Exhibit')
+      roles.where(resource_type: 'Spotlight::Exhibit').where.not(role: 'viewer')
+    end
+
+    def viewer_roles
+      roles.where(resource_type: 'Spotlight::Exhibit', role: 'viewer')
     end
 
     def admin_roles

data/app/models/sir_trevor_rails/blocks/browse_block.rb

@@ -31,7 +31,7 @@ module SirTrevorRails
         send(:'display-item-counts') == 'true'
       end
 
-      def as_json
+      def as_json(*)
         result = super
 
         result[:data][:item] ||= {}

data/app/models/sir_trevor_rails/blocks/featured_pages_block.rb

@@ -22,7 +22,7 @@ module SirTrevorRails
       end
 
       # rubocop:disable Metrics/MethodLength
-      def as_json
+      def as_json(*)
         result = super
         result[:data][:item] ||= {}
 

data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb

@@ -43,6 +43,15 @@ module SirTrevorRails
         ActiveModel::Type::Boolean.new.cast(send(:'show-primary-caption'))
       end
 
+      def document_caption(presenter, caption_field, default: nil)
+        caption_field ||= default
+
+        return unless caption_field
+        return presenter.heading if caption_field == Spotlight::PageConfigurations::DOCUMENT_TITLE_KEY
+
+        presenter.field_value(solr_helper.blacklight_config.index_fields[caption_field] || Blacklight::Configuration::NullField.new(caption_field))
+      end
+
       def secondary_caption?
         secondary_caption_field.present? && show_secondary_caption?
       end

data/app/models/sir_trevor_rails/blocks/uploaded_items_block.rb

@@ -11,6 +11,10 @@ module SirTrevorRails
       def files
         (item || {}).map { |_, file| file }.select { |file| file[:display].to_s == 'true' }
       end
+
+      def zpr_link?
+        zpr_link == 'true'
+      end
     end
   end
 end

data/app/models/spotlight/ability.rb

@@ -19,7 +19,7 @@ module Spotlight
       can :manage, [Spotlight::BlacklightConfiguration, Spotlight::ContactEmail, Spotlight::Language], exhibit_id: user.admin_roles.pluck(:resource_id)
       can :manage, Spotlight::Role, resource_id: user.admin_roles.pluck(:resource_id), resource_type: 'Spotlight::Exhibit'
 
-      can :manage, [PaperTrail::Version, Spotlight::FeaturedImage] if user.roles.any?
+      can :manage, [PaperTrail::Version, Spotlight::FeaturedImage] if user.exhibit_roles.any?
 
       # exhibit curator
       can :manage, [
@@ -34,10 +34,12 @@ module Spotlight
         Translation
       ], exhibit_id: user.exhibit_roles.pluck(:resource_id)
 
+      can :read, Spotlight::JobTracker, on_id: user.exhibit_roles.pluck(:resource_id), on_type: 'Spotlight::Exhibit'
+
       can :manage, Spotlight::Lock, by: user
 
       can :read, Spotlight::Language, exhibit_id: user.exhibit_roles.pluck(:resource_id)
-      can %i[read curate tag], Spotlight::Exhibit, id: user.exhibit_roles.pluck(:resource_id)
+      can %i[read curate tag bulk_update], Spotlight::Exhibit, id: user.exhibit_roles.pluck(:resource_id)
 
       # public
       can :read, Spotlight::HomePage
@@ -46,6 +48,8 @@ module Spotlight
       can :read, Spotlight::Search, published: true
       can :read, Spotlight::Group, published: true
       can :read, Spotlight::Language, public: true
+
+      can :read, Spotlight::Exhibit, id: user.viewer_roles.pluck(:resource_id)
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end

data/app/models/spotlight/attachment.rb

@@ -8,7 +8,7 @@ module Spotlight
     mount_uploader :file, Spotlight::AttachmentUploader
 
     def as_json(options = nil)
-      file.as_json(options).merge(name: name, uid: uid, id: id, class: self.class.to_s)
+      file.as_json(options).merge(name: name, uid: uid, attachment: to_global_id)
     end
   end
 end

data/app/models/spotlight/{reindex_progress.rb → background_job_progress.rb}

@@ -2,14 +2,15 @@
 
 module Spotlight
   ##
-  # ReindexProgress is a class that models the progress of reindexing a list of resources
-  class ReindexProgress
-    attr_reader :exhibit
+  # BackgroundJobProgress is a class that models the progress of a list of resources
+  class BackgroundJobProgress
+    attr_reader :exhibit, :job_class
 
     delegate :updated_at, to: :most_relevant_job_tracker
 
-    def initialize(exhibit)
+    def initialize(exhibit, job_class:)
       @exhibit = exhibit
+      @job_class = job_class
     end
 
     def as_json(*)
@@ -28,7 +29,7 @@ module Spotlight
     private
 
     def job_trackers
-      @job_trackers ||= exhibit.job_trackers.where(job_class: 'Spotlight::ReindexExhibitJob').recent
+      @job_trackers ||= exhibit.job_trackers.where(job_class: job_class.to_s).recent
     end
 
     def most_relevant_job_tracker
@@ -59,13 +60,13 @@ module Spotlight
     end
 
     def total
-      return most_relevant_job_tracker.total if finished?
+      return most_relevant_job_tracker.total if finished? || most_relevant_job_tracker.job_trackers.none?
 
       most_relevant_job_tracker.job_trackers.sum(&:total)
     end
 
     def completed
-      return most_relevant_job_tracker.progress if finished?
+      return most_relevant_job_tracker.progress if finished? || most_relevant_job_tracker.job_trackers.none?
 
       most_relevant_job_tracker.job_trackers.sum(&:progress)
     end

data/app/models/spotlight/blacklight_configuration.rb

@@ -74,16 +74,41 @@ module Spotlight
 
         config.current_exhibit = exhibit
 
+        config.document_presenter_class = lambda do |context|
+          if context.action_name == 'index'
+            config.index.document_presenter_class
+          else
+            config.show.document_presenter_class
+          end
+        end
+
         config.show.merge! show unless show.blank?
         config.index.merge! index unless index.blank?
         config.index.respond_to[:iiif_json] = true
 
         config.index.thumbnail_field ||= Spotlight::Engine.config.thumbnail_field
 
-        config.add_results_collection_tool 'save_search', if: :render_save_this_search?
+        config.add_results_collection_tool 'curator_actions', if: :render_curator_actions?
+
+        unless config.curator_actions
+          config.curator_actions ||= Blacklight::NestedOpenStructWithHashAccess.new(Blacklight::Configuration::ToolConfig)
+          config.curator_actions.save_search!
+          config.curator_actions.bulk_actions!
+        end
+
+        unless config.bulk_actions
+          config.bulk_actions ||= Blacklight::NestedOpenStructWithHashAccess.new(Blacklight::Configuration::ToolConfig)
+
+          config.bulk_actions.change_visibility!
+          config.bulk_actions.add_tags!
+          config.bulk_actions.remove_tags!
+        end
 
         config.default_solr_params = config.default_solr_params.merge(default_solr_params)
 
+        config.default_per_page = default_per_page if default_per_page
+
+        config.view.embed!
         config.view.embed.partials ||= ['openseadragon']
         config.view.embed.if = false
         config.view.embed.locals ||= { osd_container_class: '' }
@@ -186,11 +211,6 @@ module Spotlight
 
         config.per_page = (config.per_page & per_page) unless per_page.blank?
 
-        if default_per_page
-          config.per_page.delete(default_per_page)
-          config.per_page.unshift(default_per_page)
-        end
-
         unless document_index_view_types.blank?
           config.view.each do |k, v|
             v.original = v.dup

data/app/models/spotlight/bulk_update.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Spotlight
+  class BulkUpdate < ActiveRecord::Base
+    mount_uploader :file, Spotlight::BulkUpdatesUploader
+    belongs_to :exhibit
+  end
+end

data/app/models/spotlight/exhibit.rb

@@ -57,6 +57,7 @@ module Spotlight
     has_many :feature_pages, -> { for_default_locale }, extend: FriendlyId::FinderMethods
     has_many :groups, dependent: :delete_all
     has_many :job_trackers, as: :on, dependent: :delete_all
+    has_many :bulk_updates, dependent: :delete_all
     has_many :main_navigations, dependent: :delete_all
     has_many :resources
     has_many :roles, as: :resource, dependent: :delete_all
@@ -135,7 +136,7 @@ module Spotlight
     end
 
     def reindex_progress
-      @reindex_progress ||= ReindexProgress.new(self)
+      @reindex_progress ||= BackgroundJobProgress.new(self, job_class: Spotlight::ReindexExhibitJob)
     end
 
     def available_locales