hyrax 2.0.3 → 2.1.0.beta1

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

@@ -32,7 +32,7 @@ module Hyrax
         end
 
         def ensure_permission_template!(admin_set_id:)
-          Hyrax::PermissionTemplate.find_by(admin_set_id: admin_set_id) || create_permission_template!(admin_set_id: admin_set_id)
+          Hyrax::PermissionTemplate.find_by(source_id: admin_set_id) || create_permission_template!(source_id: admin_set_id)
         end
 
         def default_admin_set_id
@@ -40,8 +40,8 @@ module Hyrax
         end
 
         # Creates a Hyrax::PermissionTemplate for the given AdminSet
-        def create_permission_template!(admin_set_id:)
-          Hyrax::PermissionTemplate.create!(admin_set_id: admin_set_id)
+        def create_permission_template!(source_id:)
+          Hyrax::PermissionTemplate.create!(source_id: source_id)
         end
     end
   end

data/app/actors/hyrax/actors/file_set_actor.rb

@@ -14,7 +14,7 @@ module Hyrax
 
       # Spawns asynchronous IngestJob unless ingesting from URL
       # Called from FileSetsController, AttachFilesToWorkJob, IngestLocalFileJob, ImportUrlJob
-      # @param [Hyrax::UploadedFile, File, ActionDigest::HTTP::UploadedFile] file the file uploaded by the user
+      # @param [Hyrax::UploadedFile, File] file the file uploaded by the user
       # @param [Symbol, #to_s] relation
       # @return [IngestJob, FalseClass] false on failure, otherwise the queued job
       def create_content(file, relation = :original_file, from_url: false)
@@ -130,8 +130,6 @@ module Hyrax
         def label_for(file)
           if file.is_a?(Hyrax::UploadedFile) # filename not present for uncached remote file!
             file.uploader.filename.present? ? file.uploader.filename : File.basename(Addressable::URI.parse(file.file_url).path)
-          elsif file.respond_to?(:original_filename) # e.g. ActionDispatch::Http::UploadedFile, CarrierWave::SanitizedFile
-            file.original_filename
           elsif file.respond_to?(:original_name) # e.g. Hydra::Derivatives::IoDecorator
             file.original_name
           elsif file_set.import_url.present?
@@ -146,15 +144,21 @@ module Hyrax
           !((file_set_params || {}).keys.map(&:to_s) & %w[visibility embargo_release_date lease_expiration_date]).empty?
         end
 
+        # Must clear the fileset from the thumbnail_id, representative_id and rendering_ids fields on the work
+        #   and force it to be re-solrized.
+        # Although ActiveFedora clears the children nodes it leaves those fields in Solr populated.
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/CyclomaticComplexity
         def unlink_from_work
           work = file_set.parent
-          return unless work && (work.thumbnail_id == file_set.id || work.representative_id == file_set.id)
-          # Must clear the thumbnail_id and representative_id fields on the work and force it to be re-solrized.
-          # Although ActiveFedora clears the children nodes it leaves those fields in Solr populated.
+          return unless work && (work.thumbnail_id == file_set.id || work.representative_id == file_set.id || work.rendering_ids.include?(file_set.id))
           work.thumbnail = nil if work.thumbnail_id == file_set.id
           work.representative = nil if work.representative_id == file_set.id
+          work.rendering_ids -= [file_set.id]
           work.save!
         end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

data/app/actors/hyrax/actors/interpret_visibility_actor.rb

@@ -104,7 +104,7 @@ module Hyrax
         # Validate against selected AdminSet's PermissionTemplate (if any)
         def validate(env, intention, attributes)
           # If AdminSet was selected, look for its PermissionTemplate
-          template = PermissionTemplate.find_by!(admin_set_id: attributes[:admin_set_id]) if attributes[:admin_set_id].present?
+          template = PermissionTemplate.find_by!(source_id: attributes[:admin_set_id]) if attributes[:admin_set_id].present?
 
           validate_lease(env, intention, template) &&
             validate_release_type(env, intention, template) &&

data/app/assets/javascripts/hyrax.js

@@ -1,11 +1,11 @@
 //= require jquery-ui/core
 //= require jquery-ui/widget
