sufia 7.2.0 → 7.3.0.rc1

data/app/assets/stylesheets/sufia/blacklight_gallery.scss

@@ -0,0 +1,17 @@
+/* These styles are very specific to override the thumbnails from blacklight gallery */
+
+.slideshow-documents {
+  .grid {
+    .document {
+      .thumbnail {
+        padding: 0;
+
+        a > img {
+          left: 0;
+          max-width: 100%;
+          top: 0;
+        }
+      }
+    }
+  }
+}

data/app/authorities/qa/authorities/find_works.rb

@@ -0,0 +1,15 @@
+module Qa::Authorities
+  class FindWorks < Qa::Authorities::Base
+    def search(_q, controller)
+      repo = CatalogController.new.repository
+      builder = Sufia::FindWorksSearchBuilder.new(controller)
+      response = repo.search(builder)
+      docs = response.documents
+      docs.map do |doc|
+        id = doc.id
+        title = doc.title
+        { id: id, label: title, value: id }
+      end
+    end
+  end
+end

data/app/controllers/concerns/sufia/batch_edits_controller_behavior.rb

@@ -48,7 +48,8 @@ module Sufia
       end
 
       def _prefixes
-        # This allows us to use the templates in curation_concerns/base
+        # This allows us to use the templates in curation_concerns/base, while prefering
+        # our local paths. Thus we are unable to just override `self.local_prefixes`
         @_prefixes ||= super + ['curation_concerns/base']
       end
 

data/app/controllers/concerns/sufia/batch_uploads_controller_behavior.rb

@@ -5,28 +5,38 @@ module Sufia
     include CurationConcerns::CurationConcernController
 
     included do
-      self.curation_concern_type = form_class.model_class
+      self.work_form_service = BatchUploadFormService
+      self.curation_concern_type = work_form_service.form_class.model_class # includes CanCan side-effects
+      # We use BatchUploadItem as a null stand-in curation_concern_type.
+      # The actual permission is checked dynamically during #create.
     end
 
+    # The permissions to create a batch are not as important as the permissions for the concern being batched.
+    # @note we don't call `authorize!` directly, since `authorized_models` already checks `user.can? :create, ...`
     def create
       authenticate_user!
-      create_update_job
-      flash[:notice] = t('sufia.works.new.after_create_html', application_name: view_context.application_name)
+      unsafe_pc = params.fetch(:batch_upload_item, {})[:payload_concern]
+      # Calling constantize on user params is disfavored (per brakeman), so we sanitize by matching it against an authorized model.
+      safe_pc = Sufia::SelectTypeListPresenter.new(current_user).authorized_models.map(&:to_s).find { |x| x == unsafe_pc }
+      raise CanCan::AccessDenied, "Cannot create an object of class '#{unsafe_pc}'" unless safe_pc
+      # authorize! :create, safe_pc
+      create_update_job(safe_pc)
+      flash[:notice] = t('sufia.works.create.after_create_html', application_name: view_context.application_name)
       redirect_after_update
     end
 
-    module ClassMethods
-      def form_class
+    class BatchUploadFormService < CurationConcerns::WorkFormService
+      # Gives the class of the form.
+      def self.form_class(_curation_concern = nil)
         ::Sufia::Forms::BatchUploadForm
       end
     end
 
     protected
 
-      # Gives the class of the form.
-      # This overrides CurationConcerns
-      def form_class
-        self.class.form_class
+      def build_form
+        super
+        @form.payload_concern = params[:payload_concern]
       end
 
       def redirect_after_update
@@ -37,14 +47,17 @@ module Sufia
         end
       end
 
-      def create_update_job
+      # @param [String] klass the name of the Sufia Work Class being created by the batch
+      # @note Cannot use a proper Class here because it won't serialize
+      def create_update_job(klass)
         log = BatchCreateOperation.create!(user: current_user,
                                            operation_type: "Batch Create")
+        # ActionController::Parameters are not serializable, so cast to a hash
         BatchCreateJob.perform_later(current_user,
-                                     params[:title],
-                                     params[:resource_type],
+                                     params[:title].permit!.to_h,
+                                     params[:resource_type].permit!.to_h,
                                      params[:uploaded_files],
-                                     attributes_for_actor,
+                                     attributes_for_actor.to_h.merge!(model: klass),
                                      log)
       end
 

