hyrax 5.0.0.rc1 → 5.0.0.rc3

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # A module of form behaviours for depositors and depositor agreements.
+  module DepositAgreementBehavior
+    def self.included(descendant)
+      descendant.property :depositor
+
+      descendant.property :agreement_accepted, virtual: true, default: false, prepopulator: proc { |_opts| self.agreement_accepted = !model.new_record }
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # A module of form behaviours for embargoes, leases, and resulting
+  # visibilities.
+  module LeaseabilityBehavior
+    def self.included(descendant) # rubocop:disable Metrics/AbcSize
+      descendant.property :visibility, default: VisibilityIntention::PRIVATE, populator: :visibility_populator
+
+      descendant.property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator
+      descendant.property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator
+
+      # virtual properties for embargo/lease;
+      descendant.property :embargo_release_date, virtual: true, prepopulator: proc { |_opts| self.embargo_release_date = model.embargo&.embargo_release_date }
+      descendant.property :visibility_after_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
+      descendant.property :visibility_during_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
+
+      descendant.property :lease_expiration_date, virtual: true,  prepopulator: proc { |_opts| self.lease_expiration_date = model.lease&.lease_expiration_date }
+      descendant.property :visibility_after_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_after_lease = model.lease&.visibility_after_lease }
+      descendant.property :visibility_during_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_during_lease = model.lease&.visibility_during_lease }
+    end
+
+    def embargo_populator(**)
+      self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)
+    end
+
+    def lease_populator(**)
+      self.lease = Hyrax::LeaseManager.lease_for(resource: model)
+    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
+  end
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # A module of form behaviours for populating permissions.
+  module PermissionBehavior
+    def self.included(descendant)
+      descendant.collection(:permissions,
+                 virtual: true,
+                 default: [],
+                 form: Hyrax::Forms::Permission,
+                 populator: :permission_populator,
+                 prepopulator: proc { |_opts| self.permissions = Hyrax::AccessControl.for(resource: model).permissions })
+    end
+
+    # https://trailblazer.to/2.1/docs/reform.html#reform-populators-populator-collections
+    def permission_populator(collection:, index:, **)
+      Hyrax::Forms::Permission.new(collection[index])
+    end
+  end
+end

data/app/forms/hyrax/forms/administrative_set_form.rb

@@ -5,7 +5,7 @@ module Hyrax
     ##
     # @api public
     # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
-    class AdministrativeSetForm < Valkyrie::ChangeSet
+    class AdministrativeSetForm < Hyrax::Forms::ResourceForm
       ##
       # @api private
       AdminSetMembersPopulator = lambda do |**_options|
@@ -23,10 +23,6 @@ module Hyrax
       property :title, required: true, primary: true
       property :description, primary: true
 
-      property :human_readable_type, writable: false
-      property :date_modified, readable: false
-      property :date_uploaded, readable: false
-
       property :creator
 
       validates :title, presence: true

data/app/forms/hyrax/forms/collection_form.rb

@@ -35,6 +35,12 @@ module Hyrax
         end
       end
 
+      # This describes the parameters we are expecting to receive from the client
+      # @return [Array] a list of parameters used by sanitize_params
+      def self.build_permitted_params
+        super + [{ based_near_attributes: [:id, :_destroy] }]
+      end
+
       # @param model [::Collection] the collection model that backs this form
       # @param current_ability [Ability] the capabilities of the current user
       # @param repository [Blacklight::Solr::Repository] the solr repository
@@ -123,19 +129,17 @@ module Hyrax
         collection_member_service.available_member_subcollections.documents
       end
 
-      ##
-      # @deprecated this implementation requires an extra db round trip, had a
-      #   buggy cacheing mechanism, and was largely duplicative of other code.
-      #   all versions of this code are replaced by
-      #   {CollectionsHelper#available_parent_collections_data}.
-      def available_parent_collections(scope:)
-        return @available_parents if @available_parents.present?
+      protected
 
-        collection = model_class.find(id)
-        colls = Hyrax::Collections::NestedCollectionQueryService.available_parent_collections(child: collection, scope: scope, limit_to_id: nil)
-        @available_parents = colls.map do |col|
-          { "id" => col.id, "title_first" => col.title.first }
-        end.to_json
+      def initialize_field(key)
+        # rubocop:disable Lint/AssignmentInCondition
+        if class_name = model_class.properties[key.to_s].try(:class_name)
+          # Initialize linked properties such as based_near
+          self[key] += [class_name.new]
+        else
+          super
+        end
+        # rubocop:enable Lint/AssignmentInCondition
       end
 
       private

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

