hyrax 5.0.0.rc1 → 5.0.0.rc3

data/lib/hyrax/specs/capybara.rb

@@ -15,59 +15,43 @@ require 'capybara/rspec'
 require 'capybara/rails'
 require 'capybara-screenshot/rspec'
 require 'selenium-webdriver'
-require 'webdrivers' unless ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
 
 Capybara.save_path = ENV['CI'] ? "/tmp/test-results" : Rails.root.join('tmp', 'capybara')
 
-if ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
-  options = Selenium::WebDriver::Chrome::Options.new.tap do |opts|
-    opts.add_argument("--headless") if ENV["CHROME_HEADLESS_MODE"]
-    opts.add_argument("--disable-gpu") if Gem.win_platform?
-    # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
-    opts.add_argument("--disable-site-isolation-trials")
-    opts.add_argument("--window-size=1440,1440")
-    opts.add_argument("--enable-features=NetworkService,NetworkServiceInProcess")
-    opts.add_argument("--disable-features=VizDisplayCompositor")
-  end
-
-  Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
-    driver = Capybara::Selenium::Driver.new(app,
-                                       browser: :remote,
-                                       capabilities: options,
-                                       url: ENV['HUB_URL'])
+options = Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+  opts.add_argument("--headless") if ENV["CHROME_HEADLESS_MODE"]
+  opts.add_argument("--disable-gpu") if Gem.win_platform?
+  # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
+  opts.add_argument("--disable-site-isolation-trials")
+  opts.add_argument("--window-size=1440,1440")
+  opts.add_argument("--enable-features=NetworkService,NetworkServiceInProcess")
+  opts.add_argument("--disable-features=VizDisplayCompositor")
+end
 
-    # Fix for capybara vs remote files. Selenium handles this for us
-    driver.browser.file_detector = lambda do |args|
-      str = args.first.to_s
-      str if File.exist?(str)
-    end
+Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
+  driver = Capybara::Selenium::Driver.new(app,
+                                      browser: :remote,
+                                      capabilities: options,
+                                      url: ENV['HUB_URL'])
 
-    driver
+  # Fix for capybara vs remote files. Selenium handles this for us
+  driver.browser.file_detector = lambda do |args|
+    str = args.first.to_s
+    str if File.exist?(str)
   end
 
-  Capybara.server_host = '0.0.0.0'
-  Capybara.server_port = 3010
-
-  ip = IPSocket.getaddress(Socket.gethostname)
-  Capybara.app_host = "http://#{ip}:#{Capybara.server_port}"
-else
-  TEST_HOST = 'localhost:3000'.freeze
-  # @note In January 2018, TravisCI disabled Chrome sandboxing in its Linux
-  #       container build environments to mitigate Meltdown/Spectre
-  #       vulnerabilities, at which point Hyrax could no longer use the
-  #       Capybara-provided :selenium_chrome_headless driver (which does not
-  #       include the `--no-sandbox` argument).
-  Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
-    browser_options = ::Selenium::WebDriver::Chrome::Options.new
-    browser_options.args << '--headless'
-    browser_options.args << '--disable-gpu'
-    browser_options.args << '--no-sandbox'
-    Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-  end
+  driver
 end
 
+Capybara.server_host = '0.0.0.0'
+Capybara.server_port = 3010
+
+ip = IPSocket.getaddress(Socket.gethostname)
+Capybara.app_host = "http://#{ip}:#{Capybara.server_port}"
+
 Capybara.default_driver = :rack_test # This is a faster driver
 Capybara.javascript_driver = :selenium_chrome_headless_sandboxless # This is slower
+Capybara.disable_animation = true
 Capybara.default_max_wait_time = ENV.fetch('CAPYBARA_WAIT_TIME', 10) # We may have a slow application, let's give it some time.
 
 Capybara::Screenshot.register_driver(:selenium_chrome_headless_sandboxless) do |driver, path|

data/lib/hyrax/specs/shared_specs/hydra_works.rb

@@ -19,11 +19,41 @@ RSpec.shared_examples 'a Hyrax::Resource' do
     end
   end
 