data/app/controllers/concerns/sufia/collections_controller_behavior.rb

@@ -14,6 +14,31 @@ module Sufia
 
     protected
 
+      def after_destroy(id)
+        respond_to do |wants|
+          wants.html do
+            redirect_to sufia.dashboard_collections_path,
+                        notice: "Collection #{id} was successfully deleted"
+          end
+          wants.json do
+            render json: { id: id, description: "Collection #{id} was successfully deleted" }
+          end
+        end
+      end
+
+      def after_destroy_error(id)
+        respond_to do |wants|
+          wants.html do
+            flash[:notice] = "Collection #{id} could not be deleted"
+            render :edit, status: :unprocessable_entity
+          end
+          wants.json do
+            render json: { id: id, description: "Collection #{id} could not be deleted" },
+                   status: :unprocessable_entity
+          end
+        end
+      end
+
       def add_breadcrumb_for_controller
         add_breadcrumb I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path
       end

data/app/controllers/concerns/sufia/controller.rb

@@ -2,8 +2,11 @@ module Sufia::Controller
   extend ActiveSupport::Concern
 
   included do
+    class_attribute :create_work_presenter_class
+    self.create_work_presenter_class = Sufia::SelectTypeListPresenter
     # Adds Hydra behaviors into the application controller
     include Hydra::Controller::ControllerBehavior
+    helper_method :create_work_presenter
   end
 
   def current_ability
@@ -14,4 +17,9 @@ module Sufia::Controller
   def after_sign_in_path_for(_resource)
     sufia.dashboard_index_path
   end
+
+  # A presenter for selecting a work type to create
+  def create_work_presenter
+    @create_work_presenter ||= create_work_presenter_class.new(current_user)
+  end
 end

data/app/controllers/concerns/sufia/deny_access_override_behavior.rb

@@ -1,6 +1,6 @@
 module Sufia
   module DenyAccessOverrideBehavior
-    # Overriding the default behavior from Hydra::Core::ContorllerBehavior
+    # Overriding the default behavior from Hydra::Core::ControllerBehavior
     def deny_access(exception)
       if current_user && current_user.persisted?
         redirect_to root_path, alert: exception.message

data/app/controllers/concerns/sufia/file_sets_controller_behavior.rb

@@ -4,15 +4,6 @@ module Sufia
     include Sufia::Breadcrumbs
 
     included do
-      include Blacklight::Configurable
-
-      with_themed_layout '1_column'
-
-      copy_blacklight_config_from(CatalogController)
-
-      # actions: index, create, new, edit, show, update,
-      #          destroy, permissions, citation, stats
-
       # prepend this hook so that it comes before load_and_authorize
       prepend_before_action :authenticate_user!, except: [:show, :citation, :stats]
       before_action :build_breadcrumbs, only: [:show, :edit, :stats]
@@ -44,12 +35,12 @@ module Sufia
       end
     end
 
-    protected
+    # This allows us to use the templates in curation_concerns/file_sets
+    def self.local_prefixes
+      ['curation_concerns/file_sets']
+    end
 
-      def _prefixes
-        # This allows us to use the templates in curation_concerns/file_sets
-        @_prefixes ||= ['curation_concerns/file_sets'] + super
-      end
+    protected
 
       def initialize_edit_form
         @version_list = version_list

data/app/controllers/concerns/sufia/homepage_controller_behavior.rb

@@ -34,6 +34,8 @@ module Sufia::HomepageControllerBehavior
                                                        .rows(5)
       response = repository.search(builder)
       response.documents
+    rescue Blacklight::Exceptions::ECONNREFUSED
+      []
     end
 
     def recent

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -12,13 +12,7 @@ module Sufia::UsersControllerBehavior
   end
 
   def index
-    query = params[:uq].blank? ? nil : "%" + params[:uq].downcase + "%"
-    base = User.where(*base_query)
-    unless query.blank?
-      base = base.where("#{Devise.authentication_keys.first} like lower(?) OR display_name like lower(?)", query, query)
-    end
-    @users = base.references(:trophies).order(sort_value).page(params[:page]).per(10)
-
+    @users = search(params[:uq])
     respond_to do |format|
       format.html
       format.json { render json: @users.to_json }
