hyrax 3.0.0.pre.beta3 → 3.0.0

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

@@ -1,40 +1,36 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
-    # When adding member FileSets to a Work, Hyrax saves
-    #   and reloads the work for each new member FileSet.
-    #   This can significantly slow down ingest for Works
-    #   with many member FileSets. The saving and reloading
-    #   happens in FileSetActor#attach_to_work.
+    ##
+    # When adding member {FileSetBehavior}s to a {WorkBehavior}, {Hyrax} saves
+    # and reloads the work for each new member FileSet. This can significantly
+    # slow down ingest for Works with many member FileSets. The saving and
+    # reloading happens in {FileSetActor#attach_to_work}.
     #
-    # This is a 'swappable' alternative approach. It will
-    #   be of most value to Hyrax applications dealing with
-    #   works with many filesets. Anecdotally, a 600 fileset
-    #   can be processed in ~15 mins versus >3 hours
-    #   with the standard approach.
+    # This is a 'swappable' alternative approach. It will be of most value to
+    # Hyrax applications dealing with works with many filesets. Anecdotally, a
+    # 600 FileSet work can be processed in ~15 mins versus >3 hours with the
+    # standard approach.
     #
-    # The tradeoff is that the ordered members are now added in a
-    #   single step after the creation of all the FileSets, thus
-    #   introducing a slight risk of orphan filesets if the upload
-    #   fails before the addition of the ordered members. This
-    #   has not been observed in practice.
+    # The tradeoff is that the ordered members are now added in a single step
+    # after the creation of all the FileSets, thus introducing a slight risk of
+    # orphan filesets if the upload fails before the addition of the ordered members.
+    # This has not been observed in practice.
     #
     # Swapping out the actors can be achieved thus:
     #
-    # In `config/initializers/hyrax.rb`:
-    # ```
-    # Hyrax::CurationConcern.actor_factory.swap(Hyrax::Actors::CreateWithFilesActor,
-    #   Hyrax::Actors::CreateWithRemoteFilesOrderedMembersActor)
-    # ```
-    # Alternatively, in `config/application.rb`:
-    # ```
-    # config.to_prepare
-    #   Hyrax::CurationConcern.actor_factory.swap(Hyrax::Actors::CreateWithFilesActor,
+    # In +config/initializers/hyrax.rb+:
+    #   Hyrax::CurationConcern.actor_factory.swap(Hyrax::Actors::CreateWithRemoteFilesActor,
     #     Hyrax::Actors::CreateWithRemoteFilesOrderedMembersActor)
-    # end
-    # ```
     #
-    # If there is a key `:remote_files' in the attributes, it attaches the files at the specified URIs
-    # to the work. e.g.:
+    # Alternatively, in +config/application.rb+:
+    #  config.to_prepare
+    #    Hyrax::CurationConcern.actor_factory.swap(Hyrax::Actors::CreateWithRemoteFilesActor,
+    #      Hyrax::Actors::CreateWithRemoteFilesOrderedMembersActor)
+    #  end
+    #
+    # If there is a key +:remote_files+ in the attributes, it attaches the files at
+    # the specified URIs to the work. e.g.:
     #     attributes[:remote_files] = filenames.map do |name|
     #       { url: "https://example.com/file/#{name}", file_name: name }
     #     end

data/app/actors/hyrax/actors/default_admin_set_actor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
     # Ensures that the default AdminSet id is set if this form doesn't have
@@ -5,8 +6,17 @@ module Hyrax
     # Hyrax::Actors::InitializeWorkflowActor, so that the correct
     # workflow can be kicked off.
     #
+    # @see Hyrax::EnsureWellFormedAdminSetService
+    #
     # @note Creates AdminSet, Hyrax::PermissionTemplate, Sipity::Workflow (with activation)
     class DefaultAdminSetActor < Hyrax::Actors::AbstractActor
+      # Hyrax provides a service that ensures well formed admin sets.
+      # It is possible that downstream implementers might seek to
+      # override this behavior.  The class attribute provicdes a means
+      # to override that behavior.
+      class_attribute :ensure_well_formed_admin_set_service
+      self.ensure_well_formed_admin_set_service = Hyrax::EnsureWellFormedAdminSetService
+
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if create was successful
       def create(env)
