hyrax 3.0.0 → 3.2.0

data/app/actors/hyrax/actors/create_with_remote_files_actor.rb

@@ -26,90 +26,112 @@ module Hyrax
 
       private
 
-      def registered_ingest_dirs
-        Hyrax.config.registered_ingest_dirs
+      def attach_files(env, remote_files)
+        ingest_remote_files_service_class.new(user: env.user,
+                                              curation_concern: env.curation_concern,
+                                              remote_files: remote_files,
+                                              file_set_actor_class: file_set_actor_class).attach!
       end
 
-      # @param uri [URI] the uri fo the resource to import
-      def validate_remote_url(uri)
-        if uri.scheme == 'file'
-          path = File.absolute_path(CGI.unescape(uri.path))
-          registered_ingest_dirs.any? do |dir|
-            path.start_with?(dir) && path.length > dir.length
+      class IngestRemoteFilesService
+        ##
+        # @parm user [User]
+        # @parm curation_concern [Hyrax::Work]
+        # @param remote_files [HashWithIndifferentAccess]
+        # @param file_set_actor_class
+        # @param ordered_members [Array]
+        # @param ordered [Boolean]
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(user:, curation_concern:, remote_files:, file_set_actor_class:, ordered_members: [], ordered: false)
+          @remote_files = remote_files
+          @user = user
+          @curation_concern = curation_concern
+          @file_set_actor_class = file_set_actor_class
+          @ordered_members = ordered_members
+          @ordered = ordered
+        end
+        # rubocop:enable Metrics/ParameterLists
+        attr_reader :remote_files, :user, :curation_concern, :ordered_members, :ordered, :file_set_actor_class
+
+        ##
+        # @return true
+        def attach!
+          return true unless remote_files
+          remote_files.each do |file_info|
+            next if file_info.blank? || file_info[:url].blank?
+            # Escape any space characters, so that this is a legal URI
+            uri = URI.parse(Addressable::URI.escape(file_info[:url]))
+            unless self.class.validate_remote_url(uri)
+              Rails.logger.error "User #{user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
+              return false
+            end
+            auth_header = file_info.fetch(:auth_header, {})
+            create_file_from_url(uri, file_info[:file_name], auth_header)
           end
-        else
-          Rails.logger.debug "Assuming #{uri.scheme} uri is valid without a serious attempt to validate: #{uri}"
+          add_ordered_members! if ordered
           true
         end
-      end
 
-      # @param [HashWithIndifferentAccess] remote_files
-      # @return [TrueClass]
-      def attach_files(env, remote_files)
-        return true unless remote_files
-        remote_files.each do |file_info|
-          next if file_info.blank? || file_info[:url].blank?
-          # Escape any space characters, so that this is a legal URI
-          uri = URI.parse(Addressable::URI.escape(file_info[:url]))
-          unless validate_remote_url(uri)
-            Rails.logger.error "User #{env.user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
-            return false
+        def self.registered_ingest_dirs
+          Hyrax.config.registered_ingest_dirs
+        end
+
+        # @param uri [URI] the uri fo the resource to import
+        def self.validate_remote_url(uri)
+          if uri.scheme == 'file'
+            path = File.absolute_path(CGI.unescape(uri.path))
+            registered_ingest_dirs.any? do |dir|
+              path.start_with?(dir) && path.length > dir.length
+            end
+          else
+            Rails.logger.debug "Assuming #{uri.scheme} uri is valid without a serious attempt to validate: #{uri}"
+            true
           end
-          auth_header = file_info.fetch(:auth_header, {})
-          create_file_from_url(env, uri, file_info[:file_name], auth_header)
         end
-        true
-      end
 
-      def create_file_from_url(env, uri, file_name, auth_header)
-        case env.curation_concern
-        when Valkyrie::Resource
-          create_file_from_url_through_valkyrie(env, uri, file_name, auth_header)
-        else
-          create_file_from_url_through_active_fedora(env, uri, file_name, auth_header)
+        private
+
+        def create_file_from_url(uri, file_name, auth_header)
+          import_url = URI.decode_www_form_component(uri.to_s)
+          use_valkyrie = false
+          case curation_concern
+          when Valkyrie::Resource
+            file_set = Hyrax.persister.save(resource: Hyrax::FileSet.new(import_url: import_url, label: file_name))
+            use_valkyrie = true
+          else
+            file_set = ::FileSet.new(import_url: import_url, label: file_name)
+          end
+          __create_file_from_url(file_set: file_set, uri: uri, auth_header: auth_header, use_valkyrie: use_valkyrie)
         end
