hyrax 2.1.0.beta1 → 2.1.0.beta2

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

@@ -46,12 +46,7 @@ module Hyrax
     def new
       # TODO: move these lines to the work form builder in Hyrax
       curation_concern.depositor = current_user.user_key
-
-      # admin_set_id is required on the client, otherwise simple_form renders a blank option.
-      # however it isn't a required field for someone to submit via json.
-      # Set the first admin_set they have access to.
-      admin_set = Hyrax::AdminSetService.new(self).search_results(:deposit).first
-      curation_concern.admin_set_id = admin_set && admin_set.id
+      curation_concern.admin_set_id = admin_set_id_for_new
       build_form
     end
 
@@ -137,6 +132,16 @@ module Hyrax
 
     private
 
+      def admin_set_id_for_new
+        # admin_set_id is required on the client, otherwise simple_form renders a blank option.
+        # however it isn't a required field for someone to submit via json.
+        # Set the default admin set if it exists; otherwise, set to first admin_set they have access to.
+        admin_sets = Hyrax::AdminSetService.new(self).search_results(:deposit)
+        return nil if admin_sets.blank? # shouldn't happen
+        return AdminSet::DEFAULT_ID if admin_sets.map(&:id).include?(AdminSet::DEFAULT_ID)
+        admin_sets.first.id
+      end
+
       def build_form
         @form = work_form_service.build(curation_concern, current_ability, self)
       end
@@ -154,12 +159,10 @@ module Hyrax
       end
 
       def parent_presenter
+        return @parent_presenter unless params[:parent_id]
+
         @parent_presenter ||=
-          begin
-            if params[:parent_id]
-              @parent_presenter ||= show_presenter.new(search_result_document(id: params[:parent_id]), current_ability, request)
-            end
-          end
+          show_presenter.new(search_result_document(id: params[:parent_id]), current_ability, request)
       end
 
       # Include 'hyrax/base' in the search path for views, while prefering

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

@@ -29,6 +29,7 @@ module Hyrax
         Hyrax::CollectionTypes::CreateService.add_default_participants(@collection_type.id)
         redirect_to hyrax.edit_admin_collection_type_path(@collection_type), notice: t(:'hyrax.admin.collection_types.create.notification', name: @collection_type.title)
       else
+        report_error_msg
         setup_form
         add_common_breadcrumbs
         add_breadcrumb t(:'hyrax.admin.collection_types.new.header'), hyrax.new_admin_collection_type_path
@@ -64,6 +65,15 @@ module Hyrax
 
     private
 
+      def report_error_msg
+        error_msg = @collection_type.errors.messages
+        msg = 'Save was not successful because '
+        error_msg.each { |k, v| msg << k.to_s + ' ' + v.join(', ') + ', and ' }
+        msg.chomp!(', and ')
+        msg << '.'
+        flash[:error] = msg
+      end
+
       def update_referer
         hyrax.edit_admin_collection_type_path(@collection_type) + (params[:referer_anchor] || '')
       end
@@ -90,7 +100,7 @@ module Hyrax
       end
 
       def collection_type_params