@@ -23,29 +33,19 @@ module Hyrax
 
       private
 
-        def ensure_admin_set_attribute!(env)
-          if env.attributes[:admin_set_id].present?
-            ensure_permission_template!(admin_set_id: env.attributes[:admin_set_id])
-          elsif env.curation_concern.admin_set_id.present?
-            env.attributes[:admin_set_id] = env.curation_concern.admin_set_id
-            ensure_permission_template!(admin_set_id: env.attributes[:admin_set_id])
-          else
-            env.attributes[:admin_set_id] = default_admin_set_id
-          end
-        end
-
-        def ensure_permission_template!(admin_set_id:)
-          Hyrax::PermissionTemplate.find_by(source_id: admin_set_id) || create_permission_template!(source_id: admin_set_id)
-        end
-
-        def default_admin_set_id
-          AdminSet.find_or_create_default_admin_set_id
-        end
-
-        # Creates a Hyrax::PermissionTemplate for the given AdminSet
-        def create_permission_template!(source_id:)
-          Hyrax::PermissionTemplate.create!(source_id: source_id)
-        end
+      # This method:
+      #
+      # - ensures that the env.attributes[:admin_set_id] is set
+      # - ensures that the permission template for the admin set is correct
+      def ensure_admin_set_attribute!(env)
+        # These logical hoops copy the prior behavior of the code;
+        # With a small logical caveat.  If the given curation_concern
+        # has an admin_set_id, we now verify that that admin set is
+        # well formed.
+        given_admin_set_id = env.attributes[:admin_set_id].presence || env.curation_concern.admin_set_id.presence
+        admin_set_id = ensure_well_formed_admin_set_service.call(admin_set_id: given_admin_set_id)
+        env.attributes[:admin_set_id] = given_admin_set_id || admin_set_id
+      end
     end
   end
 end

data/app/actors/hyrax/actors/embargo_actor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
     class EmbargoActor

data/app/actors/hyrax/actors/environment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
     class Environment

data/app/actors/hyrax/actors/featured_work_actor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Hyrax
   module Actors
@@ -19,14 +20,14 @@ module Hyrax
 
       private
 
-        def cleanup_featured_works(curation_concern)
-          FeaturedWork.where(work_id: curation_concern.id).destroy_all
-        end
+      def cleanup_featured_works(curation_concern)
+        FeaturedWork.where(work_id: curation_concern.id).destroy_all
+      end
 
-        def check_featureability(curation_concern)
-          return unless curation_concern.private?
-          cleanup_featured_works(curation_concern)
-        end
+      def check_featureability(curation_concern)
+        return unless curation_concern.private?
+        cleanup_featured_works(curation_concern)
+      end
     end
   end
 end

data/app/actors/hyrax/actors/file_actor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'wings/services/file_metadata_builder'
 
 module Hyrax
@@ -5,16 +6,16 @@ module Hyrax
     # Actions for a file identified by file_set and relation (maps to use predicate)
     # @note Spawns asynchronous jobs
     class FileActor
-      attr_reader :file_set, :relation, :user
+      attr_reader :file_set, :relation, :user, :use_valkyrie
 
       # @param [FileSet] file_set the parent FileSet
       # @param [Symbol, #to_sym] relation the type/use for the file
       # @param [User] user the user to record as the Agent acting upon the file