-      end
 
-      # Generic utility for creating FileSet from a URL
-      # Used in to import files using URLs from a file picker like browse_everything
-      def create_file_from_url_through_active_fedora(env, uri, file_name, auth_header)
-        import_url = URI.decode_www_form_component(uri.to_s)
-        ::FileSet.new(import_url: import_url, label: file_name) do |fs|
-          actor = Hyrax::Actors::FileSetActor.new(fs, env.user)
-          actor.create_metadata(visibility: env.curation_concern.visibility)
-          actor.attach_to_work(env.curation_concern)
-          fs.save!
+        def __create_file_from_url(file_set:, uri:, auth_header:, use_valkyrie: Hyrax.config.use_valkyrie?)
+          actor = file_set_actor_class.new(file_set, user, use_valkyrie: use_valkyrie)
+          actor.create_metadata(visibility: curation_concern.visibility)
+          actor.attach_to_work(curation_concern)
+          file_set.save! if file_set.respond_to?(:save!)
+          # We'll remember the order, but if it's not `@ordered` we won't do anything.
+          ordered_members << file_set
           if uri.scheme == 'file'
             # Turn any %20 into spaces.
             file_path = CGI.unescape(uri.path)
-            IngestLocalFileJob.perform_later(fs, file_path, env.user)
+            IngestLocalFileJob.perform_later(file_set, file_path, user)
           else
-            ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
+            ImportUrlJob.perform_later(file_set, operation_for(user: user), auth_header)
           end
         end
-      end
 
-      # Generic utility for creating Hyrax::FileSet from a URL
-      # Used in to import files using URLs from a file picker like browse_everything
-      def create_file_from_url_through_valkyrie(env, uri, file_name, auth_header)
-        import_url = URI.decode_www_form_component(uri.to_s)
-        fs = Hyrax.persister.save(resource: Hyrax::FileSet.new(import_url: import_url, label: file_name))
-        actor = Hyrax::Actors::FileSetActor.new(fs, env.user, use_valkyrie: true)
-        actor.create_metadata(visibility: env.curation_concern.visibility)
-        actor.attach_to_work(env.curation_concern)
-        if uri.scheme == 'file'
-          # Turn any %20 into spaces.
-          file_path = CGI.unescape(uri.path)
-          IngestLocalFileJob.perform_later(fs, file_path, env.user)
-        else
-          ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
+        def operation_for(user:)
+          Hyrax::Operation.create!(user: user,
+                                   operation_type: "Attach Remote File")
         end
-      end
 
-      def operation_for(user:)
-        Hyrax::Operation.create!(user: user,
-                                 operation_type: "Attach Remote File")
+        def add_ordered_members!
+          actor = Hyrax::Actors::OrderedMembersActor.new(ordered_members, user)
+          actor.attach_ordered_members_to_work(curation_concern)
+        end
       end
+      class_attribute :file_set_actor_class, default: ::Hyrax::Actors::FileSetActor
+      class_attribute :ingest_remote_files_service_class, default: ::Hyrax::Actors::CreateWithRemoteFilesActor::IngestRemoteFilesService
     end
   end
 end

data/app/actors/hyrax/actors/create_with_remote_files_ordered_members_actor.rb

@@ -39,54 +39,19 @@ module Hyrax
     # url property, it may have spaces, and not be a valid URI.
     class CreateWithRemoteFilesOrderedMembersActor < CreateWithRemoteFilesActor
       attr_reader :ordered_members
+      self.file_set_actor_class = Hyrax::Actors::FileSetOrderedMembersActor
 
       # @param [HashWithIndifferentAccess] remote_files
       # @return [TrueClass]
       def attach_files(env, remote_files)
-        return true unless remote_files
         @ordered_members = env.curation_concern.ordered_members.to_a