-        params.require(:collection_type).permit(:title, :description, :nestable, :discoverable, :sharable, :share_applies_to_new_works,
+        params.require(:collection_type).permit(:title, :description, :nestable, :brandable, :discoverable, :sharable, :share_applies_to_new_works,
                                                 :allow_multiple_membership, :require_membership, :assigns_workflow, :assigns_visibility)
       end
   end

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

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

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -11,6 +11,8 @@ module Hyrax
     # provides the help_text view method
     helper PermissionsHelper
 
+    with_themed_layout 'dashboard'
+
     def edit
       work = form_class.model_class.new
       work.depositor = current_user.user_key
@@ -47,6 +49,10 @@ module Hyrax
       obj.attributes = work_params
       obj.date_modified = Time.current.ctime
       obj.visibility = params[:visibility]
+
+      InheritPermissionsJob.perform_now(obj)
+      VisibilityCopyJob.perform_now(obj)
+
       obj.save
     end
 

data/app/controllers/hyrax/batch_uploads_controller.rb

@@ -60,7 +60,7 @@ module Hyrax
         # Calling `#t` in a controller context does not mark _html keys as html_safe
         flash[:notice] = view_context.t('hyrax.works.create.after_create_html', application_name: view_context.application_name)
         if uploading_on_behalf_of?
-          redirect_to hyrax.dashboard_shares_path
+          redirect_to hyrax.dashboard_works_path
         else
           redirect_to hyrax.my_works_path
         end

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

@@ -63,8 +63,10 @@ module Hyrax
       end
 
       def show
-        banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
-        @banner_file = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
+        if @collection.collection_type.brandable?
+          banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
+          @banner_file = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
+        end
 
         presenter
         query_collection_members
@@ -142,12 +144,7 @@ module Hyrax
 
         process_member_changes
         @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
-        visiblity_updated = (@collection.visibility != collection_params[:visibility])
         if @collection.update(collection_params.except(:members))
-          # added because the collection indexing happens before Hydra::AccessControls::Permission is
-          # saved, and the after_update_index callback in the nested_relationship_reindexer removes the
-          # permissions from the collection's Solr document.
-          @collection.update_index if visiblity_updated
           after_update
         else
           after_update_error

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

@@ -10,6 +10,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.profile'), hyrax.dashboard_profile_path
+
+        @presenter = Hyrax::UserProfilePresenter.new(@user, current_ability)
       end
 
       # Display form for users to edit their profile information

data/app/controllers/hyrax/dashboard_controller.rb

@@ -1,12 +1,12 @@
 module Hyrax
   class DashboardController < ApplicationController
     include Blacklight::Base
+    include Hyrax::Breadcrumbs
     with_themed_layout 'dashboard'
     before_action :authenticate_user!
+    before_action :build_breadcrumbs, only: [:show]
 
     def show
-      add_breadcrumb t(:'hyrax.controls.home'), root_path
-      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       if can? :read, :admin_dashboard
         @presenter = Hyrax::Admin::DashboardPresenter.new
         @admin_set_rows = Hyrax::AdminSetService.new(self).search_results_with_work_count(:read)

data/app/controllers/hyrax/depositors_controller.rb

@@ -5,6 +5,15 @@ module Hyrax
     before_action :authenticate_user!
     before_action :validate_users, only: :create
 
+    layout :decide_layout
+
+    def index
+      add_breadcrumb t(:'hyrax.controls.home'), root_path
+      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t(:'hyrax.dashboard.manage_proxies'), hyrax.depositors_path
+      @user = current_user
+    end
+
     def create
       grantor = authorize_and_return_grantor
       grantee = ::User.from_url_component(params[:grantee_id])
@@ -41,5 +50,15 @@ module Hyrax
         Hyrax::MessengerService.deliver(::User.batch_user, grantor, message_to_grantor, "Proxy Depositor Added")
         Hyrax::MessengerService.deliver(::User.batch_user, grantee, message_to_grantee, "Proxy Depositor Added")
       end
+
+      def decide_layout
+        layout = case action_name
+                 when 'index'
+                   'dashboard'
+                 else
+                   '1_column'
+                 end
+        File.join(theme, layout)
+      end
   end
 end

data/app/controllers/hyrax/downloads_controller.rb

@@ -1,6 +1,7 @@
 module Hyrax
   class DownloadsController < ApplicationController
     include Hydra::Controller::DownloadBehavior
+    include Hyrax::LocalFileDownloadsControllerBehavior
 
     def self.default_content_path
       :original_file
@@ -15,9 +16,7 @@ module Hyrax
         super
       when String
         # For derivatives stored on the local file system
-        response.headers['Accept-Ranges'] = 'bytes'
-        response.headers['Content-Length'] = File.size(file).to_s
-        send_file file, derivative_download_options
+        send_local_content
       else
         raise ActiveFedora::ObjectNotFoundError
       end
@@ -55,7 +54,7 @@ module Hyrax
       # Loads the file specified by the HTTP parameter `:file`.
       # If this object does not have a file by that name, return the default file
       # as returned by {#default_file}
-      # @return [ActiveFedora::File, String, NilClass] Returns the file from the repository or a path to a file on the local file system, if it exists.
+      # @return [ActiveFedora::File, File, NilClass] Returns the file from the repository or a path to a file on the local file system, if it exists.
       def load_file
         file_reference = params[:file]
         return default_file unless file_reference

data/app/controllers/hyrax/embargoes_controller.rb

@@ -1,5 +1,7 @@
 module Hyrax
   class EmbargoesController < ApplicationController
     include Hyrax::EmbargoesControllerBehavior
+
+    with_themed_layout 'dashboard'
   end
 end

data/app/controllers/hyrax/file_sets_controller.rb

@@ -28,6 +28,8 @@ module Hyrax
     private :curation_concern=
     helper_method :file_set
 
+    layout :decide_layout
+
     # GET /concern/file_sets/:id
     def edit
       initialize_edit_form
@@ -168,5 +170,15 @@ module Hyrax
       def _prefixes
         @_prefixes ||= super + ['hyrax/base']
       end
+
+      def decide_layout
+        layout = case action_name
+                 when 'show'
+                   '1_column'
+                 else
+                   'dashboard'
+                 end
+        File.join(theme, layout)
+      end
   end
 end

data/app/controllers/hyrax/leases_controller.rb

@@ -1,5 +1,7 @@
 module Hyrax
   class LeasesController < ApplicationController
     include Hyrax::LeasesControllerBehavior
+
+    with_themed_layout 'dashboard'
   end
 end

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

@@ -1,6 +1,15 @@
 module Hyrax
   module My
     class WorksController < MyController
+      # Define collection specific filter facets.
+      def self.configure_facets
+        configure_blacklight do |config|
+          config.add_facet_field solr_name("admin_set", :facetable), limit: 5
+          config.add_facet_field solr_name('member_of_collections', :symbol), limit: 5
+        end
+      end
+      configure_facets
+
       class_attribute :create_work_presenter_class
       self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
 

data/app/controllers/hyrax/my_controller.rb

@@ -13,7 +13,6 @@ module Hyrax
                                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

data/app/controllers/hyrax/transfers_controller.rb

@@ -46,9 +46,7 @@ module Hyrax
     # any existing edit permissions on the work.
     def accept
       @proxy_deposit_request.transfer!(params[:reset])
-      if params[:sticky]
-        current_user.can_receive_deposits_from << @proxy_deposit_request.sending_user
-      end
+      current_user.can_receive_deposits_from << @proxy_deposit_request.sending_user if params[:sticky]
       redirect_to hyrax.transfers_path, notice: "Transfer complete"
     end
 

data/app/controllers/hyrax/users_controller.rb

@@ -24,9 +24,7 @@ module Hyrax
       def search(query)
         clause = query.blank? ? nil : "%" + query.downcase + "%"
         base = ::User.where(*base_query)
-        if clause.present?
-          base = base.where("#{Hydra.config.user_key_field} like lower(?) OR display_name like lower(?)", clause, clause)
-        end
+        base = base.where("#{Hydra.config.user_key_field} like lower(?) OR display_name like lower(?)", clause, clause) if clause.present?
         base.registered
             .where("#{Hydra.config.user_key_field} not in (?)",
                    [::User.batch_user_key, ::User.audit_user_key])

data/app/forms/hyrax/forms/admin/collection_type_form.rb

@@ -6,7 +6,7 @@ module Hyrax
         attr_accessor :collection_type
         validates :title, presence: true
 
-        delegate :title, :description, :discoverable, :nestable, :sharable, :share_applies_to_new_works,
+        delegate :title, :description, :brandable, :discoverable, :nestable, :sharable, :share_applies_to_new_works,
                  :require_membership, :allow_multiple_membership, :assigns_workflow,
                  :assigns_visibility, :id, :collection_type_participants, :persisted?,
                  :collections?, :admin_set?, :user_collection?, to: :collection_type

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

@@ -45,7 +45,6 @@ module Hyrax
       # @return [Hash{Symbol => String, Boolean}] { :content_tab (for confirmation message),
       #                                             :updated (true/false),
       #                                               :error_code (for flash error lookup) }
-      # rubocop:disable Metrics/MethodLength
       def update(attributes)
         @attributes = attributes
         return_info = { content_tab: tab_to_update }
@@ -219,9 +218,7 @@ module Hyrax
         def grants_as_collection
           return [] unless attributes[:access_grants_attributes]
           attributes_collection = attributes[:access_grants_attributes]
-          if attributes_collection.respond_to?(:permitted?)
-            attributes_collection = attributes_collection.to_h
-          end
+          attributes_collection = attributes_collection.to_h if attributes_collection.respond_to?(:permitted?)
           if attributes_collection.is_a? Hash
             attributes_collection = attributes_collection
                                     .sort_by { |i, _| i.to_i }

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

@@ -160,9 +160,7 @@ module Hyrax
       # are going into a mediated deposit workflow.
       def self.sanitize_params(form_params)
         admin_set_id = form_params[:admin_set_id]
-        if admin_set_id && workflow_for(admin_set_id: admin_set_id).allows_access_grant?
-          return super
-        end
+        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)
       end