-//= require jquery-ui/menu
-//= require jquery-ui/autocomplete
+//= require jquery-ui/widgets/menu
+//= require jquery-ui/widgets/autocomplete
 //= require jquery-ui/position
 //= require jquery-ui/effect
-//= require jquery-ui/effect-highlight
-//= require jquery-ui/sortable
+//= require jquery-ui/effects/effect-highlight
+//= require jquery-ui/widgets/sortable
 
 //= require bootstrap/alert
 //= require bootstrap/button
@@ -69,6 +69,9 @@
 //= require hyrax/admin/admin_set/registered_users
 //= require hyrax/admin/admin_set/participants
 //= require hyrax/admin/admin_set/visibility
+//= require hyrax/admin/collection_type_controls
+//= require hyrax/admin/collection_type/participants
+//= require hyrax/admin/collection_type/settings
 //= require hyrax/collections/editor
 //= require hyrax/editor
 //= require hyrax/editor/admin_set_widget
@@ -78,22 +81,25 @@
 //= require hyrax/permissions
 //= require hyrax/autocomplete
 //= require hyrax/autocomplete/default
-//= require hyrax/autocomplete/work
 //= require hyrax/autocomplete/linked_data
+//= require hyrax/autocomplete/resource
 //= require hyrax/relationships
 //= require hyrax/select_work_type
 //= require hyrax/collections
+//= require hyrax/collections_forms
+//= require hyrax/collection_types
+//= require hyrax/select_collection_type
 //= require hydra-editor/hydra-editor
 //= require nestable
 //= require hyrax/file_manager/sorting
 //= require hyrax/file_manager/save_manager
 //= require hyrax/file_manager/member
 //= require hyrax/file_manager
-//= require hyrax/workflow_actions_affix
 //= require hyrax/authority_select
-//= require hyrax/per_page
+//= require hyrax/sort_and_per_page
 //= require hyrax/thumbnail_select
 //= require hyrax/batch_select
+//= require hyrax/tabbed_form
 
 // 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_controls.es6

@@ -4,6 +4,7 @@
 import Visibility from 'hyrax/admin/admin_set/visibility'
 import Participants from 'hyrax/admin/admin_set/participants'
 import ThumbnailSelect from 'hyrax/thumbnail_select'
