blacklight-spotlight 3.5.0.1 → 3.6.0.beta1

data/app/assets/stylesheets/spotlight/_catalog.scss

@@ -159,3 +159,19 @@ form.edit_solr_document {
     }
   }
 }
+
+.visibility-toggle {
+	.no-js & {
+		input[type="submit"] {
+			display: inline
+		}
+
+		div.toggle-visibility {
+			display: none
+		}
+	}
+
+	input[type="submit"] {
+		display: none;
+	}
+}

data/app/controllers/concerns/spotlight/base.rb

@@ -6,7 +6,8 @@ module Spotlight
   module Base
     extend ActiveSupport::Concern
 
-    include Blacklight::Base
+    include Blacklight::Configurable
+    include Blacklight::SearchContext
     include Spotlight::Config
 
     included do

data/app/controllers/concerns/spotlight/controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'spotlight/search_state'
+
 module Spotlight
   ##
   # Spotlight controller helpers
@@ -67,6 +69,14 @@ module Spotlight
       end
     end
 
+    def search_state
+      if current_exhibit
+        @search_state ||= Spotlight::SearchState.new(super, current_exhibit)
+      else
+        super
+      end
+    end
+
     def search_action_url(*args, **kwargs)
       if current_exhibit
         exhibit_search_action_url(*args, **kwargs)

data/app/controllers/spotlight/admin_users_controller.rb

@@ -18,9 +18,9 @@ module Spotlight
     def create
       if update_roles
         Spotlight::InviteUsersService.call(resource: @site)
-        flash[:notice] = t('spotlight.admin_users.create.success')
+        flash[:notice] = t('.success')
       else
-        flash[:error] = t('spotlight.admin_users.create.error')
+        flash[:error] = t('.error')
       end
 
       redirect_to spotlight.admin_users_path
@@ -41,9 +41,9 @@ module Spotlight
     def destroy
       user = Spotlight::Engine.user_class.find(params[:id])
       if user.roles.where(resource: @site).first.destroy
-        flash[:notice] = t('spotlight.admin_users.destroy.success')
+        flash[:notice] = t('.success')
       else
-        flash[:error] = t('spotlight.admin_users.destroy.error')
+        flash[:error] = t('.error')
       end
       redirect_to spotlight.admin_users_path
     end

data/app/controllers/spotlight/appearances_controller.rb

@@ -7,6 +7,12 @@ module Spotlight
     before_action :authenticate_user!
     load_and_authorize_resource id_param: :exhibit_id, instance_name: 'exhibit', class: 'Spotlight::Exhibit', parent: false
 
+    def edit
+      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit)
+    end
+
     def update
       if @exhibit.update(exhibit_params)
         notice = t(:'helpers.submit.spotlight_default.updated', model: @exhibit.class.model_name.human.downcase)
@@ -16,12 +22,6 @@ module Spotlight
       end
     end
 
-    def edit
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.configuration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit)
-    end
-
     protected
 
     def exhibit_params

data/app/controllers/spotlight/browse_controller.rb

@@ -7,7 +7,7 @@ module Spotlight
   class BrowseController < Spotlight::ApplicationController
     load_and_authorize_resource :exhibit, class: 'Spotlight::Exhibit'
     include Spotlight::Catalog
-    include Blacklight::Facet
+    include Blacklight::Facet if defined?(Blacklight::Facet)
 
     load_and_authorize_resource :group, through: :exhibit
     load_and_authorize_resource :search, through: %i[group exhibit], parent: false

data/app/controllers/spotlight/catalog_controller.rb

@@ -20,6 +20,8 @@ module Spotlight
     before_action :attach_breadcrumbs
     before_action :add_breadcrumb_with_search_params, only: :index
 
+    before_action :load_document, only: %i[edit update make_private make_public manifest]
+
     before_action only: :show do
       blacklight_config.show.partials.unshift 'tophat'
       blacklight_config.show.partials.unshift 'curation_mode_toggle'
