Merge branch 'main'

app/assets/javascripts/hydra-editor/field_manager.es6

@@ -0,0 +1,187 @@
+export class FieldManager {
+    constructor(element, options) {
+        this.element = $(element);
+
+        this.options = options;
+
+        this.options.label = this.getFieldLabel(this.element, options)
+
+        this.addSelector = '.add'
+        this.removeSelector = '.remove'
+
+        this.adder    = this.createAddHtml(this.options)
+        this.remover  = this.createRemoveHtml(this.options)
+
+        this.controls = $(options.controlsHtml);
+
+        this.inputTypeClass = options.inputTypeClass;
+        this.fieldWrapperClass = options.fieldWrapperClass;
+        this.warningClass = options.warningClass;
+        this.listClass = options.listClass;
+
+        this.init();
+    }
+
+    // call _addInitialID
+    init() {
+        this._addInitialClasses();
+        this._addInitialID();
+        this._addAriaLiveRegions();
+        this._appendControls();
+        this._attachEvents();
+        this._addCallbacks();
+    }
+
+    _addInitialClasses() {
+        this.element.addClass("managed");
+        $(this.fieldWrapperClass, this.element).addClass("input-group input-append");
+    }
+
+    // ensure ID is assigned
+    _addInitialID() {
+      let id = this.element.find('.multi_value.form-control').attr('id') + '_' + 'label';
+      if (id != "undefined_label"){
+        this.element.find('label').attr('id', id);
+      }
+    }
+
+    _addAriaLiveRegions() {
+        $(this.element).find('.listing').attr('aria-live', 'polite')
+    }
+
+    // Add the "Add another" and "Remove" controls to the DOM
+    _appendControls() {
+        // We want to make these DOM additions idempotently, so exit if it's
+        // already set up.
+        if (!this._hasRemoveControl()) {
+          this._createRemoveWrapper()
+          this._createRemoveControl()
+        }
+
+        if (!this._hasAddControl()) {
+          this._createAddControl()
+        }
+    }
+
+    _createRemoveWrapper() {
+      $(this.fieldWrapperClass, this.element).append(this.controls);
+    }
+
+    _createRemoveControl() {
+      $(this.fieldWrapperClass + ' .field-controls', this.element).append(this.remover)
+    }
+
+    _createAddControl() {
+      this.element.find(this.listClass).after(this.adder)
+    }
+
+    _hasRemoveControl() {
+      return this.element.find(this.removeSelector).length > 0
+    }
+
+    _hasAddControl() {
+      return this.element.find(this.addSelector).length > 0
+    }
+
+    _attachEvents() {
+        this.element.on('click', this.removeSelector, (e) => this.removeFromList(e))
+        this.element.on('click', this.addSelector, (e) => this.addToList(e))
+    }
+
+    _addCallbacks() {
+        this.element.bind('managed_field:add', this.options.add);
+        this.element.bind('managed_field:remove', this.options.remove);
+    }
+
+    _manageFocus() {
+        $(this.element).find(this.listClass).children('li').last().find('.form-control').focus();
+    }
+
+    addToList( event ) {
+        event.preventDefault();
+        let $listing = $(event.target).closest(this.inputTypeClass).find(this.listClass)
+        let $activeField = $listing.children('li').last()
+
+        if (this.inputIsEmpty($activeField)) {
+            this.displayEmptyWarning();
+        } else {
+            this.clearEmptyWarning();
+            $listing.append(this._newField($activeField));
+        }
+
+        this._manageFocus()
+    }
+
+    inputIsEmpty($activeField) {
+        return $activeField.children('input.multi-text-field').val() === '';
+    }
+
+    _newField ($activeField) {
+        var $newField = this.createNewField($activeField);
+        return $newField;
+    }
+
+    createNewField($activeField) {
+        let $newField = $activeField.clone();
+        let $newChildren = this.createNewChildren($newField);
+        this.element.trigger("managed_field:add", $newChildren);
+        return $newField;
+    }
+
+    clearEmptyWarning() {
+        let $listing = $(this.listClass, this.element)
+        $listing.children(this.warningClass).remove();
+    }
+
+    displayEmptyWarning() {
+        let $listing = $(this.listClass, this.element)
+        var $warningMessage  = $("<div class=\'message has-warning\'>cannot add another with empty field</div>");
+        $listing.children(this.warningClass).remove();
+        $listing.append($warningMessage);
+    }
+
+    removeFromList( event ) {
+        event.preventDefault();
+        var $field = $(event.target).parents(this.fieldWrapperClass).remove();
+        this.element.trigger("managed_field:remove", $field);
+
+        this._manageFocus();
+    }
+
+    destroy() {
+        $(this.fieldWrapperClass, this.element).removeClass("input-append");
+        this.element.removeClass("managed");
+    }
+
+    getFieldLabel($element, options) {
+        var label = '';
+        var $label = $element.find("label").first();
+        if ($label.length && options.labelControls) {
+          var label = $label.data('label') || $.trim($label.contents().filter(function() { return this.nodeType === 3; }).text());
+          label = ' ' + label;
+        }
+
+        return label;
+    }
+
+    createAddHtml(options) {
+        var $addHtml  = $(options.addHtml);
+        $addHtml.find('.controls-add-text').html(options.addText + options.label);
+        return $addHtml;
+    }
+
+    createRemoveHtml(options) {
+        var $removeHtml = $(options.removeHtml);
+        $removeHtml.find('.controls-remove-text').html(options.removeText);
+        $removeHtml.find('.controls-field-name-text').html(options.label);
+        return $removeHtml;
+    }
+
+    createNewChildren(clone) {
+        let $newChildren = $(clone).children(this.inputTypeClass);
+        $newChildren.val('').removeAttr('required');
+        $newChildren.first().focus();
+        return $newChildren.first();
+    }
+}
+

