hyrax 4.0.0 → 5.0.0.rc2

data/app/controllers/hyrax/file_sets_controller.rb

@@ -113,20 +113,30 @@ module Hyrax
     def update_metadata
       case file_set
       when Hyrax::Resource
-        change_set = Hyrax::Forms::ResourceForm.for(file_set)
-
-        change_set.validate(attributes) &&
-          transactions['change_set.apply'].call(change_set).value_or { false }
+        valkyrie_update_metadata
       else
         file_attributes = form_class.model_attributes(attributes)
         actor.update_metadata(file_attributes)
       end
     end
 
+    def valkyrie_update_metadata
+      change_set = Hyrax::Forms::ResourceForm.for(file_set)
+
+      result =
+        change_set.validate(attributes) &&
+        transactions['change_set.update_file_set']
+        .with_step_args(
+          'file_set.save_acl' => { permissions_params: change_set.input_params["permissions"] }
+        )
+        .call(change_set).value_or { false }
+      @file_set = result if result
+    end
+
     def parent(file_set: curation_concern)
       @parent ||=
         case file_set
-        when Hyrax::Resource
+        when Hyrax::FileSet
           Hyrax.query_service.find_parents(resource: file_set).first
         else
           file_set.parent
@@ -134,6 +144,7 @@ module Hyrax
     end
 
     def attempt_update
+      return attempt_update_valkyrie if ::FileSet < Hyrax::Resource
       if wants_to_revert?
         actor.revert_content(params[:revision])
       elsif params.key?(:file_set)
@@ -149,9 +160,33 @@ module Hyrax
       end
     end
 
+    def attempt_update_valkyrie
+      return revert_valkyrie if wants_to_revert_valkyrie?
+      if params.key?(:file_set)
+        if params[:file_set].key?(:files)
+          ValkyrieIngestJob.perform_later(uploaded_file_from_path)
+        else
+          update_metadata
+        end
+      elsif params.key?(:files_files) # version file already uploaded with ref id in :files_files array
+        uploaded_files = Array(Hyrax::UploadedFile.find(params[:files_files]))
+        uploaded_files.first.file_set_uri = file_set.id.to_s
+        uploaded_files.first.save
+        ValkyrieIngestJob.perform_later(uploaded_files.first)
+        update_metadata
+      end
+    end
+
+    def revert_valkyrie
+      Hyrax::VersioningService.create(file_metadata, current_user, Hyrax.storage_adapter.find_by(id: params[:revision]))
+      # update_metadata
+      Hyrax.publisher.publish("file.uploaded", metadata: file_set.original_file)
+      true
+    end
+
     def uploaded_file_from_path
       uploaded_file = CarrierWave::SanitizedFile.new(params[:file_set][:files].first)
-      Hyrax::UploadedFile.create(user_id: current_user.id, file: uploaded_file)
+      Hyrax::UploadedFile.create(user_id: current_user.id, file: uploaded_file, file_set_uri: @file_set.id.to_s)
     end
 
     def after_update_response
@@ -171,6 +206,7 @@ module Hyrax
       respond_to do |wants|
         wants.html do
           initialize_edit_form
+          # TODO: return a valuable error message
           flash[:error] = "There was a problem processing your request."
           render 'edit', status: :unprocessable_entity
         end
@@ -250,6 +286,14 @@ module Hyrax
       params.key?(:revision) && params[:revision] != curation_concern.latest_content_version.label
     end
 
+    def wants_to_revert_valkyrie?
+      params.key?(:revision) && params[:revision] != Hyrax::VersioningService.new(resource: file_metadata).latest_version.version_id.to_s
+    end
+
+    def file_metadata
+      @file_metadata ||= Hyrax.query_service.custom_queries.find_file_metadata_by(id: curation_concern.original_file_id)
+    end
+
     # Override this method to add additional response formats to your local app
     def additional_response_formats(_); end
 

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

@@ -37,6 +37,8 @@ module Hyrax
         hyrax.my_collections_url(*args)
       end
 