@@ -68,6 +62,23 @@ module Sufia::UsersControllerBehavior
 
   protected
 
+    # TODO: this should move to a service.
+    # Returns a list of users excluding the system users and guest_users
+    # @param query [String] the query string
+    def search(query)
+      clause = query.blank? ? nil : "%" + query.downcase + "%"
+      base = User.where(*base_query)
+      unless clause.blank?
+        base = base.where("#{Devise.authentication_keys.first} like lower(?) OR display_name like lower(?)", clause, clause)
+      end
+      base.where("#{Devise.authentication_keys.first} not in (?)",
+                 [User.batch_user_key, User.audit_user_key])
+          .where(guest: false)
+          .references(:trophies)
+          .order(sort_value)
+          .page(params[:page]).per(10)
+    end
+
     def user_params
       params.require(:user).permit(:avatar, :facebook_handle, :twitter_handle,
                                    :googleplus_handle, :linkedin_handle, :remove_avatar, :orcid)

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

@@ -9,8 +9,8 @@ module Sufia
     end
 
     module ClassMethods
-      # We don't want the breadcrumb action to occur until after the concern has
-      # been loaded and authorized
+      # We don't want the actions to occur until after the concern has been loaded and authorized
+      # @note this is a terribly side-effecty kludge
       def curation_concern_type=(curation_concern_type)
         super
         before_action :build_breadcrumbs, only: [:edit, :show]
@@ -52,7 +52,7 @@ module Sufia
       def after_create_response
         respond_to do |wants|
           wants.html do
-            flash[:notice] = t('sufia.works.new.after_create_html', application_name: view_context.application_name)
+            flash[:notice] = t('sufia.works.create.after_create_html', application_name: view_context.application_name)
             redirect_to [main_app, curation_concern]
           end
           wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
@@ -62,13 +62,15 @@ module Sufia
       def after_update_response
         if permissions_changed? && curation_concern.file_sets.present?
           redirect_to sufia.confirm_access_curation_concerns_permission_path(curation_concern)
-        elsif curation_concern.visibility_changed? && curation_concern.file_sets.present?
-          redirect_to main_app.confirm_curation_concerns_permission_path(curation_concern)
         else
-          respond_to do |wants|
-            wants.html { redirect_to [main_app, curation_concern] }
-            wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
-          end
+          super
+        end
+      end
+
+      def after_destroy_response(title)
+        respond_to do |wants|
+          wants.html { redirect_to sufia.dashboard_works_path, notice: "Deleted #{title}" }
+          wants.json { render_json_response(response_type: :deleted, message: "Deleted #{curation_concern.id}") }
         end
       end
 
@@ -88,7 +90,8 @@ module Sufia
       def add_breadcrumb_for_action
         case action_name
         when 'edit'.freeze
-          add_breadcrumb I18n.t("sufia.work.browse_view"), main_app.polymorphic_path(curation_concern)
+          add_breadcrumb curation_concern.to_s, main_app.polymorphic_path(curation_concern)
+          add_breadcrumb t('sufia.works.edit.breadcrumb'), request.path
         when 'show'.freeze
           add_breadcrumb presenter.to_s, main_app.polymorphic_path(presenter)
         end

data/app/controllers/my/collections_controller.rb

@@ -14,5 +14,10 @@ module My
       def search_action_url(*args)
         sufia.dashboard_collections_url(*args)
       end
+
+      # The url of the "more" link for additional facet values
+      def search_facet_path(args = {})
+        sufia.dashboard_collections_facet_path(args[:id])
+      end
   end
 end

data/app/controllers/my/shares_controller.rb

@@ -14,5 +14,10 @@ module My
       def search_action_url(*args)
         sufia.dashboard_shares_url(*args)
       end
+
+      # The url of the "more" link for additional facet values
+      def search_facet_path(args = {})
+        sufia.dashboard_shares_facet_path(args[:id])
+      end
   end
 end

data/app/controllers/my/works_controller.rb

@@ -14,5 +14,10 @@ module My
       def search_action_url(*args)
         sufia.dashboard_works_url(*args)
       end
+
+      # The url of the "more" link for additional facet values
+      def search_facet_path(args = {})
+        sufia.dashboard_works_facet_path(args[:id])
+      end
   end
 end

data/app/controllers/stats_controller.rb

