hyrax 5.0.0.rc1 → 5.0.0.rc3

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

@@ -9,36 +9,63 @@ module Hyrax
 
     private
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def send_file_contents_valkyrie(file_set)
       response.headers["Accept-Ranges"] = "bytes"
       self.status = 200
-      use = params.fetch(:file, :original_file).to_sym
-      file_metadata = find_file_metadata(file_set: file_set, use: use)
+      mime_type = params[:mime_type]
+      file_metadata = find_file_metadata(file_set: file_set, use: use, mime_type: mime_type)
       return unless stale?(last_modified: file_metadata.updated_at, template: false)
 
-      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+      file = Valkyrie::StorageAdapter.find_by(id: file_metadata.file_identifier)
       prepare_file_headers_valkyrie(metadata: file_metadata, file: file)
 
       # Warning - using the range header will load the range selection in to memory
       # this can cause memory bloat
       if request.headers['Range']
-        file.rewind
-        send_data send_range_valkyrie(file: file), data_options(file_metadata)
+        if request.head?
+          prepare_range_headers_valkyrie(file: file)
+          head status
+        else
+          send_data send_range_valkyrie(file: file), data_options(file_metadata)
+        end
+      elsif request.head?
+        head status
       else
-        send_file file.disk_path
+        send_file file.disk_path, data_options(file_metadata).except(:status)
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def data_options(file_metadata)
       {
         type: file_metadata.mime_type,
         filename: file_metadata.original_filename,
-        disposition: "inline",
+        disposition: disposition,
         status: status
       }
     end
 
+    def use
+      params.fetch(:file, :original_file).to_sym
+    end
+
+    def disposition
+      if ActiveRecord::Type::Boolean.new.cast(params.fetch(:inline, use != :original_file))
+        'inline'
+      else
+        'attachment'
+      end
+    end
+
     def send_range_valkyrie(file:)
+      from, length = prepare_range_headers_valkyrie(file: file)
+      file.rewind
+      file.read from # Seek to start of requested range
+      file.read length
+    end
+
+    def prepare_range_headers_valkyrie(file:)
       _, range = request.headers['Range'].split('bytes=')
       from, to = range.split('-').map(&:to_i)
       to = file.size - 1 unless to
@@ -46,29 +73,36 @@ module Hyrax
       response.headers['Content-Range'] = "bytes #{from}-#{to}/#{file.size}"
       response.headers['Content-Length'] = length.to_s
       self.status = 206
-      file.read from # Seek to start of requested range
-      file.read length
+      [from, length]
     end
 
-    def prepare_file_headers_valkyrie(metadata:, file:, inline: false)
-      inline_display = ActiveRecord::Type::Boolean.new.cast(params.fetch(:inline, inline))
-      response.headers["Content-Disposition"] = "#{inline_display ? 'inline' : 'attachment'}; filename=#{metadata.original_filename}"
+    # rubocop:disable Metrics/AbcSize
+    def prepare_file_headers_valkyrie(metadata:, file:)
+      response.headers["Content-Disposition"] =
+        ActionDispatch::Http::ContentDisposition.format(disposition: disposition, filename: metadata.original_filename)
       response.headers["Content-Type"] = metadata.mime_type
       response.headers["Content-Length"] ||= (file.try(:size) || metadata.size.first).to_s
+      headers["Content-Transfer-Encoding"] = "binary"
       # Prevent Rack::ETag from calculating a digest over body
       response.headers["Last-Modified"] = metadata.updated_at.utc.strftime("%a, %d %b %Y %T GMT")
       self.content_type = metadata.mime_type
+      response.cache_control[:public] ||= false
     end
+    # rubocop:enable Metrics/AbcSize
 
-    def find_file_metadata(file_set:, use: :original_file)
-      use = :thumbnail_file if use == :thumbnail
-      begin
+    def find_file_metadata(file_set:, use: :original_file, mime_type: nil)
+      if mime_type.nil?
+        use = :thumbnail_file if use == :thumbnail
         use = Hyrax::FileMetadata::Use.uri_for(use: use)
