hyrax 3.4.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b16b002450d8ab2e549a1e79a558df2cdcc5a4f906d5cad461a010de5d3083d
-  data.tar.gz: e31cfe1456a09806f220c3a80582c708ea04707fb927dce8bcd1fa897d738c94
+  metadata.gz: 98e61b637b4f510e877e88c3f2f8020a411b7d83cd0c074e142f666fbda964f1
+  data.tar.gz: 17a8be1a76c9755d5e8b2b1387e907c2d70722809cdb28a62088d913dc584384
 SHA512:
-  metadata.gz: c559a06ad78eb3b2e13ab6f11cc7fd0a5ee94a0da1670b0c67557610cf0d65fde294a6998ce46c634bff1a24ad3a17d6eb4755ec7ddf87e7c339ef7c46a0e717
-  data.tar.gz: d95bd5690258a422be6913a1fb7bed33c225288948c74d6864ec3f7740d4791fd7dcca321b89f81efc33083048965102635281ff5b0de815701125a95c8e24f7
+  metadata.gz: 445d46c5b5b5ee45ea4262e1809e92356f9536f2f919af929b9d33fafcc13c584ae0ff1c6c2b27cac8ffbcdf35f9be6fd9a726b9bf5c9cafc0632fbd8596a90c
+  data.tar.gz: d5d5ca3a839a02af1fec27d262eb8301a5880a07caba29b9ce383b37a7c7aea098e57f3ddf9c3fbc1582f5a9ffa227e7d0fc3702833a645ae86b7ab94745a2f9

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -70,7 +70,7 @@ module Hyrax
       # along side the FileSets on the show page
       def add(env, id)
         collection = Hyrax.config.collection_class.find(id)
-        collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
+        collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
 
         return unless env.current_ability.can?(:deposit, collection)
         env.curation_concern.member_of_collections << collection

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

@@ -12,10 +12,17 @@ module Hyrax
       # Update the visibility of the work to match the correct state of the embargo, then clear the embargo date, etc.
       # Saves the embargo and the work
       def destroy
-        work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
-        work.deactivate_embargo!
-        work.embargo.save!
-        work.save!
+        case work
+        when Valkyrie::Resource
+          embargo_manager = Hyrax::EmbargoManager.new(resource: work)
+          embargo_manager.release && Hyrax::AccessControlList(work).save
+          embargo_manager.nullify
+        else
+          work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
+          work.deactivate_embargo!
+          work.embargo.save!
+          work.save!
+        end
       end
     end
   end

data/app/actors/hyrax/actors/lease_actor.rb

@@ -12,10 +12,17 @@ module Hyrax
       # Update the visibility of the work to match the correct state of the lease, then clear the lease date, etc.
       # Saves the lease and the work
       def destroy
-        work.lease_visibility! # If the lease has lapsed, update the current visibility.
-        work.deactivate_lease!
-        work.lease.save!
-        work.save!
+        case work
+        when Valkyrie::Resource
+          lease_manager = Hyrax::LeaseManager.new(resource: work)
+          lease_manager.release && Hyrax::AccessControlList(work).save
+          lease_manager.nullify
+        else
+          work.lease_visibility! # If the lease has lapsed, update the current visibility.
+          work.deactivate_lease!
+          work.lease.save!
+          work.save!
+        end
       end
     end
   end

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

