sufia 7.3.0.rc3 → 7.3.0

data/app/assets/javascripts/sufia/relationships/work.es6

@@ -0,0 +1,7 @@
+export default class Work {
+  constructor(id, title) {
+    this.id = id
+    this.title = title
+    this.index = 0
+  }
+}

data/app/assets/javascripts/sufia/save_work/required_fields.es6

@@ -7,7 +7,7 @@ export class RequiredFields {
   }
 
   get areComplete() {
-    return this.requiredFields.filter((n, elem) => { return this.isValuePresent(elem) } ).length == 0
+    return this.requiredFields.filter((n, elem) => { return this.isValuePresent(elem) } ).length === 0
   }
 
   isValuePresent(elem) {

data/app/assets/javascripts/sufia/save_work/save_work_control.es6

@@ -2,7 +2,7 @@ import { RequiredFields } from './required_fields'
 import { ChecklistItem } from './checklist_item'
 import { UploadedFiles } from './uploaded_files'
 import { DepositAgreement } from './deposit_agreement'
-import { VisibilityComponent } from './visibility_component'
+import VisibilityComponent from './visibility_component'
 
 /**
  * Polyfill String.prototype.startsWith()
@@ -14,16 +14,18 @@ if (!String.prototype.startsWith) {
   };
 }
 
-export class SaveWorkControl {
+export default class SaveWorkControl {
   /**
    * Initialize the save controls
    * @param {jQuery} element the jquery selector for the save panel
+   * @param {AdminSetWidget} adminSetWidget the control for the adminSet dropdown
    */
-  constructor(element) {
-    if (element.size() == 0) {
+  constructor(element, adminSetWidget) {
+    if (element.length < 1) {
       return
     }
     this.element = element
+    this.adminSetWidget = adminSetWidget
     this.form = element.closest('form')
     element.data('save_work_control', this)
     this.activate();
@@ -82,20 +84,26 @@ export class SaveWorkControl {
     }
     this.requiredFields = new RequiredFields(this.form, () => this.formStateChanged())
     this.uploads = new UploadedFiles(this.form, () => this.formStateChanged())
-
     this.saveButton = this.element.find(':submit')
-
     this.depositAgreement = new DepositAgreement(this.form, () => this.formStateChanged())
-
     this.requiredMetadata = new ChecklistItem(this.element.find('#required-metadata'))
     this.requiredFiles = new ChecklistItem(this.element.find('#required-files'))
-    new VisibilityComponent(this.element.find('.visibility'))
+    new VisibilityComponent(this.element.find('.visibility'), this.adminSetWidget)
+    this.preventSubmit()
+    this.watchMultivaluedFields()
+    this.formChanged()
+  }
+
+  preventSubmit() {
     this.preventSubmitUnlessValid()
     this.preventSubmitIfAlreadyInProgress()
     this.preventSubmitIfUploading()
-    $('.multi_value.form-group', this.form).bind('managed_field:add', () => this.formChanged())
-    $('.multi_value.form-group', this.form).bind('managed_field:remove', () => this.formChanged())
-    this.formChanged()
+  }
+
+  // If someone adds or removes a field on a multivalue input, fire a formChanged event.
+  watchMultivaluedFields() {
+      $('.multi_value.form-group', this.form).bind('managed_field:add', () => this.formChanged())
+      $('.multi_value.form-group', this.form).bind('managed_field:remove', () => this.formChanged())
   }
 
   // Called when a file has been uploaded, the deposit agreement is clicked or a form field has had text entered.

data/app/assets/javascripts/sufia/save_work/visibility_component.es6

@@ -1,6 +1,12 @@
-export class VisibilityComponent {
-  constructor(element) {
+export default class VisibilityComponent {
+  /**
+   * Initialize the save controls
+   * @param {jQuery} element the jquery selector for the visibility component
+   * @param {AdminSetWidget} adminSetWidget the control for the adminSet dropdown
+   */
+  constructor(element, adminSetWidget) {
     this.element = element
+    this.adminSetWidget = adminSetWidget
     this.form = element.closest('form')
     $('.collapse').collapse({ toggle: false })
     element.find("[type='radio']").on('change', () => { this.showForm() })
@@ -35,21 +41,24 @@ export class VisibilityComponent {
 
   // Limit visibility options based on selected AdminSet (if enabled)
   limitByAdminSet() {
-    let adminSetInput = this.form.find('select[id$="_admin_set_id"]')
-    if(adminSetInput) {
-      $(adminSetInput).on('change', () => { this.restrictToVisibility(adminSetInput.find(":selected")) })
-      this.restrictToVisibility(adminSetInput.find(":selected"))
+    if(this.adminSetWidget) {
+      this.adminSetWidget.on('change', (data) => this.restrictToVisibility(data))
+      if (this.adminSetWidget.isEmpty()) {
+          console.error("No data was passed from the admin set. Perhaps there are no selectable options?")
+          return
+      }
+      this.restrictToVisibility(this.adminSetWidget.data())
     }
   }
 
   // Restrict visibility and/or release date to match the AdminSet requirements (if any)
-  restrictToVisibility(selected) {
+  restrictToVisibility(data) {
     // visibility requirement is in HTML5 'data-visibility' attr
-    let visibility = selected.data('visibility')
+    let visibility = data['visibility']
     // release date requirement is in HTML5 'data-release-date' attr
-    let release_date = selected.data('release-date')
+    let release_date = data['releaseDate']
     // if release_date is flexible (i.e. before date), then 'data-release-before-date' attr will be true
-    let release_before = selected.data('release-before-date')
+    let release_before = data['releaseBeforeDate']
 
     // Restrictions require either a visibility requirement or a release_date requirement (or both)
     if(visibility || release_date) {

data/app/assets/javascripts/sufia/select_work_type.es6

@@ -6,17 +6,17 @@ export default class SelectWorkType {
   constructor(element) {
       this.$element = element;
       this.target = element.data('target')
-      this.modal = $(this.target);
+      this.modal = $(this.target)
       this.form = this.modal.find('form.new-work-select')
 
       // launch the modal.
-      element.on('click', (e) => { 
-          e.preventDefault();
-          this.modal.modal();
+      element.on('click', (e) => {
+          e.preventDefault()
+          this.modal.modal()
           // ensure the type is set for the last clicked element
           this.type = element.data('create-type')
           // add custom routing logic when the modal is shown
-          this.form.on('submit', this.routingLogic.bind(this));
+          this.form.on('submit', this.routingLogic.bind(this))
       });
 
       // remove the routing logic when the modal is hidden
@@ -27,7 +27,9 @@ export default class SelectWorkType {
 
   // when the form is submitted route to the correct location
   routingLogic(e) {
-      e.preventDefault();
+      e.preventDefault()
+      if (this.destination() === undefined)
+        return false
       // get the destination from the data attribute of the selected radio button
       window.location.href = this.destination()
   }

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

@@ -55,7 +55,7 @@ module Sufia
         # ActionController::Parameters are not serializable, so cast to a hash
         BatchCreateJob.perform_later(current_user,
                                      params[:title].permit!.to_h,
-                                     params[:resource_type].permit!.to_h,
+                                     params.fetch(:resource_type, {}).permit!.to_h,
                                      params[:uploaded_files],
                                      attributes_for_actor.to_h.merge!(model: klass),
                                      log)

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

@@ -19,7 +19,14 @@ module Sufia
     end
 
     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 = Sufia::AdminSetService.new(self).search_results(:deposit).first
+      curation_concern.admin_set_id = admin_set && admin_set.id
       super
     end
 

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

@@ -64,8 +64,11 @@ module Sufia
     end
 
     def destroy
-      @admin_set.destroy
-      redirect_to sufia.admin_admin_sets_path, notice: t(:'sufia.admin.admin_sets.delete.notification')
+      if @admin_set.destroy
+        redirect_to sufia.admin_admin_sets_path, notice: t(:'sufia.admin.admin_sets.delete.notification')
+      else
+        redirect_to sufia.admin_admin_set_path(@admin_set), alert: @admin_set.errors.full_messages.to_sentence
+      end
     end
 
     # for the AdminSetService

data/app/forms/sufia/forms/batch_edit_form.rb

@@ -27,7 +27,8 @@ module Sufia
       def self.build_permitted_params
         super + [:visibility_during_embargo, :embargo_release_date,
                  :visibility_after_embargo, :visibility_during_lease,
-                 :lease_expiration_date, :visibility_after_lease, :visibility]
+                 :lease_expiration_date, :visibility_after_lease, :visibility] -
+          [{ work_members_attributes: [:id, :_destroy] }]
       end
 
       private

data/app/forms/sufia/forms/work_form.rb

@@ -37,22 +37,8 @@ module Sufia::Forms
          :collection_ids, :in_works_ids, :admin_set_id]
     end
 
-    # The ordered_members which are FileSet types
-    # @return [Array] All of the file sets in the ordered_members
-    def ordered_fileset_members
-      model.ordered_members.to_a.select { |m| m.model_name.singular.to_sym == :file_set }
-    end
-
-    # The ordered_members which are not FileSet types
-    # @return [Array] All of the non file sets in the ordered_members
-    def ordered_work_members
-      model.ordered_members.to_a.select { |m| m.model_name.singular.to_sym != :file_set }
-    end
-
-    # The in_work items
-    # @return [Array] All of the works that this work is a member of
-    def in_work_members
-      model.in_works.to_a
+    def work_members
+      model.members.to_a.reject { |m| m.is_a? FileSet }
     end
 
     def self.multiple?(term)
@@ -60,8 +46,24 @@ module Sufia::Forms
       super
     end
 
+    def self.sanitize_params(form_params)
+      admin_set_id = form_params[:admin_set_id]
+      if admin_set_id && Sipity::Workflow.find_by!(name: Sufia::PermissionTemplate.find_by!(admin_set_id: admin_set_id).workflow_name).allows_access_grant?
+        return super
+      end
+      params_without_permissions = permitted_params.reject { |arg| arg.respond_to?(:key?) && arg.key?(:permissions_attributes) }
+      form_params.permit(*params_without_permissions)
+    end
+
     def self.build_permitted_params
-      super + [:on_behalf_of, { collection_ids: [] }]
+      super + [:on_behalf_of,
+               { collection_ids: [] },
+               { work_members_attributes: [:id, :_destroy] }]
     end
+
+    # This is required so that fields_for will draw a nested form.
+    # See ActionView::Helpers#nested_attributes_association?
+    #   https://github.com/rails/rails/blob/v5.0.2/actionview/lib/action_view/helpers/form_helper.rb#L1890
+    delegate :work_members_attributes=, to: :model
   end
 end

data/app/models/concerns/sufia/admin_set_behavior.rb

@@ -0,0 +1,38 @@
+module Sufia
+  module AdminSetBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      DEFAULT_ID = 'admin_set/default'.freeze
+      DEFAULT_WORKFLOW_NAME = 'default'.freeze
+
+      def self.default_set?(id)
+        id == DEFAULT_ID
+      end
+
+      before_destroy :check_if_not_default_set, :check_if_empty
+    end
+
+    private
+
+      def check_if_empty
+        return true if members.empty?
+        errors[:base] << I18n.t('sufia.admin.admin_sets.delete.error_not_empty')
+        if Rails.version < '5.0.0'
+          false
+        else
+          throw :abort
+        end
+      end
+
+      def check_if_not_default_set
+        return true unless AdminSet.default_set?(id)
+        errors[:base] << I18n.t('sufia.admin.admin_sets.delete.error_default_set')
+        if Rails.version < '5.0.0'
+          false
+        else
+          throw :abort
+        end
+      end
+  end
+end

data/app/presenters/sufia/admin_set_options_presenter.rb

@@ -0,0 +1,51 @@
+module Sufia
+  # Presents the options for the AdminSet widget on the create/edit form
+  class AdminSetOptionsPresenter
+    def initialize(service)
+      @service = service
+    end
+
+    # Return AdminSet selectbox options based on access type
+    # @param [Symbol] access :deposit, :read, or :edit
+    def select_options(access = :deposit)
+      @service.search_results(access).map do |admin_set|
+        [admin_set.to_s, admin_set.id, data_attributes(admin_set)]
+      end
+    end
+
+    private
+
+      # Create a hash of HTML5 'data' attributes. These attributes are added to select_options and
+      # later utilized by Javascript to limit new Work options based on AdminSet selected
+      def data_attributes(admin_set)
+        # Get permission template associated with this AdminSet (if any)
+        permission_template = PermissionTemplate.find_by(admin_set_id: admin_set.id)
+
+        # Only add data attributes if permission template exists
+        return {} unless permission_template
+        attributes_for(permission_template: permission_template)
+      end
+
+      # all PermissionTemplate release & visibility data attributes (if not blank or false)
+      def attributes_for(permission_template:)
+        {}.tap do |attrs|
+          attrs['data-sharing'] = sharing?(permission_template: permission_template)
+          attrs['data-release-date'] = permission_template.release_date unless permission_template.release_date.blank?
+          attrs['data-release-before-date'] = true if permission_template.release_before_date?
+          attrs['data-visibility'] = permission_template.visibility unless permission_template.visibility.blank?
+        end
+      end
+
+      # Does the workflow for the currently selected permission template allow sharing?
+      def sharing?(permission_template:)
+        wf = workflow(permission_template: permission_template)
+        return false unless wf
+        wf.allows_access_grant?
+      end
+
+      def workflow(permission_template:)
+        return unless permission_template.workflow_name
+        Sipity::Workflow.find_by!(name: permission_template.workflow_name)
+      end
+  end
+end

data/app/presenters/sufia/admin_set_presenter.rb

@@ -3,5 +3,16 @@ module Sufia
     def total_items
       ActiveFedora::SolrService.count("{!field f=isPartOf_ssim}#{id}")
     end
+
+    # AdminSet cannot be deleted if default set or non-empty
+    def disable_delete?
+      AdminSet.default_set?(id) || total_items > 0
+    end
+
+    # Message to display if deletion is disabled
+    def disabled_message
+      return I18n.t('sufia.admin.admin_sets.delete.error_default_set') if AdminSet.default_set?(id)
+      return I18n.t('sufia.admin.admin_sets.delete.error_not_empty') if total_items > 0
+    end
   end
 end

data/app/search_builders/sufia/find_works_search_builder.rb

@@ -5,6 +5,7 @@ class Sufia::FindWorksSearchBuilder < Sufia::SearchBuilder
 
   self.default_processor_chain += [:filter_on_title, :show_only_resources_deposited_by_current_user, :show_only_other_works, :show_only_works_not_child, :show_only_works_not_parent]
 
+  # Excludes the id that is part of the params
   def initialize(context)
     super(context)
     @id = context.params[:id]

data/app/services/sufia/actor_factory.rb

@@ -8,6 +8,7 @@ module Sufia
        CurationConcerns::Actors::AddToWorkActor,
        CurationConcerns::Actors::AssignRepresentativeActor,
        CurationConcerns::Actors::AttachFilesActor,
+       Sufia::Actors::AttachMembersActor,
        CurationConcerns::Actors::ApplyOrderActor,
        InterpretVisibilityActor,
        DefaultAdminSetActor,

data/app/services/sufia/admin_set_create_service.rb

@@ -1,29 +1,28 @@
 module Sufia
   # Creates AdminSets
   class AdminSetCreateService
-    DEFAULT_ID = 'admin_sets/default'.freeze
-
     def self.create_default!
-      return if AdminSet.exists?(DEFAULT_ID)
-      admin_set = AdminSet.new(id: DEFAULT_ID, title: ['Default Admin Set'])
+      return if AdminSet.exists?(AdminSet::DEFAULT_ID)
+      admin_set = AdminSet.new(id: AdminSet::DEFAULT_ID, title: ['Default Admin Set'])
       begin
-        new(admin_set, nil).create
+        new(admin_set, nil, AdminSet::DEFAULT_WORKFLOW_NAME).create
       rescue ActiveFedora::IllegalOperation
         # It is possible that another thread created the AdminSet just before this method
         # was called, so ActiveFedora will raise IllegalOperation. In this case we can safely
         # ignore the error.
-        Rails.logger.error("AdminSet ID=#{DEFAULT_ID} may or may not have been created due to threading issues.")
+        Rails.logger.error("AdminSet ID=#{AdminSet::DEFAULT_ID} may or may not have been created due to threading issues.")
       end
     end
 
     # @param admin_set [AdminSet] the admin set to operate on
     # @param creating_user [User] the user who created the admin set.
-    def initialize(admin_set, creating_user)
+    def initialize(admin_set, creating_user, workflow_name)
       @admin_set = admin_set
       @creating_user = creating_user
+      @workflow_name = workflow_name
     end
 
-    attr_reader :creating_user, :admin_set
+    attr_reader :creating_user, :admin_set, :workflow_name
 
     # Creates an admin set, setting the creator and the default access controls.
     # @return [TrueClass, FalseClass] true if it was successful
@@ -43,7 +42,8 @@ module Sufia
 
     def create_permission_template
       PermissionTemplate.create!(admin_set_id: admin_set.id,
-                                 access_grants_attributes: access_grants_attributes)
+                                 access_grants_attributes: access_grants_attributes,
+                                 workflow_name: workflow_name)
     end
   end
 end

data/app/services/sufia/admin_set_service.rb

@@ -20,33 +20,5 @@ module Sufia
         [doc, counts[doc.id]]
       end
     end
-
-    # Return AdminSet selectbox options based on access type
-    # @param [Symbol] access :read or :edit
-    def select_options(access = :read)
-      search_results(access).map do |admin_set|
-        [admin_set.to_s, admin_set.id, data_attributes(admin_set)]
-      end
-    end
-
-    private
-
-      # Create a hash of HTML5 'data' attributes. These attributes are added to select_options and
-      # later utilized by Javascript to limit new Work options based on AdminSet selected
-      def data_attributes(admin_set)
-        attrs = {}
-        # Get permission template associated with this AdminSet (if any)
-        permission_template = PermissionTemplate.find_by(admin_set_id: admin_set.id)
-
-        # Only add data attributes if permission template exists
-        if permission_template
-          # Save all PermissionTemplate release & visibility data attributes (if not blank or false)
-          attrs['data-release-date'] = permission_template.release_date unless permission_template.release_date.blank?
-          attrs['data-release-before-date'] = true if permission_template.release_before_date?
-          attrs['data-visibility'] = permission_template.visibility unless permission_template.visibility.blank?
-        end
-
-        attrs
-      end
   end
 end