hyrax 4.0.0.beta1 → 4.0.0.rc1

data/app/components/hyrax/dropdown_facet_field_component.html.erb

@@ -0,0 +1,21 @@
+<fieldset class="btn-group">
+  <legend class="sr-only"><%= @facet_field.label %></legend>
+  <button class="btn btn-secondary dropdown-toggle" type="button" id="<%= @facet_field.key.parameterize %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" aria-controls="<%= @facet_field.key.parameterize + '-dropdown-options' %>">
+    <%= @facet_field.label %>
+  </button>
+  <ul class="dropdown-menu" id="<%= @facet_field.key.parameterize + '-dropdown-options' %>">
+    <% facet_item_presenters.each do |item| -%>
+      <li class="dropdown-item">
+        <%= render Blacklight::FacetItemComponent.new(facet_item: item, wrapping_element: nil) %>
+      </li>
+    <% end %>
+
+    <% if @facet_field.modal_path %>
+      <li class="dropdown-item more_facets">
+        <%= link_to t("more_#{@facet_field.key}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: @facet_field.label),
+          @facet_field.modal_path,
+          data: { blacklight_modal: 'trigger' } %>
+      </li>
+    <% end %>
+  </ul>
+</fieldset>

data/app/components/hyrax/dropdown_facet_field_component.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Hyrax
+  class DropdownFacetFieldComponent < Blacklight::FacetFieldListComponent
+    def facet_item_presenters
+      return to_enum(:facet_item_presenters) unless block_given?
+
+      @facet_field.paginator.items.each do |item|
+        skipped = facet_config.skip_item&.call(item)
+
+        yield facet_item_presenter(item) unless skipped
+
+        item.items&.each do |subitem|
+          yield facet_item_presenter(subitem.dup.tap { |i| i.fq = nil if skipped })
+        end
+      end
+    end
+
+    def facet_item_presenter(facet_item)
+      config = facet_config(facet_item.field)
+
+      (config.item_presenter || Blacklight::FacetItemPresenter).new(facet_item, config, helpers, facet_item.field)
+    end
+
+    def facet_config(key = nil)
+      return @facet_field.facet_field if key.nil?
+
+      helpers.blacklight_config.facet_fields[key]
+    end
+  end
+end

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

@@ -66,13 +66,6 @@ module Hyrax
       Hyrax::SearchService.new(config: blacklight_config, user_params: params.except(:q, :page), scope: self, search_builder_class: single_item_search_builder_class)
     end
 
-    # Instantiates the search builder that builds a query for a single item
-    # this is useful in the show view.
-    def single_item_search_builder
-      search_service.search_builder
-    end
-    deprecation_deprecate :single_item_search_builder
-
     def collection_params
       form_class.model_attributes(params[:collection])
     end
@@ -83,11 +76,15 @@ module Hyrax
       @_prefixes ||= super + ['catalog', 'hyrax/base']
     end
 
+    # rubocop:disable Style/GuardClause
     def query_collection_members
       load_member_works
-      load_member_subcollections if collection.collection_type.nestable?
-      load_parent_collections if collection.collection_type.nestable? && action_name == 'show'
+      if Hyrax::CollectionType.for(collection: collection).nestable?
+        load_member_subcollections
+        load_parent_collections if action_name == 'show'
+      end
     end
+    # rubocop:enable Style/GuardClause
 
     # Instantiate the membership query service
     def collection_member_service

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

@@ -32,28 +32,6 @@ module Hyrax::Controller
     super.merge(locale: I18n.locale)
   end
 
-  ##
-  # @deprecated provides short-term compatibility with Blacklight 6
-  # @return [Class<Blacklight::SearchBuilder>]
-  def search_builder_class
-    return super if defined?(super)
-    Deprecation.warn("Avoid direct calls to `#search_builder_class`; this" \
-                     " method provides short-term compatibility to" \
-                     " Blacklight 6 clients.")
-    blacklight_config.search_builder_class
-  end
-
-  ##
-  # @deprecated provides short-term compatibility with Blacklight 6
-  # @return [Blacklight::AbstractRepository]
-  def repository
-    return super if defined?(super)
-    Deprecation.warn("Avoid direct calls to `#repository`; this method" \
-                     " provides short-term compatibility to Blacklight 6 " \
-                     " clients.")
-    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)
@@ -69,7 +47,7 @@ module Hyrax::Controller
     search_service_class.new(config: blacklight_config,
                              scope: self,
                              user_params: search_params,
-                             search_builder_class: search_builder_class)
+                             search_builder_class: blacklight_config.search_builder_class)
   end
 
   private

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