-        remote_files.each do |file_info|
-          next if file_info.blank? || file_info[:url].blank?
-          # Escape any space characters, so that this is a legal URI
-          uri = URI.parse(Addressable::URI.escape(file_info[:url]))
-          unless validate_remote_url(uri)
-            Rails.logger.error "User #{env.user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
-            return false
-          end
-          auth_header = file_info.fetch(:auth_header, {})
-          create_file_from_url(env, uri, file_info[:file_name], auth_header)
-        end
-        add_ordered_members(env.user, env.curation_concern)
-        true
-      end
-
-      # Generic utility for creating FileSet from a URL
-      # Used in to import files using URLs from a file picker like browse_everything
-      def create_file_from_url(env, uri, file_name, auth_header = {})
-        ::FileSet.new(import_url: uri.to_s, label: file_name) do |fs|
-          actor = file_set_actor_class.new(fs, env.user)
-          actor.create_metadata(visibility: env.curation_concern.visibility)
-          actor.attach_to_work(env.curation_concern)
-          fs.save!
-          ordered_members << fs
-          if uri.scheme == 'file'
-            # Turn any %20 into spaces.
-            file_path = CGI.unescape(uri.path)
-            IngestLocalFileJob.perform_later(fs, file_path, env.user)
-          else
-            ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
-          end
-        end
+        ingest_remote_files_service_class.new(user: env.user,
+                                              curation_concern: env.curation_concern,
+                                              remote_files: remote_files,
+                                              ordered_members: @ordered_members,
+                                              ordered: true,
+                                              file_set_actor_class: file_set_actor_class).attach!
       end
-
-      # Add all file_sets as ordered_members in a single action
-      def add_ordered_members(user, work)
-        actor = Hyrax::Actors::OrderedMembersActor.new(ordered_members, user)
-        actor.attach_ordered_members_to_work(work)
-      end
-
-      class_attribute :file_set_actor_class
-      self.file_set_actor_class = Hyrax::Actors::FileSetOrderedMembersActor
     end
   end
 end

data/app/actors/hyrax/actors/file_set_actor.rb

@@ -31,10 +31,9 @@ module Hyrax
           # hand. Do this because we don't have the underlying UploadedFile instance
           file_actor = build_file_actor(relation)
           file_actor.ingest_file(wrapper!(file: file, relation: relation))
-          # Copy visibility and permissions from parent (work) to
-          # FileSets even if they come in from BrowseEverything
-          VisibilityCopyJob.perform_later(file_set.parent)
-          InheritPermissionsJob.perform_later(file_set.parent)
+          parent = parent_for(file_set: file_set)
+          VisibilityCopyJob.perform_later(parent)
+          InheritPermissionsJob.perform_later(parent)
         else
           IngestJob.perform_later(wrapper!(file: file, relation: relation))
         end
@@ -138,6 +137,12 @@ module Hyrax
         @ability ||= ::Ability.new(user)
       end
 
+      # @param file_set [FileSet]
+      # @return [ActiveFedora::Base]
+      def parent_for(file_set:)
+        file_set.parent
+      end
+
       def build_file_actor(relation)
         fs = use_valkyrie ? file_set.valkyrie_resource : file_set
         file_actor_class.new(fs, relation, user, use_valkyrie: use_valkyrie)
@@ -160,6 +165,8 @@ module Hyrax
         elsif file_set.import_url.present?
           # This path is taken when file is a Tempfile (e.g. from ImportUrlJob)
           File.basename(Addressable::URI.unencode(file.file_url))
+        elsif file.respond_to?(:original_filename) # e.g. Rack::Test::UploadedFile
+          file.original_filename
         else
           File.basename(file)
         end
@@ -179,7 +186,7 @@ module Hyrax
       # Although ActiveFedora clears the children nodes it leaves those fields in Solr populated.
       # rubocop:disable Metrics/CyclomaticComplexity
       def unlink_from_work
-        work = file_set.parent
+        work = parent_for(file_set: file_set)
         return unless work && (work.thumbnail_id == file_set.id || work.representative_id == file_set.id || work.rendering_ids.include?(file_set.id))
         work.thumbnail = nil if work.thumbnail_id == file_set.id
         work.representative = nil if work.representative_id == file_set.id

data/app/assets/stylesheets/hyrax/_styles.scss

@@ -72,3 +72,8 @@ label.disabled {
     }
   }
 }
+
+.read-only {
+  font-size: 1.2em;
+  margin: 0 0 10px;
+}

data/app/controllers/concerns/hyrax/collections_controller_behavior.rb

@@ -15,18 +15,21 @@ module Hyrax
       class_attribute :presenter_class,
                       :form_class,
                       :single_item_search_builder_class,
-                      :membership_service_class
+                      :membership_service_class,
+                      :parent_collection_query_service
 
       self.presenter_class = Hyrax::CollectionPresenter
 
       # The search builder to find the collection
       self.single_item_search_builder_class = SingleCollectionSearchBuilder
       # The search builder to find the collections' members