-      rescue ArgumentError
-        raise Hyrax::ObjectNotFoundError
+        results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
+      else
+        files = Hyrax.custom_queries.find_files(file_set: file_set)
+        results = [files.find { |f| f.mime_type == mime_type }]
       end
-      results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
+
       results.first || raise(Hyrax::ObjectNotFoundError)
+    rescue ArgumentError
+      raise(Hyrax::ObjectNotFoundError)
     end
   end
 end

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

@@ -18,9 +18,12 @@ module Hyrax
 
       class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
       class_attribute :iiif_manifest_builder, instance_accessor: false
+      class_attribute :create_valkyrie_work_action
+
       self.show_presenter = Hyrax::WorkShowPresenter
       self.work_form_service = Hyrax::WorkFormService
       self.search_builder_class = WorkSearchBuilder
+      self.create_valkyrie_work_action = Hyrax::Action::CreateValkyrieWork
       self.iiif_manifest_builder = nil
       attr_accessor :curation_concern
       helper_method :curation_concern, :contextual_path
@@ -79,14 +82,11 @@ module Hyrax
         wants.html { presenter && parent_presenter }
         wants.json do
           # load @curation_concern manually because it's skipped for html
-          @curation_concern = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id])
+          @curation_concern = load_curation_concern
           curation_concern # This is here for authorization checks (we could add authorize! but let's use the same method for CanCanCan)
           render :show, status: :ok
         end
         additional_response_formats(wants)
-        wants.ttl { render body: presenter.export_as_ttl, mime_type: Mime[:ttl] }
-        wants.jsonld { render body: presenter.export_as_jsonld, mime_type: Mime[:jsonld] }
-        wants.nt { render body: presenter.export_as_nt, mime_type: Mime[:nt] }
       end
     end
     # rubocop:enable Metrics/AbcSize
@@ -114,9 +114,9 @@ module Hyrax
         Hyrax.config.callback.run(:after_destroy, curation_concern.id, current_user, warn: false)
       else
         transactions['work_resource.destroy']
-          .with_step_args('work_resource.delete' => { user: current_user })
-          .call(curation_concern)
-          .value!
+          .with_step_args('work_resource.delete' => { user: current_user },
+                          'work_resource.delete_all_file_sets' => { user: current_user })
+          .call(curation_concern).value!
 
         title = Array(curation_concern.title).first
       end
@@ -139,13 +139,20 @@ module Hyrax
       json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
 
       respond_to do |wants|
-        wants.json { render json: json }
-        wants.html { render json: json }
+        wants.any { render json: json }
       end
     end
 
     private
 
+    def load_curation_concern
+      if Hyrax.config.disable_wings
+        Hyrax.query_service.find_by(id: params[:id])
+      else
+        Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id])
+      end
+    end
+
     def iiif_manifest_builder
       self.class.iiif_manifest_builder ||
         (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
@@ -183,20 +190,16 @@ module Hyrax
     # rubocop:disable Metrics/MethodLength
     def create_valkyrie_work
       form = build_form
-      # fallback to an empty hash to avoid: # NoMethodError: undefined method `has_key?` for nil:NilClass
-      original_input_params_for_form = params[hash_key_for_curation_concern] ? params[hash_key_for_curation_concern] : {}
-      return after_create_error(form_err_msg(form), original_input_params_for_form) unless form.validate(original_input_params_for_form)
+      action = create_valkyrie_work_action.new(form: form,
+                                               transactions: transactions,
+                                               user: current_user,
+                                               params: params,
+                                               work_attributes_key: hash_key_for_curation_concern)
+
+      return after_create_error(form_err_msg(action.form), action.work_attributes) unless action.validate
+
+      result = action.perform
 
-      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: original_input_params_for_form[: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) },
-          'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] }
-        )
-        .call(form)
       @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
       after_create_response
     end
@@ -224,7 +227,13 @@ module Hyrax
     end
 
     def transaction_err_msg(result)