-  it { is_expected.to respond_to :collection? }
-  it { is_expected.to respond_to :file? }
-  it { is_expected.to respond_to :file_set? }
-  it { is_expected.to respond_to :pcdm_object? }
-  it { is_expected.to respond_to :work? }
+  describe '#class' do
+    subject(:klass) { resource.class }
+
+    it { is_expected.to respond_to :collection? }
+    it { is_expected.to respond_to :file? }
+    it { is_expected.to respond_to :file_set? }
+    it { is_expected.to respond_to :pcdm_collection? }
+    it { is_expected.to respond_to :pcdm_object? }
+    it { is_expected.to respond_to :work? }
+  end
+
+  it do
+    is_expected.to respond_to :collection?
+    expect(resource.collection?).to eq resource.class.collection?
+  end
+  it do
+    is_expected.to respond_to :file?
+    expect(resource.file?).to eq resource.class.file?
+  end
+  it do
+    is_expected.to respond_to :file_set?
+    expect(resource.file_set?).to eq resource.class.file_set?
+  end
+  it do
+    is_expected.to respond_to :pcdm_collection?
+    expect(resource.pcdm_collection?).to eq resource.class.pcdm_collection?
+  end
+  it do
+    is_expected.to respond_to :pcdm_object?
+    expect(resource.pcdm_object?).to eq resource.class.pcdm_object?
+  end
+  it do
+    is_expected.to respond_to :work?
+    expect(resource.work?).to eq resource.class.work?
+  end
 end
 
 RSpec.shared_examples 'belongs to collections' do
@@ -128,15 +158,21 @@ end
 RSpec.shared_examples 'a Hyrax::PcdmCollection' do
   subject(:collection) { described_class.new }
 
-  it { is_expected.to be_collection }
-  it { is_expected.to be_pcdm_object }
-  it { is_expected.not_to be_file_set }
-  it { is_expected.not_to be_work }
-
   it_behaves_like 'a Hyrax::Resource'
   it_behaves_like 'a model with core metadata'
   it_behaves_like 'has members'
 
+  describe '#class' do
+    subject(:klass) { collection.class }
+
+    it { is_expected.to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.not_to be_file_set }
+    it { is_expected.to be_pcdm_collection }
+    it { is_expected.not_to be_pcdm_object }
+    it { is_expected.not_to be_work }
+  end
+
   describe '#collection_type_gid' do
     let(:gid) { Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id.to_s }
 
@@ -151,8 +187,20 @@ end
 RSpec.shared_examples 'a Hyrax::AdministrativeSet' do
   subject(:admin_set) { described_class.new }
 
+  it_behaves_like 'a Hyrax::Resource'
   it_behaves_like 'a model with core metadata'
 
+  describe '#class' do
+    subject(:klass) { admin_set.class }
+
+    it { is_expected.to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.not_to be_file_set }
+    it { is_expected.to be_pcdm_collection }
+    it { is_expected.not_to be_pcdm_object }
+    it { is_expected.not_to be_work }
+  end
+
   it 'has an #alternative_title' do
     expect { admin_set.alternative_title = ['Moomin'] }
       .to change { admin_set.alternative_title }
@@ -191,11 +239,16 @@ RSpec.shared_examples 'a Hyrax::Work' do
   it_behaves_like 'belongs to collections'
   it_behaves_like 'has members'
 
-  it { is_expected.not_to be_collection }
-  it { is_expected.not_to be_file }
-  it { is_expected.not_to be_file_set }
-  it { is_expected.to be_pcdm_object }
-  it { is_expected.to be_work }
+  describe '#class' do
+    subject(:klass) { work.class }
+
+    it { is_expected.not_to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.not_to be_file_set }
+    it { is_expected.not_to be_pcdm_collection }
+    it { is_expected.to be_pcdm_object }
+    it { is_expected.to be_work }
+  end
 
   describe '#admin_set_id' do
     it 'is nil by default' do
@@ -249,7 +302,7 @@ RSpec.shared_examples 'a Hyrax::Work' do
   end
 end
 
-RSpec.shared_examples 'a Hyrax::FileSet' do
+RSpec.shared_examples 'a Hyrax::FileSet', valkyrie_adapter: :test_adapter do
   subject(:fileset)   { described_class.new }
   let(:adapter)       { Valkyrie::MetadataAdapter.find(:test_adapter) }
   let(:persister)     { adapter.persister }
@@ -259,11 +312,16 @@ RSpec.shared_examples 'a Hyrax::FileSet' do
   it_behaves_like 'a model with core metadata'
   it_behaves_like 'a model with basic metadata'
 