-      self.membership_service_class = Collections::CollectionMemberService
+      self.membership_service_class = Collections::CollectionMemberSearchService
+      # A search service to use in finding parent collections
+      self.parent_collection_query_service = Collections::NestedCollectionQueryService
     end
 
     def show
-      @curation_concern ||= Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id])
+      @curation_concern = @collection # we must populate curation_concern
       presenter
       query_collection_members
     end
@@ -74,9 +77,9 @@ module Hyrax
     end
 
     def query_collection_members
-      member_works
-      member_subcollections if collection.collection_type.nestable?
-      parent_collections if collection.collection_type.nestable? && action_name == 'show'
+      load_member_works
+      load_member_subcollections if collection.collection_type.nestable?
+      load_parent_collections if collection.collection_type.nestable? && action_name == 'show'
     end
 
     # Instantiate the membership query service
@@ -89,15 +92,31 @@ module Hyrax
       @member_docs = @response.documents
       @members_count = @response.total
     end
+    alias load_member_works member_works
 
-    def parent_collections
+    ##
+    # Handles paged loading for parent collections.
+    #
+    # @param the query service to use when searching for the parent collections.
+    #   uses the class attribute +parent_collection_query_service+ by default.
+    def parent_collections(query_service: self.class.parent_collection_query_service)
       page = params[:parent_collection_page].to_i
-      query = Hyrax::Collections::NestedCollectionQueryService
-      collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page: page)
+
+      collection.parent_collections =
+        query_service.parent_collections(child: collection_object,
+                                         scope: self,
+                                         page: page)
     end
+    alias load_parent_collections parent_collections
 
+    ##
+    # @note this is here because, though we want to load and authorize the real
+    #   collection for show views, for apparently historical reasons,
+    #   {#collection} is overridden to access `@presenter`. this should probably
+    #   be deprecated and callers encouraged to use `@collection` but the scope
+    #   and impact of that change needs more evaluation.
     def collection_object
-      action_name == 'show' ? Collection.find(collection.id) : collection
+      action_name == 'show' ? @collection : collection
     end
 
     def member_subcollections
@@ -106,6 +125,7 @@ module Hyrax
       @subcollection_docs = results.documents
       @subcollection_count = @presenter.subcollection_count = results.total
     end
+    alias load_member_subcollections member_subcollections
 
     # You can override this method if you need to provide additional inputs to the search
     # builder. For example:

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

@@ -16,6 +16,7 @@ module Hyrax::Controller
     include Hydra::Controller::ControllerBehavior
     helper_method :create_work_presenter
     before_action :set_locale
+    before_action :check_read_only, except: [:show, :index]
   end
 
   # Provide a place for Devise to send the user to after signing in
@@ -34,12 +35,14 @@ module Hyrax::Controller
   # @api public
   #
   # @return [#[]] a resolver for Hyrax's Transactions; this *should* be a
-  #   thread-safe Dry::Container, but callers to this method should strictly
-  #   use #[] for access
+  #   thread-safe {Dry::Container}, but callers to this method should strictly
+  #   use +#[]+ for access.
   #
   # @example
   #   transactions['change_set.create_work'].call(my_form)
   #
+  # @see Hyrax::Transactions::Container
+  # @see Hyrax::Transactions::Transaction
   # @see https://dry-rb.org/gems/dry-container
   def transactions
     Hyrax::Transactions::Container
@@ -88,4 +91,12 @@ module Hyrax::Controller
       wants.json { render_json_response(response_type: :unauthorized, message: json_message) }
     end
   end
+
+  # Redirect all deposit and edit requests with warning message when in read only mode
+  def check_read_only
+    return unless Flipflop.read_only?
+    # Allows feature to be turned off
+    return if self.class.to_s == Hyrax::Admin::StrategiesController.to_s
+    redirect_to root_path, flash: { error: t('hyrax.read_only') }
+  end
 end

data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb

@@ -24,23 +24,35 @@ module Hyrax
     end
 
     # Updates a batch of embargos
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/PerceivedComplexity
     def update
       filter_docs_with_edit_access!
       copy_visibility = []
       copy_visibility = params[:embargoes].values.map { |h| h[:copy_visibility] } if params[:embargoes]
