hyrax 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d9c34fb76fd8e3ac06d6605962c16bbdad32ffa2c1f5ab24958740fc175507
-  data.tar.gz: 8be6a02dc887f93076d84a5dc47b8e4cc7ecf916415e23fd00df24078f20ebbf
+  metadata.gz: 4fa4543b3224a41244d522ea1eedff364bc5a611766952b7f75472c438b4fff1
+  data.tar.gz: 19c28428038b672908944c5ad30dd144eabc934e80ecfa5c1d080d6144e7df9d
 SHA512:
-  metadata.gz: b6e519190cda4bdcdb4a68577b682ad6fd138756da25ce69228429755e3ee3a2fb3ac95d9140831d623f75e0aa8a9115d378abafe8f301850c200fb8080b9942
-  data.tar.gz: 90610095bd1b82e79bc7ebaa8de11a2f3c8452803a15d60a4595308b67ab85724b118c7343b2a46fb2bafb3a138365fdb94540e948965cc1a96d4259fd8b07d6
+  metadata.gz: 697a6d11f891fe1a0c42997fb80d49ab94810779745c7472670b9c32bd09d49283ceddb5736d1d5652efc9d5ac21e9dffb416fa2e75c300954c5cb529034a82c
+  data.tar.gz: efe3443f9e7e285713ff9c53661f5202748fc0613c9282dc07d834e8802c052a3551d617460d2b1975493b9ab065b0d9c66e9bfd0561fe1aef996821093f6526

data/.dassie/config/initializers/hyrax.rb

@@ -15,6 +15,8 @@ Hyrax.config do |config|
   config.register_curation_concern :monograph
 
   config.iiif_image_server = true
+  config.work_requires_files = false
+  config.citations = true
 
   # Returns a URL that resolves to an image provided by a IIIF image server
   config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
@@ -38,14 +40,22 @@ Hyrax.config do |config|
     config.browse_everything = nil
   end
 
+  # config.geonames_username = ''
+
   ##
   # Set the system-wide virus scanner
   config.virus_scanner = Hyrax::VirusScanner
 
   ##
-  # To index to the Valkyrie core, uncomment the following two lines.
+  # To index to the Valkyrie core, uncomment the following lines.
   # config.query_index_from_valkyrie = true
   # config.index_adapter = :solr_index
+
+  ##
+  # NOTE: To Valkyrie works, use Monograph which is_a Hyrax::Work is_a Valkyrie::Resource
+  # To use Valkyrie models, uncomment the following lines.
+  # config.collection_model = 'Hyrax::PcdmCollection'
+  # config.admin_set_model = 'Hyrax::AdministrativeSet'
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/.gitignore

@@ -49,6 +49,8 @@ coverage
 rdoc
 /.bundle
 tmp
+/.idea
+
 
 *.log
 *~
@@ -71,6 +73,7 @@ db/schema.rb
 
 .*_app
 .byebug_history
+.tool-versions
 
 ## Carried over from hyrax-models (RIP)
 *.gem

data/.regen

@@ -1 +1 @@
-40
+41

data/.rubocop_fixme.yml

@@ -63,6 +63,7 @@ RSpec/ExampleLength:
     - 'spec/jobs/content_restored_version_event_job_spec.rb'
     - 'spec/jobs/content_new_version_event_job_spec.rb'
     - 'spec/jobs/content_depositor_change_event_job_spec.rb'
+    - 'spec/jobs/change_depositor_event_job_spec.rb'
     - 'spec/jobs/content_deposit_event_job_spec.rb'
     - 'spec/jobs/content_delete_event_job_spec.rb'
     - 'spec/jobs/ingest_file_job_spec.rb'
@@ -100,7 +101,6 @@ RSpec/SubjectStub:
     - 'spec/models/hyrax/operation_spec.rb'
     - 'spec/controllers/hyrax/accepts_batches_controller_spec.rb'
     - 'spec/indexers/hyrax/repository_reindexer_spec.rb'
-    - 'spec/jobs/content_depositor_change_event_job_spec.rb'
     - 'spec/lib/hyrax/analytics_spec.rb'
     - 'spec/models/job_io_wrapper_spec.rb'
     - 'spec/search_builders/hyrax/abstract_type_relation_spec.rb'
@@ -114,6 +114,8 @@ RSpec/AnyInstance:
     - 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
     - 'spec/controllers/hyrax/stats_controller_spec.rb'
     - 'spec/controllers/hyrax/users_controller_spec.rb'
