hyrax 3.3.0 → 4.0.0.beta1

data/app/controllers/hyrax/dashboard/nest_collections_controller.rb

@@ -70,38 +70,6 @@ module Hyrax
 
       private
 
-      ##
-      # @deprecated
-      def build_within_form
-        authorize! :read, form_params[:child_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_within_form
-
-      ##
-      # @deprecated
-      def build_under_form
-        authorize! :read, form_params[:parent_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_under_form
-
-      ##
-      # @deprecated
-      def build_create_collection_form
-        authorize! :deposit, form_params[:parent_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_create_collection_form
-
-      ##
-      # @deprecated
-      def build_remove_form
-        authorize! :edit, form_params[:parent_id]
-        form_class.new(context: self, **form_params.to_h.symbolize_keys)
-      end
-      deprecation_deprecate :build_create_collection_form
-
       ##
       # @api public
       # @since 3.2.0

data/app/controllers/hyrax/file_sets_controller.rb

@@ -10,6 +10,9 @@ module Hyrax
     before_action :authenticate_user!, except: [:show, :citation, :stats]
     load_and_authorize_resource class: ::FileSet, except: :show
     before_action :build_breadcrumbs, only: [:show, :edit, :stats]
+    before_action do
+      blacklight_config.track_search_session = false
+    end
 
     # provides the help_text view method
     helper PermissionsHelper

data/app/controllers/hyrax/homepage_controller.rb

@@ -2,7 +2,6 @@
 class Hyrax::HomepageController < ApplicationController
   # Adds Hydra behaviors into the application controller
   include Blacklight::SearchContext
-  include Blacklight::SearchHelper
   include Blacklight::AccessControls::Catalog
 
   class_attribute :presenter_class

data/app/controllers/hyrax/my_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Hyrax
   class MyController < ApplicationController
-    extend Deprecation
     include Hydra::Catalog
     include Hyrax::Collections::AcceptsBatches
 
@@ -63,11 +62,6 @@ module Hyrax
       @add_works_to_collection_label = params.fetch(:add_works_to_collection_label, '')
     end
 
-    def query_solr
-      search_service.search_results
-    end
-    deprecation_deprecate :query_solr
-
     def search_service
       Hyrax::SearchService.new(config: blacklight_config, user_params: params, scope: self)
     end

data/app/controllers/hyrax/single_use_links_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Hyrax
   class SingleUseLinksController < ApplicationController
-    include Blacklight::SearchHelper
     class_attribute :show_presenter
     self.show_presenter = Hyrax::SingleUseLinkPresenter
     before_action :authenticate_user!
@@ -45,7 +44,7 @@ module Hyrax
     end
 
     def asset_show_path
-      polymorphic_path([main_app, fetch(params[:id]).last])
+      polymorphic_path([main_app, search_service.fetch(params[:id]).last])
     end
   end
 end

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -75,7 +75,7 @@ module Hyrax
 
     def render_single_use_error(exception)
       logger.error("Rendering PAGE due to exception: #{exception.inspect} - #{exception.backtrace if exception.respond_to? :backtrace}")
-      render 'single_use_error', layout: "error", status: 404
+      render 'single_use_error', layout: "error", status: :not_found
     end
 
     def _prefixes

data/app/forms/hyrax/forms/administrative_set_form.rb

@@ -6,6 +6,20 @@ module Hyrax
     # @api public
     # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
     class AdministrativeSetForm < Valkyrie::ChangeSet
+      ##
+      # @api private
+      AdminSetMembersPopulator = lambda do |_options|
+        self.member_ids =
+          if model.new_record
+            []
+          else
+            Hyrax
+              .query_service
+              .find_inverse_references_by(property: :admin_set_id, resource: model)
+              .map(&:id)
+          end
+      end
+
       property :title, required: true, primary: true
       property :description, primary: true
 
@@ -13,7 +27,11 @@ module Hyrax
       property :date_modified, readable: false
       property :date_uploaded, readable: false
 
-      property :depositor
+      property :creator
+
+      validates :title, presence: true
+
+      property :member_ids, virtual: true, default: [], prepopulator: AdminSetMembersPopulator
 
       class << self
         def model_class

data/app/forms/hyrax/forms/batch_edit_form.rb

@@ -65,7 +65,7 @@ module Hyrax
       def initialize_combined_fields
         # For each of the files in the batch, set the attributes to be the concatenation of all the attributes
         batch_document_ids.each_with_object({}) do |doc_id, combined_attributes|
-          work = ActiveFedora::Base.find(doc_id)
+          work = Hyrax.query_service.find_by(id: doc_id)
           terms.each do |field|
             combined_attributes[field] ||= []
             combined_attributes[field] = (combined_attributes[field] + work[field].to_a).uniq

data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb

@@ -26,11 +26,11 @@ module Hyrax
                        context:,
                        query_service: default_query_service,
                        persistence_service: default_persistence_service)
-          self.parent = parent || (parent_id.present? && Hyrax.config.collection_class.find(parent_id))
-          self.child = child || (child_id.present? && Hyrax.config.collection_class.find(child_id))
           self.context = context
           self.query_service = query_service
           self.persistence_service = persistence_service
+          self.parent = parent || (parent_id.present? && find_parent(parent_id))
+          self.child = child || (child_id.present? && find_child(child_id))
         end # rubocop:enable Metrics/ParameterLists
 
         attr_accessor :parent, :child
@@ -83,7 +83,7 @@ module Hyrax
         # rerouting to new_dashboard_collection_path to add the new collection as
         # a child. Since we don't yet have a child collection, the valid? option can't be used here.
         def validate_add
-          if parent.try(:nestable?)
+          if nestable?(parent)
             nesting_within_maximum_depth
           else
             errors.add(:parent, :cannot_have_child_nested)
@@ -116,15 +116,30 @@ module Hyrax
         end
 
         def parent_and_child_can_be_nested
-          if parent.try(:nestable?) && child.try(:nestable?)
+          if nestable?(parent) && nestable?(child)
             return true if query_service.parent_and_child_can_nest?(parent: parent, child: child, scope: context)
             errors.add(:parent, :cannot_have_child_nested)
             errors.add(:child, :cannot_nest_in_parent)
           else
-            errors.add(:parent, :is_not_nestable) unless parent.try(:nestable?)
-            errors.add(:child, :is_not_nestable) unless child.try(:nestable?)
+            errors.add(:parent, :is_not_nestable) unless nestable?(parent)
+            errors.add(:child, :is_not_nestable) unless nestable?(child)
           end
         end
+
+        def find_parent(parent_id)
+          Hyrax.query_service.find_by(id: parent_id)
+        end
+
+        def find_child(child_id)
+          Hyrax.query_service.find_by(id: child_id)
+        end
+
+        def nestable?(collection)
+          return false if collection.blank?
+          return collection.nestable? if collection.respond_to? :nestable?
+          collection_type = Hyrax::CollectionType.find_by_gid!(collection.collection_type_gid)
+          collection_type.nestable?
+        end
       end
     end
   end

data/app/forms/hyrax/forms/pcdm_collection_form.rb

@@ -6,7 +6,32 @@ module Hyrax
     # @api public
     # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
     class PcdmCollectionForm < Valkyrie::ChangeSet # rubocop:disable Metrics/ClassLength
-      property :title, required: true, primary: true
+      include Hyrax::FormFields(:core_metadata)
+
+      BannerInfoPrepopulator = lambda do |_options|
+        self.banner_info ||= begin
+          banner_info = CollectionBrandingInfo.where(collection_id: id.to_s, role: "banner")
+          banner_file = File.split(banner_info.first.local_path).last unless banner_info.empty?
+          alttext = banner_info.first.alt_text unless banner_info.empty?
+          file_location = banner_info.first.local_path unless banner_info.empty?
+          relative_path = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
+          { file: banner_file, full_path: file_location, relative_path: relative_path, alttext: alttext }
+        end
+      end
+
+      LogoInfoPrepopulator = lambda do |_options|
+        self.logo_info ||= begin
+          logos_info = CollectionBrandingInfo.where(collection_id: id.to_s, role: "logo")
+
+          logos_info.map do |logo_info|
+            logo_file = File.split(logo_info.local_path).last
+            relative_path = "/" + logo_info.local_path.split("/")[-4..-1].join("/")
+            alttext = logo_info.alt_text
+            linkurl = logo_info.target_url
+            { file: logo_file, full_path: logo_info.local_path, relative_path: relative_path, alttext: alttext, linkurl: linkurl }
+          end
+        end
+      end
 
       property :human_readable_type, writable: false
       property :date_modified, readable: false
@@ -14,12 +39,15 @@ module Hyrax
 
       property :depositor, required: true
       property :collection_type_gid, required: true
+      property :visibility, default: VisibilityIntention::PRIVATE
 
       property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
 
-      validates :title, presence: true
       validates :collection_type_gid, presence: true
 
+      property :banner_info, virtual: true, prepopulator: BannerInfoPrepopulator
+      property :logo_info, virtual: true, prepopulator: LogoInfoPrepopulator
+
       class << self
         def model_class
           Hyrax::PcdmCollection

data/app/forms/hyrax/forms/permission_template_form.rb

@@ -7,16 +7,12 @@ module Hyrax
       self.model_class = PermissionTemplate
       self.terms = []
       delegate :access_grants, :access_grants_attributes=, :release_date, :release_period, :visibility, to: :model
-      delegate :available_workflows, :active_workflow, :source_model, to: :model
-
-      # @return [#to_s] the primary key of the associated admin_set or collection
-      # def source_id (because you might come looking for this method)
-      delegate :id, to: :source_model, prefix: :source
+      delegate :available_workflows, :active_workflow, :source, :source_id, to: :model
 
       ##
-      # @deprecated  use PermissionTemplate#reset_access_controls instead.
+      # @deprecated  use PermissionTemplate#reset_access_controls_for instead.
       def reset_access_controls!
-        Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls instead.")
+        Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
         source_model.reset_access_controls!
       end
 
@@ -73,8 +69,8 @@ module Hyrax
       # Copy this access to the permissions of the Admin Set or Collection and to
       # the WorkflowResponsibilities of the active workflow if this is an Admin Set
       def update_access(remove_agent: false)
-        source_model.reset_access_controls!
-        update_workflow_responsibilities(remove_agent: remove_agent) if source_model.is_a?(AdminSet)
+        model.reset_access_controls_for(collection: source)
+        update_workflow_responsibilities(remove_agent: remove_agent) if source.is_a?(Hyrax::AdministrativeSet)
       end
 
       # This method is used to revoke access to a Collection or Admin Set and its workflows
@@ -85,6 +81,18 @@ module Hyrax
         update_access(remove_agent: true)
       end
 
+      ##
+      # A bit of an analogue for a `belongs_to :source_model` as it crosses from Fedora to the DB
+      # @return [AdminSet, ::Collection]
+      # @raise [Hyrax::ObjectNotFoundError] when neither an AdminSet or Collection is found
+      # @note This method will eventually be replaced by #source which returns a Hyrax::Resource
+      #   object.  Many methods are equally able to process both Hyrax::Resource and
+      #   ActiveFedora::Base.  Only call this method if you need the ActiveFedora::Base object.
+      # @see #source
+      def source_model # rubocop:disable Rails/Delegate
+        model.source_model
+      end
+
       private
 
       # @return [String]

data/app/forms/hyrax/forms/resource_form.rb

@@ -33,7 +33,7 @@ module Hyrax
     class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
       ##
       # @api private
-      InWorksPopulator = lambda do |_options|
+      InWorksPrepopulator = lambda do |_options|
         self.in_works_ids =
           if persisted?
             Hyrax.query_service
@@ -52,7 +52,7 @@ module Hyrax
       #   with `etag`-driven, application-side lock checks. for non-wings adapters
       #   we want to move away from application side lock validation and rely
       #   on the adapter/database features instead.
-      LockKeyPopulator = lambda do |_options|
+      LockKeyPrepopulator = lambda do |_options|
         if Hyrax.config.disable_wings || !Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
           Hyrax.logger.info "trying to prepopulate a lock token for " \
                             "#{self.class.inspect}, but optimistic locking isn't " \
@@ -95,10 +95,12 @@ module Hyrax
       property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
 
       # pcdm relationships
-      property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = AdminSet::DEFAULT_ID }
-      property :in_works_ids, virtual: true, prepopulator: InWorksPopulator
+      property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
+      property :in_works_ids, virtual: true, prepopulator: InWorksPrepopulator
       property :member_ids, default: [], type: Valkyrie::Types::Array
       property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
+      property :member_of_collections_attributes, virtual: true, populator: :in_collections_populator
+      validates_with CollectionMembershipValidator
 
       property :representative_id, type: Valkyrie::Types::String
       property :thumbnail_id, type: Valkyrie::Types::String
@@ -112,7 +114,7 @@ module Hyrax
       # the model is disabled
       #
       # @see https://github.com/samvera/valkyrie/wiki/Optimistic-Locking
-      property :version, virtual: true, prepopulator: LockKeyPopulator
+      property :version, virtual: true, prepopulator: LockKeyPrepopulator
 
       # backs the child work search element;
       # @todo: look for a way for the view template not to depend on this
@@ -131,6 +133,8 @@ module Hyrax
           "#{resource.class.name}Form".constantize.new(resource)
         rescue NameError => _err
           case resource
+          when Hyrax::AdministrativeSet
+            Hyrax::Forms::AdministrativeSetForm.new(resource)
           when Hyrax::FileSet
             Hyrax::Forms::FileSetForm.new(resource)
           when Hyrax::PcdmCollection
@@ -204,6 +208,20 @@ module Hyrax
 
       private
 
+      def in_collections_populator(fragment:, **_options)
+        adds = []
+        deletes = []
+        fragment.each do |_, h|
+          if h["_destroy"] == "true"
+            deletes << Valkyrie::ID.new(h["id"])
+          else
+            adds << Valkyrie::ID.new(h["id"])
+          end
+        end
+
+        self.member_of_collection_ids = ((member_of_collection_ids + adds) - deletes).uniq
+      end
+
       # https://trailblazer.to/2.1/docs/reform.html#reform-populators-populator-collections
       def permission_populator(collection:, index:, **)
         Hyrax::Forms::Permission.new(collection[index])

data/app/forms/hyrax/forms/widgets/admin_set_visibility.rb

@@ -6,7 +6,7 @@ module Hyrax
         # Visibility options for permission templates
         def options
           i18n_prefix = "hyrax.admin.admin_sets.form_visibility.visibility"
-          # Note: Visibility 'varies' = '' implies no constraints
+          # NOTE: Visibility 'varies' = '' implies no constraints
           [[Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, I18n.t('.everyone', scope: i18n_prefix)],
            ['', I18n.t('.varies', scope: i18n_prefix)],
            [Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, I18n.t('.institution', scope: i18n_prefix)],

data/app/helpers/hyrax/collections_helper.rb

@@ -191,6 +191,20 @@ module Hyrax
       CollectionType.find_or_create_default_collection_type.title
     end
 
+    ##
+    # @param collection [Object]
+    #
+    # @return [PermissionTemplateForm]
+    def collection_permission_template_form_for(form:)
+      case form
+      when Valkyrie::ChangeSet
+        template_model = Hyrax::PermissionTemplate.find_or_create_by(source_id: form.id.to_s)
+        Hyrax::Forms::PermissionTemplateForm.new(template_model)
+      else
+        form.permission_template
+      end
+    end
+
     private
 
     # add hidden fields to a form for performing an action on a single document on a collection

data/app/helpers/hyrax/facets_helper.rb

@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module FacetsHelper
+    # Methods in this module are from Blacklight::FacetsHelperBehavior, blacklight v6.24.0
+    # This module is used to ensure Hyrax facet views that rely on deprecated Blacklight helper methods are still functional
+
+    include Blacklight::Facet
+
+    ##
+    # Renders the list of values
+    # removes any elements where render_facet_item returns a nil value. This enables an application
+    # to filter undesireable facet items so they don't appear in the UI
+    def render_facet_limit_list(paginator, facet_field, wrapping_element = :li)
+      safe_join(paginator.items.map { |item| render_facet_item(facet_field, item) }.compact.map { |item| content_tag(wrapping_element, item) })
+    end
+
+    ##
+    # Renders a single facet item
+    def render_facet_item(facet_field, item)
+      if facet_in_params?(facet_field, item.value)
+        render_selected_facet_value(facet_field, item)
+      else
+        render_facet_value(facet_field, item)
+      end
+    end
+
+    ##
+    # Standard display of a facet value in a list. Used in both _facets sidebar
+    # partial and catalog/facet expanded list. Will output facet value name as
+    # a link to add that to your restrictions, with count in parens.
+    #
+    # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
+    # @param [Blacklight::Solr::Response::Facets::FacetItem] item
+    # @param [Hash] options
+    # @option options [Boolean] :suppress_link display the facet, but don't link to it
+    # @return [String]
+    def render_facet_value(facet_field, item, options = {})
+      path = path_for_facet(facet_field, item)
+      content_tag(:span, class: "facet-label") do
+        link_to_unless(options[:suppress_link], facet_display_value(facet_field, item), path, class: "facet_select")
+      end + render_facet_count(item.hits)
+    end
+
+    ##
+    # Where should this facet link to?
+    # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
+    # @param [String] item
+    # @return [String]
+    def path_for_facet(facet_field, item)
+      facet_config = facet_configuration_for_field(facet_field)
+      if facet_config.url_method
+        send(facet_config.url_method, facet_field, item)
+      else
+        search_action_path(search_state.add_facet_params_and_redirect(facet_field, item))
+      end
+    end
+
+    ##
+    # Standard display of a SELECTED facet value (e.g. without a link and with a remove button)
+    # @see #render_facet_value
+    # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
+    # @param [String] item
+    def render_selected_facet_value(facet_field, item)
+      remove_href = search_action_path(search_state.remove_facet_params(facet_field, item))
+      content_tag(:span, class: "facet-label") do
+        content_tag(:span, facet_display_value(facet_field, item), class: "selected") +
+          # remove link
+          link_to(remove_href, class: "remove") do
+            content_tag(:i, '', class: "fa fa-times") +
+              content_tag(:span, '[remove]', class: 'sr-only')
+          end
+      end + render_facet_count(item.hits, classes: ["selected"])
+    end
+
+    ##
+    # Renders a count value for facet limits. Can be over-ridden locally
+    # to change style. And can be called by plugins to get consistent display.
+    #
+    # @param [Integer] num number of facet results
+    # @param [Hash] options
+    # @option options [Array<String>]  an array of classes to add to count span.
+    # @return [String]
+    def render_facet_count(num, options = {})
+      classes = (options[:classes] || []) << "facet-count"
+      content_tag("span", t('blacklight.search.facets.count', number: number_with_delimiter(num)), class: classes)
+    end
+
+    ##
+    # Check if the query parameters have the given facet field with the
+    # given value.
+    #
+    # @param [Object] field
+    # @param [Object] item facet value
+    # @return [Boolean]
+    def facet_in_params?(field, item)
+      value = facet_value_for_facet_item(item)
+
+      (facet_params(field) || []).include? value
+    end
+
+    ##
+    # Get the values of the facet set in the blacklight query string
+    def facet_params(field)
+      config = facet_configuration_for_field(field)
+
+      params[:f][config.key] if params[:f]
+    end
+
+    ##
+    # Get the displayable version of a facet's value
+    #
+    # @param [Object] field
+    # @param [String] item value
+    # @return [String]
+    # rubocop:disable Metrics/MethodLength
+    def facet_display_value(field, item)
+      facet_config = facet_configuration_for_field(field)
+
+      value = if item.respond_to? :label
+                item.label
+              else
+                facet_value_for_facet_item(item)
+              end
+
+      if facet_config.helper_method
+        send facet_config.helper_method, value
+      elsif facet_config.query && facet_config.query[value]
+        facet_config.query[value][:label]
+      elsif facet_config.date
+        localization_options = facet_config.date == true ? {} : facet_config.date
+
+        l(value.to_datetime, localization_options)
+      else
+        value
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    private
+
+    def facet_value_for_facet_item(item)
+      if item.respond_to? :value
+        item.value
+      else
+        item
+      end
+    end
+  end
+end

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -8,7 +8,6 @@ module Hyrax
     include Hyrax::TitleHelper
     include Hyrax::FileSetHelper
     include Hyrax::AbilityHelper
-    include Hyrax::UrlHelper
     include Hyrax::EmbargoHelper
     include Hyrax::LeaseHelper
     include Hyrax::CollectionsHelper
@@ -19,6 +18,7 @@ module Hyrax
     include Hyrax::PermissionLevelsHelper
     include Hyrax::WorkFormHelper
     include Hyrax::WorkflowsHelper
+    include Hyrax::FacetsHelper
 
     ##
     # @return [Array<String>] the list of all user groups
@@ -69,7 +69,7 @@ module Hyrax
       unread_notifications = mailbox.unread_count
       link_to(hyrax.notifications_path,
               'aria-label' => mailbox.label(params[:locale]),
-              class: 'notify-number') do
+              class: 'notify-number nav-link') do
         capture do
           concat tag.span('', class: 'fa fa-bell')
           concat "\n"
@@ -195,7 +195,7 @@ module Hyrax
       # this block is only executed when a link is inserted;
       # if we pass text containing no links, it just returns text.
       auto_link(html_escape(text)) do |value|
-        "<span class='glyphicon glyphicon-new-window'></span>#{('&nbsp;' + value) if show_link}"
+        "<span class='fa fa-external-link'></span>#{('&nbsp;' + value) if show_link}"
       end
     end
 
@@ -312,9 +312,9 @@ module Hyrax
     end
 
     def count_classes_for(unread_count)
-      classes = unread_count.zero? ? 'invisible label-default' : 'label-danger'
+      classes = unread_count.zero? ? 'invisible badge-secondary' : 'badge-danger'
 
-      "count label #{classes}"
+      "count badge #{classes}"
     end
 
     def search_action_for_dashboard

data/app/helpers/hyrax/membership_helper.rb

@@ -41,7 +41,7 @@ module Hyrax
       Hyrax.custom_queries.find_child_works(resource: resource).map do |member|
         { id: member.id.to_s,
           label: member.title.first,
-          path: url_for(member) }
+          path: main_app.url_for([member, { only_path: true }]) }
       end.to_json
     end
   end