+import tabifyForm from 'hyrax/tabbed_form'
 
 export default class {
     constructor(elem) {
@@ -11,9 +12,10 @@ export default class {
         this.thumbnailSelect = new ThumbnailSelect(url, elem.find('#admin_set_thumbnail_id'))
 
         let participants = new Participants(elem.find('#participants'))
-        participants.setup();
+        participants.setup()
 
-        let visibilityTab = new Visibility(elem.find('#visibility'));
-        visibilityTab.setup();
+        let visibilityTab = new Visibility(elem.find('#visibility'))
+        visibilityTab.setup()
+        tabifyForm(elem.find('form.edit_admin_set'))
     }
 }

data/app/assets/javascripts/hyrax/admin/collection_type/participants.es6

@@ -0,0 +1,13 @@
+
+
+export default class {
+  // Adds autocomplete to the user search function and enables the
+  // "Allow all registered users" button.
+  constructor(elem) {
+    this.userField = elem.find('#user-participants-form input[type=text]')
+  }
+
+  setup() {
+    this.userField.userSearch()
+  }
+}

data/app/assets/javascripts/hyrax/admin/collection_type/settings.es6

@@ -0,0 +1,60 @@
+// Enable/disable sharing APPLIES_TO_NEW_WORKS checkbox based on the state of checkbox SHARABLE
+export default class {
+  constructor(element) {
+    this.element = element
+  }
+
+  setup() {
+    this.sharable_checkbox = $("#collection_type_sharable")
+    this.applies_to_new_works = $("#collection_type_share_applies_to_new_works")
+    this.container = $("#sharable-applies-to-new-works-setting-checkbox-container")
+    this.label = $("#sharable-applies-to-new-works-setting-label")
+
+    // Watch for changes to "sharable" checkbox
+    $("#collection_type_sharable").on('change', () => { this.sharableChanged() })
+    this.sharableChanged()
+  }
+
+  // Based on the "sharable" checked/unchecked, enable/disable adjust share_applies_to_new_works checkbox
+  sharableChanged() {
+    let selected = this.sharable_checkbox.is(':checked')
+    let disabled = this.sharable_checkbox.is(':disabled')
+
+    if(selected) {
+        // if sharable is selected, then base disabled on whether or not sharable is disabled.  It will be disabled when a
+        // collection of this type exists.  In that case, share_applies_to_new_works is readonly, that is, it has the value
+        // from the database and is disabled
+        this.applies_to_new_works.prop("disabled", disabled)
+        if(disabled) {
+            this.addDisabledClasses()
+        }
+        else {
+            this.removeDisabledClasses()
+        }
+    }
+    else {
+        // if sharable is not selected, then share_applies_to_new_works must be unchecked and disabled so it cannot be changed
+        this.applies_to_new_works.prop("checked", false)
+        this.applies_to_new_works.prop("disabled", true)
+        this.addDisabledClasses()
+    }
+  }
+
+  /**
+   * Add disabled class to elements surrounding the APPLIES TO NEW WORKS checkbox when it is disabled
+   */
+  addDisabledClasses() {
+      this.container.addClass("disabled")
+      this.label.addClass("disabled")
+      this.applies_to_new_works.addClass("disabled")
+  }
+
+    /**
+     * Remove disabled class from elements surrounding the APPLIES TO NEW WORKS checkbox when it is not disabled
+     */
+  removeDisabledClasses() {
+      this.container.removeClass("disabled")
+      this.label.removeClass("disabled")
+      this.applies_to_new_works.removeClass("disabled")
+  }
+}

data/app/assets/javascripts/hyrax/admin/collection_type_controls.es6

@@ -0,0 +1,15 @@
+// The editor for the CollectionTypeParticipant
+// Add search for user/group to the edit an admin set's participants page
+import Participants from 'hyrax/admin/collection_type/participants'
+import Settings from 'hyrax/admin/collection_type/settings'
+import tabifyForm from 'hyrax/tabbed_form'
+
+export default class {
+    constructor(elem) {
+        let participants = new Participants(elem.find('#participants'))
+        participants.setup()
+        let settings = new Settings(elem.find('#settings'))
+        settings.setup()
+        tabifyForm(elem.find('form.edit_collection_type'))
+    }
+}

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

@@ -9,12 +9,15 @@ Hyrax = {
         this.workEditor();
         this.fileManager();
         this.selectWorkType();
+        this.selectCollectionType();
         this.datatable();
         this.adminSetEditor();
         this.collectionEditor();
+        this.collectionTypes();
+        this.collectionTypeEditor();
         this.adminStatisticsGraphs();
         this.tinyMCE();
-        this.perPage();
+        this.sortAndPerPage();
         this.sidebar();
         this.batchSelect();
     },
@@ -34,12 +37,24 @@ Hyrax = {
       var controls = new AdminSetControls($('#admin-set-controls'));
     },
 
+    // The collectionType edit page
+    collectionTypeEditor: function() {
+      var CollectionTypeControls = require('hyrax/admin/collection_type_controls');
+      var controls = new CollectionTypeControls($('#collection-types-controls'));
+    },
+
     // The Collection edit page
     collectionEditor: function() {
       var CollectionControls = require('hyrax/collections/editor');
       var controls = new CollectionControls($('#collection-controls'));
     },
 
+    // Collection types
+    collectionTypes: function() {
+      var CollectionTypes = require('hyrax/collection_types');
+      var collection_types = new CollectionTypes($('.collection-types-wrapper'))
+    },
+
     // Pretty graphs on the dashboard page
     adminStatisticsGraphs: function() {
         var AdminGraphs = require('hyrax/admin/graphs');
@@ -60,7 +75,7 @@ Hyrax = {
         var element = $("[data-behavior='work-form']")
         if (element.length > 0) {
           var Editor = require('hyrax/editor');
-          new Editor(element)
+          new Editor(element).init();
         }
     },
 
@@ -119,6 +134,14 @@ Hyrax = {
         });
     },
 