@@ -104,7 +104,7 @@ Hyrax = {
         // On the edit work page
         new PermissionsControl($("#share"), 'tmpl-work-grant');
         // On the edit fileset page
-        new PermissionsControl($("#permission"), 'tmpl-file-set-grant');
+        new PermissionsControl($("#permission"), 'tmpl-file-set-grant', { with_visibility_component: true });
         // On the batch edit page
         new PermissionsControl($("#form_permissions"), 'tmpl-work-grant');
         // On the edit collection page

data/app/assets/javascripts/hyrax/permissions/control.es6

@@ -1,6 +1,7 @@
 import { Registry } from './registry'
 import { UserControls } from './user_controls'
 import { GroupControls } from './group_controls'
+import VisibilityComponent from '../save_work/visibility_component'
 
 export default class PermissionsControl {
   /**
@@ -8,7 +9,8 @@ export default class PermissionsControl {
    * @param {jQuery} element the jquery selector for the permissions container
    * @param {String} template_id the identifier of the template for the added elements
    */
-  constructor(element, template_id) {
+  constructor(element, template_id, options = {}) {
+    const { with_visibility_component } = options
     if (element.length === 0) {
       return
     }
@@ -17,6 +19,11 @@ export default class PermissionsControl {
     this.registry = new Registry(this.element, this.object_name(), template_id)
     this.user_controls = new UserControls(this.element, this.registry)
     this.group_controls = new GroupControls(this.element, this.registry)
+    if (with_visibility_component) {
+      this.visibility_component = new VisibilityComponent(this.element)
+    } else {
+      this.visibility_component = null
+    }
   }
 
   // retrieve object_name the name of the object to create

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/hyrax/dashboard/collections_controller.rb

@@ -220,7 +220,7 @@ module Hyrax
 
         @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.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
         if @collection.update(collection_params.except(:members))
           after_update_response
         else
@@ -422,7 +422,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
 

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

@@ -10,6 +10,7 @@ module Hyrax
     before_action :authenticate_user!, except: [:show, :citation, :stats]
     load_and_authorize_resource class: ::FileSet, except: :show
     before_action :build_breadcrumbs, only: [:show, :edit, :stats]
+    before_action :presenter
 
     # provides the help_text view method
     helper PermissionsHelper
@@ -191,7 +192,15 @@ 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)
+        @form[:visibility] = file_set.visibility # workaround for hydra-head < 12
+      end
+      @version_list = Hyrax::VersionListPresenter.for(file_set: file_set)
       @groups = current_user.groups
     end
 

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

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/dashboard/nest_collection_form.rb

@@ -109,7 +109,9 @@ module Hyrax
         # 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.
+        # note: the graph indexer does not care about nesting depth
         def nesting_within_maximum_depth
+          return true if Hyrax.config.use_solr_graph_for_collection_nesting
           return true if query_service.valid_combined_nesting_depth?(parent: parent, child: child, scope: context)
           errors.add(:collection, :exceeds_maximum_nesting_depth)
           false

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

data/app/forms/hyrax/forms/resource_form.rb

@@ -11,12 +11,16 @@ module Hyrax
     #     # other WorkForm-like configuration here
     #   end
     #
+    # @note The returned class will extend +Hyrax::Forms::PcdmObjectForm+, not
+    #   only +Hyrax::Forms::ResourceForm+. This is for backwards‐compatibility
+    #   with existing Hyrax instances and satisfies the expected general use
+    #   case (building forms for various PCDM object classes), but is *not*
+    #   necessarily suitable for other kinds of Hyrax resource, like
+    #   +Hyrax::FileSet+s.
     def self.ResourceForm(work_class)
-      Class.new(Hyrax::Forms::ResourceForm) do
+      Class.new(Hyrax::Forms::PcdmObjectForm) do
         self.model_class = work_class
 
-        include Hyrax::FormFields(:core_metadata)
-
         ##
         # @return [String]
         def self.inspect
@@ -29,7 +33,7 @@ module Hyrax
     ##
     # @api public
     #
-    # This form wraps `Hyrax::ChangeSet` in the `HydraEditor::Form` interface.
+    # This form wraps +Hyrax::ChangeSet+ in the +HydraEditor::Form+ interface.
     class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
       ##
       # @api private
@@ -69,10 +73,8 @@ module Hyrax
       property :human_readable_type, writable: false
 
       property :depositor
-      property :on_behalf_of
-      property :proxy_depositor
 
-      property :visibility, default: VisibilityIntention::PRIVATE
+      property :visibility, default: VisibilityIntention::PRIVATE, populator: :visibility_populator
 
       property :date_modified, readable: false
       property :date_uploaded, readable: false
@@ -85,6 +87,9 @@ module Hyrax
                  populator: :permission_populator,
                  prepopulator: ->(_opts) { self.permissions = Hyrax::AccessControl.for(resource: model).permissions })
 
+      property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator
+      property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator
+
       # virtual properties for embargo/lease;
       property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
       property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
@@ -94,17 +99,7 @@ module Hyrax
       property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
       property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
 
-      # pcdm relationships
-      property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
       property :in_works_ids, virtual: true, prepopulator: InWorksPrepopulator
-      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
 
       # provide a lock token for optimistic locking; we name this `version` for
       # backwards compatibility
@@ -116,10 +111,6 @@ module Hyrax
       # @see https://github.com/samvera/valkyrie/wiki/Optimistic-Locking
       property :version, virtual: true, prepopulator: LockKeyPrepopulator
 
-      # 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
-
       class << self
         ##
         # @api public
@@ -140,6 +131,7 @@ module Hyrax
           when Hyrax::PcdmCollection
             Hyrax::Forms::PcdmCollectionForm.new(resource)
           else
+            # NOTE: This will create a +Hyrax::Forms::PcdmObjectForm+.
             Hyrax::Forms::ResourceForm(resource.class).new(resource)
           end
         end
@@ -208,18 +200,12 @@ module Hyrax
 
       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
+      def embargo_populator(**)
+        self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)
+      end
 
-        self.member_of_collection_ids = ((member_of_collection_ids + adds) - deletes).uniq
+      def lease_populator(**)
+        self.lease = Hyrax::LeaseManager.lease_for(resource: model)
       end
 
       # https://trailblazer.to/2.1/docs/reform.html#reform-populators-populator-collections
@@ -227,6 +213,24 @@ module Hyrax
         Hyrax::Forms::Permission.new(collection[index])
       end
 
+      def visibility_populator(fragment:, doc:, **)
+        case fragment
+        when "embargo"
+          self.visibility = doc['visibility_during_embargo']
+
+          doc['embargo'] = doc.slice('visibility_after_embargo',
+                                     'visibility_during_embargo',
+                                     'embargo_release_date')
+        when "lease"
+          self.visibility = doc['visibility_during_lease']
+          doc['lease'] = doc.slice('visibility_after_lease',
+                                     'visibility_during_lease',
+                                     'lease_expiration_date')
+        else
+          self.visibility = fragment
+        end
+      end
+
       def _form_field_definitions
         self.class.definitions
       end

data/app/forms/hyrax/forms/work_embargo_form.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Forms
+    ##
+    # Represents an embargo for edit through a work. That is, this form can
+    # be used to wrap a Work in order to capture state changes related only to
+    # its embargo, ignoring the work's other fields.
+    #
+    # @note this supports the edit functionality of
+    #   +EmbargoesControllerBehavior+.
+    class WorkEmbargoForm < Hyrax::ChangeSet
+      property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
+      property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
+      property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
+      property :visibility_during_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
+
+      def embargo_populator(**)
+        self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)
+      end
+
+      ##
+      # @return [String]
+      def human_readable_type
+        model.to_model.human_readable_type
+      end
+
+      ##
+      # @return [ActiveModel::Name]
+      def model_name
+        model.to_model.model_name
+      end
+    end
+  end
+end