@@ -53,13 +55,13 @@ module Spotlight
     # setup within their index analyzer. This will ensure that this method returns
     # results when a partial match is passed in the "q" parameter.
     def autocomplete
-      (_, @document_list) = search_service.search_results do |builder|
+      @response, = search_service.search_results do |builder|
         builder.with(builder.blacklight_params.merge(search_field: Spotlight::Engine.config.autocomplete_search_field, public: true, rows: 100))
       end
 
       respond_to do |format|
         format.json do
-          render json: { docs: autocomplete_json_response(@document_list) }
+          render json: { docs: autocomplete_json_response(@response.documents) }
         end
       end
     end
@@ -67,7 +69,7 @@ module Spotlight
     def admin
       add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
       add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_path(@exhibit)
-      (@response, @document_list) = search_service.search_results
+      (@response,) = search_service.search_results
       @filters = params[:f] || []
 
       respond_to do |format|
@@ -75,8 +77,9 @@ module Spotlight
       end
     end
 
+    def edit; end
+
     def update
-      @response, @document = search_service.fetch params[:id]
       @document.update(current_exhibit, solr_document_params)
       @document.save
 
@@ -85,12 +88,7 @@ module Spotlight
       redirect_to polymorphic_path([current_exhibit, @document])
     end
 
-    def edit
-      @response, @document = search_service.fetch params[:id]
-    end
-
     def make_private
-      @response, @document = search_service.fetch params[:id]
       @document.make_private!(current_exhibit)
       @document.save
 
@@ -101,7 +99,6 @@ module Spotlight
     end
 
     def make_public
-      @response, @document = search_service.fetch params[:id]
       @document.make_public!(current_exhibit)
       @document.save
 
@@ -112,10 +109,8 @@ module Spotlight
     end
 
     def manifest
-      _, document = search_service.fetch params[:id]
-
-      if document.uploaded_resource?
-        render json: Spotlight::IiifManifestPresenter.new(document, self).iiif_manifest_json
+      if @document.uploaded_resource?
+        render json: Spotlight::IiifManifestPresenter.new(@document, self).iiif_manifest_json
       else
         head :not_found
       end
@@ -123,6 +118,16 @@ module Spotlight
 
     protected
 
+    def load_document
+      result = search_service.fetch params[:id]
+
+      @document = if result.is_a?(Array)
+                    result.last
+                  else
+                    result
+                  end
+    end
+
     def attach_breadcrumbs
       if view_context.current_page?({ action: :admin })
         add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit)
@@ -170,7 +175,7 @@ module Spotlight
     def solr_document_params
       params.require(:solr_document).permit(:exhibit_tag_list,
                                             uploaded_resource: [:url],
-                                            sidecar: [:public, data: [editable_solr_document_params]])
+                                            sidecar: [:public, { data: [editable_solr_document_params] }])
     end
 
     def editable_solr_document_params

data/app/controllers/spotlight/concerns/application_controller.rb

@@ -13,6 +13,7 @@ module Spotlight
       included do
         layout 'spotlight/spotlight'
 
+        helper ::BlacklightHelper
         helper Spotlight::ApplicationHelper
 
         rescue_from CanCan::AccessDenied do |exception|

data/app/controllers/spotlight/concerns/catalog_search_context.rb

@@ -14,7 +14,7 @@ module Spotlight
                                     current_search_session_page_context
                                   end
       rescue ActiveRecord::RecordNotFound => e
-        Rails.logger.debug "Unable to get current page context from #{current_search_session.inspect}: #{e}"
+        Rails.logger.debug { "Unable to get current page context from #{current_search_session.inspect}: #{e}" }
         nil
       end
 
@@ -24,7 +24,7 @@ module Spotlight
                                        current_exhibit.searches.accessible_by(current_ability).find(search_id)
                                      end
       rescue ActiveRecord::RecordNotFound => e
-        Rails.logger.debug "Unable to get current page context from #{current_search_session.inspect}: #{e}"
+        Rails.logger.debug { "Unable to get current page context from #{current_search_session.inspect}: #{e}" }
         nil
       end
 