+    - 'spec/hyrax/transactions/steps/delete_access_control_spec.rb'
+    - 'spec/hyrax/transactions/steps/save_access_control_spec.rb'
     - 'spec/jobs/content_restored_version_event_job_spec.rb'
     - 'spec/jobs/file_set_attached_event_job_spec.rb'
     - 'spec/jobs/hyrax/grant_edit_to_members_job_spec.rb'

data/Dockerfile

@@ -7,6 +7,7 @@ ARG EXTRA_APK_PACKAGES="git"
 RUN apk --no-cache upgrade && \
   apk --no-cache add build-base \
   curl \
+  gcompat \
   imagemagick \
   tzdata \
   nodejs \
@@ -57,7 +58,7 @@ USER app
 
 RUN mkdir -p /app/fits && \
     cd /app/fits && \
-    wget https://github.com/harvard-lts/fits/releases/download/1.5.0/fits-1.5.0.zip -O fits.zip && \
+    wget https://github.com/harvard-lts/fits/releases/download/1.5.1/fits-1.5.1.zip -O fits.zip && \
     unzip fits.zip && \
     rm fits.zip && \
     chmod a+x /app/fits/fits.sh

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

@@ -76,6 +76,8 @@ module Hyrax
       end
 
       def perform_ingest_file_through_valkyrie(io) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        Deprecation.warn "FileActor support for Valkyrie was experimental and " \
+                         "is slated to be removed in favor of WorkUploadsHandler."
         file =
           begin
             Hyrax.storage_adapter.upload(resource: file_set, file: io, original_filename: io.original_name, use: relation)
@@ -85,12 +87,12 @@ module Hyrax
           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
+
+        file_set.file_ids << file_metadata.id
+        file_set.original_file_id = file_metadata.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))
+        CharacterizeJob.perform_later(file_set, file_metadata.id.to_s, pathhint(io))
         file_metadata
       end
 

data/app/actors/hyrax/actors/transfer_request_actor.rb

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 module Hyrax
   module Actors
-    ##
-    # @deprecated transfer requests are now carried out in response to published
-    # 'object.deposited' events.
-    #
     # Notify the provided owner that their proxy wants to make a
     # deposit on their behalf
     class TransferRequestActor < AbstractActor
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if create was successful
       def create(env)
-        Deprecation.warn('Use Hyrax::Listeners::ProxyDepositListener instead.')
         next_actor.create(env) && create_proxy_deposit_request(env)
       end
 
@@ -20,8 +15,9 @@ module Hyrax
       def create_proxy_deposit_request(env)
         proxy = env.curation_concern.on_behalf_of
         return true if proxy.blank?
-        ContentDepositorChangeEventJob.perform_later(env.curation_concern,
-                                                     ::User.find_by_user_key(proxy))
+        work = env.curation_concern
+        user = ::User.find_by_user_key(proxy)
+        Hyrax::ChangeDepositorService.call(work, user, false)
         true
       end
     end

data/app/assets/javascripts/hyrax/analytics_events.js

@@ -8,7 +8,7 @@ class TrackingTags {
       return _paq;
     }
     else {
-      return _gaq
+      return _gaq;
     }
   }
 
