hyrax 2.1.0.beta2 → 2.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be1e8653f1cbe02d0084c4e9d5ad3ae86452030c
-  data.tar.gz: 3195a5f77e3b68b97ad86b0d441340037f2c5617
+  metadata.gz: 7758e362b3ead3c21f48bf9cf6763565ea0304fb
+  data.tar.gz: 3788d88af39d4ab5b81a17bb94bf90d39e2852fa
 SHA512:
-  metadata.gz: eca96b7e93e799c6540995b8607f0c696350e125030475c7e15ac567f1c048ed05a851f656b04c2a72c258e26d1c95cf08e52f79f87c1446269e055d626e8de4
-  data.tar.gz: 155ac39bca91ca478e0856b27a6487ff9976e7dddee5b22a4ed6b3323f109e3dc1310bdd82fb529a542cb9603926d571df8e23b65f73c9a14323025ed502d159
+  metadata.gz: 4c1e3c4e80619330f7e5dd1d624a38296618d2dc40e371485d70039e52068af1dbb9593cea59a5aac0a6951b392b82800426d530a13825523517637ce9cac7e7
+  data.tar.gz: 02d3518cccfd2c631cda0e27b1dfa200bbbec739c184d211da2d9ec215f663d19f13623009bd5bc96fef967152244729acb9def82aa67d320543d44c12907636

data/.github/CODE_OF_CONDUCT.md

@@ -22,15 +22,15 @@ mutual respect and reasoned argument.
 Community members work together to promote a respectful and safe
 community. In the event that someone’s conduct is causing offence or
 distress, Samvera has a detailed
