hyrax 4.0.0.beta2 → 4.0.0.rc2

data/CONTAINERS.md

@@ -5,13 +5,13 @@ Our goal is to provide a practical, reusable reference environment for applicati
 
 The [Hyrax Engine Development](#hyrax-engine-development) is further along than the [Docker Image for Hyrax-based Applications](#docker-image-for-hyrax-based-applications) which is further along than [Deploying to Production](#deploying-to-production).
 
-There are two options for development environments to run: 
+There are two options for development environments to run:
 
 - [Dassie](#dassie-internal-test-app-with-activefedora) is the default internal test app that will run an ActiveFedora-based Hyrax web application using Fedora 4 as the backend storage. See [Troubleshooting Dassie](#troubleshooting-dassie) if you encounter any issues.
 - [Koppie](#koppie-internal-test-app-with-valkyrie-connector-to-postgres) is a newer internal test app that is a Valkyrie-based Hyrax web application that runs with PostGres as backend storage. It does not run ActiveFedora or use Fedora 4. See [Troubleshooting Koppie](#troubleshooting-koppie) if you encounter any issues.
 
 <!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
-## Hyrax Engine Development 
+## Hyrax Engine Development
 
 We support a `docker-compose`-based development environment for folks working on
 the Hyrax engine. This environment is substantially more like a Hyrax production
@@ -191,8 +191,8 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v3.4.1 # or desired version
-git checkout $HYRAX_VERSION
+export HYRAX_VERSION=v4.0.0.rc2 # or desired version
+git checkout hyrax-$HYRAX_VERSION
 
 docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .
 
@@ -229,4 +229,4 @@ helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
 ```
 
 [ghcr]: https://docs.github.com/en/enterprise-cloud@latest/packages/working-with-a-github-packages-registry/working-with-the-container-registry
-[samvera-packages]: https://github.com/orgs/samvera/packages
+[samvera-packages]: https://github.com/orgs/samvera/packages

data/CONTRIBUTING.md

@@ -45,7 +45,7 @@ further details.
 ### Reporting Issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a [Github issue](https://github.com/samvera/{{library}}/issues/) by:
+* Submit a [Github issue](https://github.com/samvera/hyrax/issues/) by:
   * Clearly describing the issue
     * Provide a descriptive summary
     * Explain the expected behavior
@@ -178,4 +178,4 @@ If you are uncertain, bring other contributors into the conversation by assignin
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
 * [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
-* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Dockerfile

@@ -1,9 +1,19 @@
-ARG RUBY_VERSION=2.7.6
-FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
+ARG RUBY_VERSION=3.2.1
+
+# Replace with official jemalloc package in alpine 3.17
+FROM ruby:$RUBY_VERSION-alpine3.16 as builder
+RUN apk add build-base curl
+RUN curl -sL https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 | tar -xj && \
+    cd jemalloc-5.3.0 && \
+    ./configure && \
+    make && \
+    make install
+
+FROM ruby:$RUBY_VERSION-alpine3.16 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
-ARG RUBYGEMS_VERSION=3.3.20
+ARG RUBYGEMS_VERSION=""
 
 RUN apk --no-cache upgrade && \
   apk --no-cache add acl \
@@ -33,6 +43,9 @@ ENV PATH="/app/samvera:$PATH"
 ENV RAILS_ROOT="/app/samvera/hyrax-webapp"
 ENV RAILS_SERVE_STATIC_FILES="1"
 
+COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/
+ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
+
 ENTRYPOINT ["hyrax-entrypoint.sh"]
 CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]
 
@@ -49,22 +62,21 @@ ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nu
 
 FROM hyrax-base as hyrax-worker-base
 
-ENV MALLOC_ARENA_MAX=2
-
 USER root
 RUN apk --no-cache add bash \
   ffmpeg \
   mediainfo \
-  openjdk11-jre \
+  openjdk17-jre \
   perl
 USER app
 
 RUN mkdir -p /app/fits && \
     cd /app/fits && \
-    wget https://github.com/harvard-lts/fits/releases/download/1.5.1/fits-1.5.1.zip -O fits.zip && \
+    wget https://github.com/harvard-lts/fits/releases/download/1.6.0/fits-1.6.0.zip -O fits.zip && \
     unzip fits.zip && \
-    rm fits.zip && \
-    chmod a+x /app/fits/fits.sh
+    rm fits.zip tools/mediainfo/linux/libmediainfo.so.0 tools/mediainfo/linux/libzen.so.0 && \
+    chmod a+x /app/fits/fits.sh && \
+    sed -i 's/\(<tool.*TikaTool.*>\)/<!--\1-->/' /app/fits/xml/fits.xml
 ENV PATH="${PATH}:/app/fits"
 
 CMD bundle exec sidekiq

data/README.md

@@ -11,25 +11,19 @@ Docs: [![Documentation Status](https://inch-ci.org/github/samvera/hyrax.svg?bran
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./.github/CONTRIBUTING.md)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 
-Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+Jump in: [![Samvera Community Slack](https://img.shields.io/badge/samvera-slack-blueviolet)](https://samvera.slack.com/)
 
 ## Table of Contents
 
 * [What is Hyrax?](#what-is-hyrax)
-* [Feature Documentation](#feature-documentation)
-* [Support Policies](#support-policies)
-* [Help](#help)
-* [Working with Hyrax](#working-with-hyrax)
-  * [Developing the Hyrax Engine](#developing-the-hyrax-engine)
-    * [Contributing](#contributing)
-    * [Release process](#release-process)
-  * [Developing your Hyrax\-based Application](#developing-your-hyrax-based-application)
-  * [Deploying your Hyrax\-based Application to production](#deploying-your-hyrax-based-application-to-production)
+* [Getting Help and Asking Questions](#getting-help-and-asking-questions)
+* [How to Run the Code](#how-to-run-the-code)
+* [Contribute](#contribute)
+* [Release Process](#release-process)
+* [Deploy](#deploy)
 * [Acknowledgments](#acknowledgments)
 * [License](#license)
 
-<aside>Table of contents created by <a href="https://github.com/ekalinin/github-markdown-toc.go">gh-md-toc</a></aside>
-
 ## What is Hyrax?
 
 Hyrax is a [Ruby on Rails Engine](https://guides.rubyonrails.org/engines.html) built by the [Samvera community](https://samvera.org). Hyrax provides a foundation for creating many different digital repository applications.
@@ -44,112 +38,45 @@ Hyrax offers the ability to:
 * Enable/disable optional features via an administrative dashboard
 * And more (https://hyrax.samvera.org/about/)
 
-## Feature Documentation
-
-* List of features: [Feature Matrix](https://github.com/samvera/hyrax/wiki/Feature-matrix)
-* Configuration and enabling features: [Hyrax Management Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide)
-* Walk-through on using features: [Hyrax Feature Guides](https://samvera.github.io/intro-to.html)
-* [Entity Relationship Diagram](./artifacts/entity-relationship-diagram.pdf)
-* For general information about Hyrax: [Hyrax Site](https://hyrax.samvera.org/)
-* A note about [versions of Hyrax](./documentation/note-about-versions.md)
-
-## Support Policies
-
-* Hyrax 3.x supports the latest browser versions for Chrome, Firefox, Edge, and Safari.
-
-## Help
-
-The Samvera community is here to help. Please see our [support guide](./.github/SUPPORT.md).
-
-## Working with Hyrax
-
-There are two primary Hyrax development concerns:
-
-1. Developing the Hyrax engine
-2. Developing your Hyrax-based Application
-
-### Developing the Hyrax Engine
-
-This is where you work on the code-base that will be used by yours and other Hyrax-based applications.  We recommend using [Docker and Hyrax's engine development containers](./CONTAINERS.md).
+## Getting Help and Asking Questions
 
-<aside>
-    <p><em><strong>Note:</em></strong> This is not the only path for Hyrax-engine development.  In the past, <a href="./documentation/legacyREADME.md">we documented extensive steps</a> to install the various dependencies for Hyrax-engine development. There is also a <a href="https://github.com/samvera/hyrax/wiki/Hyrax-Development-Guide#quick-start-for-hyrax-development">Quick Start for Hyrax engine development</a> that outlines steps for working on the Hyrax engine.</p>
-    <p>By moving to Docker, we are encoding the documentation steps for standing up a Hyrax-engine development environment.</p>
-</aside>
+More detailed documentation about Hyrax is available on the [Hyrax Github Wiki](https://github.com/samvera/hyrax/wiki) but if you have questions or need help, please email the [Samvera community tech list](https://samvera.atlassian.net/wiki/spaces/samvera/pages/1171226735/Samvera+Community+Email+Lists#Samvera-Tech-(15-20-messages-per-week-on-average)) or stop by the #dev channel in the [Samvera community Slack team](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405211682/Getting+Started+in+the+Samvera+Community#Join-the-Samvera-Slack-workspace). You can also get in touch with the [Hyrax Maintenance Working Group](https://samvera.atlassian.net/wiki/spaces/samvera/pages/496632295/Hyrax+Maintenance+Working+Group), including the Hyrax Product Owner and Hyrax Tech Lead.
 
-### Installing Analytics
+[Reporting Issues](./.github/SUPPORT.md) 
 
-Hyrax supports your choice of either Google Analytics or Matomo.  To enable analytics tracking and reporting features, follow the directions below.
+## How to Run the Code
 
-Enable Analytics Features
+[Run Hyrax Locally Using Docker](./CONTAINERS.md)
 
-Analytics can be enabled and configured using environment variables. Set HYRAX_ANALYTICS to true, set either 'google' or 'matomo' for  HYRAX_ANALYTICS_PROVIDER, and set the date you would like reporting to start (ANALYTICS_START_DATE).
+Hyrax can also work running prerequisite dependencies separately. The following describe ways to do this:
+* [Developing Your Hyrax-based Application](./documentation/developing-your-hyrax-based-app.md)
+* [Development setup using Engine Cart and Solr Fedora wrapper](https://github.com/samvera/hyrax/wiki/Development-setup-using-Engine-Cart-and-Solr---Fedora-wrapper)
 
-```
-HYRAX_ANALYTICS=true
-HYRAX_ANALYTICS_PROVIDER=google
-ANALYTICS_START_DATE=2021-08-21
-```
+## Contribute
 
-If using google, you'll also need the following ENV variables:
+We'd love to accept your contributions. Please see our [guide to contributing to Hyrax](./.github/CONTRIBUTING.md).
 
-```
-GOOGLE_ANALYTICS_ID=UA-111111-1  # Universal ID (Currently Hyrax Analytics only works with Univeral (UA) accounts)
-GOOGLE_OAUTH_APP_NAME=
-GOOGLE_OAUTHAPP_VERSION=
-GOOGLE_OAUTH_PRIVATE_KEY_PATH= # store the .p12 file in the root of your application
-GOOGLE_OAUTH_PRIVATE_KEY_SECRET=
-GOOGLE_OAUTH_CLIENT_EMAIL=
-```
+[Installing Analytics](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#installing-analytics)
 
-Add these ENV variables if using Matomo:
-
-```
-MATOMO_SITE_ID=
-MATOMO_BASE_URL=
-MATOMO_AUTH_TOKEN=
-```
-
-#### Analytics Features
-
-Once analytics is enabled, Hyrax will automatically install the JS tracking code.  Page views and downloads of a file set are recorded and sent to the selected analytics provider.  Admin users will have access to an expanded dashboard with details about how many vistors viewed a page, and how many visitors downloaded a file.  Easily find the top works by views, and most popular file downloads!
-
-#### Contributing
-
-We'd love to accept your contributions.  Please see our guide to [contributing to Hyrax](./.github/CONTRIBUTING.md).
-
-Here are possible ways to help:
-
-* The Hyrax user interface is translated into a number of languages, and many of these translations come from Google Translate. If you are a native or fluent speaker of a non-English language, your help improving these translations are most welcome. (Hyrax currently supports English, Spanish, Chinese, Italian, German, French, and Portuguese.)
-  * Do you see English in the application where you would expect to see one of the languages above? If so, [file an issue](https://github.com/samvera/hyrax/issues/new) and suggest a translation, please.
-* [Contribute a user story](https://github.com/samvera/hyrax/issues/new).
-* Help us improve [Hyrax's test coverage](https://coveralls.io/r/samvera/hyrax) or [documentation coverage](https://inch-ci.org/github/samvera/hyrax).
-* Refactor away [code smells](https://codeclimate.com/github/samvera/hyrax).
-
-#### Release process
+## Release Process
 
 See the [release management process](https://github.com/samvera/hyrax/wiki/Release-management-process).
 
-### Developing your Hyrax-based Application
-
-For those familiar with Rails, this is where you create your own application (via `rails new`) and add Hyrax as a gem to your `Gemfile`.  Your Hyrax-based application is the place for you to create features specific to your Hyrax-based application.
+We also have a [Maintenance Policy](./documentation/MAINTENANCE.md).
 
-For more information, see [our documentation on developing your Hyrax-based application](./documentation/developing-your-hyrax-based-app.md).
-
-### Deploying your Hyrax-based Application to production
+## Deploy
 
 Steps to deploy a Hyrax-based application to production will vary depending on your particular ecosystem but here are some methods and things to consider:
-
- * [Samvera Community Knowledge Base: Running in Production](https://samvera.github.io/service-stack.html)
- * [Helm Chart](./CONTAINERS.md#deploying-to-production) (for cloud-based Kubernetes-style deployments)
+* [Hyrax Management Guide](https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide) (provides guidance for things to keep in mind in production environments)
+* [Helm Chart to deploy Hyrax-based application](./CONTAINERS.md#deploying-to-production) (for cloud-based Kubernetes-style deployments)
 
 ## Acknowledgments
 
 This software has been developed by and is brought to you by the Samvera community.  Learn more at the
 [Samvera website](http://samvera.org/).
 
-![Samvera Logo](https://wiki.lyrasis.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)
+![Samvera Logo](./samvera-fall-TM3.svg)
 
 ## License
 
-Hyrax is available under [the Apache 2.0 license](LICENSE).
+Hyrax is available under [the Apache 2.0 license](LICENSE).

data/app/actors/hyrax/actors/create_with_files_actor.rb

@@ -50,7 +50,7 @@ module Hyrax
       # @return [TrueClass]
       def attach_files(files, curation_concern, attributes)
         return true if files.blank?
-        AttachFilesToWorkJob.perform_later(curation_concern, files, attributes.to_h.symbolize_keys)
+        AttachFilesToWorkJob.perform_later(curation_concern, files, **attributes.to_h.symbolize_keys)
         true
       end
 

data/app/assets/stylesheets/hyrax/_catalog.scss

@@ -76,6 +76,10 @@
   color: #fff;
 }
 
+.dark-text {
+  color: #000
+}
+
 .view-type-group a {
   > span.caption {
     display: none;

data/app/assets/stylesheets/hyrax/_forms.scss

@@ -38,6 +38,10 @@ legend small {
   margin-top: 1em;
 }
 
+.select2-container .select2-choice > .select2-chosen {
+  max-width: 26em;
+}
+
 form {
   .form-group {
     align-items: center;

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)
@@ -63,13 +41,14 @@ module Hyrax::Controller
 
   ##
   # @note for Blacklight 6/7 compatibility
-  def search_service(**search_params)
+  def search_service(*args, **search_params)
+    search_params.merge!(args.last) if args.last.is_a?(Hash)
     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)
+                             search_builder_class: blacklight_config.search_builder_class)
   end
 
   private

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

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

@@ -7,8 +7,8 @@ module Hyrax
       end
 
       # TODO: we could remove this if we used an isolated engine
-      def features_url
-        hyrax.admin_features_path
+      def features_url(*args)
+        hyrax.admin_features_path(*args)
       end
     end
   end

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

@@ -513,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

@@ -195,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
 
@@ -236,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/works_controller.rb

@@ -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/transfers_controller.rb

@@ -45,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/administrative_set_form.rb

@@ -8,7 +8,7 @@ module Hyrax
     class AdministrativeSetForm < Valkyrie::ChangeSet
       ##
       # @api private
-      AdminSetMembersPopulator = lambda do |_options|
+      AdminSetMembersPopulator = lambda do |**_options|
         self.member_ids =
           if model.new_record
             []

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/pcdm_collection_form.rb

@@ -8,7 +8,7 @@ module Hyrax
     class PcdmCollectionForm < Valkyrie::ChangeSet # rubocop:disable Metrics/ClassLength
       include Hyrax::FormFields(:core_metadata)
 
-      BannerInfoPrepopulator = lambda do |_options|
+      BannerInfoPrepopulator = lambda do |**_options|
         self.banner_info ||= begin
           banner_info = CollectionBrandingInfo.where(collection_id: id.to_s, role: "banner")
           banner_file = File.split(banner_info.first.local_path).last unless banner_info.empty?
@@ -19,7 +19,7 @@ module Hyrax
         end
       end
 
-      LogoInfoPrepopulator = lambda do |_options|
+      LogoInfoPrepopulator = lambda do |**_options|
         self.logo_info ||= begin
           logos_info = CollectionBrandingInfo.where(collection_id: id.to_s, role: "logo")
 

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: proc { |_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/permission.rb

@@ -9,8 +9,8 @@ module Hyrax
     #   names. we provide these as virtual fields and prepopulate these from
     #   `Hyrax::Permission`.
     class Permission < Hyrax::ChangeSet
-      property :agent_name, virtual: true, prepopulator: ->(_opts) { self.agent_name = model.agent }
-      property :access, virtual: true, prepopulator: ->(_opts) { self.access = model.mode }
+      property :agent_name, virtual: true, prepopulator: proc { |_opts| self.agent_name = model.agent }
+      property :access, virtual: true, prepopulator: proc { |_opts| self.access = model.mode }
 
       ##
       # @note support a {#to_hash} method for compatibility with