+      # @api public
+      #
       # The url of the "more" link for additional facet values
       def search_facet_path(args = {})
         hyrax.my_dashboard_collections_facet_path(args[:id])

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

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

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

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

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

@@ -123,21 +123,6 @@ 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?
-
-        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
-      end
-
       private
 
       def all_files_with_access

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_edit_form.rb

@@ -6,7 +6,7 @@ module Hyrax::Forms
 
     delegate :depositor, :permissions, :human_readable_type, to: :model
 
-    self.required_fields = [:title, :creator, :license]
+    self.required_fields = [:title, :creator]
 
     self.model_class = ::FileSet
 

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

@@ -12,8 +12,8 @@ module Hyrax
       # be configurable.
       include Hyrax::FormFields(:file_set_metadata)
 
-      property :representative_id, type: Valkyrie::Types::String
-      property :thumbnail_id, type: Valkyrie::Types::String
+      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_object_form.rb

@@ -2,6 +2,27 @@
 
 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)
+      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
+
     ##
     # A form for PCDM objects: resources which have collection relationships and
     # generally resemble +Hyrax::Work+.

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
@@ -266,6 +259,8 @@ module Hyrax
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def permission_template_update_params
+        return attributes unless attributes.key?(:release_varies) || attributes.key?(:release_embargo)
+
         filtered_attributes = attributes.except(:release_varies, :release_embargo)
         # If 'varies' before date option selected, then set release_period='before' and save release_date as-is
         if attributes[:release_varies] == Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE

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

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+module Hyrax
+  module Forms
+    class ResourceBatchEditForm < Hyrax::Forms::ResourceForm
+      include Hyrax::FormFields(:basic_metadata)
+
+      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
+
+      # @param [Hyrax::Work] model the model backing the form
+      # @param [Ability] current_ability the user authorization model
+      # @param [Array<String>] batch_document_ids a list of document ids in the batch
+      def initialize(model, _current_ability, batch_document_ids)
+        @names = []
+        @batch_document_ids = batch_document_ids
+        if @batch_document_ids.present?
+          combined_fields = model_attributes(model, initialize_combined_fields)
+          super(model.class.new(combined_fields))
+        else
+          super(model)
+        end
+      end
+
+      def terms
+        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
+      def self.build_permitted_params
+        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,
+         :visibility_during_embargo,
+         :embargo_release_date,
+         :visibility_after_embargo,
+         :visibility_during_lease,
+         :lease_expiration_date,
+         :visibility_after_lease,
+         :visibility,
+         { based_near_attributes: [:id, :_destroy] }]
+      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.
+      def column_for_attribute(name)
+        name
+      end
+
+      private
+
+      # override this method if you need to initialize more complex RDF assertions (b-nodes)
+      # @return [Hash<String, Array>] the list of unique values per field
+      def initialize_combined_fields
+        # For each of the files in the batch, set the attributes to be the concatenation of all the attributes
+        batch_document_ids.each_with_object({}) do |doc_id, combined_attributes|
+          work = Hyrax.query_service.find_by(id: doc_id)
+          terms.each do |field|
+            combined_attributes[field] ||= []
+            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

@@ -5,29 +5,26 @@ module Hyrax
     ##
     # @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
+    # Returns the form class associated with a given model.
     #
-    # @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
+    # @note The default case assumes that the provided model class is for a
+    #   PCDM object and returns a +Hyrax::Forms::PcdmObjectForm+. This is for
+    #   backwards‐compatibility with existing Hyrax instances. However, a
+    #   different +Hyrax::Forms::ResourceForm+ subclass will be returned in
+    #   some known cases where that is preferable.
+    def self.ResourceForm(model_class)
+      @resource_forms ||= {}.compare_by_identity
+      @resource_forms[model_class] ||=
+        if model_class <= Hyrax::AdministrativeSet
+          Hyrax::Forms::AdministrativeSetForm
+        elsif model_class <= Hyrax::FileSet
+          Hyrax::Forms::FileSetForm
+        elsif model_class <= Hyrax::PcdmCollection
+          Hyrax::Forms::PcdmCollectionForm
+        else
+          "Hyrax::Forms::PcdmObjectForm".constantize # autoload
+          Hyrax::Forms::PcdmObjectForm(model_class)
         end