@@ -44,40 +44,6 @@ module Hyrax
           persistence_service.persist_nested_collection_for(parent: parent, child: child, user: context.current_user)
         end
 
-        ##
-        # @deprecated this method is unused by hyrax, and is effectively a
-        #   delegation to `Hyrax::Collections::NestedCollectionQueryService`.
-        #   if you want to be sure to use nested indexing to generate this list,
-        #   use the query service directly.
-        #
-        # For the given parent, what are all of the available collections that
-        # can be added as sub-collection of the parent.
-        def available_child_collections
-          Deprecation.warn "#{self.class}#available_child_collections " \
-                           "is deprecated. the helper of the same name or " \
-                           "Hyrax::Collections::NestedCollectionQueryService " \
-                           "instead."
-
-          query_service.available_child_collections(parent: parent, scope: context)
-        end
-
-        ##
-        # @deprecated this method is unused by hyrax, and is effectively a
-        #   delegation to `Hyrax::Collections::NestedCollectionQueryService`.
-        #   if you want to be sure to use nested indexing to generate this list,
-        #   use the query service directly.
-        #
-        # For the given child, what are all of the available collections to
-        # which the child can be added as a sub-collection.
-        def available_parent_collections
-          Deprecation.warn "#{self.class}#available_parent_collections " \
-                           "is deprecated. the helper of the same name or " \
-                           "Hyrax::Collections::NestedCollectionQueryService " \
-                           "instead."
-
-          query_service.available_parent_collections(child: child, scope: context)
-        end
-
         # when creating a NEW collection, we need to do some basic validation before
         # 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.

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

@@ -12,8 +12,13 @@ module Hyrax
       # be configurable.
       include Hyrax::FormFields(:file_set_metadata)
 
-      property :representative_id, type: Valkyrie::Types::String
-      property :thumbnail_id, type: Valkyrie::Types::String
+      include Hyrax::DepositAgreementBehavior
+      include Hyrax::ContainedInWorksBehavior
+      include Hyrax::LeaseabilityBehavior
+      include Hyrax::PermissionBehavior
+
+      property :representative_id, type: Valkyrie::Types::String, writeable: false
+      property :thumbnail_id, type: Valkyrie::Types::String, writeable: false
     end
   end
 end

data/app/forms/hyrax/forms/pcdm_collection_form.rb

@@ -5,7 +5,7 @@ module Hyrax
     ##
     # @api public
     # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
-    class PcdmCollectionForm < Valkyrie::ChangeSet # rubocop:disable Metrics/ClassLength
+    class PcdmCollectionForm < Hyrax::Forms::ResourceForm # rubocop:disable Metrics/ClassLength
       include Hyrax::FormFields(:core_metadata)
 
       BannerInfoPrepopulator = lambda do |**_options|
@@ -33,10 +33,6 @@ module Hyrax
         end
       end
 
-      property :human_readable_type, writable: false
-      property :date_modified, readable: false
-      property :date_uploaded, readable: false
-
       property :depositor, required: true
       property :collection_type_gid, required: true
       property :visibility, default: VisibilityIntention::PRIVATE

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

@@ -5,14 +5,22 @@ module Hyrax
     ##
     # A form for PCDM objects: resources which have collection relationships and
     # generally resemble +Hyrax::Work+.
+    #
+    # Although File Sets are technically also PCDM objects, they use a separate
+    # form class: +Hyrax::Forms::FileSetForm+.
     class PcdmObjectForm < Hyrax::Forms::ResourceForm
       include Hyrax::FormFields(:core_metadata)
 
+      include Hyrax::ContainedInWorksBehavior
+      include Hyrax::DepositAgreementBehavior
+      include Hyrax::LeaseabilityBehavior
+      include Hyrax::PermissionBehavior
+
       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 :admin_set_id, prepopulator: :admin_set_prepopulator
       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
@@ -28,6 +36,10 @@ module Hyrax
 
       private
 