+    // Popover menu to select the type when creating a new collection
+    selectCollectionType: function () {
+        var SelectCollectionType = require('hyrax/select_collection_type');
+        $("[data-behavior=select-collection]").each(function () {
+            new SelectCollectionType($(this)); // eslint-disable-line no-new
+        });
+    },
+
     // Minimize/maximize the dashboard sidebar
     sidebar: function () {
         $('.sidebar-toggle').on('click', function() {
@@ -133,10 +156,10 @@ Hyrax = {
     },
 
     // Per Page select will submit its form to change records shown
-    perPage: function () {
-        var PerPage = require('hyrax/per_page');
-        $('#per_page').each(function () {
-            new PerPage($(this));
+    sortAndPerPage: function () {
+        var SortAndPerPage = require('hyrax/sort_and_per_page');
+        $('#sort, #per_page').each(function () {
+            new SortAndPerPage($(this));
         });
     },
 
@@ -151,5 +174,4 @@ Hyrax = {
         var BatchSelect = require('hyrax/batch_select');
         BatchSelect.initialize_batch_selected();
     }
-
 };

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

@@ -1,23 +1,28 @@
 import Default from './autocomplete/default'
-import Work from './autocomplete/work'
+import Resource from './autocomplete/resource'
 import LinkedData from './autocomplete/linked_data'
 
 export default class Autocomplete {
   /**
    * Setup for the autocomplete field.
    * @param {jQuery} element - The input field to add autocompete to
-   # @param {string} fieldName - The name of the field (e.g. 'based_near')
-   # @param {string} url - The url for the autocompete search endpoint
+   * @param {string} fieldName - The name of the field (e.g. 'based_near')
+   * @param {string} url - The url for the autocompete search endpoint
    */
   setup (element, fieldName, url) {
     switch (fieldName) {
       case 'work':
-        new Work(
+        new Resource(
           element,
           url,
-          element.data('exclude-work')
+          { excluding: element.data('exclude-work') }
         )
         break
+      case 'collection':
+        new Resource(
+          element,
+          url)
+        break
       case 'based_near':
         new LinkedData(element, url)
       default:

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

@@ -1,3 +1,4 @@
+// This script initializes a jquery-ui autocomplete widget
 export default class Default {
   constructor(element, url) {
     this.url = url;
@@ -10,7 +11,6 @@ export default class Default {
       minLength: 2,
 
       source: (request, response) => {
-        console.log("Requesting " + this.url)
         $.getJSON(this.url, {
           q: request.term
         }, response );

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

@@ -1,4 +1,4 @@
-// Autocomplete for linked data elements
+// Autocomplete for linked data elements using a select2 autocomplete widget
 // After selecting something, the seleted item is immutable
 export default class LinkedData {
   constructor(element, url) {

data/app/assets/javascripts/hyrax/autocomplete/{work.es6 → resource.es6}

@@ -1,8 +1,14 @@
-export default class Work {
-  // Autocomplete for finding possible related works.
-  constructor(element, url, excludeWorkId) {
+export default class Resource {
+  /**
+   * Autocomplete for finding possible related works.
+   * @param {jQuery} element - The input field to add autocompete to
+   * @param {string} url - The url for the autocompete search endpoint
+   * @param {Object} options - optional arguments
+   * @param {string} options.excluding - The id to exclude from the search
+   */
+  constructor(element, url, options = {}) {
     this.url = url;
-    this.excludeWorkId = excludeWorkId;
+    this.excludeWorkId = options.excluding;
     this.initUI(element)
   }
 

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

@@ -0,0 +1,65 @@
+export default class CollectionTypes {
+
+  constructor(element) {
+    if (element.length > 0) {
+      this.handleCollapseToggle()
+      this.handleDelete()
+    }
+  }
+
+  handleCollapseToggle() {
+    let $collapseHeader = $('a.collapse-header')
+    let $collapseHeaderSpan = $('a.collapse-header').find('span')
+
+    // Toggle show/hide of collapsible content on bootstrap toggle events
+    $('#collapseAbout').on('show.bs.collapse', () => {
+      $collapseHeader.addClass('open')
+      $collapseHeaderSpan.html('Less')
+    })
+    $('#collapseAbout').on('hide.bs.collapse', () => {
+      $collapseHeader.removeClass('open')
+      $collapseHeaderSpan.html('More')
+    })
+  }
+
+  handleDelete() {
+    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'
+      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()
+      } else {
+        $('#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
+    $('.view-collections-of-this-type').on('click', (event) => {
+        $('#deleteDenyModal').modal('hide')
+    })
+
+  }
+
+}