data/app/helpers/hyrax/trophy_helper.rb

@@ -15,7 +15,7 @@ module Hyrax
       args[:data]['remove-text'] = args[:remove_text]
 
       args[:data][:url] = hyrax.trophy_work_path(id)
-      link_to '#', class: args[:class], data: args[:data] do
+      link_to '#', id: 'action-highlight-work', class: args[:class], data: args[:data] do
         yield(text)
       end
     end

data/app/indexers/hyrax/administrative_set_indexer.rb

@@ -4,14 +4,20 @@ module Hyrax
   ##
   # Indexes Hyrax::AdministrativeSet objects
   class AdministrativeSetIndexer < Hyrax::ValkyrieIndexer
+    include Hyrax::ResourceIndexer
+    include Hyrax::PermissionIndexer
+    include Hyrax::VisibilityIndexer
     include Hyrax::Indexer(:core_metadata)
 
     def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
       super.tap do |solr_doc|
-        solr_doc[:generic_type_si]         = 'Admin Set'
+        solr_doc[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
         solr_doc[:alternative_title_tesim] = resource.alternative_title
-        solr_doc[:creator_ssim]            = resource.creator
+        solr_doc[:creator_ssim]            = [resource.creator]
+        solr_doc[:creator_tesim]           = [resource.creator]
         solr_doc[:description_tesim]       = resource.description
+        solr_doc[:generic_type_sim]        = ['Admin Set']
+        solr_doc[:thumbnail_path_ss]       = Hyrax::CollectionThumbnailPathService.call(resource)
       end
     end
   end