data/app/controllers/spotlight/contacts_controller.rb

@@ -18,19 +18,19 @@ module Spotlight
       add_breadcrumb @contact.name, edit_exhibit_contact_path(@contact.exhibit, @contact)
     end
 
-    def update
+    def create
       if @contact.update(contact_params)
-        redirect_to exhibit_about_pages_path(@contact.exhibit), notice: t(:'helpers.submit.contact.updated', model: @contact.class.model_name.human.downcase)
+        redirect_to exhibit_about_pages_path(@contact.exhibit), notice: t(:'helpers.submit.contact.created', model: @contact.class.model_name.human.downcase)
       else
-        render 'edit'
+        render 'new'
       end
     end
 
-    def create
+    def update
       if @contact.update(contact_params)
-        redirect_to exhibit_about_pages_path(@contact.exhibit), notice: t(:'helpers.submit.contact.created', model: @contact.class.model_name.human.downcase)
+        redirect_to exhibit_about_pages_path(@contact.exhibit), notice: t(:'helpers.submit.contact.updated', model: @contact.class.model_name.human.downcase)
       else
-        render 'new'
+        render 'edit'
       end
     end
 

data/app/controllers/spotlight/dashboards_controller.rb

@@ -52,10 +52,10 @@ module Spotlight
 
     def load_recent_solr_documents(count)
       solr_params = { sort: "#{blacklight_config.index.timestamp_field} desc" }
-      @response, docs = search_service.search_results do |builder|
+      @response, _docs = search_service.search_results do |builder|
         builder.merge(solr_params)
       end
-      docs.take(count)
+      @response.documents.take(count)
     end
   end
 end

data/app/controllers/spotlight/exhibits_controller.rb

@@ -20,6 +20,18 @@ module Spotlight
       end
     end
 
+    def show
+      respond_to do |format|
+        format.json do
+          authorize! :export, @exhibit
+          send_data JSON.pretty_generate(Spotlight::ExhibitImportExportService.new(@exhibit).as_json),
+                    type: 'application/json',
+                    disposition: 'attachment',
+                    filename: "#{@exhibit.friendly_id}-export.json"
+        end
+      end
+    end
+
     def new
       build_initial_exhibit_contact_emails
       add_breadcrumb t(:'spotlight.sites.home'), root_url
@@ -34,6 +46,13 @@ module Spotlight
       end
     end
 
+    def edit
+      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
+      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.configuration.sidebar.settings'), edit_exhibit_path(@exhibit)
+      build_initial_exhibit_contact_emails
+    end
+
     def create
       @exhibit.attributes = exhibit_params
 
@@ -45,25 +64,6 @@ module Spotlight
       end
     end
 
-    def show
-      respond_to do |format|
-        format.json do
-          authorize! :export, @exhibit
-          send_data JSON.pretty_generate(Spotlight::ExhibitImportExportService.new(@exhibit).as_json),
-                    type: 'application/json',
-                    disposition: 'attachment',
-                    filename: "#{@exhibit.friendly_id}-export.json"
-        end
-      end
-    end
-
-    def edit
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.configuration.sidebar.settings'), edit_exhibit_path(@exhibit)
-      build_initial_exhibit_contact_emails
-    end
-
     def update
       if @exhibit.update(exhibit_params)
         redirect_to edit_exhibit_path(@exhibit, tab: @tab),

data/app/controllers/spotlight/featured_images_controller.rb

@@ -16,7 +16,7 @@ module Spotlight
     private
 
     def tilesource
-      riiif.info_url(@featured_image)
+      Spotlight::Engine.config.iiif_service.info_url(@featured_image, request.host)
     end
 
     # The create action can be called from a number of different forms, so

data/app/controllers/spotlight/home_pages_controller.rb

@@ -10,13 +10,7 @@ module Spotlight
 
     before_action :attach_breadcrumbs, except: :show
 