-      def initialize(file_set, relation, user, use_valkyrie: false)
+      def initialize(file_set, relation, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
+        @use_valkyrie = use_valkyrie
         @file_set = file_set
-        @relation = normalize_relation(relation, use_valkyrie: use_valkyrie)
+        @relation = normalize_relation(relation)
         @user = user
-        @use_valkyrie = use_valkyrie
       end
 
       # Persists file as part of file_set and spawns async job to characterize and create derivatives.
@@ -24,7 +25,7 @@ module Hyrax
       # @see IngestJob
       # @todo create a job to monitor the temp directory (or in a multi-worker system, directories!) to prune old files that have made it into the repo
       def ingest_file(io)
-        perform_ingest_file(io, use_valkyrie: @use_valkyrie)
+        use_valkyrie ? perform_ingest_file_through_valkyrie(io) : perform_ingest_file_through_active_fedora(io)
       end
 
       # Reverts file and spawns async job to characterize and create derivatives.
@@ -34,7 +35,7 @@ module Hyrax
         repository_file = related_file
         repository_file.restore_version(revision_id)
         return false unless file_set.save
-        Hyrax::VersioningService.create(repository_file, user)
+        create_version(repository_file, user)
         CharacterizeJob.perform_later(file_set, repository_file.id)
       end
 
@@ -47,78 +48,84 @@ module Hyrax
 
       private
 
-        # @return [Hydra::PCDM::File] the file referenced by relation
-        def related_file
-          file_set.public_send(normalize_relation(relation)) || raise("No #{relation} returned for FileSet #{file_set.id}")
-        end
+      ##
+      # Wraps the verisoning service with erro handling. if the service's
+      # create handler isn't implemented, we want to accept that quietly here.
+      def create_version(content, user)
+        Hyrax::VersioningService.create(content, user)
+      rescue NotImplementedError
+        :no_op
+      end
 
-        # Persists file as part of file_set and records a new version.
-        # Also spawns an async job to characterize and create derivatives.
-        # @param [JobIoWrapper] io the file to save in the repository, with mime_type and original_name
-        # @return [FileMetadata, FalseClass] the created file metadata on success, false on failure
-        # @todo create a job to monitor the temp directory (or in a multi-worker system, directories!) to prune old files that have made it into the repo
-        def perform_ingest_file(io, use_valkyrie: false)
-          use_valkyrie ? perform_ingest_file_through_valkyrie(io) : perform_ingest_file_through_active_fedora(io)
-        end
+      ##
+      # @return [Hydra::PCDM::File] the file referenced by relation
+      def related_file
+        file_set.public_send(normalize_relation(relation)) || raise("No #{relation} returned for FileSet #{file_set.id}")
+      end
 
-        def perform_ingest_file_through_active_fedora(io)
-          # Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer.
-          Hydra::Works::AddFileToFileSet.call(file_set,
-                                              io,
-                                              relation,
-                                              versioning: false)
-          return false unless file_set.save
-          repository_file = related_file
-          Hyrax::VersioningService.create(repository_file, user)
-          pathhint = io.uploaded_file.uploader.path if io.uploaded_file # in case next worker is on same filesystem
-          CharacterizeJob.perform_later(file_set, repository_file.id, pathhint || io.path)
-        end
+      def perform_ingest_file_through_active_fedora(io)
+        # Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer.
+        Hydra::Works::AddFileToFileSet.call(file_set,
+                                            io,
+                                            relation,
+                                            versioning: false)
+        return false unless file_set.save
+        repository_file = related_file
+        create_version(repository_file, user)
+        CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io))
+      end
 
-        def perform_ingest_file_through_valkyrie(io)
-          # Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer.
-          unsaved_file_metadata = io.to_file_metadata
-          unsaved_file_metadata.use = relation
+      def perform_ingest_file_through_valkyrie(io) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        file =
           begin
-            saved_file_metadata = file_metadata_builder.create(io_wrapper: io, file_metadata: unsaved_file_metadata, file_set: file_set)
-          rescue StandardError => e # Handle error persisting file metadata
-            Rails.logger.error("Failed to save file_metadata through valkyrie: #{e.message}")
+            Hyrax.storage_adapter.upload(resource: file_set, file: io, original_filename: io.original_name, use: relation)
+          rescue StandardError => err
+            Rails.logger.error("Failed to save file_metadata through valkyrie: #{err.message}")
             return false
           end
