hyrax 3.6.0 → 4.0.0.beta1

data/CONTRIBUTING.md

@@ -11,17 +11,6 @@ experience for all its members, whether they are at a formal gathering, in
 a social setting, or taking part in activities online. Please see our
 [Code of Conduct](CODE_OF_CONDUCT.md) for more information.
 
-## Samvera Community Intellectual Property Licensing and Ownership
-
-All code contributors must have an Individual Contributor License Agreement
-(iCLA) on file with the Samvera Steering Group. If the contributor works for
-an institution, the institution must have a Corporate Contributor License
-Agreement (cCLA) on file.
-
-https://wiki.lyrasis.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.
-
 ## Language
 
 The language we use matters.  Today, tomorrow, and for years to come
@@ -67,15 +56,22 @@ further details.
 
 * Fork the repository on GitHub
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
-  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
-  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
-  * Please avoid working directly on the `master` branch.
+  * This is usually the `main` branch.
+  * To quickly create a topic branch based on `main`; `git branch fix/main/my_contribution main`
+  * Then checkout the new branch with `git checkout fix/main/my_contribution`.
+  * Please avoid working directly on the `main` branch.
+  * Please do not create a branch called `master`. (See note below.)
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
   * Test functionality with RSpec; Test features / UI with Capybara.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 
