hyrax 3.0.0.pre.beta3 → 3.0.0

data/app/actors/hyrax/actors/terminator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
     # This is always the last middleware on the actor middleware stack.

data/app/actors/hyrax/actors/transactional_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
     # Wrap the stack in a database transaction.

data/app/actors/hyrax/actors/transfer_request_actor.rb

@@ -1,23 +1,29 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
+    ##
+    # @deprecated transfer requests are now carried out in response to published
+    # 'object.deposited' events.
+    #
     # Notify the provided owner that their proxy wants to make a
     # deposit on their behalf
     class TransferRequestActor < AbstractActor
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if create was successful
       def create(env)
+        Deprecation.warn('Use Hyrax::Listeners::ProxyDepositListener instead.')
         next_actor.create(env) && create_proxy_deposit_request(env)
       end
 
       private
 
-        def create_proxy_deposit_request(env)
-          proxy = env.curation_concern.on_behalf_of
-          return true if proxy.blank?
-          ContentDepositorChangeEventJob.perform_later(env.curation_concern,
-                                                       ::User.find_by_user_key(proxy))
-          true
-        end
+      def create_proxy_deposit_request(env)
+        proxy = env.curation_concern.on_behalf_of
+        return true if proxy.blank?
+        ContentDepositorChangeEventJob.perform_later(env.curation_concern,
+                                                     ::User.find_by_user_key(proxy))
+        true
+      end
     end
   end
 end

data/app/actors/hyrax/actors/valkyrie_to_active_fedora.rb

@@ -47,14 +47,14 @@ module Hyrax
 
       private
 
-        def cast(env)
-          return true unless env.curation_concern.is_a? Valkyrie::Resource
+      def cast(env)
+        return true unless env.curation_concern.is_a? Valkyrie::Resource
 
-          env.curation_concern =
-            Wings::ActiveFedoraConverter.convert(resource: env.curation_concern)
+        env.curation_concern =
+          Wings::ActiveFedoraConverter.convert(resource: env.curation_concern)
 
-          true
-        end
+        true
+      end
     end
   end
 end

data/app/assets/javascripts/hyrax.js

@@ -30,6 +30,7 @@
 //= require morris/morris.min
 
 //= require clipboard
+//= require tinymce
 
 // This is required for Jasmine tests, specifically to polyfill the Symbol() function
 //= require babel/polyfill
@@ -104,6 +105,8 @@
 //= require hyrax/tabbed_form
 //= require hyrax/turbolinks_events
 //= require hyrax/i18n_helper
+//= require hyrax/collapse
+//= require hyrax/skip_to_content
 
 // this needs to be after batch_select so that the form ids get setup correctly
 //= require hyrax/batch_edit

data/app/assets/javascripts/hyrax/admin/admin_set/visibility.es6