@@ -15,8 +15,8 @@ module Hyrax
     # Removes a single embargo
     def destroy
       Hyrax::Actors::EmbargoActor.new(curation_concern).destroy
-      flash[:notice] = curation_concern.embargo_history.last
-      if curation_concern.work? && curation_concern.file_sets.present?
+      flash[:notice] = embargo_history(curation_concern)
+      if curation_concern.work? && work_has_file_set_members?(curation_concern)
         redirect_to confirm_permission_path
       else
         redirect_to edit_embargo_path
@@ -60,10 +60,19 @@ module Hyrax
     end
 
     def edit
+      @curation_concern = Hyrax::Forms::WorkEmbargoForm.new(curation_concern).prepopulate! if
+        Hyrax.config.use_valkyrie?
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.embargoes.index.manage_embargoes'), hyrax.embargoes_path
       add_breadcrumb t(:'hyrax.embargoes.edit.embargo_update'), '#'
     end
+
+    private
+
+    def embargo_history(concern)
+      concern.try(:embargo_history) ||
+        concern.try(:embargo)&.embargo_history
+    end
   end
 end

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

@@ -15,8 +15,8 @@ module Hyrax
     # Removes a single lease
     def destroy
       Hyrax::Actors::LeaseActor.new(curation_concern).destroy
-      flash[:notice] = curation_concern.lease_history.last
-      if curation_concern.work? && curation_concern.file_sets.present?
+      flash[:notice] = lease_history(curation_concern)&.last
+      if curation_concern.work? && work_has_file_set_members?(curation_concern)
         redirect_to confirm_permission_path
       else
         redirect_to edit_lease_path
@@ -51,10 +51,19 @@ module Hyrax
     end
 
     def edit
+      @curation_concern = Hyrax::Forms::WorkLeaseForm.new(curation_concern).prepopulate! if
+        Hyrax.config.use_valkyrie?
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.leases.index.manage_leases'), hyrax.leases_path
       add_breadcrumb t(:'hyrax.leases.edit.lease_update'), '#'
     end
+
+    private
+
+    def lease_history(concern)
+      concern.try(:lease_history) ||
+        concern.try(:lease)&.lease_history
+    end
   end
 end

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

@@ -6,7 +6,8 @@ module Hyrax
     included do
       attr_accessor :curation_concern
       helper_method :curation_concern
-      load_and_authorize_resource class: ActiveFedora::Base, instance_name: :curation_concern
+      base_class = Hyrax.config.use_valkyrie? ? Hyrax::Resource : ActiveFedora::Base
+      load_and_authorize_resource class: base_class, instance_name: :curation_concern, except: [:index]
     end
 
     # This is an override of Hyrax::ApplicationController
@@ -15,5 +16,16 @@ module Hyrax
     end
 
     def edit; end
+
+    private
+
+    def work_has_file_set_members?(work)
+      case work
+      when Valkyrie::Resource
+        Hyrax.custom_queries.find_child_file_set_ids(resource: work).any?
+      else
+        work.file_sets.present?
+      end
+    end
   end
 end

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

@@ -13,6 +13,7 @@ module Hyrax
 
       before_action do
         blacklight_config.track_search_session = false
+        blacklight_config.search_builder_class = search_builder_class
       end
 
       class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
@@ -189,7 +190,8 @@ module Hyrax
           '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) }
+          '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)) }
@@ -202,7 +204,8 @@ module Hyrax
       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 })
+                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes },
+                        'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] })
         .call(form)
       @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
       after_update_response

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

@@ -30,7 +30,6 @@ module Hyrax
         after_update_error(err_msg) if err_msg.present?
         return if err_msg.present?
 
-        @collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
         begin
           Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: collection_id,
                                                                          new_member_ids: batch_ids,

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

@@ -165,7 +165,7 @@ module Hyrax
           end
         end
       rescue StandardError => err
-        Rails.logger.error(err)
+        Hyrax.logger.error(err)
         after_destroy_error(params[:id])
       end
 
@@ -190,7 +190,7 @@ module Hyrax
         @collection.collection_type_gid = params[:collection_type_gid].presence || default_collection_type.to_global_id
         @collection.attributes = collection_params.except(:members, :parent_id, :collection_type_gid)
         @collection.apply_depositor_metadata(current_user.user_key)
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless Hyrax::CollectionType.for(collection: @collection).discoverable?
         if @collection.save
           after_create_response
         else
@@ -218,9 +218,7 @@ module Hyrax
         process_member_changes
         process_branding
 
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
-        # we don't have to reindex the full graph when updating collection
-        @collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
+        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless Hyrax::CollectionType.for(collection: @collection).discoverable?
         if @collection.update(collection_params.except(:members))
           after_update_response
         else