-          Hyrax::VersioningService.create(saved_file_metadata, user)
-          pathhint = io.uploaded_file.uploader.path if io.uploaded_file # in case next worker is on same filesystem
-          id = Hyrax.config.translate_uri_to_id.call saved_file_metadata.file_identifiers.first
-          CharacterizeJob.perform_later(file_set, id, pathhint || io.path)
-        end
-
-        def file_metadata_builder
-          Wings::FileMetadataBuilder.new(storage_adapter: Hyrax.storage_adapter,
-                                         persister:       Hyrax.persister)
-        end
+        file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file.id)
+        create_version(file_metadata, user)
+        id = file_metadata.file_identifier
+        file_set.file_ids << id
+        file_set.original_file_id = id
+        Hyrax.persister.save(resource: file_set)
+        Hyrax.publisher.publish('object.metadata.updated', object: file_set, user: user)
+        CharacterizeJob.perform_later(file_set, id.to_s, pathhint(io))
+        file_metadata
+      end
 
-        def normalize_relation(relation, use_valkyrie: false)
-          use_valkyrie ? normalize_relation_for_valkyrie(relation) : normalize_relation_for_active_fedora(relation)
-        end
+      def normalize_relation(relation)
+        use_valkyrie ? normalize_relation_for_valkyrie(relation) : normalize_relation_for_active_fedora(relation)
+      end
 
-        def normalize_relation_for_active_fedora(relation)
-          return relation if relation.is_a? Symbol
-          return relation.to_sym if relation.respond_to? :to_sym
+      def normalize_relation_for_active_fedora(relation)
+        return relation.to_sym if relation.respond_to? :to_sym
 
-          # TODO: whereever these are set, they should use Valkyrie::Vocab::PCDMUse... making the casecmp unnecessary
-          return :original_file if relation.to_s.casecmp(Valkyrie::Vocab::PCDMUse.original_file.to_s)
-          return :extracted_file if relation.to_s.casecmp(Valkyrie::Vocab::PCDMUse.extracted_file.to_s)
-          return :thumbnail_file if relation.to_s.casecmp(Valkyrie::Vocab::PCDMUse.thumbnail_file.to_s)
+        case relation
+        when Hyrax::FileMetadata::Use::ORIGINAL_FILE
+          :original_file
+        when Hyrax::FileMetadata::Use::EXTRACTED_TEXT
+          :extracted_file
+        when Hyrax::FileMetadata::Use::THUMBNAIL
+          :thumbnail_file
+        else
           :original_file
         end
+      end
 
-        def normalize_relation_for_valkyrie(relation)
-          # TODO: When this is fully switched to valkyrie, this should probably be removed and relation should always be passed
-          #       in as a valid URI already set to the file's use
-          relation = relation.to_s.to_sym
-          return Valkyrie::Vocab::PCDMUse.original_file if relation == :original_file
-          return Valkyrie::Vocab::PCDMUse.extracted_file if relation == :extracted_file
-          return Valkyrie::Vocab::PCDMUse.thumbnail_file if relation == :thumbnail_file
-          Valkyrie::Vocab::PCDMUse.original_file
-        end
+      ##
+      # @return [RDF::URI]
+      def normalize_relation_for_valkyrie(relation)
+        return relation if relation.is_a?(RDF::URI)
+
+        Hyrax::FileMetadata::Use.uri_for(use: relation.to_sym)
+      rescue ArgumentError
+        Hyrax::FileMetadata::Use::ORIGINAL_FILE
+      end
+
+      def pathhint(io)
+        io.uploaded_file&.uploader&.path || io.path
+      end
     end
   end
 end

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
     # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
-    class FileSetActor
+    class FileSetActor # rubocop:disable Metrics/ClassLength
       include Lockable
-      attr_reader :file_set, :user, :attributes
+      attr_reader :file_set, :user, :attributes, :use_valkyrie
 