-    helper_method :facet_limit_for
-
-    def edit
-      add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)
-      add_breadcrumb @page.title, [:edit, @exhibit, @page]
-      super
-    end
+    helper_method :facet_limit_for, :search_facet_path
 
     def index
       redirect_to exhibit_feature_pages_path(@exhibit)
@@ -32,6 +26,12 @@ module Spotlight
       end
     end
 
+    def edit
+      add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)
+      add_breadcrumb @page.title, [:edit, @exhibit, @page]
+      super
+    end
+
     # We're oddly getting an unknown action
     # error w/o explicitly defining this here
     def clone

data/app/controllers/spotlight/lock_controller.rb

@@ -10,7 +10,7 @@ module Spotlight
     def destroy
       @lock.destroy
 
-      render plain: '', status: 204
+      render plain: '', status: :no_content
     end
   end
 end

data/app/controllers/spotlight/metadata_configurations_controller.rb

@@ -43,8 +43,8 @@ module Spotlight
     def exhibit_configuration_index_params
       views = @blacklight_configuration.default_blacklight_config.view.keys | [:show]
 
-      @blacklight_configuration.blacklight_config.index_fields.keys.each_with_object({}) do |element, result|
-        result[element] = (%i[enabled label weight] | views)
+      @blacklight_configuration.blacklight_config.index_fields.keys.index_with do |_element|
+        (%i[enabled label weight] | views)
       end
     end
   end

data/app/controllers/spotlight/pages_controller.rb

@@ -74,7 +74,7 @@ module Spotlight
       @page.lock&.delete
 
       if @page.update(page_params.merge(last_edited_by: current_user))
-        redirect_to [spotlight, @page.exhibit, @page, format: params.permit(:format)], flash: { html_safe: true }, notice: undo_notice(:updated)
+        redirect_to [spotlight, @page.exhibit, @page, { format: params.permit(:format) }], flash: { html_safe: true }, notice: undo_notice(:updated)
       else
         render action: 'edit'
       end
@@ -128,7 +128,8 @@ module Spotlight
       return unless can? :manage, @page
       return if @page.versions.blank?
 
-      view_context.link_to(t(:'spotlight.versions.undo'), revert_version_path(@page.versions.last), method: :post)
+      view_context.link_to(t(:'spotlight.versions.undo'), revert_version_path(@page.versions.last),
+                           data: { method: :post, turbo_method: :post })
     end
 
     def undo_notice(key)
@@ -150,7 +151,7 @@ module Spotlight
     end
 
     def allowed_page_params
-      [:title, :content, thumbnail_attributes: featured_image_params]
+      [:title, :content, { thumbnail_attributes: featured_image_params }]
     end
 
     def human_name

data/app/controllers/spotlight/search_configurations_controller.rb

@@ -48,20 +48,20 @@ module Spotlight
     end
 
     def exhibit_configuration_facet_params
-      @blacklight_configuration.blacklight_config.facet_fields.keys.each_with_object({}) do |element, result|
-        result[element] = %i[show label weight sort]
+      @blacklight_configuration.blacklight_config.facet_fields.keys.index_with do |_element|
+        %i[show label weight sort]
       end
     end
 
     def exhibit_configuration_search_params
-      @blacklight_configuration.blacklight_config.search_fields.keys.each_with_object({}) do |element, result|
-        result[element] = %i[enabled label weight]
+      @blacklight_configuration.blacklight_config.search_fields.keys.index_with do |_element|
+        %i[enabled label weight]
       end
     end
 
     def exhibit_configuration_sort_params
-      @blacklight_configuration.blacklight_config.sort_fields.keys.each_with_object({}) do |element, result|
-        result[element] = %i[enabled label weight]
+      @blacklight_configuration.blacklight_config.sort_fields.keys.index_with do |_element|
+        %i[enabled label weight]
       end
     end
   end

data/app/controllers/spotlight/searches_controller.rb

@@ -14,6 +14,26 @@ module Spotlight
     include Spotlight::Base
     include Spotlight::SearchHelper
 