-      af_objects = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
-      af_objects.each do |curation_concern|
-        Hyrax::Actors::EmbargoActor.new(curation_concern).destroy
-        # if the concern is a FileSet, set its visibility and visibility propagation
-        if curation_concern.file_set?
-          curation_concern.visibility = curation_concern.to_solr["visibility_after_embargo_ssim"]
-          curation_concern.save!
-        elsif copy_visibility.include?(curation_concern.id)
-          Hyrax::VisibilityPropagator.for(source: curation_concern).propagate
+      resources = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: Hyrax.config.use_valkyrie?)
+      resources.each do |resource|
+        if Hyrax.config.use_valkyrie?
+          EmbargoManager.new(resource: resource).release!
+          Hyrax::AccessControlList(resource).save
+          Hyrax::VisibilityPropagator.for(source: resource).propagate if copy_visibility.include?(resource.id)
+        else
+          Hyrax::Actors::EmbargoActor.new(resource).destroy
+          # if the concern is a FileSet, set its visibility and visibility propagation
+          if resource.file_set?
+            resource.visibility = resource.to_solr["visibility_after_embargo_ssim"]
+            resource.save!
+          elsif copy_visibility.include?(resource.id)
+            Hyrax::VisibilityPropagator.for(source: resource).propagate
+          end
         end
       end
       redirect_to embargoes_path, notice: t('.embargo_deactivated')
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/PerceivedComplexity
 
     # This allows us to use the unauthorized template in curation_concerns/base
     def self.local_prefixes

data/app/controllers/concerns/hyrax/leases_controller_behavior.rb

@@ -23,18 +23,27 @@ module Hyrax
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def update
       filter_docs_with_edit_access!
       copy_visibility = []
       copy_visibility = params[:leases].values.map { |h| h[:copy_visibility] } if params[:leases]
-      af_objects = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
-      af_objects.each do |curation_concern|
-        Hyrax::Actors::LeaseActor.new(curation_concern).destroy
-        Hyrax::VisibilityPropagator.for(source: curation_concern).propagate if
-          copy_visibility.include?(curation_concern.id)
+      resources = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: Hyrax.config.use_valkyrie?)
+      resources.each do |resource|
+        if Hyrax.config.use_valkyrie?
+          LeaseManager.new(resource: resource).release!
+          Hyrax::AccessControlList(resource).save
+        else
+          Hyrax::Actors::LeaseActor.new(resource).destroy
+        end
+        Hyrax::VisibilityPropagator.for(source: resource).propagate if
+          copy_visibility.include?(resource.id)
       end
       redirect_to leases_path
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     # This allows us to use the unauthorized template in curation_concerns/base
     def self.local_prefixes

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -47,6 +47,7 @@ module Hyrax
     end
 
     def new
+      @admin_set_options = available_admin_sets
       # TODO: move these lines to the work form builder in Hyrax
       curation_concern.depositor = current_user.user_key
       curation_concern.admin_set_id = admin_set_id_for_new
@@ -95,6 +96,7 @@ module Hyrax
     # rubocop:enable Metrics/AbcSize
 
     def edit
+      @admin_set_options = available_admin_sets
       build_form
     end
 
@@ -203,7 +205,8 @@ module Hyrax
         @curation_concern =
           form.validate(params[hash_key_for_curation_concern]) &&
           transactions['change_set.create_work']
-          .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files },
+          .with_step_args('work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
+                          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
                           'change_set.set_user_as_depositor' => { user: current_user })
           .call(form).value!
       end
@@ -219,7 +222,7 @@ module Hyrax
         @curation_concern =
           form.validate(params[hash_key_for_curation_concern]) &&
           transactions['change_set.update_work']
-          .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files })
+          .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] })
           .call(form).value!
       end
     end
@@ -255,7 +258,7 @@ module Hyrax
 
     # @deprecated
     def curation_concern_from_search_results
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " /
+      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
                        "Instead, use '#search_result_document'.")
       search_params = params.deep_dup
       search_params.delete :page
@@ -436,5 +439,21 @@ module Hyrax
     def uploaded_files
       UploadedFile.find(params.fetch(:uploaded_files, []))
     end
+
+    def available_admin_sets
+      admin_set_results = Hyrax::AdminSetService.new(self).search_results(:deposit)
+      # get all the templates at once, reducing query load
+      templates = PermissionTemplate.where(id: admin_set_results.map(&:id)).to_a
+
+      admin_sets = admin_set_results.map do |admin_set_doc|
+        template = templates.find { |temp| temp.source_id == admin_set_doc.id.to_s }
+        sharing = can?(:manage, template) || !!template&.active_workflow&.allows_access_grant?
+
+        AdminSetSelectionPresenter::OptionsEntry
+          .new(admin_set: admin_set_doc, permission_template: template, permit_sharing: sharing)
+      end
+
+      AdminSetSelectionPresenter.new(admin_sets: admin_sets)
+    end
   end
 end