@@ -23,7 +23,7 @@ class StatsController < ApplicationController
       when 'file'.freeze
         add_breadcrumb I18n.t("sufia.file_set.browse_view"), main_app.curation_concerns_file_set_path(params["id"])
       when 'work'.freeze
-        add_breadcrumb I18n.t("sufia.work.browse_view"), polymorphic_path(@work)
+        add_breadcrumb @work.to_s, polymorphic_path(@work)
       end
     end
 end

data/app/controllers/sufia/admin/admin_sets_controller.rb

@@ -43,6 +43,7 @@ module Sufia
 
     def update
       if @admin_set.update(admin_set_params)
+        permission_template.update(permission_template_params)
         redirect_to sufia.admin_admin_sets_path
       else
         setup_form
@@ -52,6 +53,9 @@ module Sufia
 
     def create
       if create_admin_set
+        permission_template_holder = permission_template
+        permission_template_holder.attributes = permission_template_params
+        permission_template_holder.save! # to create permission template on create
         redirect_to sufia.admin_admin_sets_path
       else
         setup_form
@@ -59,6 +63,11 @@ module Sufia
       end
     end
 
+    def destroy
+      @admin_set.destroy
+      redirect_to sufia.admin_admin_sets_path, notice: t(:'sufia.admin.admin_sets.delete.notification')
+    end
+
     # for the AdminSetService
     def repository
       repository_class.new(blacklight_config)
@@ -83,7 +92,7 @@ module Sufia
       end
 
       def create_admin_set
-        AdminSetService.new(@admin_set, current_user).create
+        AdminSetCreateService.new(@admin_set, current_user).create
       end
 
       def setup_form
@@ -91,7 +100,12 @@ module Sufia
         add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
         add_breadcrumb t(:'sufia.admin.sidebar.admin_sets'), sufia.admin_admin_sets_path
         add_breadcrumb action_breadcrumb, request.path
-        @form = form_class.new(@admin_set)
+        @form = form_class.new(@admin_set, permission_template)
+      end
+
+      # Find or create the permission_template object for this admin set
+      def permission_template
+        PermissionTemplate.find_or_initialize_by(admin_set_id: @admin_set.id)
       end
 
       def action_breadcrumb
@@ -110,5 +124,9 @@ module Sufia
       def repository_class
         blacklight_config.repository_class
       end
+
+      def permission_template_params
+        { "workflow_name" => params[:admin_set][:workflow_name] }
+      end
   end
 end

data/app/controllers/sufia/admin/permission_template_accesses_controller.rb

@@ -0,0 +1,15 @@
+module Sufia
+  module Admin
+    class PermissionTemplateAccessesController < ApplicationController
+      load_and_authorize_resource class: 'Sufia::PermissionTemplateAccess'
+
+      def destroy
+        @permission_template_access.destroy
+
+        redirect_to sufia.edit_admin_admin_set_path(@permission_template_access.permission_template.admin_set_id,
+                                                    anchor: 'participants'),
+                    notice: 'Permissions updated'
+      end
+    end
+  end
+end

data/app/controllers/sufia/admin/permission_templates_controller.rb

@@ -0,0 +1,29 @@
+module Sufia
+  module Admin
+    class PermissionTemplatesController < ApplicationController
+      before_action :load_template_for_admin_set
+
+      def update
+        authorize! :update, @permission_template
+        Forms::PermissionTemplateForm.new(@permission_template).update(update_params)
+        # Ensure we redirect to active tab
+        current_tab = params[:sufia_permission_template][:access_grants_attributes].present? ? 'participants' : 'visibility'
+        redirect_to sufia.edit_admin_admin_set_path(params[:admin_set_id], anchor: current_tab),
+                    notice: 'Permissions updated'
+      end
+
+      private
+
+        # This sets the @permission_template so that CanCanCan doesn't have to.
+        def load_template_for_admin_set
+          @permission_template = Sufia::PermissionTemplate.find_by(admin_set_id: params[:admin_set_id])
+        end
+
+        def update_params
+          params.require(:sufia_permission_template)
+                .permit(:release_date, :release_period, :release_varies, :release_embargo, :visibility,
+                        access_grants_attributes: [:access, :agent_id, :agent_type, :id])
+        end
+    end
+  end
+end