-[Anti-Harassment Policy and Protocol](https://wiki.duraspace.org/display/hydra/Anti-Harassment+Policy)
+[Anti-Harassment Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
 which can be applied to address the problem. The first step in dealing
 with any serious misconduct is to contact a local meeting organizer,
 the
-[Samvera community helpers](https://wiki.duraspace.org/display/hydra/Hydra+Community+Helpers)
-([email](mailto:helpers@projecthydra.org)), a community member you
+[Samvera community helpers](https://wiki.duraspace.org/display/samvera/Samvera+Community+Helpers)
+([email](mailto:helpers@samvera.org)), a community member you
 trust, or the
-[Samvera Steering Group](https://wiki.duraspace.org/display/hydra/Samvera+Steering+Group+membership)
+[Samvera Steering Group](https://wiki.duraspace.org/display/samvera/Samvera+Steering+Group+membership)
 immediately; at Samvera events, these people can be identified by
 distinctive name badges. The
-[Policy and Protocol](https://wiki.duraspace.org/display/hydra/Anti-Harassment+Policy)
+[Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
 should be consulted for fuller details.

data/.github/CONTRIBUTING.md

@@ -18,7 +18,7 @@ All code contributors must have an Individual Contributor License Agreement
 an institution, the institution must have a Corporate Contributor License 
 Agreement (cCLA) on file.
 
-https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
 
 You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
 
@@ -164,6 +164,6 @@ If you are uncertain, bring other contributors into the conversation by assignin
 # Additional Resources
 
 * [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
 * [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
 * [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/.rubocop.yml

@@ -24,6 +24,7 @@ Metrics/BlockLength:
     - 'app/models/concerns/hyrax/content_block_behavior.rb'
     - 'app/services/hyrax/workflow/workflow_schema.rb'
     - 'config/initializers/simple_form.rb'
+    - 'config/features.rb'
     - 'config/routes.rb'
     - 'lib/generators/hyrax/templates/catalog_controller.rb'
     - 'lib/generators/hyrax/templates/config/initializers/simple_form_bootstrap.rb'

data/.rubocop_fixme.yml

@@ -6,6 +6,7 @@ Metrics/ClassLength:
   Exclude:
     - 'app/controllers/hyrax/dashboard/collections_controller.rb'
     - 'app/controllers/hyrax/admin/admin_sets_controller.rb'
+    - 'app/controllers/hyrax/batch_edits_controller.rb'
     - 'app/controllers/hyrax/downloads_controller.rb'
     - 'app/controllers/hyrax/file_sets_controller.rb'
     - 'app/forms/hyrax/forms/permission_template_form.rb'
@@ -83,6 +84,7 @@ RSpec/ExampleLength:
     - 'spec/actors/hyrax/actors/file_set_actor_spec.rb'
     - 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
     - 'spec/controllers/hyrax/api/items_controller_spec.rb'
+    - 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
     - 'spec/controllers/hyrax/batch_uploads_controller_spec.rb'
     - 'spec/controllers/hyrax/file_sets_controller_spec.rb'
     - 'spec/controllers/hyrax/generic_works_controller_spec.rb'

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 group :development, :test do
   gem 'coveralls', require: false
+  gem 'i18n-tasks'
   gem 'pry' unless ENV['CI']
   gem 'pry-byebug' unless ENV['CI']
   gem "simplecov", require: false

data/README.md

@@ -63,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.1.0.beta2__. If you are looking for instructions on installing a different
+v2.1.0.rc1__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -162,7 +162,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.1.0.beta2/template.rb
+rails _5.0.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.1.0.rc1/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -172,6 +172,7 @@ Generating a new Rails application using Hyrax's template above takes cares of a
 * Running Hyrax's install generator, to add a number of files that Hyrax requires within your Rails app, including e.g. database migrations
 * Loading all of Hyrax's database migrations into your application's database
 * Loading Hyrax's default workflows into your application's database
+* Create default collection types (e.g. Admin Set, User Collection)
 
 ## Start servers
 

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -79,6 +79,7 @@ module Hyrax
             Deprecation.warn(self, ':member_of_collection_ids has been deprecated for removal in Hyrax 3.0. ' \
                                    'use :member_of_collections_attributes instead.')
 
+            collection_ids = [] if collection_ids.empty?
             other_collections = collections_without_edit_access(env)
 
             collections = ::Collection.find(collection_ids)
@@ -102,6 +103,8 @@ module Hyrax
         # along side the FileSets on the show page
         def add(env, id)
           collection = Collection.find(id)
+          collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
+
           return unless env.current_ability.can?(:deposit, collection)
           env.curation_concern.member_of_collections << collection
         end

data/app/actors/hyrax/actors/create_with_remote_files_actor.rb

@@ -55,14 +55,15 @@ module Hyrax
               Rails.logger.error "User #{env.user.user_key} attempted to ingest file from url #{file_info[:url]}, which doesn't pass validation"
               return false
             end
-            create_file_from_url(env, uri, file_info[:file_name])
+            auth_header = file_info.fetch(:auth_header, {})
+            create_file_from_url(env, uri, file_info[:file_name], auth_header)
           end
           true
         end
 
         # Generic utility for creating FileSet from a URL
         # Used in to import files using URLs from a file picker like browse_everything
-        def create_file_from_url(env, uri, file_name)
+        def create_file_from_url(env, uri, file_name, auth_header = {})
           ::FileSet.new(import_url: uri.to_s, label: file_name) do |fs|
             actor = Hyrax::Actors::FileSetActor.new(fs, env.user)
             actor.create_metadata(visibility: env.curation_concern.visibility)
@@ -73,7 +74,7 @@ module Hyrax
               file_path = CGI.unescape(uri.path)
               IngestLocalFileJob.perform_later(fs, file_path, env.user)
             else
-              ImportUrlJob.perform_later(fs, operation_for(user: actor.user))
+              ImportUrlJob.perform_later(fs, operation_for(user: actor.user), auth_header)
             end
           end
         end

data/app/actors/hyrax/actors/default_admin_set_actor.rb

@@ -10,24 +10,27 @@ module Hyrax
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if create was successful
       def create(env)
-        ensure_admin_set_attribute!(env.attributes)
+        ensure_admin_set_attribute!(env)
         next_actor.create(env)
       end
 
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if update was successful
       def update(env)
-        ensure_admin_set_attribute!(env.attributes)
+        ensure_admin_set_attribute!(env)
         next_actor.update(env)
       end
 
       private
 
-        def ensure_admin_set_attribute!(attributes)
-          if attributes[:admin_set_id].present?
-            ensure_permission_template!(admin_set_id: attributes[:admin_set_id])
+        def ensure_admin_set_attribute!(env)
+          if env.attributes[:admin_set_id].present?
+            ensure_permission_template!(admin_set_id: env.attributes[:admin_set_id])
+          elsif env.curation_concern.admin_set_id.present?
+            env.attributes[:admin_set_id] = env.curation_concern.admin_set_id
+            ensure_permission_template!(admin_set_id: env.attributes[:admin_set_id])
           else
-            attributes[:admin_set_id] = default_admin_set_id
+            env.attributes[:admin_set_id] = default_admin_set_id
           end
         end
 

data/app/assets/javascripts/hyrax.js

@@ -54,6 +54,7 @@
 //= require hyrax/browse_everything
 //= require hyrax/search
 //= require hyrax/content_blocks
+//= require hyrax/nav_safety
 //= require hyrax/ga_events
 //= require hyrax/select_submit
 //= require hyrax/tabs
@@ -86,7 +87,9 @@
 //= require hyrax/relationships
 //= require hyrax/select_work_type
 //= require hyrax/collections
+//= require hyrax/collections_v2
 //= require hyrax/collection_types
+//= require hyrax/collections_utils
 //= require hyrax/select_collection_type
 //= require hydra-editor/hydra-editor
 //= require nestable

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

@@ -13,8 +13,10 @@ Hyrax = {
         this.datatable();
         this.adminSetEditor();
         this.collectionEditor();
+        this.collectionsV2();
         this.collectionTypes();
         this.collectionTypeEditor();
+        this.collectionUtilities();
         this.adminStatisticsGraphs();
         this.tinyMCE();
         this.sortAndPerPage();
@@ -49,12 +51,24 @@ Hyrax = {
       var controls = new CollectionControls($('#collection_permissions'));
     },
 
+    // Collections v2 - collections related js should (over time) be moved here
+    // from 'collections.js' to take advantage of shared modules
+    collectionsV2: function() {
+      var CollectionsV2 = require('hyrax/collections_v2');
+      new CollectionsV2();
+    },
+
     // Collection types
     collectionTypes: function() {
       var CollectionTypes = require('hyrax/collection_types');
       var collection_types = new CollectionTypes($('.collection-types-wrapper'))
     },
 
+    collectionUtilities: function() {
+      var CollectionUtilities = require('hyrax/collections_utils');
+      new CollectionUtilities();
+    },
+
     // Pretty graphs on the dashboard page
     adminStatisticsGraphs: function() {
         var AdminGraphs = require('hyrax/admin/graphs');

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

@@ -159,7 +159,8 @@ function batch_edit_init () {
         setTimeout(ajaxManager.runNow(), 100);
     }
 
-    $("#permissions_save").click(runSave);
+    $("#permissions_visibility_save").click(runSave);
+    $("#permissions_roles_save").click(runSave);
     $(".field-save").click(runSave);
 }
 

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

@@ -1,65 +1,126 @@
-export default class CollectionTypes {
+import CollectionUtilities from 'hyrax/collections_utils';
 
+export default class CollectionTypes {
   constructor(element) {
+    this.collectionUtilities = new CollectionUtilities();
+
     if (element.length > 0) {
-      this.handleCollapseToggle()
-      this.handleDelete()
+      this.handleCollapseToggle();
+      this.handleDelete();
+
+      // Edit Collection Type
+      this.setupAddParticipantsHandler();
+      this.participantsAddButtonDisabler();
     }
   }
 
+  setupAddParticipantsHandler() {
+    const { addParticipants } = this.collectionUtilities;
+    const wrapEl = '.form-add-participants-wrapper';
+    const url = '/admin/collection_type_participants?locale=en';
+
+    $('#participants')
+      .find('.add-participants-form input[type="submit"]')
+      .on(
+        'click',
+        {
+          wrapEl,
+          // This is a callback (seems odd here because just passing in a string value),
+          // because other urls need to be calculated with an id or other param only truly
+          // known from when we know the clicked element's place in DOM.
+          urlFn: e => url
+        },
+        addParticipants.handleAddParticipants.bind(addParticipants)
+      );
+  }
+
   handleCollapseToggle() {
-    let $collapseHeader = $('a.collapse-header')
-    let $collapseHeaderSpan = $('a.collapse-header').find('span')
+    let $collapseHeader = $('a.collapse-header');
+    let $collapseHeaderSpan = $('a.collapse-header').find('span');
+    const collapseText = $collapseHeader.data('collapseText');
+    const expandText = $collapseHeader.data('expandText');
 
     // Toggle show/hide of collapsible content on bootstrap toggle events
     $('#collapseAbout').on('show.bs.collapse', () => {
-      $collapseHeader.addClass('open')
-      $collapseHeaderSpan.html('Less')
-    })
+      $collapseHeader.addClass('open');
+      $collapseHeaderSpan.html(collapseText);
+    });
     $('#collapseAbout').on('hide.bs.collapse', () => {
-      $collapseHeader.removeClass('open')
-      $collapseHeaderSpan.html('More')
-    })
+      $collapseHeader.removeClass('open');
+      $collapseHeaderSpan.html(expandText);
+    });
   }
 
   handleDelete() {
-    let trData = null
+    let trData = null;
 
     // Click delete collections type button in the table row
-    $('.delete-collection-type').on('click', (event) => {
-      let dataset = event.target.dataset
-      let collectionType = JSON.parse(dataset.collectionType) || null
-      let hasCollections = dataset.hasCollections === 'true'
+    $('.delete-collection-type').on('click', event => {
+      let dataset = event.target.dataset;
+      let collectionType = JSON.parse(dataset.collectionType) || null;
+      let hasCollections = dataset.hasCollections === 'true';
       this.handleDelete_event_target = event.target;
       this.collectionType_id = collectionType.id;
 
       if (hasCollections === true) {
-        $('.view-collections-of-this-type').attr('href',dataset.collectionTypeIndex)
-        $('#deleteDenyModal').modal()
+        $('.view-collections-of-this-type').attr(
+          'href',
+          dataset.collectionTypeIndex
+        );
+        $('#deleteDenyModal').modal();
       } else {
-        $('#deleteModal').modal()
+        $('#deleteModal').modal();
       }
-    })
+    });
 
     // Confirm delete collection type
-    $('.confirm-delete-collection-type').on('click', (event) => {
-        event.preventDefault();
-        $.ajax({
-            url: window.location.pathname + '/' + this.collectionType_id,
-            type: 'DELETE',
-            done: function(e) {
-                $(this.handleDelete_event_target).parent('td').parent('tr').remove();
-                let defaultButton = $(event.target).parent('div').find('.btn-default');
-                defaultButton.trigger( 'click' );
-            }
-        })
-    })
+    $('.confirm-delete-collection-type').on('click', event => {
+      event.preventDefault();
+      $.ajax({
+        url: window.location.pathname + '/' + this.collectionType_id,
+        type: 'DELETE',
+        done: function(e) {
+          $(this.handleDelete_event_target)
+            .parent('td')
+            .parent('tr')
+            .remove();
+          let defaultButton = $(event.target)
+            .parent('div')
+            .find('.btn-default');
+          defaultButton.trigger('click');
+        }
+      });
+    });
 
     // Confirm delete collection type
-    $('.view-collections-of-this-type').on('click', (event) => {
-        $('#deleteDenyModal').modal('hide')
-    })
-
+    $('.view-collections-of-this-type').on('click', event => {
+      $('#deleteDenyModal').modal('hide');
+    });
   }
 
+  /**
+   * Set up enabling/disabling "Add" button for adding groups and/or users in
+   * Edit Collection Type > Participants tab
+   * @return {void}
+   */
+  participantsAddButtonDisabler() {
+    const { addParticipantsInputValidator } = this.collectionUtilities;
+    // Selector for the button to enable/disable
+    const buttonSelector = '.add-participants-form input[type="submit"]';
+    const inputsWrapper = '.form-add-participants-wrapper';
+
+    $('#participants')
+      .find(inputsWrapper)
+      .on(
+        'change',
+        // custom data we need passed into the event handler
+        {
+          buttonSelector,
+          inputsWrapper
+        },
+        addParticipantsInputValidator.handleWrapperContentsChange.bind(
+          addParticipantsInputValidator
+        )
+      );
+  }
 }

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

@@ -240,27 +240,29 @@ Blacklight.onLoad(function () {
     };
     var $deleteWordingTarget = $('#selected-collections-delete-modal .pluralized');
 
-    tableRows.each(function(i, row) {
-      checkbox = $(row).find('td:first input[type=checkbox]');
-      if (typeof checkbox[0] !== "undefined") {
-        if (checkbox[0].checked) {
-          numRowsSelected++;
-        }
-      }
-    });
+    var canDeleteAll = true;
+    var selectedInputs = $('#documents table.collections-list-table tbody tr')
+      // Get all inputs in the table
+      .find('td:first input[type=checkbox]')
+      // Filter to those that are checked
+      .filter(function(i, checkbox) { return checkbox.checked; });
+
+    var cannotDeleteInputs = selectedInputs.filter(function(i, checkbox) { return checkbox.dataset.hasaccess === "false"; });
+    if(cannotDeleteInputs.length > 0) {
+      // TODO: Can we pass data to this modal to be more specific about which ones they cannot delete?
+      $('#collections-to-delete-deny-modal').modal('show');
+      return;
+    }
 
-    if (numRowsSelected > 0) {
+    if (selectedInputs.length > 0) {
       // Collections are selected
       // Update singular / plural text in delete modal
-      if (numRowsSelected > 1) {
+      if (selectedInputs.length > 1) {
         $deleteWordingTarget.text(deleteWording.plural);
       } else {
         $deleteWordingTarget.text(deleteWording.singular);
       }
       $('#selected-collections-delete-modal').modal('show');
-    } else {
-      // No collections are selected
-      $('#collections-to-delete-deny-modal').modal('show');
     }
   });
 
@@ -317,40 +319,4 @@ Blacklight.onLoad(function () {
     $('#add-subcollection-modal-' + $(this).data('presenterId')).modal('show');
   });
 
-
-  // Edit Collection: Sharing tab: Add Sharing section click handlers
-  /*
-  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.
-   */
-  $('#participants').find('.edit-collection-add-sharing-button').on('click', function(e) {
-    e.preventDefault();
-    var $wrapEl = $(e.target).parents('.form-add-sharing-wrapper');
-    if ($wrapEl.length === 0) {
-      return;
-    }
-    var serialized = $wrapEl.find(':input').serialize(),
-      url = '/dashboard/collections/' + $wrapEl.data('id') + '/permission_template?locale=en';
-
-    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);
-    });
-
-  });
 });