+    def index
+      @groups = @exhibit.groups
+      respond_to do |format|
+        format.html
+        format.json do
+          render json: @searches.as_json(methods: %i[full_title count thumbnail_image_url]), root: false
+        end
+      end
+    end
+
+    def show
+      redirect_to exhibit_browse_url(@search.exhibit, @search)
+    end
+
+    def edit
+      @groups = @exhibit.groups
+      add_breadcrumb @search.full_title, edit_exhibit_search_path(@search.exhibit, @search)
+      @exhibit = @search.exhibit
+    end
+
     def create
       @search.assign_attributes(search_params.except((:title unless @search.new_record?)))
       @search.query_params = query_params
@@ -26,35 +46,19 @@ module Spotlight
       end
     end
 
-    def index
-      @groups = @exhibit.groups
-      respond_to do |format|
-        format.html
-        format.json do
-          render json: @searches.as_json(methods: %i[full_title count thumbnail_image_url]), root: false
-        end
-      end
-    end
-
     def autocomplete
       search_params = autocomplete_params.merge(search_field: Spotlight::Engine.config.autocomplete_search_field)
-      (_, document_list) = search_service.search_results do |builder|
+      (response, _document_list) = search_service.search_results do |builder|
         builder.with(search_params)
       end
 
       respond_to do |format|
         format.json do
-          render json: { docs: autocomplete_json_response(document_list) }
+          render json: { docs: autocomplete_json_response(response.documents) }
         end
       end
     end
 
-    def edit
-      @groups = @exhibit.groups
-      add_breadcrumb @search.full_title, edit_exhibit_search_path(@search.exhibit, @search)
-      @exhibit = @search.exhibit
-    end
-
     def update
       if @search.update search_params
         redirect_to exhibit_searches_path(@search.exhibit), notice: t(:'helpers.submit.search.updated', model: @search.class.model_name.human.downcase)
@@ -77,10 +81,6 @@ module Spotlight
       redirect_back fallback_location: fallback_url, notice: notice
     end
 
-    def show
-      redirect_to exhibit_browse_url(@search.exhibit, @search)
-    end
-
     protected
 
     def autocomplete_params

data/app/controllers/spotlight/solr_controller.rb

@@ -57,7 +57,7 @@ module Spotlight
     def validate_writable_index!
       return if Spotlight::Engine.config.writable_index
 
-      render plain: 'Spotlight is unable to write to solr', status: 409
+      render plain: 'Spotlight is unable to write to solr', status: :conflict
     end
 
     def create_or_update_solr_document_sidecar(doc, data)

data/app/controllers/spotlight/translations_controller.rb

@@ -7,6 +7,12 @@ module Spotlight
     before_action :authenticate_user!, :set_language, :set_tab
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
+    def show
+      respond_to do |format|
+        format.yaml
+      end
+    end
+
     def edit
       attach_breadcrumbs
     end
@@ -21,12 +27,6 @@ module Spotlight
       end
     end
 
-    def show
-      respond_to do |format|
-        format.yaml
-      end
-    end
-
     def import
       if current_exhibit.update(import_exhibit_params)
         I18n.reload! # reload since we're memoizing
@@ -72,15 +72,13 @@ module Spotlight
       @tab = params[:tab]
     end
 
-    def unfold(value, key = nil)
+    def unfold(value, key = nil, &block)
       return to_enum(:unfold, value, key) unless block_given?
 
       if value.is_a? Hash
         value.each do |k, v|
           arr = unfold(v, [key, k].compact.join('.'))
-          arr.each do |k1, v1|
-            yield k1, v1
-          end
+          arr.each(&block)
         end
       else
         yield key, value

data/app/controllers/spotlight/versions_controller.rb

@@ -32,7 +32,8 @@ module Spotlight
                     view_context.t(:'spotlight.versions.redo')
                   end
 
-      view_context.link_to(link_name, revert_version_path(@version.next, redo: !params[:redo]), method: :post)
+      view_context.link_to(link_name, revert_version_path(@version.next, redo: !params[:redo]),
+                           data: { method: :post, turbo_method: :post })
     end
   end
 end