@@ -422,7 +420,6 @@ module Hyrax
           params.permit(collection: {})[:collection]
                 .merge(params.permit(:collection_type_gid)
                              .with_defaults(collection_type_gid: default_collection_type_gid))
-                .merge(member_of_collection_ids: Array(params[:parent_id]))
         end
       end
 
@@ -485,7 +482,7 @@ module Hyrax
           params[:destination_collection_id]
         flash[:notice] = "Successfully moved #{batch.count} files to #{destination_title} Collection."
       rescue StandardError => err
-        Rails.logger.error(err)
+        Hyrax.logger.error(err)
         destination_title =
           Hyrax.query_service.find_by(id: params[:destination_collection_id]).title.first ||
           destination_id
@@ -516,7 +513,7 @@ module Hyrax
             form.prepopulate!
             form
           else
-            form_class.new(@collection, current_ability, repository)
+            form_class.new(@collection, current_ability, blacklight_config.repository)
           end
       end
 

data/app/controllers/hyrax/downloads_controller.rb

@@ -3,6 +3,7 @@ module Hyrax
   class DownloadsController < ApplicationController
     include Hydra::Controller::DownloadBehavior
     include Hyrax::LocalFileDownloadsControllerBehavior
+    include Hyrax::WorkflowsHelper # Provides #workflow_restriction?
 
     def self.default_content_path
       :original_file
@@ -37,12 +38,26 @@ module Hyrax
       { type: mime_type_for(file), disposition: 'inline' }
     end
 
+    def file_set_parent(file_set_id)
+      file_set = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: file_set_id, use_valkyrie: Hyrax.config.use_valkyrie?)
+      @parent ||=
+        case file_set
+        when Hyrax::Resource
+          Hyrax.query_service.find_parents(resource: file_set).first
+        else
+          file_set.parent
+        end
+    end
+
     # Customize the :read ability in your Ability class, or override this method.
     # Hydra::Ability#download_permissions can't be used in this case because it assumes
     # that files are in a LDP basic container, and thus, included in the asset's uri.
     def authorize_download!
       authorize! :download, params[asset_param_key]
-    rescue CanCan::AccessDenied
+      # Deny access if the work containing this file is restricted by a workflow
+      return unless workflow_restriction?(file_set_parent(params[asset_param_key]), ability: current_ability)
+      raise Hyrax::WorkflowAuthorizationException
+    rescue CanCan::AccessDenied, Hyrax::WorkflowAuthorizationException
       unauthorized_image = Rails.root.join("app", "assets", "images", "unauthorized.png")
       send_file unauthorized_image, status: :unauthorized
     end

data/app/controllers/hyrax/file_sets_controller.rb

@@ -13,6 +13,7 @@ module Hyrax
     before_action do
       blacklight_config.track_search_session = false
     end
+    before_action :presenter
 
     # provides the help_text view method
     helper PermissionsHelper
@@ -194,7 +195,14 @@ module Hyrax
     def initialize_edit_form
       guard_for_workflow_restriction_on!(parent: parent)
 
-      @version_list = Hyrax::VersionListPresenter.for(file_set: @file_set)
+      case file_set
+      when Hyrax::Resource
+        @form = Hyrax::Forms::ResourceForm.for(file_set)
+        @form.prepopulate!
+      else
+        @form = form_class.new(file_set)
+      end
+      @version_list = Hyrax::VersionListPresenter.for(file_set: file_set)
       @groups = current_user.groups
     end
 
@@ -235,7 +243,7 @@ module Hyrax
     end
 
     def single_item_search_service
-      Hyrax::SearchService.new(config: blacklight_config, user_params: params.except(:q, :page), scope: self, search_builder_class: search_builder_class)
+      Hyrax::SearchService.new(config: blacklight_config, user_params: params.except(:q, :page), scope: self, search_builder_class: blacklight_config.search_builder_class)
     end
 
     def wants_to_revert?

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

@@ -12,6 +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" },
                                  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',

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

@@ -7,7 +7,7 @@ module Hyrax
         configure_blacklight do |config|
           config.search_builder_class = Hyrax::My::WorksSearchBuilder
           config.add_facet_field "admin_set_sim", limit: 5
-          config.add_facet_field "member_of_collections_ssim", limit: 5
+          config.add_facet_field "member_of_collections_ssim", limit: 1
         end
       end
       configure_facets
@@ -30,7 +30,9 @@ module Hyrax
       private
 
       def collections_service