-  it { is_expected.not_to be_collection }
-  it { is_expected.not_to be_file }
-  it { is_expected.to be_file_set }
-  it { is_expected.to be_pcdm_object }
-  it { is_expected.not_to be_work }
+  describe '#class' do
+    subject(:klass) { fileset.class }
+
+    it { is_expected.not_to be_collection }
+    it { is_expected.not_to be_file }
+    it { is_expected.to be_file_set }
+    it { is_expected.not_to be_pcdm_collection }
+    it { is_expected.to be_pcdm_object }
+    it { is_expected.not_to be_work }
+  end
 
   describe 'files' do
     it 'has empty file_ids by default' do
@@ -275,12 +333,10 @@ RSpec.shared_examples 'a Hyrax::FileSet' do
     end
 
     context 'with files' do
-      let(:file_class) { Hyrax::FileMetadata }
-      let(:files) do
-        [file_class.new, file_class.new, file_class.new]
-          .map! { |f| persister.save(resource: f) }
-      end
-
+      let(:original_file) { FactoryBot.valkyrie_create :hyrax_file_metadata, :original_file }
+      let(:thumbnail) { FactoryBot.valkyrie_create :hyrax_file_metadata, :thumbnail }
+      let(:extracted_text) { FactoryBot.valkyrie_create :hyrax_file_metadata, :extracted_text }
+      let(:files) { [original_file, thumbnail, extracted_text] }
       let(:file_ids) { files.map(&:id) }
 
       before { fileset.file_ids = file_ids }
@@ -301,6 +357,35 @@ RSpec.shared_examples 'a Hyrax::FileSet' do
         expect { fileset.file_ids << file_ids.first }
           .not_to change { query_service.custom_queries.find_files(file_set: fileset) }
       end
+
+      it 'returns an original_file' do
+        expect(fileset.original_file).to eq original_file
+        expect(fileset.original_file_id).to eq original_file.id
+      end
+
+      it 'returns a thumbnail' do
+        expect(fileset.thumbnail).to eq thumbnail
+        expect(fileset.thumbnail_id).to eq thumbnail.id
+      end
+
+      it 'returns an extracted_text' do
+        expect(fileset.extracted_text).to eq extracted_text
+        expect(fileset.extracted_text_id).to eq extracted_text.id
+      end
+
+      context 'with simulated original file' do
+        let(:file_metadata_double) { double("Fake Hyrax::FileMetadata", id: SecureRandom.uuid, file_identifier: SecureRandom.uuid, versions: [file_double]) }
+        let(:file_double) { double("Fake Valkyrie::StorageAdapter::File", id: SecureRandom.uuid, version_id: SecureRandom.uuid)}
+
+        before do
+          allow(fileset).to receive(:original_file).and_return(file_metadata_double)
+          fileset.id = Valkyrie::ID.new(SecureRandom.uuid)
+        end
+
+        it 'returns a iiif_id with matching ids' do
+          expect(fileset.iiif_id).to eq "#{fileset.id}/files/#{fileset.original_file_id}/#{Digest::MD5.hexdigest(file_double.version_id)}"
+        end
+      end
     end
   end
 end

data/lib/hyrax/specs/shared_specs/indexers.rb

@@ -18,7 +18,7 @@ RSpec.shared_examples 'a Hyrax::Resource indexer' do
   describe '#to_solr' do
     it 'indexes base resource fields' do
       expect(indexer.to_solr)