+      def admin_set_prepopulator
+        self.admin_set_id ||= Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
+      end
+
       def in_collections_populator(fragment:, **_options)
         adds = []
         deletes = []

data/app/forms/hyrax/forms/permission_template_form.rb

@@ -9,13 +9,6 @@ module Hyrax
       delegate :access_grants, :access_grants_attributes=, :release_date, :release_period, :visibility, to: :model
       delegate :available_workflows, :active_workflow, :source, :source_id, to: :model
 
-      ##
-      # @deprecated  use PermissionTemplate#reset_access_controls_for instead.
-      def reset_access_controls!
-        Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
-        source_model.reset_access_controls!
-      end
-
       # Stores which radio button under release "Varies" option is selected
       attr_accessor :release_varies
       # Selected release embargo timeframe (if any) under release "Varies" option

data/app/forms/hyrax/forms/resource_batch_edit_form.rb

@@ -4,9 +4,18 @@ module Hyrax
     class ResourceBatchEditForm < Hyrax::Forms::ResourceForm
       include Hyrax::FormFields(:basic_metadata)
 
+      include Hyrax::ContainedInWorksBehavior
+      include Hyrax::DepositAgreementBehavior
+      include Hyrax::LeaseabilityBehavior
+      include Hyrax::PermissionBehavior
+
       self.required_fields = []
       self.model_class = Hyrax.primary_work_type
 
+      # Terms that need to exclude from batch edit
+      class_attribute :terms_excluded
+      self.terms_excluded = [:abstract, :label, :source]
+
       # Contains a list of titles of all the works in the batch
       attr_accessor :names
 
@@ -17,38 +26,39 @@ module Hyrax
         @names = []
         @batch_document_ids = batch_document_ids
         if @batch_document_ids.present?
-          super(model.class.new(initialize_combined_fields))
+          combined_fields = model_attributes(model, initialize_combined_fields)
+          super(resource: model.class.new(combined_fields))
         else
-          super(model)
+          super(resource: model)
         end
       end
 
       def terms
-        [:creator, :contributor, :description,
-         :keyword, :resource_type, :license, :publisher, :date_created,
-         :subject, :language, :identifier, :based_near,
-         :related_url]
+        self.class.terms
+      end
+
+      def self.terms
+        return Hyrax::Forms::BatchEditForm.terms if model_class < ActiveFedora::Base
+
+        terms_primary = definitions.select { |_, definition| definition[:primary] }
+                                   .keys.map(&:to_sym)
+        terms_secondary = definitions.select { |_, definition| definition[:display] && !definition[:primary] }
+                                     .keys.map(&:to_sym)
+
+        (terms_primary + terms_secondary) - terms_excluded
       end
 
       attr_reader :batch_document_ids
 
       # Returns a list of parameters we accept from the form
-      # rubocop:disable Metrics/MethodLength
       def self.build_permitted_params