@@ -42,6 +42,9 @@ function trackAnalyticsEvents() {
 
 function setupTracking() {
     var provider = $('meta[name="analytics-provider"]').prop('content')
+    if (provider === undefined) {
+      return;
+    }
     window.trackingTags = new TrackingTags(provider)
     trackPageView()
     trackAnalyticsEvents()
@@ -59,6 +62,9 @@ if (typeof Turbolinks !== 'undefined') {
 
 $(document).on('click', '#file_download', function(e) {
   var provider = $('meta[name="analytics-provider"]').prop('content')
+  if (provider === undefined) {
+    return;
+  }
   window.trackingTags = new TrackingTags(provider)
   window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set', 'file-set-download', $(this).data('label')]);
   window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set-in-work', 'file-set-in-work-download', $(this).data('work-id')]);
@@ -66,4 +72,4 @@ $(document).on('click', '#file_download', function(e) {
     window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set-in-collection', 'file-set-in-collection-download', collection]);
     window.trackingTags.analytics().push([trackingTags.trackEvent(), 'work-in-collection', 'work-in-collection-download', collection]);
   });
-});
+});

data/app/assets/javascripts/hyrax/autocomplete/linked_data.es6

@@ -40,11 +40,9 @@ export default class LinkedData {
         // Called when Select2 is created to allow the user to initialize the
         // selection based on the value of the element select2 is attached to.
         // Essentially this is an id->object mapping function.
-
-        // TODO: Presently we're just showing a URI, but we should show the label.
         var data = {
           id: element.val(),
-          label: element.val()
+          label: element[0].dataset.label || element.val()
         };
         callback(data);
       },

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

@@ -17,6 +17,9 @@ module Hyrax::Controller
     helper_method :create_work_presenter
     before_action :set_locale
     before_action :check_read_only, except: [:show, :index]
+
+    class_attribute :search_service_class
+    self.search_service_class = Hyrax::SearchService
   end
 
   # Provide a place for Devise to send the user to after signing in
@@ -51,6 +54,24 @@ module Hyrax::Controller
     blacklight_config.repository
   end
 
+  # @note for Blacklight 6/7 compatibility
+  def search_results(*args)
+    return super if defined?(super) # use the upstream if present (e.g. in BL 6)
+
+    search_service(*args).search_results
+  end
+
+  ##
+  # @note for Blacklight 6/7 compatibility
+  def search_service(**search_params)
+    return super if defined?(super) && search_params.empty?
+
+    search_service_class.new(config: blacklight_config,
+                             scope: self,
+                             user_params: search_params,
+                             search_builder_class: search_builder_class)
+  end
+
   private
 
   ##

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

@@ -55,21 +55,12 @@ module Hyrax
     end
 
     def create
-      # Caching the original input params in case the form is not valid
-      original_input_params_for_form = params[hash_key_for_curation_concern].deep_dup
-      if create_work
-        after_create_response
+      case curation_concern
+      when ActiveFedora::Base
+        original_input_params_for_form = params[hash_key_for_curation_concern].deep_dup
+        actor.create(actor_environment) ? after_create_response : after_create_error(curation_concern.errors, original_input_params_for_form)
       else
-        respond_to do |wants|
-          wants.html do
-            build_form
-            # Creating a form object that can re-render most of the
-            # submitted parameters
-            @form = Hyrax::Forms::FailedSubmissionFormWrapper.new(form: @form, input_params: original_input_params_for_form)
-            render 'new', status: :unprocessable_entity
-          end
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: curation_concern.errors }) }
-        end
+        create_valkyrie_work
       end
     end
 
@@ -101,16 +92,11 @@ module Hyrax
     end
 
     def update
-      if update_work
-        after_update_response
+      case curation_concern
+      when ActiveFedora::Base
+        actor.update(actor_environment) ? after_update_response : after_update_error(curation_concern.errors)
       else
-        respond_to do |wants|
-          wants.html do
-            build_form
-            render 'edit', status: :unprocessable_entity
-          end
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: curation_concern.errors }) }
-        end
+        update_valkyrie_work
       end
     end
 
@@ -176,13 +162,7 @@ module Hyrax
     end
 
     def admin_set_id_for_new
-      # admin_set_id is required on the client, otherwise simple_form renders a blank option.
-      # however it isn't a required field for someone to submit via json.
-      # Set the default admin set if it exists; otherwise, set to first admin_set they have access to.
-      admin_sets = Hyrax::AdminSetService.new(self).search_results(:deposit)
-      return nil if admin_sets.blank? # shouldn't happen
-      return AdminSet::DEFAULT_ID if admin_sets.map(&:id).include?(AdminSet::DEFAULT_ID)
-      admin_sets.first.id
+      Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
     end
 
     def build_form
@@ -195,36 +175,45 @@ module Hyrax
 
     ##
     # @return [#errors]
-    def create_work
-      case curation_concern
-      when ActiveFedora::Base
-        actor.create(actor_environment)
-      else
-        form = build_form
-
-        @curation_concern =
-          form.validate(params[hash_key_for_curation_concern]) &&
-          transactions['change_set.create_work']
-          .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
+    def create_valkyrie_work
+      form = build_form
+      return after_create_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
+
+      result =
+        transactions['change_set.create_work']
+        .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 },
+          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
+        )
+        .call(form)
+      @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
+      after_create_response
     end
 
-    def update_work
-      case curation_concern
-      when ActiveFedora::Base
-        actor.update(actor_environment)
-      else
-        form = build_form
+    def update_valkyrie_work
+      form = build_form
+      return after_update_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
+      result =
+        transactions['change_set.update_work']
+        .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes })
+        .call(form)
+      @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
+      after_update_response
+    end
 
