hyrax 2.1.0.beta2 → 2.1.0.rc1

data/app/assets/javascripts/hyrax/collections_utils.es6

@@ -0,0 +1,116 @@
+/**
+ * Generic helper utilities for processing Collection and Collection Type editing
+ * @type {Class}
+ */
+export default class CollectionUtilities {
+  constructor() {
+    this.addParticipantsInputValidator = new AddParticipantsInputValidator();
+    this.addParticipants = new AddParticipants();
+  }
+}
+
+class AddParticipants {
+  /**
+   * Notes:
+   This is a workaround for a scoping issue with 'simple_form' and nested forms in the
+   'Edit Collections' partials.  All tabs were wrapped in a 'simple_form'. Nested forms, for example inside a tab partial,
+   have behaved erratically, so the pattern has been to remove nested form instances for relatively non-complex forms
+   and replace with AJAX requests.  For this instance of Add Sharing > Add user and Add group, seem more complex in how
+   the form is built from '@form.permission_template', so since it's not working, but the form is already built, this
+   code listens for a click event on the nested form submit button, prevents Default submit behavior, and manually makes
+   the form post.
+   * @param  {jQuery event} e jQuery event object
+   * @return {void}
+   */
+  handleAddParticipants(e) {
+    e.preventDefault();
+    const { wrapEl, urlFn } = e.data;
+    // This is a callback, because some POST urls might depend on dynamic id variables
+    // Send the e event object back and construct any values needed
+    const url = urlFn(e);
+    const $wrapEl = $(e.target).parents(wrapEl);
+
+    if ($wrapEl.length === 0) {
+      return;
+    }
+    // Get all input values to send in the upcoming POST
+    const serialized = $wrapEl.find(':input').serialize();
+    if (serialized.length === 0) {
+      return;
+    }
+
+    $.ajax({
+      type: 'POST',
+      url: url,
+      data: serialized
+    })
+      .done(function(response) {
+        // Success handler here, possibly show alert success if page didn't reload?
+      })
+      .fail(function(err) {
+        console.error(err);
+      });
+  }
+}
+
+/**
+ * Handle enabling/disabling "Add" button for adding a user or group when editing a Collection
+ * or Collection Type.  Determines whether editable inputs have been filled out or not, then sets button state.
+ * @type: {Class}
+ */
+class AddParticipantsInputValidator {
+  /**
+   * Check that regular inputs have a non-empty input value
+   * @param  {jQuery object} $inputs Inputs which are editable by the user
+   * @return {boolean}  Do all inputs passed in have values?
+   */
+  checkInputsPass($inputs) {
+    let inputsPass = true;
+
+    $inputs.each(function(i) {
+      if ($(this).val() === '') {
+        inputsPass = false;
+        return false;
+      }
+    });
+    return inputsPass;
+  }
+
+  /**
+   * Checks that the select2 input (if it exists) has a non-default value
+   * @param  {object} context jQuery $(this) context object
+   * @return {boolean} Whether a select2 input has a non-default value, or doesn't exist
+   */
+  checkSelect2Pass(context) {
+    const $select2 = context.find('.select2-container');
+    // No select2 element present, so it passes by default
+    if ($select2.length === 0) {
+      return true;
+    }
+    const $placeholder = $select2.siblings('[placeholder]');
+    const placeholderValue = $placeholder.attr('placeholder');
+    const chosenValue = $select2.find('.select2-chosen').text();
+
+    return placeholderValue !== chosenValue;
+  }
+
+  /**
+   * Handle disabled button state for the 'Add' button for Collections or
+   * Collection Type > Edit > Sharing or Participants tab Add Sharing or Add Partipants section
+   * @param  {object} event jQuery event object
+   * @param {string} event.data.buttonSelector jQuery selector string for row's button
+   * @param {string} event.data.inputsWrapper jQuery selector string for the wrapping selector class which holds inputs
+   * @return {void}
+   */
+  handleWrapperContentsChange(event) {
+    const { buttonSelector, inputsWrapper } = event.data;
+    const $inputsWrapper = $(event.target).parents(inputsWrapper);
+    // Get regular inputs for the row
+    const $inputs = $inputsWrapper.find('.form-control');
+    const $addButton = $inputsWrapper.find(buttonSelector);
+    const inputsPass = this.checkInputsPass($inputs);
+    const select2Pass = this.checkSelect2Pass($inputsWrapper);
+
+    $addButton.prop('disabled', !(inputsPass && select2Pass));
+  }
+}

data/app/assets/javascripts/hyrax/collections_v2.es6

