hyrax 5.0.0.rc1 → 5.0.0.rc2

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

@@ -56,6 +56,29 @@ $gutter-width: $grid-gutter-width/2;
     }
   }
 
+  &:not(.maximized) {
+    .sidebar-action-text,
+    a span + span,
+    h5 {
+      display: none;
+    }
+
+    .nav li {
+      text-align: center;
+      a {
+        padding-left: 0;
+        padding-right: 0;
+      }
+      .fa {
+        margin-right: 0;
+      }
+    }
+
+    .nav-item {
+      width: $drawer-small;
+    }
+  }
+
   .sidebar-toggle {
     cursor: pointer;
     background-color: $body-background-color;

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

@@ -31,7 +31,13 @@ module Hyrax
       filter_docs_with_edit_access!
       copy_visibility = []
       copy_visibility = params[:embargoes].values.map { |h| h[:copy_visibility] } if params[:embargoes]
-      resources = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: Hyrax.config.use_valkyrie?)
+
+      resources = if Hyrax.config.use_valkyrie?
+                    Hyrax.query_service.find_many_by_ids(ids: batch)
+                  else
+                    Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
+                  end
+
       resources.each do |resource|
         if Hyrax.config.use_valkyrie?
           EmbargoManager.new(resource: resource).release!

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

@@ -29,7 +29,13 @@ module Hyrax
       filter_docs_with_edit_access!
       copy_visibility = []
       copy_visibility = params[:leases].values.map { |h| h[:copy_visibility] } if params[:leases]
-      resources = Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: Hyrax.config.use_valkyrie?)
+
+      resources = if Hyrax.config.use_valkyrie?
+                    Hyrax.query_service.find_many_by_ids(ids: batch)
+                  else
+                    Hyrax.custom_queries.find_many_by_alternate_ids(alternate_ids: batch, use_valkyrie: false)
+                  end
+
       resources.each do |resource|
         if Hyrax.config.use_valkyrie?
           LeaseManager.new(resource: resource).release!

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

@@ -13,10 +13,11 @@ module Hyrax
       response.headers["Accept-Ranges"] = "bytes"
       self.status = 200
       use = params.fetch(:file, :original_file).to_sym
-      file_metadata = find_file_metadata(file_set: file_set, use: use)
+      mime_type = params[:mime_type]
+      file_metadata = find_file_metadata(file_set: file_set, use: use, mime_type: mime_type)
       return unless stale?(last_modified: file_metadata.updated_at, template: false)
 
-      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+      file = Valkyrie::StorageAdapter.find_by(id: file_metadata.file_identifier)
       prepare_file_headers_valkyrie(metadata: file_metadata, file: file)
 
       # Warning - using the range header will load the range selection in to memory
@@ -25,7 +26,7 @@ module Hyrax
         file.rewind
         send_data send_range_valkyrie(file: file), data_options(file_metadata)
       else
-        send_file file.disk_path
+        send_file file.disk_path, data_options(file_metadata).except(:status)
       end
     end
 
@@ -60,15 +61,19 @@ module Hyrax
       self.content_type = metadata.mime_type
     end
 
-    def find_file_metadata(file_set:, use: :original_file)
-      use = :thumbnail_file if use == :thumbnail
-      begin
+    def find_file_metadata(file_set:, use: :original_file, mime_type: nil)
+      if mime_type.nil?
+        use = :thumbnail_file if use == :thumbnail
         use = Hyrax::FileMetadata::Use.uri_for(use: use)
-      rescue ArgumentError
-        raise Hyrax::ObjectNotFoundError
+        results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
+      else
+        files = Hyrax.custom_queries.find_files(file_set: file_set)
+        results = [files.find { |f| f.mime_type == mime_type }]
       end
-      results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
+
       results.first || raise(Hyrax::ObjectNotFoundError)
+    rescue ArgumentError
+      raise(Hyrax::ObjectNotFoundError)
     end
   end
 end

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

@@ -79,14 +79,11 @@ module Hyrax
         wants.html { presenter && parent_presenter }
         wants.json do
           # load @curation_concern manually because it's skipped for html
-          @curation_concern = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id])
+          @curation_concern = load_curation_concern
           curation_concern # This is here for authorization checks (we could add authorize! but let's use the same method for CanCanCan)
           render :show, status: :ok
         end
         additional_response_formats(wants)
-        wants.ttl { render body: presenter.export_as_ttl, mime_type: Mime[:ttl] }
-        wants.jsonld { render body: presenter.export_as_jsonld, mime_type: Mime[:jsonld] }
-        wants.nt { render body: presenter.export_as_nt, mime_type: Mime[:nt] }
       end
     end
     # rubocop:enable Metrics/AbcSize
@@ -114,9 +111,9 @@ module Hyrax
         Hyrax.config.callback.run(:after_destroy, curation_concern.id, current_user, warn: false)
       else
         transactions['work_resource.destroy']
-          .with_step_args('work_resource.delete' => { user: current_user })
-          .call(curation_concern)
-          .value!
+          .with_step_args('work_resource.delete' => { user: current_user },
+                          'work_resource.delete_all_file_sets' => { user: current_user })
+          .call(curation_concern).value!
 
         title = Array(curation_concern.title).first
       end