-      def initialize(file_set, user)
+      def initialize(file_set, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
+        @use_valkyrie = use_valkyrie
         @file_set = file_set
         @user = user
       end
@@ -21,7 +23,8 @@ module Hyrax
         # If the file set doesn't have a title or label assigned, set a default.
         file_set.label ||= label_for(file)
         file_set.title = [file_set.label] if file_set.title.blank?
-        return false unless file_set.save # Need to save to get an id
+        @file_set = perform_save(file_set)
+        return false unless file_set
         if from_url
           # If ingesting from URL, don't spawn an IngestJob; instead
           # reach into the FileActor and run the ingest with the file instance in
@@ -44,7 +47,6 @@ module Hyrax
       def update_content(file, relation = :original_file)
         IngestJob.perform_later(wrapper!(file: file, relation: relation), notification: true)
       end
-
       # @!endgroup
 
       # Adds the appropriate metadata, visibility and relationships to file_set
@@ -66,31 +68,53 @@ module Hyrax
         yield(file_set) if block_given?
       end
 
-      # Adds a FileSet to the work using ore:Aggregations.
       # Locks to ensure that only one process is operating on the list at a time.
       def attach_to_work(work, file_set_params = {})
         acquire_lock_for(work.id) do
           # Ensure we have an up-to-date copy of the members association, so that we append to the end of the list.
-          work.reload unless work.new_record?
-          file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
-          work.ordered_members << file_set
-          work.representative = file_set if work.representative_id.blank?
-          work.thumbnail = file_set if work.thumbnail_id.blank?
-          # Save the work so the association between the work and the file_set is persisted (head_id)
-          # NOTE: the work may not be valid, in which case this save doesn't do anything.
-          work.save
-          Hyrax.config.callback.run(:after_create_fileset, file_set, user)
+          if valkyrie_object?(work)
+            attach_to_valkyrie_work(work, file_set_params)
+          else
+            attach_to_af_work(work, file_set_params)
+          end
+          Hyrax.config.callback.run(:after_create_fileset, file_set, user, warn: false)
         end
       end
       alias attach_file_to_work attach_to_work
       deprecation_deprecate attach_file_to_work: "use attach_to_work instead"
 
+      def attach_to_valkyrie_work(work, file_set_params)
+        work = Hyrax.query_service.find_by(id: work.id) unless work.new_record
+        file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
+        fs = Hyrax.persister.save(resource: file_set)
+        Hyrax.publisher.publish('object.metadata.updated', object: fs, user: user)
+        work.member_ids << fs.id
+        work.representative_id = fs.id if work.representative_id.blank?
+        work.thumbnail_id = fs.id if work.thumbnail_id.blank?
+        # Save the work so the association between the work and the file_set is persisted (head_id)
+        # NOTE: the work may not be valid, in which case this save doesn't do anything.
+        Hyrax.persister.save(resource: work)
+        Hyrax.publisher.publish('object.metadata.updated', object: work, user: user)
+      end
+
+      # Adds a FileSet to the work using ore:Aggregations.
+      def attach_to_af_work(work, file_set_params)
+        work.reload unless work.new_record?
+        file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
+        work.ordered_members << file_set
+        work.representative = file_set if work.representative_id.blank?
+        work.thumbnail = file_set if work.thumbnail_id.blank?
+        # Save the work so the association between the work and the file_set is persisted (head_id)
+        # NOTE: the work may not be valid, in which case this save doesn't do anything.
+        work.save
+      end
+
       # @param [String] revision_id the revision to revert to
       # @param [Symbol, #to_sym] relation
       # @return [Boolean] true on success, false otherwise
       def revert_content(revision_id, relation = :original_file)
         return false unless build_file_actor(relation).revert_to(revision_id)
-        Hyrax.config.callback.run(:after_revert_content, file_set, user, revision_id)
+        Hyrax.config.callback.run(:after_revert_content, file_set, user, revision_id, warn: false)
         true
       end
 
@@ -102,7 +126,7 @@ module Hyrax
       def destroy
         unlink_from_work
         file_set.destroy
-        Hyrax.config.callback.run(:after_destroy, file_set.id, user)
+        Hyrax.config.callback.run(:after_destroy, file_set.id, user, warn: false)
       end
 
       class_attribute :file_actor_class
@@ -110,57 +134,83 @@ module Hyrax
 
       private
 
-        def ability
-          @ability ||= ::Ability.new(user)
-        end
+      def ability
+        @ability ||= ::Ability.new(user)
+      end
 
-        def build_file_actor(relation)
-          file_actor_class.new(file_set, relation, user)
-        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)
+      end
 