@@ -0,0 +1,57 @@
+import CollectionUtilities from 'hyrax/collections_utils';
+
+export default class CollectionsV2 {
+  constructor() {
+    this.collectionUtilities = new CollectionUtilities();
+    this.setupAddSharingHandler();
+    this.sharingAddButtonDisabler();
+  }
+
+  /**
+   * Set up the handler for adding groups or users via AJAX POSTS at the following location:
+   * Collection > Edit > Sharing tab; or
+   * Collection Types > Edit > Participants tab
+   * @return {void}
+   */
+  setupAddSharingHandler() {
+    const { addParticipants } = this.collectionUtilities;
+    const wrapEl = '.form-add-sharing-wrapper';
+
+    $('#participants')
+      .find('.edit-collection-add-sharing-button')
+      .on('click', {
+        wrapEl,
+        urlFn: (e) => {
+          const $wrapEl = $(e.target).parents(wrapEl);
+          return '/dashboard/collections/' + $wrapEl.data('id') + '/permission_template?locale=en';
+        }
+      },
+      addParticipants.handleAddParticipants.bind(addParticipants));
+  }
+
+  /**
+   * Set up enabling/disabling "Add" button for adding groups and/or users in
+   * Edit Collection > Sharing tab
+   * @return {void}
+   */
+  sharingAddButtonDisabler() {
+    const { addParticipantsInputValidator } = this.collectionUtilities;
+    // Selector for the button to enable/disable
+    const buttonSelector = '.edit-collection-add-sharing-button';
+    const inputsWrapper = '.form-add-sharing-wrapper';
+
+    $('#participants')
+      .find(inputsWrapper)
+      .on(
+        'change',
+        // custom data we need passed into the event handler
+        {
+          buttonSelector: '.edit-collection-add-sharing-button',
+          inputsWrapper
+        },
+        addParticipantsInputValidator.handleWrapperContentsChange.bind(
+          addParticipantsInputValidator
+        )
+      );
+  }
+}

data/app/assets/javascripts/hyrax/content_blocks.js

@@ -9,16 +9,4 @@ Blacklight.onLoad(function() {
     $this.parent().hide();
     $($this.data('target')).show();
   });
-
-  $('.show-confirm').on('click', function(evt) {
-    evt.preventDefault();
-    evt.stopPropagation();
-    $('#change-tab-content-block').modal('show');
-  });
-
-  $('#change-tab-btn').on('click', function(evt) {
-    evt.preventDefault();
-    $('#change-tab-content-block').modal('hide');
-    $('.nav-tabs a[href="' + location.hash + '"]').tab('show');
-  });    
-});
+});

data/app/assets/javascripts/hyrax/nav_safety.js

@@ -0,0 +1,41 @@
+// To enable nav safety on a form:
+// - Render the shared/nav-safety partial on the page.
+// - Add the nav-safety-confirm class to the tab anchor element.
+// - Add the nav-safety class to the form element.
+
+Blacklight.onLoad(function() {
+  $('.nav-safety-confirm').on('click', function(evt) {
+    var dirtyData = $('#nav-safety-modal[dirtyData=true]');
+    if (dirtyData.length > 0) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      $('#nav-safety-modal').modal('show');
+    }
+  });
+  
+  $('#nav-safety-dismiss').on('click', function(evt) {
+    // evt.preventDefault();
+    nav_safety_off();
+    // $('#nav-safety-change-tab').modal('hide');
+  });
+  
+  $('form.nav-safety').on('change', function(evt) {
+    nav_safety_on();
+  });
+  $('form.nav-safety').on('reset', function(evt) {
+    nav_safety_off();
+  });
+});
+
+function nav_safety_on() {
+  $('#nav-safety-modal')[0].setAttribute('dirtyData', true);
+}
+
+function nav_safety_off() {
+  $('#nav-safety-modal')[0].setAttribute('dirtyData', false);
+}
+
+function tinymce_nav_safety(editor) {editor.on('Change', function (e) {
+  $(e.target.targetElm).parents('form.nav-safety').change();
+});
+}

data/app/assets/javascripts/hyrax/turbolinks_events.js

@@ -2,4 +2,7 @@
 // See https://github.com/rails/jquery-ujs/issues/456
 $(document).on('turbolinks:load', function() {
   $.rails.refreshCSRFTokens();
+  // Explicitly set flag to false to force loading of UV
+  // See https://github.com/samvera/hyrax/issues/2906
+  window.embedScriptIncluded = false;
 });

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