-        Hyrax::CollectionsService.new(self)
+        cloned = clone
+        cloned.params = {}
+        Hyrax::CollectionsService.new(cloned)
       end
 
       def search_action_url(*args)

data/app/controllers/hyrax/permissions_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Hyrax
   class PermissionsController < ApplicationController
-    load_resource class: ActiveFedora::Base, instance_name: :curation_concern
+    load_resource class: Hyrax::Resource, instance_name: :curation_concern
 
     attr_reader :curation_concern
     helper_method :curation_concern

data/app/controllers/hyrax/transfers_controller.rb

@@ -23,7 +23,6 @@ module Hyrax
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.transfers.new.header'), hyrax.new_work_transfer_path
-      @work = Hyrax::WorkRelation.new.find(params[:id])
     end
 
     def create
@@ -31,7 +30,6 @@ module Hyrax
       if @proxy_deposit_request.save
         redirect_to hyrax.transfers_path, notice: "Transfer request created"
       else
-        @work = Hyrax::WorkRelation.new.find(params[:id])
         render :new
       end
     end
@@ -47,7 +45,10 @@ module Hyrax
     # any existing edit permissions on the work.
     def accept
       @proxy_deposit_request.transfer!(params[:reset])
-      current_user.can_receive_deposits_from << @proxy_deposit_request.sending_user if params[:sticky]
+      if params[:sticky]
+        current_user.can_receive_deposits_from << @proxy_deposit_request.sending_user unless
+                current_user.can_receive_deposits_from.include? @proxy_deposit_request.sending_user
+      end
       redirect_to hyrax.transfers_path, notice: "Transfer complete"
     end
 

data/app/controllers/hyrax/workflow_actions_controller.rb

@@ -9,7 +9,8 @@ module Hyrax
     #   @return [Hyrax::Resource]
     attr_reader :curation_concern
 
-    load_resource class: Hyrax::Resource, instance_name: :curation_concern
+    resource_klass = Hyrax.config.use_valkyrie? ? Hyrax::Resource : ActiveFedora::Base
+    load_resource class: resource_klass, instance_name: :curation_concern
     before_action :authenticate_user!
 
     def update
@@ -39,7 +40,7 @@ module Hyrax
 
     def after_update_response
       respond_to do |wants|
-        wants.html { redirect_to [main_app, curation_concern], notice: "The #{curation_concern.human_readable_type} has been updated." }
+        wants.html { redirect_to [main_app, curation_concern], notice: "The #{curation_concern.class.human_readable_type} has been updated." }
         wants.json { render 'hyrax/base/show', status: :ok, location: polymorphic_path([main_app, curation_concern]) }
       end
     end

data/app/forms/hyrax/forms/batch_upload_form.rb

@@ -30,7 +30,7 @@ module Hyrax
       # Override of ActiveModel::Model name that allows us to use our custom name class
       def self.model_name
         @_model_name ||= begin
-          namespace = parents.detect do |n|
+          namespace = module_parents.detect do |n|
             n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
           end
           Name.new(model_class, namespace)

data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb

@@ -38,7 +38,6 @@ module Hyrax
         validates :parent, presence: true
         validates :child, presence: true
         validate :parent_and_child_can_be_nested
-        validate :nesting_within_maximum_depth
 
         def save
           return false unless valid?
@@ -83,12 +82,11 @@ module Hyrax
         # rerouting to new_dashboard_collection_path to add the new collection as
         # a child. Since we don't yet have a child collection, the valid? option can't be used here.
         def validate_add
-          if nestable?(parent)
-            nesting_within_maximum_depth
-          else
+          unless nestable?(parent)
             errors.add(:parent, :cannot_have_child_nested)
-            false
+            return false
           end
+          true
         end
 
         def remove
@@ -104,17 +102,6 @@ module Hyrax
 
         attr_accessor :query_service, :persistence_service, :context, :collection
 
-        # ideally we would love to be able to eliminate collections which exceed the
-        # maximum nesting depth from the lists of available collections, but the queries
-        # needed to make the determination are too expensive to do for every possible
-        # collection, so we only test for this situation prior to saving the new
-        # relationship.
-        def nesting_within_maximum_depth
-          return true if query_service.valid_combined_nesting_depth?(parent: parent, child: child, scope: context)
-          errors.add(:collection, :exceeds_maximum_nesting_depth)
-          false
-        end
-
         def parent_and_child_can_be_nested
           if nestable?(parent) && nestable?(child)
             return true if query_service.parent_and_child_can_nest?(parent: parent, child: child, scope: context)