+NOTE: This repository follows the [Samvera Community Code of Conduct](https://samvera.atlassian.net/wiki/spaces/samvera/pages/405212316/Code+of+Conduct) 
+and [language recommendations](#language).  
+Please ***do not*** create a branch called `master` for this repository or as part of 
+your pull request; the branch will either need to be removed or renamed before it can 
+be considered for inclusion in the code base and history of this repository.
+
 ### Documenting Code
 
 * All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
@@ -131,15 +127,15 @@ further details.
 ### Submitting Changes
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
-* Make sure your branch is up to date with its parent branch (i.e. master)
-  * `git checkout master`
+* Make sure your branch is up to date with its parent branch (i.e. main)
+  * `git checkout main`
   * `git pull --rebase`
   * `git checkout <your-branch>`
-  * `git rebase master`
+  * `git rebase main`
   * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * `git rebase --interactive main` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
@@ -149,12 +145,14 @@ further details.
 We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
 Common checks that may occur in our repositories:
 
-1. Travis CI - where our automated tests are running
-2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+1. [CircleCI](https://circleci.com/gh/samvera) - where our automated tests are running
+2. RuboCop/Bixby - where we check for style violations
+3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
 
 If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
 
-*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (CI tests are usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
 
 #### Things to Consider When Reviewing
 
@@ -171,7 +169,7 @@ This is your chance for a mentoring moment of another developer. Take time to gi
   * Do new or changed methods, modules, and classes have documentation?
   * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
   * Does the description of the new/changed specs match your understanding of what the spec is doing?
-  * Did the Travis tests complete successfully?
+  * Did the Continuous Integration tests complete successfully?
 
 If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
@@ -180,4 +178,4 @@ If you are uncertain, bring other contributors into the conversation by assignin
 * [General GitHub documentation](http://help.github.com/)
 * [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/)
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=2.7.5
+ARG RUBY_VERSION=2.7.6
 FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"

data/Rakefile

@@ -9,10 +9,6 @@ end
 
 Bundler::GemHelper.install_tasks
 
-import "#{Gem.loaded_specs['jasmine'].full_gem_path}/lib/jasmine/tasks/jasmine.rake"
-
-# Set up the test application prior to running jasmine tasks.
-task 'jasmine:require' => :setup_test_server
 task :setup_test_server do
   require 'engine_cart'
   EngineCart.load_application!

data/app/actors/hyrax/actors/base_actor.rb

@@ -37,7 +37,7 @@ module Hyrax
       # @return [Boolean] true if destroy was successful
       def destroy(env)
         env.curation_concern.in_collection_ids.each do |id|
-          destination_collection = Hyrax.config.collection_class.find(id)
+          destination_collection = ::Collection.find(id)
           destination_collection.members.delete(env.curation_concern)
           destination_collection.update_index
         end

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

@@ -70,7 +70,7 @@ module Hyrax
       # along side the FileSets on the show page
       def add(env, id)
         collection = Hyrax.config.collection_class.find(id)
-        collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
+        collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
 
         return unless env.current_ability.can?(:deposit, collection)
         env.curation_concern.member_of_collections << collection

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

@@ -93,19 +93,13 @@ module Hyrax
 
         def create_file_from_url(uri, file_name, auth_header)
           import_url = URI.decode_www_form_component(uri.to_s)
-          use_valkyrie = false
-          case curation_concern
-          when Valkyrie::Resource
-            file_set = Hyrax.persister.save(resource: Hyrax::FileSet.new(import_url: import_url, label: file_name))
-            use_valkyrie = true
-          else
-            file_set = ::FileSet.new(import_url: import_url, label: file_name)
-          end
-          __create_file_from_url(file_set: file_set, uri: uri, auth_header: auth_header, use_valkyrie: use_valkyrie)
+          file_set = ::FileSet.new(import_url: import_url, label: file_name)
+
+          __create_file_from_url(file_set: file_set, uri: uri, auth_header: auth_header)
         end
 
-        def __create_file_from_url(file_set:, uri:, auth_header:, use_valkyrie: Hyrax.config.use_valkyrie?)
-          actor = file_set_actor_class.new(file_set, user, use_valkyrie: use_valkyrie)
+        def __create_file_from_url(file_set:, uri:, auth_header:)
+          actor = file_set_actor_class.new(file_set, user)
           actor.create_metadata(visibility: curation_concern.visibility)
           actor.attach_to_work(curation_concern)
           file_set.save! if file_set.respond_to?(:save!)

data/app/actors/hyrax/actors/embargo_actor.rb

@@ -12,17 +12,10 @@ module Hyrax
       # Update the visibility of the work to match the correct state of the embargo, then clear the embargo date, etc.
       # Saves the embargo and the work
       def destroy
-        case work
-        when Valkyrie::Resource
-          embargo_manager = Hyrax::EmbargoManager.new(resource: work)
-          embargo_manager.release && Hyrax::AccessControlList(work).save
-          embargo_manager.nullify
-        else
-          work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
-          work.deactivate_embargo!
-          work.embargo.save!
-          work.save!
-        end
+        work.embargo_visibility! # If the embargo has lapsed, update the current visibility.
+        work.deactivate_embargo!
+        work.embargo.save!
+        work.save!
       end
     end
   end

data/app/actors/hyrax/actors/file_actor.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'wings/services/file_metadata_builder'
 
 module Hyrax
   module Actors
@@ -11,8 +10,7 @@ module Hyrax
       # @param [FileSet] file_set the parent FileSet
       # @param [Symbol, #to_sym] relation the type/use for the file
       # @param [User] user the user to record as the Agent acting upon the file
-      def initialize(file_set, relation, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
-        @use_valkyrie = use_valkyrie
+      def initialize(file_set, relation, user)
         @file_set = file_set
         @relation = normalize_relation(relation)
         @user = user
@@ -25,7 +23,14 @@ module Hyrax
       # @see IngestJob
       # @todo create a job to monitor the temp directory (or in a multi-worker system, directories!) to prune old files that have made it into the repo
       def ingest_file(io)
-        use_valkyrie ? perform_ingest_file_through_valkyrie(io) : perform_ingest_file_through_active_fedora(io)
+        Hydra::Works::AddFileToFileSet.call(file_set,
+                                            io,
+                                            relation,
+                                            versioning: false)
+        return false unless file_set.save
+        repository_file = related_file
+        create_version(repository_file, user)
+        CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io))
       end
 
       # Reverts file and spawns async job to characterize and create derivatives.
@@ -63,39 +68,6 @@ module Hyrax
         file_set.public_send(normalize_relation(relation)) || raise("No #{relation} returned for FileSet #{file_set.id}")
       end
 
-      def perform_ingest_file_through_active_fedora(io)
-        # Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer.
-        Hydra::Works::AddFileToFileSet.call(file_set,
-                                            io,
-                                            relation,
-                                            versioning: false)
-        return false unless file_set.save
-        repository_file = related_file
-        create_version(repository_file, user)
-        CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io))
-      end
-
-      def perform_ingest_file_through_valkyrie(io) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        Deprecation.warn "FileActor support for Valkyrie was experimental and " \
-                         "is slated to be removed in favor of WorkUploadsHandler."
-        file =
-          begin
-            Hyrax.storage_adapter.upload(resource: file_set, file: io, original_filename: io.original_name, use: relation)
-          rescue StandardError => err
-            Rails.logger.error("Failed to save file_metadata through valkyrie: #{err.message}")
-            return false
-          end
-        file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file.id)
-        create_version(file_metadata, user)
-
-        file_set.file_ids << file_metadata.id
-        file_set.original_file_id = file_metadata.id
-        Hyrax.persister.save(resource: file_set)
-        Hyrax.publisher.publish('object.metadata.updated', object: file_set, user: user)
-        CharacterizeJob.perform_later(file_set, file_metadata.id.to_s, pathhint(io))
-        file_metadata
-      end
-
       def normalize_relation(relation)
         use_valkyrie ? normalize_relation_for_valkyrie(relation) : normalize_relation_for_active_fedora(relation)
       end

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

@@ -4,10 +4,9 @@ module Hyrax
     # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
     class FileSetActor # rubocop:disable Metrics/ClassLength
       include Lockable
-      attr_reader :file_set, :user, :attributes, :use_valkyrie
+      attr_reader :file_set, :user, :attributes
 
-      def initialize(file_set, user, use_valkyrie: Hyrax.config.query_index_from_valkyrie)
-        @use_valkyrie = use_valkyrie
+      def initialize(file_set, user)
         @file_set = file_set
         @user = user
       end
@@ -71,42 +70,17 @@ module Hyrax
       def attach_to_work(work, file_set_params = {})
         acquire_lock_for(work.id) do
           # Ensure we have an up-to-date copy of the members association, so that we append to the end of the list.
-          if valkyrie_object?(work)
-            attach_to_valkyrie_work(work, file_set_params)
-          else
-            attach_to_af_work(work, file_set_params)
-          end
+          work.reload unless work.new_record?
+          file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
+          work.ordered_members << file_set
+          work.representative = file_set if work.representative_id.blank?
+          work.thumbnail = file_set if work.thumbnail_id.blank?
+          # Save the work so the association between the work and the file_set is persisted (head_id)
+          # NOTE: the work may not be valid, in which case this save doesn't do anything.
+          work.save
           Hyrax.config.callback.run(:after_create_fileset, file_set, user, warn: false)
         end
       end
-      alias attach_file_to_work attach_to_work
-      deprecation_deprecate attach_file_to_work: "use attach_to_work instead"
-
-      def attach_to_valkyrie_work(work, file_set_params)
-        work = Hyrax.query_service.find_by(id: work.id) unless work.new_record
-        file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
-        fs = Hyrax.persister.save(resource: file_set)
-        Hyrax.publisher.publish('object.metadata.updated', object: fs, user: user)
-        work.member_ids << fs.id
-        work.representative_id = fs.id if work.representative_id.blank?
-        work.thumbnail_id = fs.id if work.thumbnail_id.blank?
-        # Save the work so the association between the work and the file_set is persisted (head_id)
-        # NOTE: the work may not be valid, in which case this save doesn't do anything.
-        Hyrax.persister.save(resource: work)
-        Hyrax.publisher.publish('object.metadata.updated', object: work, user: user)
-      end
-
-      # Adds a FileSet to the work using ore:Aggregations.
-      def attach_to_af_work(work, file_set_params)
-        work.reload unless work.new_record?
-        file_set.visibility = work.visibility unless assign_visibility?(file_set_params)
-        work.ordered_members << file_set
-        work.representative = file_set if work.representative_id.blank?
-        work.thumbnail = file_set if work.thumbnail_id.blank?
-        # Save the work so the association between the work and the file_set is persisted (head_id)
-        # NOTE: the work may not be valid, in which case this save doesn't do anything.
-        work.save
-      end
 
       # @param [String] revision_id the revision to revert to
       # @param [Symbol, #to_sym] relation
@@ -144,8 +118,7 @@ module Hyrax
       end
 
       def build_file_actor(relation)
-        fs = use_valkyrie ? file_set.valkyrie_resource : file_set
-        file_actor_class.new(fs, relation, user, use_valkyrie: use_valkyrie)
+        file_actor_class.new(file_set, relation, user)
       end
 
       # uses create! because object must be persisted to serialize for jobs
@@ -194,32 +167,10 @@ module Hyrax
         work.save!
       end
 
-      # switches between using valkyrie to save or active fedora to save
       def perform_save(object)
-        obj_to_save = object_to_act_on(object)
-        if valkyrie_object?(obj_to_save)
-          saved_resource = Hyrax.persister.save(resource: obj_to_save)
-          # return the same type of object that was passed in
-          saved_object_to_return = valkyrie_object?(object) ? saved_resource : Wings::ActiveFedoraConverter.new(resource: saved_resource).convert
-        else
-          obj_to_save.save
-          saved_object_to_return = obj_to_save
-        end
-        saved_object_to_return
-      end
-
-      # if passed a resource or if use_valkyrie==true, object to act on is the valkyrie resource
-      def object_to_act_on(object)
-        return object if valkyrie_object?(object)
-        use_valkyrie ? object.valkyrie_resource : object
-      end
-
-      # determine if the object is a valkyrie resource
-      def valkyrie_object?(object)
-        object.is_a? Valkyrie::Resource
+        object.save
+        object
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

data/app/actors/hyrax/actors/lease_actor.rb

@@ -12,17 +12,10 @@ module Hyrax
       # Update the visibility of the work to match the correct state of the lease, then clear the lease date, etc.
       # Saves the lease and the work
       def destroy
-        case work
-        when Valkyrie::Resource
-          lease_manager = Hyrax::LeaseManager.new(resource: work)
-          lease_manager.release && Hyrax::AccessControlList(work).save
-          lease_manager.nullify
-        else
-          work.lease_visibility! # If the lease has lapsed, update the current visibility.
-          work.deactivate_lease!
-          work.lease.save!
-          work.save!
-        end
+        work.lease_visibility! # If the lease has lapsed, update the current visibility.
+        work.deactivate_lease!
+        work.lease.save!
+        work.save!
       end
     end
   end

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

@@ -1,125 +1,75 @@
 class TrackingTags {
   constructor(provider) {
     this.provider = provider
-    switch(this.provider) {
-    case 'matomo':
-      this.tracker = new MatomoTagTracker();
-      break;
-    case 'google':
-      this.tracker = new UATagTracker();
-      break;
-    case 'ga4':
-      this.tracker = new GA4TagTracker();
-      break;
-    default:
-      console.error('Unsupport analytics provider ' + this.provider + ', supported values are: matomo, google, ga4');
-    }
-  }
-
-  // Track an event with the configured provider
-  trackTagEvent(category, action, name) {
-    this.tracker.trackEvent(category, action, name);
   }
 
-  // Track a page view with the configured provider
-  trackPageView() {
-    this.tracker.trackPageView();
-  }
-
-  // Deprecated: use trackTagEvent and trackPageView instead.
   analytics() {
-    return this;
-  }
-
-  // Deprecated: use trackTagEvent and trackPageView instead.
-  push(params) {
-    if (params[0] == 'trackPageView' || params[0] == '_trackPageView') {
-      this.tracker.trackPageView();
-    } else {
-      this.tracker.trackTagEvent(params[1], params[2], params[3]);
+    if(this.provider === "matomo") {
+      return _paq;
+    }
+    else {
+      return _gaq;
     }
   }
 
-  // Deprecated
   pageView() {
-    return 'trackPageView';
+    if(this.provider === "matomo") {
+      return 'trackPageView'
+    } else {
+      return '_trackPageview'
+    }
   }
 
-  // Deprecated
   trackEvent() {
-    return 'trackEvent';
-  }
-}
-
-class GA4TagTracker {
-  trackEvent(category, action, name) {
-    gtag('event', action, {
-      'category': category,
-      'label': name
-    });
-  }
-
-  trackPageView() {
-    // No operation necessary, this event is automatically collected
-  }
-}
-
-class UATagTracker {
-  trackEvent(category, action, name) {
-    _gaq.push(['_trackEvent', category, action, name]);
-  }
-
-  trackPageView() {
-    _gaq.push(['_trackPageView']);
-  }
-}
-
-class MatomoTagTracker {
-  trackEvent(category, action, name) {
-    _paq.push(['trackEvent', category, action, name]);
-  }
-
-  trackPageView() {
-    _paq.push(['trackPageView']);
+    if(this.provider === "matomo") {
+      return 'trackEvent'
+    } else {
+      return '_trackEvent'
+    }
   }
 }
 
 function trackPageView() {
-  window.trackingTags.trackPageView();
+  window.trackingTags.analytics().push([window.trackingTags.pageView()]);
 }
 
 function trackAnalyticsEvents() {
   $('span.analytics-event').each(function(){
-    var eventSpan = $(this);
-    window.trackingTags.trackTagEvent(eventSpan.data('category'), eventSpan.data('action'), eventSpan.data('name'));
+    var eventSpan = $(this)
+    window.trackingTags.analytics().push([window.trackingTags.trackEvent(), eventSpan.data('category'), eventSpan.data('action'), eventSpan.data('name')]);
   })
 }
 
 function setupTracking() {
-  var provider = $('meta[name="analytics-provider"]').prop('content')
-  if (provider === undefined) {
-    return;
-  }
-  window.trackingTags = new TrackingTags(provider);
-  trackPageView();
-  trackAnalyticsEvents();
+    var provider = $('meta[name="analytics-provider"]').prop('content')
+    if (provider === undefined) {
+      return;
+    }
+    window.trackingTags = new TrackingTags(provider)
+    trackPageView()
+    trackAnalyticsEvents()
 }
 
 if (typeof Turbolinks !== 'undefined') {
   $(document).on('turbolinks:load', function() {
-    setupTracking();
-  });
+    setupTracking()
+  })
 } else {
   $(document).on('ready', function() {
-    setupTracking();
-  });
+    setupTracking()
+  })
 }
 
 $(document).on('click', '#file_download', function(e) {
-  window.trackingTags.trackTagEvent('file-set', 'file-set-download', $(this).data('label'));
-  window.trackingTags.trackTagEvent('file-set-in-work', 'file-set-in-work-download', $(this).data('work-id'));
+  var provider = $('meta[name="analytics-provider"]').prop('content')
+  if (provider === undefined) {
+    return;
+  }
+  window.trackingTags = new TrackingTags(provider)
+  window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set', 'file-set-download', $(this).data('label')]);
+  window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set-in-work', 'file-set-in-work-download', $(this).data('work-id')]);
   $(this).data('collection-ids').forEach(function (collection) {
-    window.trackingTags.trackTagEvent('file-set-in-collection', 'file-set-in-collection-download', collection);
-    window.trackingTags.trackTagEvent('work-in-collection', 'work-in-collection-download', collection);
+    window.trackingTags.analytics().push([trackingTags.trackEvent(), 'file-set-in-collection', 'file-set-in-collection-download', collection]);
+    window.trackingTags.analytics().push([trackingTags.trackEvent(), 'work-in-collection', 'work-in-collection-download', collection]);
   });
 });

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