@@ -9,8 +9,8 @@
 .collection-types-wrapper {
   @media (min-width: 900px) {
     .collection-types-table {
-      th:last-child,
-      td:last-child {
+      td:last-child,
+      th:last-child {
         width: 20%;
       }
     }
@@ -48,6 +48,50 @@
   }
 }
 
+// Edit Collection Types - Participants Tab
+.collection-types-edit-participants-tab {
+  .section-participants {
+    padding-bottom: 40px;
+
+    .form-inline {
+      label {
+        padding-right: 5px;
+        text-align: right;
+        width: 100px;
+      }
+
+      .select2-container,
+      input,
+      select {
+        width: 200px;
+      }
+
+      .btn {
+        width: 75px;
+      }
+    }
+  }
+
+  .section-current-participants {
+    legend {
+      margin-bottom: 0;
+    }
+
+    .share-status {
+      td,
+      th {
+        width: 40%;
+      }
+
+      th:last-of-type,
+      td:last-of-type {
+        text-align: center;
+        width: 20%;
+      }
+    }
+  }
+}
+
 .collection-type-share-applies-to {
   margin-left: 3em;
 }

data/app/assets/stylesheets/hyrax/_work-show.scss

@@ -35,16 +35,13 @@ ul.tabular {
   // text-align: center;
 }
 
-.table.table-borderless {
-  th,
-  td {
-    border: 0;
-    padding: 8px;
-    vertical-align: top;
+.work-show {
+  dt,
+  dd {
+    padding: 2px;
   }
-
-  th {
-    text-align: right;
+  dd {
+    margin-left: 6px;
   }
 }
 

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

@@ -159,6 +159,8 @@ body.dashboard {
       line-height: 1.42857143;
       color: #333;
       white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
 
     .facet-count {

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

@@ -44,6 +44,10 @@ $gutter-width: $grid-gutter-width/2;
         padding-left: 52px;
       }
     }
+
+    .fa {
+      width: 15px;
+    }
   }
 
   .sidebar-toggle {

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

@@ -56,7 +56,6 @@ module Hyrax
       else
         respond_to do |wants|
           wants.html do
-            flash[:error] = curation_concern.errors.messages[:collections].to_sentence
             build_form
             render 'new', status: :unprocessable_entity
           end
@@ -68,6 +67,8 @@ module Hyrax
     # Finds a solr document matching the id and sets @presenter
     # @raise CanCan::AccessDenied if the document is not found or the user doesn't have access to it.
     def show
+      @user_collections = user_collections
+
       respond_to do |wants|
         wants.html { presenter && parent_presenter }
         wants.json do
@@ -99,7 +100,6 @@ module Hyrax
       else
         respond_to do |wants|
           wants.html do
-            flash[:error] = curation_concern.errors.messages[:collections].to_sentence
             build_form
             render 'edit', status: :unprocessable_entity
           end
@@ -132,6 +132,14 @@ module Hyrax
 
     private
 
+      def user_collections
+        collections_service.search_results(:deposit) if presenter.editor?
+      end
+
+      def collections_service
+        Hyrax::CollectionsService.new(self)
+      end
+
       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.

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

@@ -20,8 +20,9 @@ module Hyrax
     self.admin_set_create_service = AdminSetCreateService
 
     def show
+      add_breadcrumb I18n.t('hyrax.controls.home'), hyrax.root_path
       add_breadcrumb t(:'hyrax.dashboard.title'), hyrax.dashboard_path
-      add_breadcrumb t(:'hyrax.dashboard.my.collections'), hyrax.admin_admin_sets_path
+      add_breadcrumb t(:'hyrax.dashboard.my.collections'), hyrax.my_collections_path
       add_breadcrumb @admin_set.title.first
       super
     end
@@ -113,14 +114,6 @@ module Hyrax
         @form ||= form_class.new(@admin_set, current_ability, repository)
       end
 
-      # Overrides the parent implementation so that the returned search builder
-      #  searches for edit access
-      # Instantiates the search builder that builds a query for a single item
-      # this is useful in the show view.
-      def single_item_search_builder
-        single_item_search_builder_class.new(self, :edit).with(params.except(:q, :page))
-      end
-
       def action_breadcrumb
         case action_name
         when 'edit', 'update'

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

@@ -101,7 +101,7 @@ module Hyrax
 
       def collection_type_params
         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)
+                                                :allow_multiple_membership, :require_membership, :assigns_workflow, :assigns_visibility, :badge_color)
       end
   end
 end

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -46,9 +46,16 @@ module Hyrax
     end
 
     def update_document(obj)
-      obj.attributes = work_params
+      interpret_visiblity_params(obj)
+      obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
       obj.date_modified = Time.current.ctime
-      obj.visibility = params[:visibility]
+
+      if params[:visibility]
+        Deprecation.warn(self, "visibility is not submitted by the Hyrax UI and is deprecated " \
+                               "for removal in Hyrax 3.0. Please use " \
+                               "#{form_class.model_name.param_key}[visibility] instead.")
+        obj.visibility = params[:visibility]
+      end
 
       InheritPermissionsJob.perform_now(obj)
       VisibilityCopyJob.perform_now(obj)
@@ -94,9 +101,28 @@ module Hyrax
         form_class.terms
       end
 
-      def work_params
+      def work_params(extra_params = {})
         work_params = params[form_class.model_name.param_key] || ActionController::Parameters.new
-        form_class.model_attributes(work_params)
+        form_class.model_attributes(work_params.merge(extra_params))
+      end
+
+      def interpret_visiblity_params(obj)
+        stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
+          middleware.use Hyrax::Actors::InterpretVisibilityActor
+        end
+        env = Hyrax::Actors::Environment.new(obj, current_ability, work_params(admin_set_id: obj.admin_set_id))
+        last_actor = Hyrax::Actors::Terminator.new
+        stack.build(last_actor).update(env)
+      end
+
+      def visibility_params
+        ['visibility',
+         'lease_expiration_date',
+         'visibility_during_lease',
+         'visibility_after_lease',
+         'embargo_release_date',
+         'visibility_during_embargo',
+         'visibility_after_embargo']
       end
 
       def redirect_to_return_controller