data/app/helpers/hyrax/citations_behaviors/common_behavior.rb

@@ -6,9 +6,7 @@ module Hyrax
       end
 
       def clean_end_punctuation(text)
-        if text && ([".", ",", ":", ";", "/"].include? text[-1, 1])
-          return text[0, text.length - 1]
-        end
+        return text[0, text.length - 1] if text && ([".", ",", ":", ";", "/"].include? text[-1, 1])
         text
       end
     end

data/app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb

@@ -4,17 +4,13 @@ module Hyrax
       class ChicagoFormatter < BaseFormatter
         include Hyrax::CitationsBehaviors::PublicationBehavior
         include Hyrax::CitationsBehaviors::TitleBehavior
-
-        # rubocop:disable Metrics/MethodLength
         def format(work)
           text = ""
 
           # setup formatted author list
           authors_list = all_authors(work)
           text << format_authors(authors_list)
-          if text.present?
-            text = "<span class=\"citation-author\">#{text}</span>"
-          end
+          text = "<span class=\"citation-author\">#{text}</span>" if text.present?
           # Get Pub Date
           pub_date = setup_pub_date(work)
           text << " #{pub_date}." unless pub_date.nil?

data/app/helpers/hyrax/collections_helper.rb

@@ -9,12 +9,15 @@ module Hyrax
     end
 
     def render_collection_links(solr_doc)