@@ -92,7 +92,7 @@ Hyrax = {
     // Popover help modals. Used on the user profile page.
     popovers: function () {
         $("a[data-toggle=popover]").popover({html: true})
-            .click(function () {
+            .on("click", function () {
                 return false;
             });
     },
@@ -104,7 +104,7 @@ Hyrax = {
         // On the edit work page
         new PermissionsControl($("#share"), 'tmpl-work-grant');
         // On the edit fileset page
-        new PermissionsControl($("#permission"), 'tmpl-file-set-grant', { with_visibility_component: true });
+        new PermissionsControl($("#permission"), 'tmpl-file-set-grant');
         // On the batch edit page
         new PermissionsControl($("#form_permissions"), 'tmpl-work-grant');
         // On the edit collection page

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

@@ -1,10 +1,10 @@
 Blacklight.onLoad(function() {
-  $('#show_addl_descriptions').click(function() {
+  $('#show_addl_descriptions').on('click', function() {
     $('#more_descriptions').show();
     $('#show_addl_descriptions').hide();
     return false;
   });
-  $('#hide_addl_descriptions').click(function() {
+  $('#hide_addl_descriptions').on('click', function() {
     $('#more_descriptions').hide();
     $('#show_addl_descriptions').show();
     return false;

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

@@ -9,7 +9,7 @@ function batch_edit_init () {
             var key = Pair[0];
             var val = Pair[1];
             if (Result[key] != null) {
-                if(!$.isArray(Result[key])) Result[key] = [Result[key]];
+                if(!Array.isArray(Result[key])) Result[key] = [Result[key]];
                 Result[key].push(val);
             } else
                 Result[key] = val;
@@ -159,9 +159,9 @@ function batch_edit_init () {
         setTimeout(ajaxManager.runNow(), 100);
     }
 
-    $("#permissions_visibility_save").click(runSave);
-    $("#permissions_roles_save").click(runSave);
-    $(".field-save").click(runSave);
+    $("#permissions_visibility_save").on('click', runSave);
+    $("#permissions_roles_save").on( 'click', runSave);
+    $(".field-save").on('click', runSave);
 }
 
 Blacklight.onLoad(function() {