@@ -137,8 +124,7 @@ module Hyrax
         def nestable?(collection)
           return false if collection.blank?
           return collection.nestable? if collection.respond_to? :nestable?
-          collection_type = Hyrax::CollectionType.find_by_gid!(collection.collection_type_gid)
-          collection_type.nestable?
+          Hyrax::CollectionType.for(collection: collection).nestable?
         end
       end
     end

data/app/forms/hyrax/forms/embargo.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module Hyrax
+  module Forms
+    ##
+    # Nested form for embargos.
+    class Embargo < Hyrax::ChangeSet
+      property :visibility_after_embargo
+      property :visibility_during_embargo
+      property :embargo_release_date
+      property :embargo_history, default: []
+    end
+  end
+end

data/app/forms/hyrax/forms/file_set_edit_form.rb

@@ -4,7 +4,7 @@ module Hyrax::Forms
     include HydraEditor::Form
     include HydraEditor::Form::Permissions
 
-    delegate :depositor, :permissions, to: :model
+    delegate :depositor, :permissions, :human_readable_type, to: :model
 
     self.required_fields = [:title, :creator, :license]
 

data/app/forms/hyrax/forms/file_set_form.rb

@@ -3,44 +3,17 @@
 module Hyrax
   module Forms
     ##
-    # @api public
-    class FileSetForm < Hyrax::ChangeSet
+    # A form for +Hyrax::FileSet+s.
+    class FileSetForm < Hyrax::Forms::ResourceForm
       include Hyrax::FormFields(:core_metadata)
 
-      class << self
-        ##
-        # @return [Array<Symbol>] list of required field names as symbols
-        def required_fields
-          definitions
-            .select { |_, definition| definition[:required] }
-            .keys.map(&:to_sym)
-        end
-      end
+      # The fields in +:file_set_metadata+ were hardcoded into this form in a
+      # previous version of Hyrax, but ideally in the future this metadata will
+      # be configurable.
+      include Hyrax::FormFields(:file_set_metadata)
 
-      property :creator, required: true
-      property :license, required: true
-
-      property :based_near
-      property :contributor
-      property :date_created
-      property :description
-      property :identifier
-      property :keyword
-      property :language
-      property :publisher
-      property :related_url
-      property :subject
-
-      property :permissions, virtual: true
-      property :visibility, default: VisibilityIntention::PRIVATE
-
-      # virtual properties for embargo/lease;
-      property :embargo_release_date, virtual: true
-      property :visibility_after_embargo, virtual: true
-      property :visibility_during_embargo, virtual: true
-      property :lease_expiration_date, virtual: true
-      property :visibility_after_lease, virtual: true
-      property :visibility_during_lease, virtual: true
+      property :representative_id, type: Valkyrie::Types::String
+      property :thumbnail_id, type: Valkyrie::Types::String
     end
   end
 end

data/app/forms/hyrax/forms/lease.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module Hyrax
+  module Forms
+    ##
+    # Nested form for leases.
+    class Lease < Hyrax::ChangeSet
+      property :visibility_after_lease
+      property :visibility_during_lease
+      property :lease_expiration_date
+      property :lease_history, default: []
+    end
+  end
+end

data/app/forms/hyrax/forms/pcdm_object_form.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Forms
+    ##
+    # A form for PCDM objects: resources which have collection relationships and
+    # generally resemble +Hyrax::Work+.
+    class PcdmObjectForm < Hyrax::Forms::ResourceForm
+      include Hyrax::FormFields(:core_metadata)
+
+      property :on_behalf_of
+      property :proxy_depositor
+
+      # pcdm relationships
+      property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
+      property :member_ids, default: [], type: Valkyrie::Types::Array
+      property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
+      property :member_of_collections_attributes, virtual: true, populator: :in_collections_populator
+      validates_with CollectionMembershipValidator
+
+      property :representative_id, type: Valkyrie::Types::String
+      property :thumbnail_id, type: Valkyrie::Types::String
+      property :rendering_ids, default: [], type: Valkyrie::Types::Array
+
+      # backs the child work search element;
+      # @todo: look for a way for the view template not to depend on this
+      property :find_child_work, default: nil, virtual: true
+
+      private
+
+      def in_collections_populator(fragment:, **_options)
+        adds = []
+        deletes = []
+        fragment.each do |_, h|
+          if h["_destroy"] == "true"
+            deletes << Valkyrie::ID.new(h["id"])
+          else
+            adds << Valkyrie::ID.new(h["id"])
+          end
+        end
+
+        self.member_of_collection_ids = ((member_of_collection_ids + adds) - deletes).uniq
+      end
+    end
+  end
+end