-      end
     end
 
     ##
@@ -121,19 +118,9 @@ module Hyrax
         #   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)
-          end
+          klass = "#{resource.class.name}Form".safe_constantize
+          klass ||= Hyrax::Forms::ResourceForm(resource.class)
+          klass.new(resource)
         end
 
         ##

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

@@ -11,6 +11,7 @@ module Hyrax
     #   +EmbargoesControllerBehavior+.
     class WorkEmbargoForm < Hyrax::ChangeSet
       property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
+      property :embargo_history, virtual: true, prepopulator: proc { |_opts| self.embargo_history = model.embargo&.embargo_history }
       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 }

data/app/forms/hyrax/forms/work_form.rb

@@ -158,7 +158,7 @@ module Hyrax
       # In particular we are discarding any access grant parameters for works that
       # are going into a mediated deposit workflow.
       def self.sanitize_params(form_params)
-        admin_set_id = form_params[:admin_set_id]
+        admin_set_id = Array(form_params[:admin_set_id]).first
         return super if admin_set_id && workflow_for(admin_set_id: admin_set_id).allows_access_grant?
         params_without_permissions = permitted_params.reject { |arg| arg.respond_to?(:key?) && arg.key?(:permissions_attributes) }
         form_params.permit(*params_without_permissions)

data/app/forms/hyrax/forms/work_lease_form.rb

@@ -11,6 +11,7 @@ module Hyrax
     #   +LeasesControllerBehavior+.
     class WorkLeaseForm < Hyrax::ChangeSet
       property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator, prepopulator: :lease_populator
+      property :lease_history, virtual: true, prepopulator: proc { |_opts| self.lease_history = model.lease&.lease_history }
       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 }

data/app/helpers/hyrax/dashboard_helper_behavior.rb

@@ -6,21 +6,38 @@ module Hyrax
     end
 
     # @param user [User]
-    # @param where [Hash] applied as the where clause when querying the Hyrax::WorkRelation
-    # @return [Integer] number of works matching the where that the user deposited
-    # @see Hyrax::WorkRelation
-    def number_of_works(user = current_user, where: { generic_type_sim: "Work" })
-      field_pairs = field_pairs(user)
-      field_pairs.merge!(where)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs).count
+    # @return [Integer] number of works that the user deposited
+    def number_of_works(user = current_user)
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'Work')
+        .count
     rescue RSolr::Error::ConnectionRefused
       '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)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs(user)).count
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'FileSet')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end
@@ -28,7 +45,11 @@ module Hyrax
     # @param user [User]
     # @return [Integer] number of Collections the user created
     def number_of_collections(user = current_user)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs(user)).count
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'Collection')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end

data/app/helpers/hyrax/membership_helper.rb

@@ -14,18 +14,30 @@ module Hyrax
     #
     # @see app/assets/javascripts/hyrax/relationships.js
     def member_of_collections_json(resource)
+      # this is where we return for dassie
       return resource.member_of_collections_json if
         resource.respond_to?(:member_of_collections_json)
 
       resource = resource.model if resource.respond_to?(:model)
 
-      Hyrax.custom_queries.find_collections_for(resource: resource).map do |collection|
+      existing_collections_array = Hyrax.custom_queries.find_collections_for(resource: resource) + add_collection_from_params
+      existing_collections_array.map do |collection|
         { id: collection.id.to_s,
           label: collection.title.first,
           path: url_for(collection) }
       end.to_json
     end
 
+    def add_collection_from_params
+      # avoid errors when creating Valkyrie resources from Dashboard >> Works
+      return [] if controller.params[:add_works_to_collection].blank?
+
+      # new valkyrie works need the collection from params when depositing directly into an existing collection
+      return [Hyrax.metadata_adapter.query_service.find_by(id: Valkyrie::ID.new(controller.params[:add_works_to_collection]))] if Hyrax.config.use_valkyrie?
+
+      [::Collection.find(@controller.params[:add_works_to_collection])]
+    end
+
     ##
     # @param resource [#work_members_json]
     #