hyrax 2.8.0 → 3.0.0.pre.rc2

data/app/actors/hyrax/actors/ordered_members_actor.rb

@@ -19,7 +19,7 @@ module Hyrax
           work.ordered_members = ordered_members
           work.save
           ordered_members.each do |file_set|
-            Hyrax.config.callback.run(:after_create_fileset, file_set, user)
+            Hyrax.config.callback.run(:after_create_fileset, file_set, user, warn: false)
           end
         end
       end

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,24 +1,25 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
-    # Used to wrap the stack in a database transaction.
-    # This would have rolled back any database actions (particularly workflow) if there
+    # Wrap the stack in a database transaction.
+    # This will roll back any database actions (particularly workflow) if there
     # is an error elsewhere in the actor stack.
-    # This was problematic, is removed in v3.0, and is currently a no-op
-    # Backport of https://github.com/samvera/hyrax/pull/3482
     class TransactionalRequest < Actors::AbstractActor
-      # rubocop:disable Rails/Delegate
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if create was successful
       def create(env)
-        next_actor.create(env)
+        ActiveRecord::Base.transaction do
+          next_actor.create(env)
+        end
       end
 
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if update was successful
       def update(env)
-        next_actor.update(env)
+        ActiveRecord::Base.transaction do
+          next_actor.update(env)
+        end
       end
-      # rubocop:enable Rails/Delegate
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Actors
     # Notify the provided owner that their proxy wants to make a
@@ -11,13 +12,13 @@ module Hyrax
 
       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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Actors
+    ##
+    # Casts `env.curation_concern` from a `Valkyrie::Resource` to an
+    # `ActiveFedora::Base` model.
+    #
+    # If the curation concern is not a `Valkyrie::Resource` this is a
+    # no-op.
+    #
+    # This can be used in conjunction with `ActiveFedoraToValkyrie` to create a
+    # vertical boundary in the actor stack between actors that deal with
+    # `ActiveFedora` models and those that work on `Valkyrie::Resource` objects.
+    #
+    # @example defining a stack using both ActiveFedora and Valkyrie actors
+    #   stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
+    #     middleware.use ActorThatUsesActiveFedora
+    #     middleware.use AnotherActorThatUsesActiveFedora
+    #     middleware.use ValkyrieToActiveFedora # casts on the way up
+    #     middleware.use ActiveFedoraToValkyrie # casts on the way down
+    #     middleware.use ActorThatUsesValkyrie
+    #     middleware.use AnotherActorThatUsesValkyrie
+    #   end
+    #
+    #   actor = stack.build(Hyrax::Actors::Terminator.new)
+    #
+    # @see ValkyrieToActiveFedora
+    class ValkyrieToActiveFedora < AbstractActor
+      # @param [Hyrax::Actors::Environment] env
+      # @return [Boolean] true
+      def create(env)
+        next_actor.create(env) && cast(env)
+      end
+
+      # @param [Hyrax::Actors::Environment] env
+      # @return [Boolean] true
+      def update(env)
+        next_actor.update(env) && cast(env)
+      end
+
+      # @param [Hyrax::Actors::Environment] env
+      # @return [Boolean] true
+      def destroy(env)
+        next_actor.destroy(env) && cast(env)
+      end
+
+      private
+
+      def cast(env)
+        return true unless env.curation_concern.is_a? Valkyrie::Resource
+
+        env.curation_concern =
+          Wings::ActiveFedoraConverter.convert(resource: env.curation_concern)
+
+        true
+      end
+    end
+  end
+end

data/app/assets/javascripts/hyrax.js

@@ -104,6 +104,7 @@
 //= require hyrax/tabbed_form
 //= require hyrax/turbolinks_events
 //= require hyrax/i18n_helper
+//= require hyrax/collapse
 
 // 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/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.js

@@ -249,11 +249,12 @@ Blacklight.onLoad(function () {
     var tableRows = $('#documents table.collections-list-table tbody tr');
     var checkbox = null;
     var numRowsSelected = false;
+    var $modal = $('#selected-collections-delete-modal');
+    var $deleteWordingTarget = $modal.find('.pluralized');
     var deleteWording = {
-      plural: 'these collections',
-      singular: 'this collection'
+      plural: $modal.data("pluralForm"),
+      singular: $modal.data("singularForm")
     };
-    var $deleteWordingTarget = $('#selected-collections-delete-modal .pluralized');
 
     var canDeleteAll = true;
     var selectedInputs = $('#documents table.collections-list-table tbody tr')
@@ -277,7 +278,7 @@ Blacklight.onLoad(function () {
       } else {
         $deleteWordingTarget.text(deleteWording.singular);
       }
-      $('#selected-collections-delete-modal').modal('show');
+      $modal.modal('show');
     }
   });
 

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

@@ -4,9 +4,6 @@ import tabifyForm from 'hyrax/tabbed_form'
 
 // Controls the behavior of the Collections edit form
 // Add search for thumbnail to the edit descriptions
-// this method used to simply replace the string edit
-// but now replaces the last url part if and only if
-// that part is edit
 export default class {
   constructor(elem) {
     let field = elem.find('#collection_thumbnail_id')
@@ -19,9 +16,7 @@ export default class {
 
   url() {
     let urlParts = window.location.pathname.split("/")
-    if(urlParts[urlParts.length - 1] === "edit") {
-      urlParts[urlParts.length - 1] = "files"
-    }
+    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/editor/controlled_vocabulary.es6

@@ -27,7 +27,7 @@ export default class ControlledVocabulary extends FieldManager {
 
         labelControls:      true,
       }
-      super(element, options)
+      super(element, $.extend({}, options, $(element).data()))
       this.paramKey = paramKey
       this.fieldName = this.element.data('fieldName')
       this.searchUrl = this.element.data('autocompleteUrl')