@@ -139,13 +136,20 @@ module Hyrax
       json = iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
 
       respond_to do |wants|
-        wants.json { render json: json }
-        wants.html { render json: json }
+        wants.any { render json: json }
       end
     end
 
     private
 
+    def load_curation_concern
+      if Hyrax.config.disable_wings
+        Hyrax.query_service.find_by(id: params[:id])
+      else
+        Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: params[:id])
+      end
+    end
+
     def iiif_manifest_builder
       self.class.iiif_manifest_builder ||
         (Flipflop.cache_work_iiif_manifest? ? Hyrax::CachingIiifManifestBuilder.new : Hyrax::ManifestBuilderService.new)
@@ -427,6 +431,13 @@ module Hyrax
     end
 
     def additional_response_formats(format)
+      respond_to_endnote(format)
+      respond_to_ttl(format)
+      respond_to_jsonld(format)
+      respond_to_nt(format)
+    end
+
+    def respond_to_endnote(format)
       format.endnote do
         send_data(presenter.solr_document.export_as_endnote,
                   type: "application/x-endnote-refer",
@@ -434,6 +445,36 @@ module Hyrax
       end
     end
 
+    def respond_to_ttl(format)
+      format.ttl do
+        if presenter.valkyrie_presenter?
+          render plain: "Error: Not Implemented", status: :not_implemented
+        else
+          render body: presenter.export_as_ttl, mime_type: Mime[:ttl]
+        end
+      end
+    end
+
+    def respond_to_jsonld(format)
+      format.jsonld do
+        if presenter.valkyrie_presenter?
+          render plain: "Error: Not Implemented", status: :not_implemented
+        else
+          render body: presenter.export_as_jsonld, mime_type: Mime[:jsonld]
+        end
+      end
+    end
+
+    def respond_to_nt(format)
+      format.nt do
+        if presenter.valkyrie_presenter?
+          render plain: "Error: Not Implemented", status: :not_implemented
+        else
+          render body: presenter.export_as_nt, mime_type: Mime[:nt]
+        end
+      end
+    end
+
     def save_permissions
       @saved_permissions =
         case curation_concern

data/app/controllers/hyrax/api/items_controller.rb

@@ -33,12 +33,11 @@ module Hyrax
       private
 
       def my_load_and_authorize_resource
-        @work = Hyrax::WorkRelation.new.find(params[:id])
-
+        @work = Hyrax.query_service.find_by(id: params[:id])
         return render plain: "#{user} lacks access to #{@work}", status: :unauthorized unless user.can? :edit, @work
 
         return render plain: "Forbidden: #{@work} not deposited via Arkivo", status: :forbidden if @work.arkivo_checksum.nil?
-      rescue ActiveFedora::ObjectNotFoundError
+      rescue ActiveFedora::ObjectNotFoundError, Valkyrie::Persistence::ObjectNotFoundError
         render plain: "id '#{params[:id]}' not found", status: :not_found
       end
 

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -41,9 +41,9 @@ module Hyrax
       batch.each do |doc_id|
         resource = Hyrax.query_service.find_by(id: Valkyrie::ID.new(doc_id))
         transactions['collection_resource.destroy']
-          .with_step_args('collection_resource.delete' => { user: current_user })
-          .call(resource)
-          .value!
+          .with_step_args('collection_resource.delete' => { user: current_user },
+                          'collection_resource.remove_from_membership' => { user: current_user })
+          .call(resource).value!
       end
       flash[:notice] = "Batch delete complete"
       after_destroy_collection
@@ -108,9 +108,9 @@ module Hyrax
       batch.each do |id|
         resource = Hyrax.query_service.find_by(id: Valkyrie::ID.new(id))
         transactions['work_resource.destroy']
-          .with_step_args('work_resource.delete' => { user: current_user })
-          .call(resource)
-          .value!
+          .with_step_args('work_resource.delete' => { user: current_user },
+                          'work_resource.delete_all_file_sets' => { user: current_user })
+          .call(resource).value!
       end
       after_update
     end

data/app/controllers/hyrax/batch_uploads_controller.rb

@@ -5,7 +5,11 @@ module Hyrax
     include Hyrax::WorksControllerBehavior
 
     # Gives the class of the form.
-    class BatchUploadFormService < Hyrax::WorkFormService
+    class BatchUploadFormService
+      def self.build(resource, current_ability, *extra)
+        form_class.new(resource, current_ability, *extra)
+      end
+
       def self.form_class(_ = nil)
         ::Hyrax::Forms::BatchUploadForm
       end

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

@@ -245,7 +245,10 @@ module Hyrax
       end
 
       def valkyrie_destroy
-        if transactions['collection_resource.destroy'].call(@collection).success?
+        if transactions['collection_resource.destroy']
+           .with_step_args('collection_resource.delete' => { user: current_user },
+                           'collection_resource.remove_from_membership' => { user: current_user })
+           .call(@collection).success?
           after_destroy(params[:id])
         else
           after_destroy_error(params[:id])

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
@@ -251,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_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