-      result.failure.first
+      msg = if result.failure[1].respond_to?(:full_messages)
+              "#{result.failure[1].full_messages.to_sentence} [#{result.failure[0]}]"
+            else
+              result.failure[0].to_s
+            end
+      Rails.logger.info("Transaction failed: #{msg}\n  #{result.trace}")
+      msg
     end
 
     def presenter
@@ -427,6 +436,13 @@ module Hyrax
     end
 
     def additional_response_formats(format)
+      respond_to_endnote(format)
+      respond_to_ttl(format)
+      respond_to_jsonld(format)
+      respond_to_nt(format)
+    end
+
+    def respond_to_endnote(format)
       format.endnote do
         send_data(presenter.solr_document.export_as_endnote,
                   type: "application/x-endnote-refer",
@@ -434,6 +450,36 @@ module Hyrax
       end
     end
 
+    def respond_to_ttl(format)
+      format.ttl do
+        if presenter.valkyrie_presenter?
+          render plain: "Error: Not Implemented", status: :not_implemented
+        else
+          render body: presenter.export_as_ttl, mime_type: Mime[:ttl]
+        end
+      end
+    end
+
+    def respond_to_jsonld(format)
+      format.jsonld do
+        if presenter.valkyrie_presenter?
+          render plain: "Error: Not Implemented", status: :not_implemented
+        else
+          render body: presenter.export_as_jsonld, mime_type: Mime[:jsonld]
+        end
+      end
+    end
+
+    def respond_to_nt(format)
+      format.nt do
+        if presenter.valkyrie_presenter?
+          render plain: "Error: Not Implemented", status: :not_implemented
+        else
+          render body: presenter.export_as_nt, mime_type: Mime[:nt]
+        end
+      end
+    end
+
     def save_permissions
       @saved_permissions =
         case curation_concern

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

@@ -99,7 +99,7 @@ module Hyrax
       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
+          return redirect_to hyrax.admin_admin_set_path(admin_set_id), alert: failure.first
         end
         after_delete_success
       else
@@ -182,7 +182,7 @@ module Hyrax
       @form ||=
         case @admin_set
         when Valkyrie::Resource
-          Hyrax::Forms::ResourceForm.for(@admin_set)
+          Hyrax::Forms::ResourceForm.for(resource: @admin_set)
         else
           form_class.new(@admin_set, current_ability, repository)
         end

data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb

@@ -29,7 +29,7 @@ module Hyrax
           @pageviews = Hyrax::Analytics.daily_events_for_id(@document.id, 'work-view')
           @uniques = Hyrax::Analytics.unique_visitors_for_id(@document.id)
           @downloads = Hyrax::Analytics.daily_events_for_id(@document.id, 'file_set_in_work_download')
-          @files = paginate(@document._source["file_set_ids_ssim"], rows: 5)
+          @files = paginate(@document._source["member_ids_ssim"], rows: 5)
           respond_to do |format|
             format.html
             format.csv { export_data }
@@ -41,11 +41,11 @@ module Hyrax
         def accessible_works
           models = Hyrax.config.curation_concerns.map { |m| "\"#{m}\"" }
           if current_user.ability.admin?
-            ActiveFedora::SolrService.query("has_model_ssim:(#{models.join(' OR ')})",
+            Hyrax::SolrService.query("has_model_ssim:(#{models.join(' OR ')})",
               fl: 'title_tesim, id, member_of_collections',
               rows: 50_000)
           else
-            ActiveFedora::SolrService.query(
+            Hyrax::SolrService.query(
               "edit_access_person_ssim:#{current_user} AND has_model_ssim:(#{models.join(' OR ')})",
               fl: 'title_tesim, id, member_of_collections',
               rows: 50_000
@@ -55,13 +55,13 @@ module Hyrax
 
         def accessible_file_sets
           if current_user.ability.admin?
-            ActiveFedora::SolrService.query(
+            Hyrax::SolrService.query(
               "has_model_ssim:FileSet",
               fl: 'title_tesim, id',
               rows: 50_000
             )
           else
-            ActiveFedora::SolrService.query(
+            Hyrax::SolrService.query(
               "edit_access_person_ssim:#{current_user} AND has_model_ssim:FileSet",
               fl: 'title_tesim, id',
               rows: 50_000

data/app/controllers/hyrax/api/items_controller.rb

@@ -33,12 +33,11 @@ module Hyrax
       private
 
       def my_load_and_authorize_resource
-        @work = Hyrax::WorkRelation.new.find(params[:id])
-
+        @work = Hyrax.query_service.find_by(id: params[:id])
         return render plain: "#{user} lacks access to #{@work}", status: :unauthorized unless user.can? :edit, @work
 
         return render plain: "Forbidden: #{@work} not deposited via Arkivo", status: :forbidden if @work.arkivo_checksum.nil?
-      rescue ActiveFedora::ObjectNotFoundError
+      rescue ActiveFedora::ObjectNotFoundError, Valkyrie::Persistence::ObjectNotFoundError
         render plain: "id '#{params[:id]}' not found", status: :not_found
       end
 

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -41,9 +41,9 @@ module Hyrax
       batch.each do |doc_id|
         resource = Hyrax.query_service.find_by(id: Valkyrie::ID.new(doc_id))
         transactions['collection_resource.destroy']
-          .with_step_args('collection_resource.delete' => { user: current_user })
-          .call(resource)
-          .value!
+          .with_step_args('collection_resource.delete' => { user: current_user },
+                          'collection_resource.remove_from_membership' => { user: current_user })
+          .call(resource).value!
       end
       flash[:notice] = "Batch delete complete"
       after_destroy_collection
@@ -108,9 +108,9 @@ module Hyrax
       batch.each do |id|
         resource = Hyrax.query_service.find_by(id: Valkyrie::ID.new(id))
         transactions['work_resource.destroy']
-          .with_step_args('work_resource.delete' => { user: current_user })
-          .call(resource)
-          .value!
+          .with_step_args('work_resource.delete' => { user: current_user },
+                          'work_resource.delete_all_file_sets' => { user: current_user })
+          .call(resource).value!
       end
       after_update
     end

data/app/controllers/hyrax/batch_uploads_controller.rb

@@ -5,7 +5,11 @@ module Hyrax
     include Hyrax::WorksControllerBehavior
 
     # Gives the class of the form.
-    class BatchUploadFormService < Hyrax::WorkFormService
+    class BatchUploadFormService
+      def self.build(resource, current_ability, *extra)
+        form_class.new(resource, current_ability, *extra)
+      end
+
       def self.form_class(_ = nil)
         ::Hyrax::Forms::BatchUploadForm
       end

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

@@ -80,7 +80,6 @@ module Hyrax
 
       def edit
         form
-        collection_type
       end
 
       def after_create
@@ -245,7 +244,10 @@ module Hyrax
       end
 
       def valkyrie_destroy
-        if transactions['collection_resource.destroy'].call(@collection).success?
+        if transactions['collection_resource.destroy']
+           .with_step_args('collection_resource.delete' => { user: current_user },
+                           'collection_resource.remove_from_membership' => { user: current_user })
+           .call(@collection).success?
           after_destroy(params[:id])
         else
           after_destroy_error(params[:id])
@@ -271,6 +273,7 @@ module Hyrax
       def collection_type
         @collection_type ||= CollectionType.find_by_gid!(collection.collection_type_gid)
       end
+      helper_method :collection_type
 
       def link_parent_collection(parent_id)
         child = collection.respond_to?(:valkyrie_resource) ? collection.valkyrie_resource : collection
@@ -509,7 +512,7 @@ module Hyrax
         @form ||=
           case @collection
           when Valkyrie::Resource
-            form = Hyrax::Forms::ResourceForm.for(@collection)
+            form = Hyrax::Forms::ResourceForm.for(resource: @collection)
             form.prepopulate!
             form
           else

data/app/controllers/hyrax/downloads_controller.rb

@@ -2,6 +2,7 @@
 module Hyrax
   class DownloadsController < ApplicationController
     include Hydra::Controller::DownloadBehavior
+    include Hyrax::StreamFileDownloadsControllerBehavior
     include Hyrax::LocalFileDownloadsControllerBehavior
     include Hyrax::ValkyrieDownloadsControllerBehavior
     include Hyrax::WorkflowsHelper # Provides #workflow_restriction?

data/app/controllers/hyrax/file_sets_controller.rb

@@ -113,20 +113,31 @@ module Hyrax
     def update_metadata
       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 }
+        valkyrie_update_metadata
       else
         file_attributes = form_class.model_attributes(attributes)
         actor.update_metadata(file_attributes)
       end
     end
 
+    def valkyrie_update_metadata
+      change_set = Hyrax::Forms::ResourceForm.for(resource: file_set)
+
+      result =
+        change_set.validate(attributes) &&
+        transactions['change_set.update_file_set']
+        .with_step_args(
+          'file_set.save_acl' => { permissions_params: change_set.input_params["permissions"] }
+        )
+        .call(change_set).value_or { false }
+      @file_set = result if result
+    end
+
     def parent(file_set: curation_concern)
       @parent ||=
         case file_set
-        when Hyrax::Resource
+        when Hyrax::FileSet
+          # TODO: Add Hyrax::FileSet#parent method
           Hyrax.query_service.find_parents(resource: file_set).first
         else
           file_set.parent
@@ -134,6 +145,7 @@ module Hyrax
     end
 
     def attempt_update
+      return attempt_update_valkyrie if ::FileSet < Hyrax::Resource
       if wants_to_revert?
         actor.revert_content(params[:revision])
       elsif params.key?(:file_set)
@@ -149,9 +161,33 @@ module Hyrax
       end
     end
 
+    def attempt_update_valkyrie
+      return revert_valkyrie if wants_to_revert_valkyrie?
+      if params.key?(:file_set)
+        if params[:file_set].key?(:files)
+          ValkyrieIngestJob.perform_later(uploaded_file_from_path)
+        else
+          update_metadata
+        end
+      elsif params.key?(:files_files) # version file already uploaded with ref id in :files_files array
+        uploaded_files = Array(Hyrax::UploadedFile.find(params[:files_files]))
+        uploaded_files.first.file_set_uri = file_set.id.to_s
+        uploaded_files.first.save
+        ValkyrieIngestJob.perform_later(uploaded_files.first)
+        update_metadata
+      end
+    end
+
+    def revert_valkyrie
+      Hyrax::VersioningService.create(file_metadata, current_user, Hyrax.storage_adapter.find_by(id: params[:revision]))
+      # update_metadata
+      Hyrax.publisher.publish("file.uploaded", metadata: file_set.original_file)
+      true
+    end
+
     def uploaded_file_from_path
       uploaded_file = CarrierWave::SanitizedFile.new(params[:file_set][:files].first)
-      Hyrax::UploadedFile.create(user_id: current_user.id, file: uploaded_file)
+      Hyrax::UploadedFile.create(user_id: current_user.id, file: uploaded_file, file_set_uri: @file_set.id.to_s)
     end
 
     def after_update_response
@@ -198,7 +234,7 @@ module Hyrax
 
       case file_set
       when Hyrax::Resource
-        @form = Hyrax::Forms::ResourceForm.for(file_set)
+        @form = Hyrax::Forms::ResourceForm.for(resource: file_set)
         @form.prepopulate!
       else
         @form = form_class.new(file_set)
@@ -251,6 +287,14 @@ module Hyrax
       params.key?(:revision) && params[:revision] != curation_concern.latest_content_version.label
     end
 
+    def wants_to_revert_valkyrie?
+      params.key?(:revision) && params[:revision] != Hyrax::VersioningService.new(resource: file_metadata).latest_version.version_id.to_s
+    end
+
+    def file_metadata
+      @file_metadata ||= Hyrax.query_service.custom_queries.find_file_metadata_by(id: curation_concern.original_file_id)
+    end
+
     # Override this method to add additional response formats to your local app
     def additional_response_formats(_); end
 

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

@@ -12,7 +12,7 @@ module Hyrax
           config.add_facet_field Hyrax.config.collection_type_index_field,
                                  helper_method: :collection_type_label, limit: 5,
                                  pivot: ['has_model_ssim', Hyrax.config.collection_type_index_field],
-                                 skip_item: ->(item) { item.value == "Collection" },
+                                 skip_item: ->(item) { Hyrax::ModelRegistry.collection_rdf_representations.include?(item.value) },
                                  label: I18n.t('hyrax.dashboard.my.heading.collection_type')
           # This causes AdminSets to also be shown with the Collection Type label
           config.add_facet_field 'has_model_ssim',
@@ -37,6 +37,8 @@ module Hyrax
         hyrax.my_collections_url(*args)
       end
 
+      # @api public
+      #
       # The url of the "more" link for additional facet values
       def search_facet_path(args = {})
         hyrax.my_dashboard_collections_facet_path(args[:id])

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -37,6 +37,14 @@ module Hyrax
 
     private
 
+    def send_content
+      if @asset.is_a?(Hyrax::FileSet)
+        send_file_contents_valkyrie(@asset)
+      else
+        super
+      end
+    end
+
     def curation_concern
       response, _document_list = search_service.search_results
       response.documents.first
@@ -52,6 +60,12 @@ module Hyrax
       end
     end
 
+    def data_options(file_metadata)
+      super.tap do |options|
+        options[:disposition] = 'attachment' if action_name == 'download'
+      end
+    end
+
     # This is called in a before filter. It causes @asset to be set.
     def authorize_download!
       authorize! :read, asset
@@ -66,7 +80,7 @@ module Hyrax
     end
 
     def asset
-      @asset ||= Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: single_use_link.item_id, use_valkyrie: false)
+      @asset ||= Hyrax.query_service.find_by(id: single_use_link.item_id)
     end
 
     def current_ability
@@ -94,7 +108,7 @@ module Hyrax
         return unless single_use_link
 
         @single_use_link = single_use_link
-        can :read, [ActiveFedora::Base, ::SolrDocument] do |obj|
+        can :read, [ActiveFedora::Base, ::SolrDocument, Hyrax::Resource] do |obj|
           single_use_link.valid? && single_use_link.item_id == obj.id && single_use_link.destroy!
         end
       end

data/app/forms/concerns/hyrax/basic_metadata_form_fields_behavior.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+module Hyrax
+  module BasicMetadataFormFieldsBehavior
+    # Provides compatibility with the behavior of the based_near (location) controlled vocabulary form field.
+    # The form expects a ControlledVocabularies::Location object as input and produces a hash like those
+    # used with accepts_nested_attributes_for.
+    def self.included(descendant)
+      descendant.property :based_near_attributes, virtual: true, populator: :based_near_populator, prepopulator: :based_near_prepopulator
+    end
+
+    private
+
+    def based_near_populator(fragment:, **_options)
+      adds = []
+      deletes = []
+      fragment.each do |_, h|
+        uri = RDF::URI.parse(h["id"]).to_s
+        if h["_destroy"] == "true"
+          deletes << uri
+        else
+          adds << uri
+        end
+      end
+      self.based_near = ((model.based_near + adds) - deletes).uniq
+    end
+
+    def based_near_prepopulator
+      self.based_near = based_near.map do |loc|
+        uri = RDF::URI.parse(loc)
+        if uri
+          Hyrax::ControlledVocabularies::Location.new(uri)
+        else
+          loc
+        end
+      end
+      based_near << Hyrax::ControlledVocabularies::Location.new if based_near.empty?
+    end
+  end
+end

data/app/forms/concerns/hyrax/contained_in_works_behavior.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # A module of form behaviours for resources which can be contained in works.
+  module ContainedInWorksBehavior
+    ##
+    # @api private
+    InWorksPrepopulator = proc do |_options|
+      self.in_works_ids =
+        if persisted?
+          Hyrax.query_service
+               .find_inverse_references_by(resource: model, property: :member_ids)
+               .select(&:work?)
+               .map(&:id)
+        else
+          []
+        end
+    end
+
+    def self.included(descendant)
+      descendant.property :in_works_ids, virtual: true, prepopulator: InWorksPrepopulator
+    end
+  end
+end