-        @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, file_set_params: params[hash_key_for_curation_concern][:file_set] })
-          .call(form).value!
-      end
+    def work_members_attributes
+      params[hash_key_for_curation_concern][:work_members_attributes]&.permit!&.to_h
+    end
+
+    def form_err_msg(form)
+      form.errors.messages.values.flatten.to_sentence
+    end
+
+    def transaction_err_msg(result)
+      result.failure.first
     end
 
     def presenter
@@ -383,6 +372,26 @@ module Hyrax
       end
     end
 
+    def after_create_error(errors, original_input_params_for_form = nil)
+      respond_to do |wants|
+        wants.html do
+          flash[:error] = errors.to_s
+          rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
+          render 'new', status: :unprocessable_entity
+        end
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+      end
+    end
+
+    # Creating a form object that can re-render most of the submitted parameters.
+    # Required for ActiveFedora::Base objects only.
+    def rebuild_form(original_input_params_for_form)
+      build_form
+      @form = Hyrax::Forms::FailedSubmissionFormWrapper
+              .new(form: @form,
+                   input_params: original_input_params_for_form)
+    end
+
     def after_update_response
       return redirect_to hyrax.confirm_access_permission_path(curation_concern) if permissions_changed? && concern_has_file_sets?
 
@@ -392,6 +401,17 @@ module Hyrax
       end
     end
 
+    def after_update_error(errors)
+      respond_to do |wants|
+        wants.html do
+          flash[:error] = errors.to_s
+          build_form unless @form.is_a? Hyrax::ChangeSet
+          render 'edit', status: :unprocessable_entity
+        end
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+      end
+    end
+
     def after_destroy_response(title)
       respond_to do |wants|
         wants.html { redirect_to hyrax.my_works_path, notice: "Deleted #{title}" }
@@ -432,7 +452,7 @@ module Hyrax
       when ActiveFedora::Common
         curation_concern.file_sets.present?
       else
-        Hyrax.custom_queries.find_child_fileset_ids(resource: curation_concern).any?
+        Hyrax.custom_queries.find_child_file_set_ids(resource: curation_concern).any?
       end
     end
 
@@ -441,12 +461,16 @@ module Hyrax
     end
 
     def available_admin_sets
+      # only returns admin sets in which the user can deposit
       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
+      templates = PermissionTemplate.where(source_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 }
+
+        # determine if sharing tab should be visible
         sharing = can?(:manage, template) || !!template&.active_workflow&.allows_access_grant?
 
         AdminSetSelectionPresenter::OptionsEntry

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

@@ -4,7 +4,8 @@ module Hyrax
     include Hyrax::CollectionsControllerBehavior
 
     before_action :authenticate_user!
-    load_and_authorize_resource
+    load_and_authorize_resource instance_name: :admin_set,
+                                class: Hyrax.config.admin_set_model
 
     # Catch permission errors
     rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_adminset_access
@@ -61,28 +62,52 @@ module Hyrax
     end
 
     def update
-      if @admin_set.update(admin_set_params)
-        redirect_to update_referer, notice: I18n.t('updated_admin_set', scope: 'hyrax.admin.admin_sets.form.permission_update_notices', name: @admin_set.title.first)
+      case @admin_set
+      when Valkyrie::Resource
+        valkyrie_update
       else
-        setup_form
-        render :edit
+        active_fedora_update
       end
     end
 
+    def after_create
+      Hyrax::SolrService.commit
+      redirect_to hyrax.edit_admin_admin_set_path(admin_set_id),
+                  notice: I18n.t('new_admin_set',
+                                 scope: 'hyrax.admin.admin_sets.form.permission_update_notices',
+                                 name: @admin_set.title.first)
+    end
+
+    def after_create_error(err_msg: "")
+      msg = "Failed to create admin set: #{err_msg}"
+      setup_form
+      flash[:error] = msg
+      Hyrax.logger.error(msg)
+      render :new
+    end
+
     def create
-      if create_admin_set
-        redirect_to hyrax.edit_admin_admin_set_path(@admin_set), notice: I18n.t('new_admin_set', scope: 'hyrax.admin.admin_sets.form.permission_update_notices', name: @admin_set.title.first)
+      case @admin_set
+      when Valkyrie::Resource
+        valkyrie_create
       else
-        setup_form
-        render :new
+        active_fedora_create
       end
     end
 
     def destroy
