hyrax 2.0.3 → 2.1.0.beta1

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

@@ -0,0 +1,106 @@
+module Hyrax
+  module Dashboard
+    class NestCollectionsController < ApplicationController
+      include Blacklight::Base
+      class_attribute :form_class, :new_collection_form_class
+      self.form_class = Hyrax::Forms::Dashboard::NestCollectionForm
+      self.new_collection_form_class = Hyrax::Forms::CollectionForm
+
+      # Add this collection as a subcollection within another existing collection
+      def create_relationship_within
+        @form = build_within_form
+        if @form.save
+          notice = I18n.t('create_within', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
+          redirect_to redirect_path(item: @form.child), notice: notice
+        else
+          redirect_to redirect_path(item: @form.child), flash: { error: @form.errors.full_messages }
+        end
+      end
+
+      # create and link a NEW subcollection under this collection, with this collection as parent
+      def create_collection_under
+        @form = build_create_collection_form
+        if @form.validate_add
+          redirect_to new_dashboard_collection_path(collection_type_id: @form.parent.collection_type.id, parent_id: @form.parent)
+        else
+          redirect_to redirect_path(item: @form.parent), flash: { error: @form.errors.full_messages }
+        end
+      end
+
+      # link this collection as parent by adding existing collection as subcollection under this one
+      def create_relationship_under
+        @form = build_under_form
+        if @form.save
+          notice = I18n.t('create_under', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
+          redirect_to redirect_path(item: @form.parent), notice: notice
+        else
+          redirect_to redirect_path(item: @form.parent), flash: { error: @form.errors.full_messages }
+        end
+      end
+
+      # remove a parent collection relationship from this collection
+      def remove_relationship_above
+        @form = build_remove_form
+        if @form.remove
+          notice = I18n.t('removed_relationship', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
+          redirect_to redirect_path(item: @form.child), notice: notice
+        else
+          redirect_to redirect_path(item: @form.child), flash: { error: @form.errors.full_messages }
+        end
+      end
+
+      # remove a subcollection relationship from this collection
+      def remove_relationship_under
+        @form = build_remove_form
+        if @form.remove
+          notice = I18n.t('removed_relationship', scope: 'hyrax.dashboard.nest_collections_form', child_title: @form.child.title.first, parent_title: @form.parent.title.first)
+          redirect_to redirect_path(item: @form.parent), notice: notice
+        else
+          redirect_to redirect_path(item: @form.parent), flash: { error: @form.errors.full_messages }
+        end
+      end
+
+      private
+
+        def build_within_form
+          child = Collection.find(params.fetch(:child_id))
+          authorize! :read, child
+          parent = params.key?(:parent_id) ? Collection.find(params[:parent_id]) : nil
+          form_class.new(child: child, parent: parent, context: self)
+        end
+
+        def build_under_form
+          parent = Collection.find(params.fetch(:parent_id))
+          authorize! :deposit, parent
+          child = params.key?(:child_id) ? Collection.find(params[:child_id]) : nil
+          form_class.new(child: child, parent: parent, context: self)
+        end
+
+        def build_create_collection_form
+          parent = Collection.find(params.fetch(:parent_id))
+          authorize! :deposit, parent
+          form_class.new(child: nil, parent: parent, context: self)
+        end
+
+        def build_remove_form
+          child = Collection.find(params.fetch(:child_id))
+          parent = Collection.find(params.fetch(:parent_id))
+          authorize! :edit, parent
+          form_class.new(child: child, parent: parent, context: self)
+        end
+
+        # determine appropriate redirect location depending on specified source
+        def redirect_path(item:)
+          from = params[:source] || 'none'
+          case from
+          when "my"
+            my_collections_path
+          when "show"
+            dashboard_collection_path(item)
+          else
+            dashboard_collection_path(item)
+          end
+        end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module Hyrax
   module Dashboard
     ## Shows and edit the profile of the current_user
     class ProfilesController < Hyrax::UsersController
-      layout 'dashboard'
+      with_themed_layout 'dashboard'
       before_action :find_user
       authorize_resource class: '::User', instance_name: :user
 

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

@@ -2,22 +2,14 @@ module Hyrax
   module Dashboard
     ## Shows a list of all works to the admins
     class WorksController < Hyrax::My::WorksController
-      before_action :ensure_admin!
-
       # Search builder for a list of works
       # Override of Blacklight::RequestBuilders
       def search_builder_class
-        Hyrax::WorksSearchBuilder
+        Hyrax::Dashboard::WorksSearchBuilder
       end
 
       private
 
-        def ensure_admin!
-          # Even though the user can view this admin set, they may not be able to view
-          # it on the admin page.
-          authorize! :read, :admin_dashboard
-        end
-
         def search_action_url(*args)
           hyrax.dashboard_works_url(*args)
         end

data/app/controllers/hyrax/dashboard_controller.rb

@@ -1,7 +1,7 @@
 module Hyrax
   class DashboardController < ApplicationController
     include Blacklight::Base
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
     before_action :authenticate_user!
 
     def show

data/app/controllers/hyrax/file_sets_controller.rb

@@ -12,7 +12,6 @@ module Hyrax
     helper PermissionsHelper
 
     helper_method :curation_concern
-    include Hyrax::ParentContainer
     copy_blacklight_config_from(::CatalogController)
 
     class_attribute :show_presenter, :form_class
@@ -29,28 +28,12 @@ module Hyrax
     private :curation_concern=
     helper_method :file_set
 
-    # routed to /files/new
-    def new; end
-
-    # routed to /files/:id/edit
+    # GET /concern/file_sets/:id
     def edit
       initialize_edit_form
     end
 
-    # routed to /files (POST)
-    def create
-      file = params.fetch(:file_set, {}).fetch(:files, []).detect { |f| f.respond_to?(:original_filename) }
-      return render_json_response(response_type: :bad_request, options: { message: 'Error! No file uploaded', description: 'missing file' }) unless file
-      return empty_file_response(file) if empty_file?(file)
-      process_non_empty_file(file: file)
-    rescue RSolr::Error::Http => error
-      logger.error "FileSetController::create rescued #{error.class}\n\t#{error}\n #{error.backtrace.join("\n")}\n\n"
-      render_json_response(response_type: :internal_error, options: { message: 'Error occurred while creating a FileSet.' })
-    ensure
-      file.tempfile.delete if file.respond_to?(:tempfile) # remove tempfile (only if it is a temp file)
-    end
-
-    # routed to /files/:id
+    # GET /concern/parent/:parent_id/file_sets/:id
     def show
       respond_to do |wants|
         wants.html { presenter }
@@ -59,13 +42,14 @@ module Hyrax
       end
     end
 
+    # DELETE /concern/file_sets/:id
     def destroy
       parent = curation_concern.parent
       actor.destroy
       redirect_to [main_app, parent], notice: 'The file has been deleted.'
     end
 
-    # routed to /files/:id (PUT)
+    # PATCH /concern/file_sets/:id
     def update
       if attempt_update
         after_update_response
@@ -78,53 +62,16 @@ module Hyrax
       render action: 'edit'
     end
 
-    # routed to /files/:id/stats
+    # GET /files/:id/stats
     def stats
       @stats = FileUsage.new(params[:id])
     end
 
-    # routed to /files/:id/citation
+    # GET /files/:id/citation
     def citation; end
 
     private
 
-      def process_non_empty_file(file:)
-        # Relative path is set by the jquery uploader when uploading a directory
-        curation_concern.relative_path = params[:relative_path] if params[:relative_path]
-        actor.create_metadata(params[:file_set])
-        actor.attach_to_work(find_parent_by_id)
-        if actor.create_content(file)
-          response_for_successfully_processed_file
-        else
-          msg = curation_concern.errors.full_messages.join(', ')
-          flash[:error] = msg
-          json_error "Error creating file #{file.original_filename}: #{msg}"
-        end
-      end
-
-      def empty_file_response(file)
-        options = {
-          errors: { files: "#{file.original_filename} has no content! (Zero length file)" },
-          description: t('hyrax.api.unprocessable_entity.empty_file')
-        }
-        render_json_response(response_type: :unprocessable_entity, options: options)
-      end
-
-      def response_for_successfully_processed_file
-        respond_to do |format|
-          format.html do
-            if request.xhr?
-              render 'jq_upload', formats: 'json', content_type: 'text/html'
-            else
-              redirect_to [main_app, curation_concern.parent]
-            end
-          end
-          format.json do
-            render 'jq_upload', status: :created, location: polymorphic_path([main_app, curation_concern])
-          end
-        end
-      end
-
       # this is provided so that implementing application can override this behavior and map params to different attributes
       def update_metadata
         file_attributes = form_class.model_attributes(attributes)
@@ -186,6 +133,7 @@ module Hyrax
       end
 
       def initialize_edit_form
+        @parent = @file_set.in_objects.first
         original = @file_set.original_file
         @version_list = Hyrax::VersionListPresenter.new(original ? original.versions.all : [])
         @groups = current_user.groups
@@ -215,26 +163,10 @@ module Hyrax
       # Override this method to add additional response formats to your local app
       def additional_response_formats(_); end
 
-      def file_set_params
-        params.require(:file_set).permit(
-          :visibility_during_embargo, :embargo_release_date, :visibility_after_embargo, :visibility_during_lease, :lease_expiration_date, :visibility_after_lease, :visibility, title: []
-        )
-      end
-
-      def empty_file?(file)
-        (file.respond_to?(:tempfile) && file.tempfile.size == 0) || (file.respond_to?(:size) && file.size == 0)
-      end
-
       # This allows us to use the unauthorized and form_permission template in hyrax/base,
       # while prefering our local paths. Thus we are unable to just override `self.local_prefixes`
       def _prefixes
         @_prefixes ||= super + ['hyrax/base']
       end
-
-      def json_error(error, name = nil, additional_arguments = {})
-        args = { error: error }
-        args[:name] = name if name
-        render additional_arguments.merge(json: [args])
-      end
   end
 end

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

@@ -1,6 +1,22 @@
 module Hyrax
   module My
     class CollectionsController < MyController
+      # Define collection specific filter facets.
+      def self.configure_facets
+        configure_blacklight do |config|
+          # Name of pivot facet must match field name that uses helper_method
+          config.add_facet_field Collection.collection_type_gid_document_field_name,
+                                 helper_method: :collection_type_label, limit: 5,
+                                 pivot: ['has_model_ssim', Collection.collection_type_gid_document_field_name],
+                                 label: I18n.t('hyrax.dashboard.my.heading.collection_type')
+          # This causes AdminSets to also be shown with the Collection Type label
+          config.add_facet_field 'has_model_ssim',
+                                 label: I18n.t('hyrax.dashboard.my.heading.collection_type'),
+                                 limit: 5, show: false
+        end
+      end
+      configure_facets
+
       def search_builder_class
         Hyrax::My::CollectionsSearchBuilder
       end
@@ -9,7 +25,8 @@ module Hyrax
         add_breadcrumb t(:'hyrax.controls.home'), root_path
         add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
         add_breadcrumb t(:'hyrax.admin.sidebar.collections'), hyrax.my_collections_path
-
+        collection_type_list_presenter
+        managed_collections_count
         super
       end
 
@@ -23,6 +40,14 @@ module Hyrax
         def search_facet_path(args = {})
           hyrax.my_dashboard_collections_facet_path(args[:id])
         end
+
+        def collection_type_list_presenter
+          @collection_type_list_presenter ||= Hyrax::SelectCollectionTypeListPresenter.new(current_user)
+        end
+
+        def managed_collections_count
+          @managed_collection_count = Hyrax::Collections::ManagedCollectionsService.managed_collections_count(scope: self)
+        end
     end
   end
 end

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

@@ -1,6 +1,9 @@
 module Hyrax
   module My
     class WorksController < MyController
+      class_attribute :create_work_presenter_class
+      self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
+
       # Search builder for a list of works that belong to me
       # Override of Blacklight::RequestBuilders
       def search_builder_class
@@ -8,15 +11,23 @@ module Hyrax
       end
 
       def index
+        # The user's collections for the "add to collection" form
+        @user_collections = collections_service.search_results(:deposit)
+
         add_breadcrumb t(:'hyrax.controls.home'), root_path
         add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
         add_breadcrumb t(:'hyrax.admin.sidebar.works'), hyrax.my_works_path
-
+        managed_works_count
+        @create_work_presenter = create_work_presenter_class.new(current_user)
         super
       end
 
       private
 
+        def collections_service
+          Hyrax::CollectionsService.new(self)
+        end
+
         def search_action_url(*args)
           hyrax.my_works_url(*args)
         end
@@ -25,6 +36,10 @@ module Hyrax
         def search_facet_path(args = {})
           hyrax.my_dashboard_works_facet_path(args[:id])
         end
+
+        def managed_works_count
+          @managed_works_count = Hyrax::Works::ManagedWorksService.managed_works_count(scope: self)
+        end
     end
   end
 end

data/app/controllers/hyrax/my_controller.rb

@@ -3,18 +3,22 @@ module Hyrax
     include Hydra::Catalog
     include Hyrax::Collections::AcceptsBatches
 
+    # Define filter facets that apply to all repository objects.
     def self.configure_facets
       # clear facet's copied from the CatalogController
       blacklight_config.facet_fields = {}
       configure_blacklight do |config|
         # TODO: add a visibility facet (requires visibility to be indexed)
+        config.add_facet_field solr_name('visibility', :stored_sortable),
+                               helper_method: :visibility_badge,
+                               limit: 5, label: I18n.t('hyrax.dashboard.my.heading.visibility')
         config.add_facet_field IndexesWorkflow.suppressed_field, helper_method: :suppressed_to_status
         config.add_facet_field solr_name("admin_set", :facetable), limit: 5
         config.add_facet_field solr_name("resource_type", :facetable), limit: 5
       end
     end
 
-    layout 'dashboard'
+    with_themed_layout 'dashboard'
 
     include Blacklight::Configurable
 
@@ -28,13 +32,8 @@ module Hyrax
     helper Hyrax::BatchEditsHelper
     # include the display_trophy_link view helper method
     helper Hyrax::TrophyHelper
-    helper_method :suppressed_to_status
 
     def index
-      # The user's collections for the "add to collection" form
-      # TODO: could this be only on the My::WorksController?
-      @user_collections = collections_service.search_results(:edit)
-
       @user = current_user
       (@response, @document_list) = query_solr
       prepare_instance_variables_for_batch_control_display
@@ -46,21 +45,8 @@ module Hyrax
       end
     end
 
-    def suppressed_to_status(value)
-      case value
-      when "false"
-        "Published"
-      else
-        "In review"
-      end
-    end
-
     private
 
-      def collections_service
-        Hyrax::CollectionsService.new(self)
-      end
-
       # TODO: Extract a presenter object that wrangles all of these instance variables.
       def prepare_instance_variables_for_batch_control_display
         # set up some parameters for allowing the batch controls to show appropriately