-      collection_list = Hyrax::CollectionMemberService.run(solr_doc)
+      collection_list = Hyrax::CollectionMemberService.run(solr_doc, controller.current_ability)
       return if collection_list.empty?
-      links = collection_list.map do |collection|
-        link_to collection.title_or_label, collection_path(collection.id)
+      links = collection_list.map { |collection| link_to collection.title_or_label, collection_path(collection.id) }
+      collection_links = []
+      links.each_with_index do |link, n|
+        collection_links << link
+        collection_links << ', ' unless links[n + 1].nil?
       end
-      content_tag :span, safe_join([t('hyrax.collection.is_part_of'), ': '] + links)
+      content_tag :span, safe_join([t('hyrax.collection.is_part_of'), ': '] + collection_links)
     end
 
     # @return [Boolean]

data/app/helpers/hyrax/file_set_helper.rb

@@ -15,7 +15,6 @@ module Hyrax::FileSetHelper
            locals.merge(file_set: presenter)
   end
 
-  # rubocop:disable Metrics/MethodLength
   def media_display_partial(file_set)
     'hyrax/file_sets/media_display/' +
       if file_set.image?

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -273,7 +273,6 @@ module Hyrax
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       def search_action_for_dashboard
         case params[:controller]
         when "hyrax/my/collections"