-      if @admin_set.destroy
+      case @admin_set
+      when Valkyrie::Resource
+        transactions['admin_set_resource.destroy'].call(@admin_set).value_or do |failure|
+          redirect_to hyrax.admin_admin_set_path(admin_set_id), alert: failure.first
+        end
         after_delete_success
       else
-        redirect_to hyrax.admin_admin_set_path(@admin_set), alert: @admin_set.errors.full_messages.to_sentence
+        if @admin_set.destroy
+          after_delete_success
+        else
+          redirect_to hyrax.admin_admin_set_path(admin_set_id), alert: @admin_set.errors.full_messages.to_sentence
+        end
       end
     end
 
@@ -98,12 +123,50 @@ module Hyrax
 
     private
 
-    def update_referer
-      hyrax.edit_admin_admin_set_path(@admin_set) + (params[:referer_anchor] || '')
+    def valkyrie_update
+      @admin_set = form.validate(admin_set_params) && transactions['admin_set_resource.update'].call(form).value_or do |_failure|
+        setup_form # probably should do some real error handling here
+        render :edit
+      end
+      redirect_to update_referer, notice: I18n.t('updated_admin_set', scope: 'hyrax.admin.admin_sets.form.permission_update_notices', name: @admin_set.title.first)
+    end
+
+    def active_fedora_update
+      if @admin_set.update(admin_set_params)
+        redirect_to update_referer, notice: I18n.t('updated_admin_set', scope: 'hyrax.admin.admin_sets.form.permission_update_notices', name: @admin_set.title.first)
+      else
+        setup_form
+        render :edit
+      end
     end
 
-    def create_admin_set
-      admin_set_create_service.call(admin_set: @admin_set, creating_user: current_user)
+    def update_referer
+      hyrax.edit_admin_admin_set_path(admin_set_id) + (params[:referer_anchor] || '')
+    end
+
+    def valkyrie_create
+      form.validate(admin_set_params) &&
+        @admin_set = transactions['change_set.create_admin_set']
+                     .with_step_args(
+                       'change_set.set_user_as_creator' => { user: current_user },
+                       'admin_set_resource.apply_collection_type_permissions' => { user: current_user }
+                     )
+                     .call(form).value_or do |_failure|
+                       setup_form # probably should do some real error handling here
+                       render :edit
+                     end
+      @admin_set = admin_set_create_service.call!(admin_set: @admin_set, creating_user: current_user)
+      after_create
+    rescue RuntimeError => err
+      after_create_error(err_msg: err.message)
+    end
+
+    def active_fedora_create
+      updated_admin_set = admin_set_create_service.call!(admin_set: admin_set_resource, creating_user: current_user)
+      @admin_set = Wings::ActiveFedoraConverter.convert(resource: updated_admin_set)
+      after_create
+    rescue RuntimeError => err
+      after_create_error(err_msg: err.message)
     end
 
     def setup_form
@@ -116,7 +179,13 @@ module Hyrax
 
     # initialize the form object
     def form
-      @form ||= form_class.new(@admin_set, current_ability, repository)
+      @form ||=
+        case @admin_set
+        when Valkyrie::Resource
+          Hyrax::Forms::ResourceForm.for(@admin_set)
+        else
+          form_class.new(@admin_set, current_ability, repository)
+        end
     end
 
     def action_breadcrumb
@@ -129,7 +198,11 @@ module Hyrax
     end
 
     def admin_set_params
-      form_class.model_attributes(params[:admin_set])
+      if Hyrax.config.admin_set_class < ActiveFedora::Base
+        form_class.model_attributes(params[:admin_set])
+      else
+        params.permit(admin_set: {})[:admin_set]
+      end
     end
 
     def repository_class
@@ -137,13 +210,26 @@ module Hyrax
     end
 
     def after_delete_success
-      if request.referer.include? "my/collections"
+      if request.referer&.include? "my/collections"
         redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
-      elsif request.referer.include? "collections"
+      elsif request.referer&.include? "collections"
         redirect_to hyrax.dashboard_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
       else
         redirect_to hyrax.my_collections_path, notice: t(:'hyrax.admin.admin_sets.delete.notification')
       end
     end
+
+    def admin_set_id
+      @admin_set&.id&.to_s
+    end
+
+    def admin_set_resource
+      case @admin_set
+      when Valkyrie::Resource
+        @admin_set
+      else
+        @admin_set.valkyrie_resource
+      end
+    end
   end
 end