-        .to include(has_model_ssim: resource.class.name,
+        .to include(has_model_ssim: resource.to_rdf_representation,
                     human_readable_type_tesim: resource.human_readable_type,
                     alternate_ids_sim: a_collection_containing_exactly(*ids))
     end
@@ -89,8 +89,6 @@ RSpec.shared_examples 'a thumbnail indexer' do
   before do
     raise 'indexer_class must be set with `let(:indexer_class)`' unless defined? indexer_class
     raise 'resource must be set with `let(:resource)` and is expected to be a kind of Hyrax::Resource' unless defined?(resource) && resource.kind_of?(Hyrax::Resource)
-    # optionally can pass in default_visibility by setting it with a let statement if your application changes the default; Hyrax defines this as 'restricted'
-    # See samvera/hyrda-head hydra-access-controls/app/models/concerns/hydra/access_controls/access_rights.rb for possible VISIBILITY_TEXT_VALUE_...'
   end
   subject(:indexer)  { indexer_class.new(resource: resource) }
   let(:thumbnail_path) { '/downloads/foo12345?file=thumbnail' }
@@ -106,6 +104,27 @@ RSpec.shared_examples 'a thumbnail indexer' do
   end
 end
 
+RSpec.shared_examples 'a location indexer' do
+  before do
+    raise 'indexer_class must be set with `let(:indexer_class)`' unless defined? indexer_class
+    raise 'resource must be set with `let(:resource)` and is expected to be a kind of Hyrax::Resource' unless defined?(resource) && resource.kind_of?(Hyrax::Resource)
+    resource.based_near = based_near
+  end
+  subject(:indexer)  { indexer_class.new(resource: resource) }
+  let(:based_near) { ["https://sws.geonames.org/4254679/"] }
+  let(:based_near_label) { ["Bloomington, Indiana, United States"] }
+
+  before do
+    allow(Hyrax.config.location_service).to receive(:full_label).with(based_near[0]).and_return(based_near_label[0])
+  end
+
+  describe '#to_solr' do
+    it 'indexes locations' do
+      expect(indexer.to_solr).to include(based_near_tesim: based_near, based_near_label_tesim: based_near_label)
+    end
+  end
+end
+
 RSpec.shared_examples 'a Core metadata indexer' do
   before do
     raise 'indexer_class must be set with `let(:indexer_class)`' unless defined? indexer_class
@@ -138,9 +157,10 @@ RSpec.shared_examples 'a Basic metadata indexer' do
   end
   subject(:indexer) { indexer_class.new(resource: resource) }
 
+  it_behaves_like 'a location indexer'
+
   let(:attributes) do
     {
-      based_near: ['helsinki', 'finland'],
       date_created: ['tuesday'],
       keyword: ['comic strip'],
       related_url: ['http://example.com/moomin'],
@@ -152,9 +172,7 @@ RSpec.shared_examples 'a Basic metadata indexer' do
   describe '#to_solr' do
     it 'indexes basic metadata' do
       expect(indexer.to_solr)
-        .to include(based_near_tesim: a_collection_containing_exactly(*attributes[:based_near]),
-                    based_near_sim: a_collection_containing_exactly(*attributes[:based_near]),
-                    date_created_tesim: a_collection_containing_exactly(*attributes[:date_created]),
+        .to include(date_created_tesim: a_collection_containing_exactly(*attributes[:date_created]),
                     keyword_sim: a_collection_containing_exactly(*attributes[:keyword]),
                     related_url_tesim: a_collection_containing_exactly(*attributes[:related_url]),
                     resource_type_tesim: a_collection_containing_exactly(*attributes[:resource_type]),

data/lib/hyrax/transactions/admin_set_destroy.rb

@@ -8,7 +8,8 @@ module Hyrax
     #
     # @since 3.4.0
     class AdminSetDestroy < Transaction
-      DEFAULT_STEPS = ['admin_set_resource.check_empty',
+      DEFAULT_STEPS = ['admin_set_resource.check_default',
+                       'admin_set_resource.check_empty',
                        'admin_set_resource.delete',
                        'admin_set_resource.delete_acl'].freeze
 

data/lib/hyrax/transactions/collection_destroy.rb

@@ -9,8 +9,9 @@ module Hyrax
     # @since 3.4.0
     class CollectionDestroy < Transaction
       # TODO: Add step that checks if collection is empty for collections of types that require it
-      DEFAULT_STEPS = ['collection_resource.delete',
-                       'collection_resource.delete_acl'].freeze
+      DEFAULT_STEPS = ['collection_resource.delete_acl',
+                       'collection_resource.remove_from_membership',
+                       'collection_resource.delete'].freeze
 
       ##
       # @see Hyrax::Transactions::Transaction

data/lib/hyrax/transactions/container.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'dry/container'
+
 module Hyrax
   module Transactions
     ##
@@ -23,7 +25,9 @@ module Hyrax
       require 'hyrax/transactions/collection_create'
       require 'hyrax/transactions/collection_destroy'
       require 'hyrax/transactions/collection_update'
+      require 'hyrax/transactions/file_metadata_destroy'
       require 'hyrax/transactions/file_set_destroy'
+      require 'hyrax/transactions/file_set_update'
       require 'hyrax/transactions/work_create'
       require 'hyrax/transactions/work_destroy'
       require 'hyrax/transactions/work_update'
@@ -33,12 +37,17 @@ module Hyrax
       require 'hyrax/transactions/steps/apply_collection_type_permissions'
       require 'hyrax/transactions/steps/apply_permission_template'
       require 'hyrax/transactions/steps/change_depositor'
+      require 'hyrax/transactions/steps/check_for_default_admin_set'
       require 'hyrax/transactions/steps/check_for_empty_admin_set'
       require 'hyrax/transactions/steps/delete_access_control'
+      require 'hyrax/transactions/steps/delete_all_file_metadata'
+      require 'hyrax/transactions/steps/delete_all_file_sets'
       require 'hyrax/transactions/steps/delete_resource'
       require 'hyrax/transactions/steps/ensure_admin_set'
+      require 'hyrax/transactions/steps/file_metadata_delete'
       require 'hyrax/transactions/steps/set_collection_type_gid'
       require 'hyrax/transactions/steps/remove_file_set_from_work'
+      require 'hyrax/transactions/steps/remove_from_membership'
       require 'hyrax/transactions/steps/save'
       require 'hyrax/transactions/steps/save_access_control'
       require 'hyrax/transactions/steps/save_collection_banner'
@@ -112,6 +121,10 @@ module Hyrax
           CollectionUpdate.new
         end
 
+        ops.register 'update_file_set' do
+          FileSetUpdate.new
+        end
+
         ops.register 'update_work' do
           WorkUpdate.new
         end
@@ -121,11 +134,25 @@ module Hyrax
         end
       end
 
+      namespace "file_metadata" do |ops| # Hyrax::FileMetadata
+        ops.register 'destroy' do
+          FileMetadataDestroy.new
+        end
+
+        ops.register 'delete' do
+          Steps::FileMetadataDelete.new
+        end
+      end
+
       namespace 'file_set' do |ops| # Hyrax::FileSet resource
         ops.register 'delete' do
           Steps::DeleteResource.new
         end
 
+        ops.register 'delete_all_file_metadata' do
+          Steps::DeleteAllFileMetadata.new
+        end
+
         ops.register 'destroy' do
           FileSetDestroy.new
         end
@@ -133,9 +160,21 @@ module Hyrax
         ops.register 'remove_from_work' do
           Steps::RemoveFileSetFromWork.new
         end
+
+        ops.register 'delete_acl' do
+          Steps::DeleteAccessControl.new
+        end
+
+        ops.register 'save_acl' do
+          Steps::SaveAccessControl.new
+        end
       end
 
       namespace 'admin_set_resource' do |ops| # Hyrax::AdministrativeSet resource
+        ops.register 'check_default' do
+          Steps::CheckForDefaultAdminSet.new
+        end
+
         ops.register 'check_empty' do
           Steps::CheckForEmptyAdminSet.new
         end
@@ -182,6 +221,10 @@ module Hyrax
           Steps::DeleteAccessControl.new
         end
 
+        ops.register 'remove_from_membership' do
+          Steps::RemoveFromMembership.new
+        end
+
         ops.register 'save_acl' do
           Steps::SaveAccessControl.new
         end
@@ -216,6 +259,10 @@ module Hyrax
           Steps::DeleteResource.new
         end
 
+        ops.register 'delete_all_file_sets' do
+          Steps::DeleteAllFileSets.new
+        end
+
         ops.register 'destroy' do
           WorkDestroy.new
         end

data/lib/hyrax/transactions/file_metadata_destroy.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require 'hyrax/transactions/transaction'
+
+module Hyrax
+  module Transactions
+    ##
+    # destroys a FileSet resource.
+    #
+    # @since 3.1.0
+    class FileMetadataDestroy < Transaction
+      DEFAULT_STEPS = ['file_metadata.delete'].freeze
+
+      ##
+      # @see Hyrax::Transactions::Transaction
+      def initialize(container: Container, steps: DEFAULT_STEPS)
+        super
+      end
+    end
+  end
+end

data/lib/hyrax/transactions/file_set_destroy.rb

@@ -8,7 +8,9 @@ module Hyrax
     #
     # @since 3.1.0
     class FileSetDestroy < Transaction
-      DEFAULT_STEPS = ['file_set.remove_from_work',
+      DEFAULT_STEPS = ['file_set.delete_all_file_metadata',
+                       'file_set.remove_from_work',
+                       'file_set.delete_acl',
                        'file_set.delete'].freeze
 
       ##

data/lib/hyrax/transactions/file_set_update.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require 'hyrax/transactions/transaction'
+
+module Hyrax
+  module Transactions
+    ##
+    # Updates a {Hyrax::FileSet} from a ChangeSet
+    #
+    # @since 3.4.0
+    class FileSetUpdate < Transaction
+      DEFAULT_STEPS = ['change_set.apply',
+                       'file_set.save_acl'].freeze
+
+      ##
+      # @see Hyrax::Transactions::Transaction
+      def initialize(container: Container, steps: DEFAULT_STEPS)
+        super
+      end
+    end
+  end
+end

data/lib/hyrax/transactions/steps/add_to_parent.rb

@@ -20,11 +20,12 @@ module Hyrax
           return Success(obj) if parent_id.blank?
 
           parent = Hyrax.query_service.find_by(id: parent_id)
-          parent.member_ids << obj.id
+          parent.member_ids += [obj.id]
           Hyrax.persister.save(resource: parent)
 
           user ||= ::User.find_by_user_key(obj.depositor)
           Hyrax.publisher.publish('object.metadata.updated', object: parent, user: user)
+          Hyrax.publisher.publish('object.membership.updated', object: parent, user: user)
 
           Success(obj)
         rescue Valkyrie::Persistence::ObjectNotFoundError => _err

data/lib/hyrax/transactions/steps/check_for_default_admin_set.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Validates non-defaultness of the {Hyrax::AdministrativeSet}; gives `Success`
+      # when not the default and `Failure` otherwise.
+      #
+      # Use this step to guard against destroying the default AdminSet.
+      class CheckForDefaultAdminSet
+        include Dry::Monads[:result]
+
+        ##
+        # @param [#find_inverse_references_by] query_service
+        def initialize(query_service: Hyrax.query_service)
+          @query_service = query_service
+        end
+
+        ##
+        # @param [Hyrax::AdministrativeSet] admin_set
+        #
+        # @return [Dry::Monads::Result]
+        def call(admin_set)
+          return Failure["Administrative set cannot be deleted as it is the default set", admin_set] if admin_set.id == Hyrax.config.default_admin_set_id
+          Success(admin_set)
+        end
+      end
+    end
+  end
+end

data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb

@@ -26,7 +26,7 @@ module Hyrax
           members = @query_service
                     .find_inverse_references_by(property: :admin_set_id,
                                                 resource: admin_set)
-          return Failure[:admin_set_has_members, members] if members.any?
+          return Failure["Administrative set cannot be deleted as it is not empty", members] if members.any?
 
           Success(admin_set)
         end

data/lib/hyrax/transactions/steps/delete_all_file_metadata.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+require 'dry/monads'
+
+module Hyrax
+  module Transactions
+    module Steps
+      ##
+      # Deletes a resource from the persister, returning a `Dry::Monads::Result`
+      # (`Success`|`Failure`).
+      #
+      # @see https://dry-rb.org/gems/dry-monads/1.0/result/
+      class DeleteAllFileMetadata
+        include Dry::Monads[:result]
+
+        ##
+        # @params [#save] persister
+        def initialize(property: :file_ids, query_service: Hyrax.query_service, persister: Hyrax.persister, publisher: Hyrax.publisher)
+          @property = property
+          @persister = persister
+          @query_service = query_service
+          @publisher = publisher
+        end
+
+        ##
+        # @param [Valkyrie::Resource] resource
+        # @param [::User] the user resposible for the delete action
+        #
+        # @return [Dry::Monads::Result]
+        def call(resource)
+          return Failure(:resource_not_persisted) unless resource.persisted?
+
+          resource[@property].each do |file_id|
+            return Failure[:failed_to_delete_file_metadata, file_id] unless
+              Hyrax::Transactions::Container['file_metadata.destroy']
+              .call(@query_service.custom_queries.find_file_metadata_by(id: file_id))
+              .success?
+          rescue ::Ldp::Gone
+            nil
+          end
+
+          Success(resource)
+        end
+      end
+    end
+  end
+end