app/assets/javascripts/hyrax.js

@@ -90,6 +90,7 @@
 //= require hyrax/collapse
 //= require hyrax/skip_to_content
 //= require hyrax/reports-buttons
+//= require hydra-editor/field_manager
 
 // this needs to be after batch_select so that the form ids get setup correctly
 //= require hyrax/batch_edit

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

@@ -10,6 +10,9 @@
       margin-left: auto;
     }
   }
+  .dropdown-item {
+    font-size: 125%;
+  }
 }
 
 .no-preview,

app/views/hyrax/file_sets/_permission_form.html.erb

@@ -56,8 +56,10 @@
         <%= select_tag 'new_group_permission_skel', options_for_select(configured_permission_options), class: 'form-control' %>
       </div>
       <div class="col-sm-3">
-        <span class="sr-only"><%= t('.add_new_group_skel') %></span>
-        <button class="btn btn-secondary" id="add_new_group_skel"><i class="fa fa-plus"></i></button>
+        <button class="btn btn-secondary" id="add_new_group_skel">
+          <span class="sr-only"><%= t('.add_new_group_skel') %></span>
+          <i class="fa fa-plus"></i>
+        </button>
         <br /><span id="directory_group_result"></span>
       </div>
     </div>

app/views/hyrax/transfers/_received.html.erb

@@ -23,7 +23,7 @@
         <% if req.pending? %>
             <div class="btn-group">
               <button class="btn btn-sm btn-primary" href="#"><%= t(".accept") %></button>
-              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"></button>
+              <button class="btn btn-sm dropdown-toggle accept" data-toggle="dropdown" href="#"><span class="sr-only">accept options</span></button>
               <ul class="dropdown-menu">
                 <li class="dropdown-item">
                   <%= link_to t(".allow_depositor_to_retain_edit_access"), hyrax.accept_transfer_path(req), method: :put, class: 'accept-retain', title: t(".accept_the_file_and_allow_the_original_depositor_to_retain_access_to_edit_the_file_and_metadata") %>