data/app/controllers/hyrax/admin/admin_sets_controller.rb

@@ -4,9 +4,7 @@ module Hyrax
     include Hyrax::CollectionsControllerBehavior
 
     before_action :authenticate_user!
-    before_action :ensure_manager!, except: [:show]
     load_and_authorize_resource
-    before_action :ensure_viewer!, only: [:show]
 
     # Catch permission errors
     rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_adminset_access
@@ -43,10 +41,8 @@ module Hyrax
     end
 
     def index
-      add_breadcrumb t(:'hyrax.controls.home'), root_path
-      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb t(:'hyrax.admin.sidebar.admin_sets'), hyrax.admin_admin_sets_path
-      @admin_sets = Hyrax::AdminSetService.new(self).search_results(:edit)
+      # admin sets are listed with collections
+      redirect_to hyrax.my_collections_url
     end
 
     def new
@@ -106,19 +102,6 @@ module Hyrax
       hyrax.edit_admin_admin_set_path(@admin_set) + (params[:referer_anchor] || '')
     end
 
-    def ensure_manager!
-      # TODO: Review for possible removal.  Doesn't appear to apply anymore.
-      # Even though the user can view this admin set, they may not be able to view
-      # it on the admin page.
-      authorize! :manage_any, AdminSet
-    end
-
-    def ensure_viewer!
-      # Even though the user can view this admin set, they may not be able to view
-      # it on the admin page if access is granted as a public or registered user only.
-      authorize! :view_admin_show, @admin_set
-    end
-
     def create_admin_set
       admin_set_create_service.call(admin_set: @admin_set, creating_user: current_user)
     end

data/app/controllers/hyrax/admin/permission_template_accesses_controller.rb

@@ -30,16 +30,12 @@ module Hyrax
         false
       end
 
-      def update_access(manage_changed:)
-        permission_template_form.update_access(manage_changed: manage_changed)
-      end
-
       def after_destroy_success
         if source.admin_set?
           redirect_to hyrax.edit_admin_admin_set_path(source_id,
                                                       anchor: 'participants'),
                       notice: translate('participants', scope: 'hyrax.admin.admin_sets.form.permission_update_notices')
-        elsif source.collection?
+        else
           redirect_to hyrax.edit_dashboard_collection_path(source_id,
                                                            anchor: 'sharing'),
                       notice: translate('sharing', scope: 'hyrax.dashboard.collections.form.permission_update_notices')
@@ -51,7 +47,7 @@ module Hyrax
           redirect_to hyrax.edit_admin_admin_set_path(source_id,
                                                       anchor: 'participants'),
                       alert: @permission_template_access.errors.full_messages.to_sentence
-        elsif source.collection?
+        else
           redirect_to hyrax.edit_dashboard_collection_path(source_id,
                                                            anchor: 'sharing'),
                       alert: @permission_template_access.errors.full_messages.to_sentence
@@ -60,6 +56,9 @@ module Hyrax
 
       delegate :source_id, to: :permission_template
 
+      ##
+      # @todo can we avoid querying solr to deciede where to redirect? we
+      #   otherwise don't need this data at all.
       def source
         @source ||= ::SolrDocument.find(source_id)
       end

data/app/controllers/hyrax/admin/workflows_controller.rb

@@ -15,8 +15,9 @@ module Hyrax
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.admin.sidebar.tasks'), '#'
       add_breadcrumb t(:'hyrax.admin.sidebar.workflow_review'), request.path
-      @status_list = Hyrax::Workflow::StatusListService.new(self, "-workflow_state_name_ssim:#{deposited_workflow_state_name}")
-      @published_list = Hyrax::Workflow::StatusListService.new(self, "workflow_state_name_ssim:#{deposited_workflow_state_name}")
+
+      @status_list = actionable_objects.reject(&:published?)
+      @published_list = actionable_objects.select(&:published?)
     end
 
     private
@@ -24,5 +25,10 @@ module Hyrax
     def ensure_authorized!
       authorize! :review, :submissions
     end
+
+    def actionable_objects
+      @actionable_objects ||=
+        Hyrax::Workflow::ActionableObjects.new(user: current_user)
+    end
   end
 end