-        [{ creator: [] },
-         { contributor: [] },
-         { description: [] },
-         { keyword: [] },
-         { resource_type: [] },
-         { license: [] },
-         { publisher: [] },
-         { date_created: [] },
-         { subject: [] },
-         { language: [] },
-         { identifier: [] },
-         { based_near: [] },
-         { related_url: [] },
-         { permissions_attributes: [:type, :name, :access, :id, :_destroy] },
+        terms_permitted_params + additional_permitted_params
+      end
+
+      # Returns a list of parameters other than those terms for the form
+      # rubocop:disable Metrics/MethodLength
+      def self.additional_permitted_params
+        [{ permissions_attributes: [:type, :name, :access, :id, :_destroy] },
          :on_behalf_of,
          :version,
          :add_works_to_collection,
@@ -63,6 +73,19 @@ module Hyrax
       end
       # rubocop:enable Metrics/MethodLength
 
+      # Returns a list of permitted parameters for the terms
+      # @param terms Array[Symbol]
+      # @return Array[Hash]
+      def self.terms_permitted_params
+        [].tap do |params|
+          terms.each do |term|
+            h = {}
+            h[term] = []
+            params << h
+          end
+        end
+      end
+
       # @param name [Symbol]
       # @return [Symbol]
       # @note Added for ActiveModel compatibility.
@@ -80,11 +103,21 @@ module Hyrax
           work = Hyrax.query_service.find_by(id: doc_id)
           terms.each do |field|
             combined_attributes[field] ||= []
-            combined_attributes[field] = (combined_attributes[field] + work[field].to_a).uniq
+            combined_attributes[field] = (combined_attributes[field] + Array.wrap(work[field])).uniq
           end
           names << work.to_s
         end
       end
+
+      # Model attributes for ActiveFedora compatibility
+      def model_attributes(model, attrs)
+        return attrs unless model.is_a? ActiveFedora::Base
+
+        attrs.keys.each do |k|
+          attrs[k] = Array.wrap(attrs[k]).first unless model.class.properties[k.to_s]&.multiple?
+        end
+        attrs
+      end
     end
   end
 end

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

@@ -2,53 +2,11 @@
 
 module Hyrax
   module Forms
-    ##
-    # @api public
-    #
-    # @example defining a form class using HydraEditor-like configuration
-    #   class MonographForm < Hyrax::Forms::ResourceForm(Monograph)
-    #     self.required_fields = [:title, :creator, :rights_statement]
-    #     # 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::PcdmObjectForm) do
-        self.model_class = work_class
-
-        ##
-        # @return [String]
-        def self.inspect
-          return "Hyrax::Forms::ResourceForm(#{model_class})" if name.blank?
-          super
-        end
-      end
-    end
-
     ##
     # @api public
     #
     # This form wraps +Hyrax::ChangeSet+ in the +HydraEditor::Form+ interface.
     class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
-      ##
-      # @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
-
       ##
       # @api private
       #
@@ -71,35 +29,8 @@ module Hyrax
       class_attribute :model_class
 
       property :human_readable_type, writable: false
-
-      property :depositor
-
-      property :visibility, default: VisibilityIntention::PRIVATE, populator: :visibility_populator
-
       property :date_modified, readable: false
       property :date_uploaded, readable: false
-      property :agreement_accepted, virtual: true, default: false, prepopulator: proc { |_opts| self.agreement_accepted = !model.new_record }
-
-      collection(:permissions,
-                 virtual: true,
-                 default: [],
-                 form: Hyrax::Forms::Permission,
-                 populator: :permission_populator,
-                 prepopulator: proc { |_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: proc { |_opts| self.embargo_release_date = model.embargo&.embargo_release_date }
-      property :visibility_after_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
-      property :visibility_during_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
-
-      property :lease_expiration_date, virtual: true,  prepopulator: proc { |_opts| self.lease_expiration_date = model.lease&.lease_expiration_date }
-      property :visibility_after_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_after_lease = model.lease&.visibility_after_lease }
-      property :visibility_during_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_during_lease = model.lease&.visibility_during_lease }
-
-      property :in_works_ids, virtual: true, prepopulator: InWorksPrepopulator
 
       # provide a lock token for optimistic locking; we name this `version` for
       # backwards compatibility
@@ -111,6 +42,24 @@ module Hyrax
       # @see https://github.com/samvera/valkyrie/wiki/Optimistic-Locking
       property :version, virtual: true, prepopulator: LockKeyPrepopulator
 
+      ##
+      # @api public
+      #
+      # Forms should be initialized with an explicit +resource:+ parameter to
+      # match indexers.
+      def initialize(deprecated_resource = nil, resource: nil)
+        if resource.nil?
+          if !deprecated_resource.nil?
+            Deprecation.warn "Initializing Valkyrie forms without an explicit resource parameter is deprecated. Pass the resource with `resource:` instead."
+            super(deprecated_resource)
+          else
+            super()
+          end
+        else
+          super(resource)
+        end
+      end
+
       class << self
         ##
         # @api public
@@ -119,20 +68,19 @@ module Hyrax
         #
         # @example
         #   monograph  = Monograph.new
-        #   change_set = Hyrax::Forms::ResourceForm.for(monograph)
-        def for(resource)
-          "#{resource.class.name}Form".constantize.new(resource)
-        rescue NameError => _err
-          case resource
-          when Hyrax::AdministrativeSet
-            Hyrax::Forms::AdministrativeSetForm.new(resource)
-          when Hyrax::FileSet
-            Hyrax::Forms::FileSetForm.new(resource)
-          when Hyrax::PcdmCollection
-            Hyrax::Forms::PcdmCollectionForm.new(resource)
-          else
-            # NOTE: This will create a +Hyrax::Forms::PcdmObjectForm+.
-            Hyrax::Forms::ResourceForm(resource.class).new(resource)
+        #   change_set = Hyrax::Forms::ResourceForm.for(resource: monograph)
+        def for(deprecated_resource = nil, resource: nil)
+          if resource.nil? && !deprecated_resource.nil?
+            Deprecation.warn "Initializing Valkyrie forms without an explicit resource parameter is deprecated. Pass the resource with `resource:` instead."
+            return self.for(resource: deprecated_resource)
+          end
+          klass = "#{resource.class.name}Form".safe_constantize
+          klass ||= Hyrax::Forms::ResourceForm(resource.class)
+          begin
+            klass.new(resource: resource)
+          rescue ArgumentError
+            Deprecation.warn "Initializing Valkyrie forms without an explicit resource parameter is deprecated. #{klass} should be updated accordingly."
+            klass.new(resource)
           end
         end
 
@@ -200,37 +148,6 @@ module Hyrax
 
       private
 
-      def embargo_populator(**)
-        self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)
-      end
-
-      def lease_populator(**)
-        self.lease = Hyrax::LeaseManager.lease_for(resource: model)
-      end
-
-      # https://trailblazer.to/2.1/docs/reform.html#reform-populators-populator-collections
-      def permission_populator(collection:, index:, **)
-        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.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Forms
+    ##
+    # @api public
+    #
+    # @example defining a form class using HydraEditor-like configuration
+    #   class MonographForm < Hyrax::Forms::PcdmObjectForm(Monograph)
+    #     self.required_fields = [:title, :creator, :rights_statement]
+    #     # other WorkForm-like configuration here
+    #   end
+    def self.PcdmObjectForm(work_class) # rubocop:disable Naming/MethodName
+      Class.new(Hyrax::Forms::PcdmObjectForm) do
+        self.model_class = work_class
+
+        ##
+        # @return [String]
+        def self.inspect
+          return "Hyrax::Forms::PcdmObjectForm(#{model_class})" if name.blank?
+          super
+        end
+      end
+    end
+
+    ##
+    # @api public
+    #
+    # Returns the form class associated with a given model.
+    def self.ResourceForm(model_class) # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Naming/MethodName
+      @resource_forms ||= {}.compare_by_identity
+      @resource_forms[model_class] ||=
+        # +#respond_to?+ needs to be used here, not +#try+, because Dry::Types
+        # overrides the latter??
+        if model_class.respond_to?(:pcdm_collection?) && model_class.pcdm_collection?
+          if model_class <= Hyrax::AdministrativeSet
+            Hyrax.config.administrative_set_form
+          else
+            Hyrax.config.pcdm_collection_form
+          end
+        elsif model_class.respond_to?(:pcdm_object?) && model_class.pcdm_object?
+          if model_class.respond_to?(:file_set?) && model_class.file_set?
+            Hyrax.config.file_set_form
+          else
+            Hyrax.config.pcdm_object_form_builder.call(model_class)
+          end
+        else
+          Hyrax::Forms::ResourceForm
+        end
+    end
+  end
+end

data/app/helpers/hyrax/dashboard_helper_behavior.rb

@@ -17,6 +17,19 @@ module Hyrax
       'n/a'
     end
 
+    def link_to_works(user = current_user)
+      state = Blacklight::SearchState.new(params, CatalogController.blacklight_config)
+      facet_type = if Hyrax.config.use_valkyrie?
+                     state.add_facet_params('generic_type_si', 'Work')
+                   else
+                     state.add_facet_params('generic_type_sim', 'Work')
+                   end
+      facet_depositor = state.add_facet_params('depositor_ssim', user.to_s)
+      state = Hash.new {}
+      state["f"] = facet_type["f"].merge(facet_depositor["f"])
+      link_to(t("hyrax.dashboard.stats.works"), main_app.search_catalog_path(state))
+    end
+
     # @param user [User]
     # @return [Integer] number of FileSets the user deposited
     def number_of_files(user = current_user)

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -294,6 +294,8 @@ module Hyrax
       solr_field = solr_docs.first["title_tesim"]
       return nil if solr_field.nil?
       solr_field.first
+    rescue Blacklight::Exceptions::RecordNotFound
+      nil
     end
 
     ##