hyrax 3.0.2 → 3.1.0

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

@@ -15,14 +15,17 @@ 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
@@ -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,12 +92,20 @@ 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
 
     def collection_object
       action_name == 'show' ? Collection.find(collection.id) : collection
@@ -106,6 +117,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/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/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

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

@@ -21,21 +21,25 @@ module Hyrax
         end
       end
 
-      def update_members
+      def update_members # rubocop:disable Metrics/MethodLength
         err_msg = validate
         after_update_error(err_msg) if err_msg.present?
         return if err_msg.present?
 
         collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
-        members = collection.add_member_objects batch_ids
-        messages = members.collect { |member| member.errors.full_messages }.flatten
-        if messages.size == members.size
-          after_update_error(messages.uniq.join(', '))
-        elsif messages.present?
-          flash[:error] = messages.uniq.join(', ')
-          after_update
-        else
+        begin
+          Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: collection.id,
+                                                                         new_member_ids: batch_ids,
+                                                                         user: current_user)
           after_update
+        rescue Hyrax::SingleMembershipError => err
+          messages = JSON.parse(err.message)
+          if messages.size == batch_ids.size
+            after_update_error(messages.uniq.join(', '))
+          elsif messages.present?
+            flash[:error] = messages.uniq.join(', ')
+            after_update
+          end
         end
       end
 

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

@@ -41,7 +41,7 @@ module Hyrax
       # 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
 
       load_and_authorize_resource except: [:index, :create], instance_name: :collection
 
@@ -112,10 +112,10 @@ module Hyrax
         @collection.collection_type_gid = params[:collection_type_gid].presence || default_collection_type.to_global_id
         @collection.attributes = collection_params.except(:members, :parent_id, :collection_type_gid)
         @collection.apply_depositor_metadata(current_user.user_key)
-        add_members_to_collection unless batch.empty?
         @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
         if @collection.save
           after_create
+          add_members_to_collection unless batch.empty?
         else
           after_create_error
         end
@@ -202,8 +202,10 @@ module Hyrax
       end
 
       def link_parent_collection(parent_id)
-        parent = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: parent_id, use_valkyrie: false)
-        Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent, child: @collection)
+        child = collection.respond_to?(:valkyrie_resource) ? collection.valkyrie_resource : collection
+        Hyrax::Collections::CollectionMemberService.add_member(collection_id: parent_id,
+                                                               new_member: child,
+                                                               user: current_user)
       end
 
       def uploaded_files(uploaded_file_ids)
@@ -379,15 +381,15 @@ module Hyrax
 
       def add_members_to_collection(collection = nil)
         collection ||= @collection
-        collection.add_member_objects batch
+        Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: collection.id,
+                                                                       new_member_ids: batch,
+                                                                       user: current_user)
       end
 
       def remove_members_from_collection
-        batch.each do |pid|
-          work = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: pid, use_valkyrie: false)
-          work.member_of_collections.delete @collection
-          work.save!
-        end
+        Hyrax::Collections::CollectionMemberService.remove_members_by_ids(collection_id: @collection.id,
+                                                                          member_ids: batch,
+                                                                          user: current_user)
       end
 
       def move_members_between_collections

data/app/controllers/hyrax/file_sets_controller.rb

@@ -44,8 +44,7 @@ module Hyrax
 
     # GET /concern/parent/:parent_id/file_sets/:id
     def show
-      presenter
-      guard_for_workflow_restriction_on!(parent: presenter.parent)
+      guard_for_workflow_restriction_on!(parent: parent(file_set: presenter))
       respond_to do |wants|
         wants.html
         wants.json
@@ -55,16 +54,17 @@ module Hyrax
 
     # DELETE /concern/file_sets/:id
     def destroy
-      parent = curation_concern.parent
       guard_for_workflow_restriction_on!(parent: parent)
-      actor.destroy
-      redirect_to [main_app, parent], notice: view_context.t('hyrax.file_sets.asset_deleted_flash.message')
+
+      delete(file_set: curation_concern)
+      redirect_to [main_app, parent],
+                  notice: view_context.t('hyrax.file_sets.asset_deleted_flash.message')
     end
 
     # PATCH /concern/file_sets/:id
     def update
-      parent = curation_concern.parent
       guard_for_workflow_restriction_on!(parent: parent)
+
       if attempt_update
         after_update_response
       else
@@ -86,10 +86,47 @@ module Hyrax
 
     private
 
-    # this is provided so that implementing application can override this behavior and map params to different attributes
+    ##
+    # @api public
+    def delete(file_set:)
+      case file_set
+      when Valkyrie::Resource
+        transactions['file_set.destroy']
+          .with_step_args('file_set.remove_from_work' => { user: current_user },
+                          'file_set.delete' => { user: current_user })
+          .call(curation_concern)
+          .value!
+      else
+        actor.destroy
+      end
+    end
+
+    ##
+    # @api public
+    #
+    # @note this is provided so that implementing application can override this
+    #   behavior and map params to different attributes
     def update_metadata
-      file_attributes = form_class.model_attributes(attributes)
-      actor.update_metadata(file_attributes)
+      case file_set
+      when Hyrax::Resource
+        change_set = Hyrax::Forms::ResourceForm.for(file_set)
+
+        change_set.validate(attributes) &&
+          transactions['change_set.apply'].call(change_set).value_or { false }
+      else
+        file_attributes = form_class.model_attributes(attributes)
+        actor.update_metadata(file_attributes)
+      end
+    end
+
+    def parent(file_set: curation_concern)
+      @parent ||=
+        case file_set
+        when Hyrax::Resource
+          Hyrax.query_service.find_parents(resource: file_set).first
+        else
+          file_set.parent
+        end
     end
 
     def attempt_update
@@ -152,10 +189,9 @@ module Hyrax
     end
 
     def initialize_edit_form
-      @parent = @file_set.in_objects.first
-      guard_for_workflow_restriction_on!(parent: @parent)
-      original = @file_set.original_file
-      @version_list = Hyrax::VersionListPresenter.new(original ? original.versions.all : [])
+      guard_for_workflow_restriction_on!(parent: parent)
+
+      @version_list = Hyrax::VersionListPresenter.for(file_set: @file_set)
       @groups = current_user.groups
     end
 

data/app/controllers/hyrax/permissions_controller.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 module Hyrax
   class PermissionsController < ApplicationController
+    load_resource class: ActiveFedora::Base, instance_name: :curation_concern
+
+    attr_reader :curation_concern
     helper_method :curation_concern
 
     def confirm
@@ -28,9 +31,5 @@ module Hyrax
       InheritPermissionsJob.perform_later(curation_concern)
       redirect_to [main_app, curation_concern], notice: I18n.t("hyrax.upload.change_access_flash_message")
     end
-
-    def curation_concern
-      @curation_concern ||= Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id], use_valkyrie: false)
-    end
   end
 end

data/app/controllers/hyrax/workflow_actions_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module Hyrax
   class WorkflowActionsController < ApplicationController
+    DEFAULT_FORM_CLASS = Hyrax::Forms::WorkflowActionForm
+
     before_action :authenticate_user!
 
     def update
@@ -21,7 +23,7 @@ module Hyrax
     end
 
     def workflow_action_form
-      @workflow_action_form ||= Hyrax::Forms::WorkflowActionForm.new(
+      @workflow_action_form ||= DEFAULT_FORM_CLASS.new(
         current_ability: current_ability,
         work: curation_concern,
         attributes: workflow_action_params