-        # uses create! because object must be persisted to serialize for jobs
-        def wrapper!(file:, relation:)
-          JobIoWrapper.create_with_varied_file_handling!(user: user, file: file, relation: relation, file_set: file_set)
-        end
+      # uses create! because object must be persisted to serialize for jobs
+      def wrapper!(file:, relation:)
+        JobIoWrapper.create_with_varied_file_handling!(user: user, file: file, relation: relation, file_set: file_set)
+      end
 
-        # For the label, use the original_filename or original_name if it's there.
-        # If the file was imported via URL, parse the original filename.
-        # If all else fails, use the basename of the file where it sits.
-        # @note This is only useful for labeling the file_set, because of the recourse to import_url
-        def label_for(file)
-          if file.is_a?(Hyrax::UploadedFile) # filename not present for uncached remote file!
-            file.uploader.filename.present? ? file.uploader.filename : File.basename(Addressable::URI.parse(file.file_url).path)
-          elsif file.respond_to?(:original_name) # e.g. Hydra::Derivatives::IoDecorator
-            file.original_name
-          elsif file_set.import_url.present?
-            # This path is taken when file is a Tempfile (e.g. from ImportUrlJob)
-            File.basename(Addressable::URI.parse(file_set.import_url).path)
-          else
-            File.basename(file)
-          end
+      # For the label, use the original_filename or original_name if it's there.
+      # If the file was imported via URL, parse the original filename.
+      # If all else fails, use the basename of the file where it sits.
+      # @note This is only useful for labeling the file_set, because of the recourse to import_url
+      def label_for(file)
+        if file.is_a?(Hyrax::UploadedFile) # filename not present for uncached remote file!
+          file.uploader.filename.presence || File.basename(Addressable::URI.unencode(file.file_url))
+        elsif file.respond_to?(:original_name) # e.g. Hydra::Derivatives::IoDecorator
+          file.original_name
+        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))
+        else
+          File.basename(file)
         end
+      end
 
-        def assign_visibility?(file_set_params = {})
-          !((file_set_params || {}).keys.map(&:to_s) & %w[visibility embargo_release_date lease_expiration_date]).empty?
-        end
+      def assign_visibility?(file_set_params = {})
+        !((file_set_params || {}).keys.map(&:to_s) & %w[visibility embargo_release_date lease_expiration_date]).empty?
+      end
 
-        # replaces file_set.apply_depositor_metadata(user)from hydra-access-controls so depositor doesn't automatically get edit access
-        def depositor_id(depositor)
-          depositor.respond_to?(:user_key) ? depositor.user_key : depositor
-        end
+      # replaces file_set.apply_depositor_metadata(user)from hydra-access-controls so depositor doesn't automatically get edit access
+      def depositor_id(depositor)
+        depositor.respond_to?(:user_key) ? depositor.user_key : depositor
+      end
 
-        # Must clear the fileset from the thumbnail_id, representative_id and rendering_ids fields on the work
-        #   and force it to be re-solrized.
-        # 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
-          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
-          work.rendering_ids -= [file_set.id]
-          work.save!
+      # Must clear the fileset from the thumbnail_id, representative_id and rendering_ids fields on the work
+      #   and force it to be re-solrized.
+      # 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
+        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
+        work.rendering_ids -= [file_set.id]
+        work.save!
+      end
+
+      # switches between using valkyrie to save or active fedora to save
+      def perform_save(object)
+        obj_to_save = object_to_act_on(object)
+        if valkyrie_object?(obj_to_save)
+          saved_resource = Hyrax.persister.save(resource: obj_to_save)
+          # return the same type of object that was passed in
+          saved_object_to_return = valkyrie_object?(object) ? saved_resource : Wings::ActiveFedoraConverter.new(resource: saved_resource).convert
+        else
+          obj_to_save.save
+          saved_object_to_return = obj_to_save
         end
+        saved_object_to_return
+      end
+
+      # if passed a resource or if use_valkyrie==true, object to act on is the valkyrie resource
+      def object_to_act_on(object)
+        return object if valkyrie_object?(object)
+        use_valkyrie ? object.valkyrie_resource : object
+      end
+
+      # determine if the object is a valkyrie resource
+      def valkyrie_object?(object)
+        object.is_a? Valkyrie::Resource
+      end
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/CyclomaticComplexity
     end