@@ -4,6 +4,7 @@ export default class {
   }
 
   setup() {
+    this.formatDateOnLoad();
     // Watch for changes to "release_period" radio inputs
     let releasePeriodInput = this.element.find("input[type='radio'][name$='[release_period]']")
     $(releasePeriodInput).on('change', () => { this.releasePeriodSelected() })
@@ -13,6 +14,7 @@ export default class {
     let releaseVariesInput = this.element.find("input[type='radio'][name$='[release_varies]']")
     $(releaseVariesInput).on('change', () => { this.releaseVariesSelected() })
     this.releaseVariesSelected()
+    this.validateEmbargoDate();
   }
 
   // Based on the "release_period" radio selected, enable/disable other options
@@ -131,4 +133,59 @@ export default class {
   enableVisibilityRestricted() {
     this.element.find("input[type='radio'][name$='[visibility]'][value='restricted']").prop("disabled", false)
   }
+
+  // Check whether the browser supports input[type="date"]
+  isDateSupported() {
+    let input = document.createElement('input');
+    input.setAttribute('type', 'date');
+    return (input.type === 'date');
+  }
+
+  // Change date form on from yyyy-mm-dd to mm/dd/yyyy on display
+  formatDateOnLoad() {
+    if(!this.isDateSupported()) {
+      // Detect yyyy-mm-dd format
+      const regex = /^\d{4}[./-]\d{2}[./-]\d{2}$/;
+
+      // Get all the input fields
+      let $inputs = this.element.find(':input');
+
+      $inputs.each(function() {
+        if($(this).attr('type') === 'date') {
+          let value = $(this).val();
+          if(value.match(regex)) {
+            const [yyyy, mm, dd] = value.split('-');
+            $(this).val(mm + '/' + dd + '/' + yyyy);
+          }
+        }
+      });
+    }
+  }
+
+  // Change date format from mm/dd/yyyy to yyyy-mm-dd on form submit
+  validateEmbargoDate() {
+    if(!this.isDateSupported()) {
+      // Detect mm/dd/yyyy format
+      const regex = /^\d{2}[./-]\d{2}[./-]\d{4}$/;
+
+      let $form = this.element.find('form');
+      $form.on('submit', function() {
+        let data = $(this).serializeArray();
+        let releaseDate = data.find(item => item.name === 'permission_template[release_date]');
+
+        if(releaseDate && releaseDate.value.match(regex)) {
+          const [mm, dd, yyyy] = releaseDate.value.split('/');
+          releaseDate.value = yyyy + '-' + mm + '-' + dd;
+        }
+
+        // Request with modified data
+        $.ajax({
+            type: "POST",
+            url: $(this).attr('action'),
+            data: data
+        });
+        return false; // prevents normal behaviour
+      });
+    }
+  }
 }

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

@@ -18,22 +18,12 @@ Hyrax = {
         this.collectionTypeEditor();
         this.collectionUtilities();
         this.adminStatisticsGraphs();
-        this.tinyMCE();
         this.sortAndPerPage();
         this.sidebar();
         this.batchSelect();
         this.internationalizationHelper();
     },
 
-    // Add WYSIWYG editor functionality to editable content blocks
-    tinyMCE: function() {
-        if (typeof tinyMCE === "undefined")
-            return;
-        tinyMCE.init({
-            selector: 'textarea.tinymce'
-        });
-    },
-
     // The AdminSet edit page
     adminSetEditor: function() {
       var AdminSetControls = require('hyrax/admin/admin_set_controls');

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

@@ -10,6 +10,34 @@ export default class Autocomplete {
    * @param {string} url - The url for the autocompete search endpoint
    */
   setup (element, fieldName, url) {
+    if(element.data('autocomplete-type') && element.data('autocomplete-type').length > 0) {
+      this.byDataAttribute(element, url)
+    } else {
+      this.byFieldName(element, fieldName, url)
+    }
+  }
+
+  byDataAttribute(element, url) {
+    let type = element.data('autocomplete-type')
+    let exlude = element.data('exclude-work')
+    if(type === 'resource' && exclude.length > 0) {
+      new Resource(
+        element,
+        url,
+        { excluding: exclude }
+      )
+    } else if(type === 'resource' ) {
+      new Resource(
+        element,
+        url)
+    } else if(type === 'linked') {
+      new LinkedData(element, url)
+    } else {
+      new Default(element, url)
+    }
+  }
+
+  byFieldName(element, fieldName, url) {
     switch (fieldName) {
       case 'work':
         new Resource(
@@ -30,4 +58,5 @@ export default class Autocomplete {
         break
     }
   }
+
 }

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

@@ -81,6 +81,11 @@ Blacklight.onLoad(function() {
     $("input:checkbox").prop('checked', $(this).prop("checked"));
   });
 
+  // Check files within
+  $('[checks="active"]').on('click', function(evt) {
+     $("[value=" + this.value + "]").prop('checked', $(this).prop("checked"));
+  });
+
   // toggle button on or off based on boxes being clicked
   $(".batch_document_selector").bind('click', function(e) {
      toggleButtons();

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

@@ -0,0 +1,91 @@
+Blacklight.onLoad(function() {
+    const isCollapsed = getCollapsedActivity();
+    if(isCollapsed){
+        localStorage.setItem('collapsedActivity', 'collapsed');
+    }else{
+        localStorage.setItem('collapsedActivity', 'un-collapsed');
+    }
+    getStatusActivity();
+
+    const isCollapsedSettings = getCollapsedSettings();
+    if(isCollapsedSettings){
+        localStorage.setItem('collapsedSettings', 'collapsed');
+    }else{
+        localStorage.setItem('collapsedSettings', 'un-collapsed');
+    }
+    getStatusSettings();
+});
+
+function getCollapsedActivity() {
+    const state = localStorage.getItem('collapsedActivity');
+    if(state === 'un-collapsed'){
+        return false;
+    }
+    return true;
+}
+
+function getCollapsedSettings() {
+    const state = localStorage.getItem('collapsedSettings');
+    if(state === 'un-collapsed'){
+        return false;
+    }
+    return true;
+}
+
+function getStatusActivity(){
+    const resultDiv = document.getElementById('collapseUserActivity');
+    const isCollapsed = getCollapsedActivity();
+    if (resultDiv === null) {
+        return;
+    }
+    else if(isCollapsed){
+        resultDiv.classList.remove("in");
+        resultDiv.setAttribute("aria-expanded", "false");
+    }else{
+        resultDiv.classList.add("in");
+        resultDiv.setAttribute("aria-expanded", "true");
+    }
+}
+
+function getStatusSettings(){
+    const resultDiv = document.getElementById('collapseSettings');
+    const isCollapsed = getCollapsedSettings();
+    if (resultDiv === null) {
+        return;
+    }
+    else if(isCollapsed){
+        resultDiv.classList.remove("in");
+        resultDiv.setAttribute("aria-expanded", "false");
+    }else{
+        resultDiv.classList.add("in");
+        resultDiv.setAttribute("aria-expanded", "true");
+    }
+}
+
+function toggleCollapse(input){
+    var type = input.href;
+    var start = type.indexOf("#");
+    type = type.substring(start + 1);
+
+    if (type === "collapseUserActivity"){
+        const isCollapsedActivity = getCollapsedActivity();
+        if(isCollapsedActivity){
+            localStorage.setItem('collapsedActivity', 'un-collapsed');
+        }else{
+            localStorage.setItem('collapsedActivity', 'collapsed');
+        }
+    }
+
+    if (type === "collapseSettings"){
+        const isCollapsedSettings = getCollapsedSettings();
+        if(isCollapsedSettings){
+            localStorage.setItem('collapsedSettings', 'un-collapsed');
+        }else{
+            localStorage.setItem('collapsedSettings', 'collapsed');
+        }
+    }
+}
+
+function dontChangeAccordion(e) {
+    e.stopPropagation();
+}

data/app/assets/javascripts/hyrax/collections/editor.es6

@@ -6,12 +6,17 @@ import tabifyForm from 'hyrax/tabbed_form'
 // Add search for thumbnail to the edit descriptions
 export default class {
   constructor(elem) {
-    let url =  window.location.pathname.replace('edit', 'files')
     let field = elem.find('#collection_thumbnail_id')
-    this.thumbnailSelect = new ThumbnailSelect(url, field)
+    this.thumbnailSelect = new ThumbnailSelect(this.url(), field)
     tabifyForm(elem.find('form.editor'))
 
     let participants = new Participants(elem.find('#participants'))
     participants.setup()
   }
+
+  url() {
+    let urlParts = window.location.pathname.split("/")
+    urlParts[urlParts.length - 1] = "files"
+    return urlParts.join("/") 
+  }
 }

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

@@ -53,17 +53,16 @@ export default class {
       $('[data-autocomplete]').each((function() {
         var elem = $(this)
         autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
+        elem.parents('.multi_value.form-group').manage_fields({
+          add: function(e, element) {
+            var elem = $(element)
+            // Don't mark an added element as readonly even if previous element was
+            // Enable before initializing, as otherwise LinkedData fields remain disabled
+            elem.attr('readonly', false)
+            autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
+          }
+        })
       }))
-
-      $('.multi_value.form-group').manage_fields({
-        add: function(e, element) {
-          var elem = $(element)
-          // Don't mark an added element as readonly even if previous element was
-          // Enable before initializing, as otherwise LinkedData fields remain disabled
-          elem.attr('readonly', false)
-          autocomplete.setup(elem, elem.data('autocomplete'), elem.data('autocompleteUrl'))
-        }
-      })
   }
 
   // initialize any controlled vocabulary widgets

data/app/assets/javascripts/hyrax/file_manager/save_manager.es6

@@ -24,7 +24,7 @@ export default class SaveManager {
   }
 
   check_button() {
-    if(this.is_changed && this.save_button.text() == "Save") {
+    if(this.is_changed && this.save_button.selector.valueOf("data-action") === "*[data-action='save-actions']") {
       this.save_button.removeClass("disabled")
     } else {
       this.save_button.addClass("disabled")
@@ -41,13 +41,14 @@ export default class SaveManager {
         .fail((element) => { this.push_changed(element) })
       )
     })
-    this.save_button.text("Saving...")
+    var label = this.save_button.text()
+    this.save_button.text(label + " ...")
     this.save_button.addClass("disabled")
-    $.when.apply($, promises).always(() => { this.reset_save_button() })
+    $.when.apply($, promises).always(() => { this.reset_save_button(label) })
   }
   
-  reset_save_button() {
-    this.save_button.text("Save")
+  reset_save_button(label) {
+    this.save_button.text(label)
     this.check_button()
   }
 

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

@@ -0,0 +1,36 @@
+/*
+ * decaffeinate suggestions:
+ * DS102: Remove unnecessary code created because of implicit returns
+ * DS207: Consider shorter variations of null checks
+ * DS208: Avoid top-level this
+ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
+ */
+// Monkey patch Turbolinks to render 401
+// See https://github.com/turbolinks/turbolinks/issues/179
+//     https://github.com/samvera/hyrax/issues/617
+if (typeof Turbolinks !== 'undefined' && Turbolinks !== null) {
+  Turbolinks.HttpRequest.prototype.requestLoaded = function() {
+    return this.endRequest(() => {
+      if ((200 <= this.xhr.status && this.xhr.status < 300) || (this.xhr.status === 401)) {
+        return this.delegate.requestCompletedWithResponse(this.xhr.responseText, this.xhr.getResponseHeader("Turbolinks-Location"));
+      } else {
+        this.failed = true;
+        return this.delegate.requestFailedWithStatusCode(this.xhr.status, this.xhr.responseText);
+      }
+    });
+  };
+
+  // Fixes a back/forward navigation problem with UV and turbolinks
+  // See https://github.com/samvera/hyrax/issues/2964
+  // This is based on https://github.com/turbolinks/turbolinks/issues/219#issuecomment-275838923
+  $(window).on('popstate', event => {
+    this.turbolinks_location = Turbolinks.Location.wrap(window.location);
+    if (Turbolinks.controller.location.requestURL === this.turbolinks_location.requestURL) { return; }
+    if (event.state != null ? event.state.turbolinks : undefined) { return; }
+    if ((this.window_turbolinks = window.history.state != null ? window.history.state.turbolinks : undefined)) {
+      return Turbolinks.controller.historyPoppedToLocationWithRestorationIdentifier(this.turbolinks_location, this.window_turbolinks.restorationIdentifier);
+    } else {
+      return Turbolinks.controller.historyPoppedToLocationWithRestorationIdentifier(this.turbolinks_location, Turbolinks.uuid());
+    }
+  });
+}