hyrax 3.4.2 → 4.0.0.beta1

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/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/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;
             });
     },

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() {

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

@@ -5,12 +5,12 @@
     var n = $(".batch_document_selector:checked").length;
     if ((n>0) || (forceOn)) {
         $('.batch-toggle').show();
-        $('.batch-select-all').removeClass('hidden');
-        $('#batch-edit').removeClass('hidden');
-    } else if ( otherPage){
+        $('.batch-select-all').removeAttr("hidden");
+        $('#batch-edit').removeAttr("hidden");
+    } else if (otherPage){
         $('.batch-toggle').hide();
-        $('.batch-select-all').addClass('hidden');
-        $('#batch-edit').addClass('hidden');
+        $('.batch-select-all').attr("hidden", "");
+        $('#batch-edit').attr("hidden", "");
     }
     $("body").css("cursor", "auto");
   }
@@ -26,10 +26,10 @@
   function toggleStateBool (obj, state) {
     if (state){
       obj.attr("data-state", 'on');
-      obj.find('a i').addClass('glyphicon glyphicon-ok');
+      obj.find('a i').addClass('fa fa-check');
     }else {
       obj.attr("data-state", 'off');
-      obj.find('a i').removeClass('glyphicon glyphicon-ok');
+      obj.find('a i').removeClass('fa fa-check');
     }
 
   }
@@ -62,22 +62,22 @@
 
 Blacklight.onLoad(function() {
   // check the select all page cog menu item and select the entire page
-  $("[data-behavior='batch-edit-select-page']").bind('click', function(e) {
+  $("[data-behavior='batch-edit-select-page']").on('click', function(e) {
     e.preventDefault();
     select_page(true);
   });
 
   // check the select none cog menu item and de-select the entire page
-  $("[data-behavior='batch-edit-select-none']").bind('click', function(e) {
+  $("[data-behavior='batch-edit-select-none']").on('click', function(e) {
     e.preventDefault();
     select_page(false);
   });
 
   // check all check boxes
-  $("#check_all").bind('click', check_all_page);
+  $("#check_all").on('click', check_all_page);
   
   // select/deselect all check boxes 
-  $("#checkAllBox").change(function () {
+  $("#checkAllBox").on('change', function () {
     $("input:checkbox").prop('checked', $(this).prop("checked"));
   });
 
@@ -87,12 +87,12 @@ Blacklight.onLoad(function() {
   });
 
   // toggle button on or off based on boxes being clicked
-  $(".batch_document_selector").bind('click', function(e) {
+  $(".batch_document_selector").on('click', function(e) {
      toggleButtons();
   });
 
   // toggle the state of the select boxes in the cog menu if all buttons are
-  $(".batch_document_selector").bind('click', function(e) {
+  $(".batch_document_selector").on('click', function(e) {
 
       // count the check boxes currently checked
       var selectedCount = $(".batch_document_selector:checked").length;

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

@@ -2,7 +2,7 @@
 //= require browse_everything/behavior
 
 // Show the files in the queue
-Blacklight.onLoad( function() {
+function showBrowseEverythingFiles() {
   // We need to check this because https://github.com/samvera/browse-everything/issues/169
   if ($('#browse-btn').length > 0) {
     $('#browse-btn').browseEverything()
@@ -12,4 +12,6 @@ Blacklight.onLoad( function() {
       $.blueimp.fileupload.prototype.options.done.call($('#fileupload').fileupload(), evt, { result: { files: files }});
     })
   }
-});
+}
+$(document).on('click', '#browse-btn', showBrowseEverythingFiles);
+

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

@@ -86,7 +86,7 @@ export default class CollectionTypes {
             .remove();
           let defaultButton = $(event.target)
             .parent('div')
-            .find('.btn-default');
+            .find('.btn-secondary');
           defaultButton.trigger('click');
         }
       });

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

@@ -15,8 +15,12 @@ export default class {
   }
 
   url() {
-    let urlParts = window.location.pathname.split("/")
+    let urlParts = this.pathname().split("/")
     urlParts[urlParts.length - 1] = "files"
     return urlParts.join("/") 
   }
+
+  pathname() {
+    return window.location.pathname
+  }
 }

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

@@ -1,6 +1,6 @@
 Blacklight.onLoad(function() {
   // toggle button on or off based on boxes being clicked
-  $(".batch_document_selector, .batch_document_selector_all").bind('click', function(e) {
+  $(".batch_document_selector, .batch_document_selector_all").on('click', function(e) {
     var n = $(".batch_document_selector:checked").length;
     if (n>0 || ($('input#check_all').length && $('input#check_all')[0].checked)) {
       $('.sort-toggle').hide();
@@ -14,21 +14,21 @@ Blacklight.onLoad(function() {
     if (array.length > 1) {
       var docId = array[1];
       $("#detail_" + docId + " .expanded-details").slideToggle();
-      $(item).toggleClass('glyphicon-chevron-right glyphicon-chevron-down');
+      $(item).toggleClass('fa-chevron-right fa-chevron-down');
     }
   }
 
   // show/hide more information on the dashboard when clicking
   // plus/minus
-  $('.glyphicon-chevron-right').on('click', function() {
+  $('.fa-chevron-right').on('click', function() {
     show_details(this);
     return false;
   });
 
   $('a').filter( function() {
-      return $(this).find('.glyphicon-chevron-right').length === 1;
+      return $(this).find('.fa-chevron-right').length === 1;
    }).on('click', function() {
-    show_details($(this).find(".glyphicon-chevron-right")[0]);
+    show_details($(this).find(".fa-chevron-right")[0]);
     return false;
   });
 

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

@@ -1,4 +1,4 @@
-//= require handlebars-v4.0.5
+//= require handlebars
 
 import { FieldManager } from 'hydra-editor/field_manager'
 import Handlebars from 'handlebars'
@@ -19,10 +19,10 @@ export default class ControlledVocabulary extends FieldManager {
         listClass:         '.listing',
         inputTypeClass:    '.controlled_vocabulary',
 
-        addHtml:           '<button type=\"button\" class=\"btn btn-link add\"><span class=\"glyphicon glyphicon-plus\"></span><span class="controls-add-text"></span></button>',
+        addHtml:           '<button type=\"button\" class=\"btn btn-link add\"><span class=\"fa fa-plus\"></span><span class="controls-add-text"></span></button>',
         addText:           'Add another',
 
-        removeHtml:        '<button type=\"button\" class=\"btn btn-link remove\"><span class=\"glyphicon glyphicon-remove\"></span><span class="controls-remove-text"></span> <span class=\"sr-only\"> previous <span class="controls-field-name-text">field</span></span></button>',
+        removeHtml:        '<button type=\"button\" class=\"btn btn-link remove\"><span class=\"fa fa-minus\"></span><span class="controls-remove-text"></span> <span class=\"sr-only\"> previous <span class="controls-field-name-text">field</span></span></button>',
         removeText:         'Remove',
 
         labelControls:      true,

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

@@ -31,7 +31,7 @@ export default class {
   // Immediate feedback after work creation, editing.
   formInProgress() {
     $('[data-behavior~=work-form]').on('submit', function(event){
-      $('.panel-footer').toggleClass('hidden');
+      $('.card-footer.save-progress').removeAttr("hidden");
     });
   }
   
@@ -82,9 +82,9 @@ export default class {
 
   sharingTabVisiblity(visible) {
       if (visible)
-         this.sharingTabElement.removeClass('hidden')
+         this.sharingTabElement.removeAttr("hidden")
       else
-         this.sharingTabElement.addClass('hidden')
+         this.sharingTabElement.attr("hidden","")
   }
 
   relationshipsControl() {

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

@@ -1,14 +1,16 @@
 Blacklight.onLoad(function() {
+  $(".facets-header button").find("span").addClass("fa fa-bars");
+  
   /*
    * facets lists
    */
-  $("li.expandable").click(function(){
+  $("li.expandable").on("click", function() {
     $(this).next("ul").slideToggle();
-    $(this).find('i').toggleClass("glyphicon-chevron-right glyphicon-chevron-down");
+    $(this).find('i').toggleClass("fa-chevron-right fa-chevron-down");
   });
 
-  $("li.expandable_new").click(function(){
-    $(this).find('i').toggleClass("glyphicon-chevron-right glyphicon-chevron-down");
+  $("li.expandable_new").on("click", function() {
+    $(this).find('i').toggleClass("fa-chevron-right fa-chevron-down");
   });
 
 }); //end of Blacklight.onload

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

@@ -10,7 +10,7 @@ export class InputTracker {
     this.notifier = notifier
     this.element.data("initial-value", this.element.val())
     this.element.data("tracker", this)
-    this.element.change(this.value_changed)
+    this.element.trigger("change", this.value_changed)
   }
 
   reset() {

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

@@ -6,7 +6,7 @@ export default class SaveManager {
 
   override_save_button() {
     Blacklight.onLoad(() => {
-      this.save_button.click(this.clicked_save)
+      this.save_button.on('click', this.clicked_save)
     })
   }
 
@@ -24,7 +24,7 @@ export default class SaveManager {
   }
 
   check_button() {
-    if(this.is_changed && this.save_button.selector.valueOf("data-action") === "*[data-action='save-actions']") {
+    if (this.is_changed) {
       this.save_button.removeClass("disabled")
     } else {
       this.save_button.addClass("disabled")

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

@@ -9,7 +9,7 @@ export default class SortManager {
   }
 
   initialize_sort() {
-    this.element.sortable({handle: ".panel-heading"})
+    this.element.sortable({handle: ".card-header"})
     this.element.on("sortstop", this.stopped_sorting)
     this.element.on("sortstart", this.started_sorting)
   }
@@ -104,7 +104,7 @@ export default class SortManager {
 
   initialize_alpha_sort_button() {
     let that = this
-    this.alpha_sort_button.click(function() { that.sort_alpha() } )
+    this.alpha_sort_button.on("click", function() { that.sort_alpha() } )
   }
 
   sort_alpha() {

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

@@ -5,7 +5,6 @@ export default class FileManager {
   constructor() {
     this.save_manager = this.initialize_save_manager()
     this.sorting()
-    this.save_affix()
     this.member_tracking()
     this.sortable_placeholder()
     this.resource_form()
@@ -19,20 +18,6 @@ export default class FileManager {
     window.new_sort_manager = new SortManager(this.save_manager)
   }
 
-  save_affix() {
-    let tools = $("#file-manager-tools")
-    if(tools.length > 0) {
-      tools.affix({
-        offset: {
-          top: $("#file-manager-tools .actions").offset().top,
-          bottom: function() {
-            return $("#file-manager-extra-tools").outerHeight(true) + $("footer").outerHeight(true)
-          }
-        }
-      })
-    }
-  }
-
   member_tracking() {
     let sm = this.save_manager
     $("li[data-reorder-id]").each(function(index, element) {
@@ -51,13 +36,13 @@ export default class FileManager {
     $("#resource-form").parent().data("file_manager_member", manager)
     // Track thumbnail ID hidden field
     new InputTracker($("*[data-member-link=thumbnail_id]"), manager)
-    $("#sortable *[name=thumbnail_id]").change(function() {
+    $("#sortable *[name=thumbnail_id]").on("change", function() {
       let val = $("#sortable *[name=thumbnail_id]:checked").val()
       $("*[data-member-link=thumbnail_id]").val(val)
       $("*[data-member-link=thumbnail_id]").change()
     })
     new InputTracker($("*[data-member-link=representative_id]"), manager)
-    $("#sortable *[name=representative_id]").change(function() {
+    $("#sortable *[name=representative_id]").on("change", function() {
       let val = $("#sortable *[name=representative_id]:checked").val()
       $("*[data-member-link=representative_id]").val(val)
       $("*[data-member-link=representative_id]").change()

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

@@ -19,7 +19,7 @@ export default class Notification {
     }
     else {
       this.counter.removeClass('invisible')
-      this.counter.addClass('label-danger').removeClass('label-default')
+      this.counter.addClass('badge-danger').removeClass('badge-secondary')
     }
   }
 }

data/app/assets/javascripts/hyrax/permissions/registry.es6

@@ -20,18 +20,18 @@ export class Registry {
 
   addError(message) {
     this.errorMessage.html(message);
-    this.error.removeClass('hidden');
+    this.error.removeAttr("hidden");
   }
 
   reset() {
-    this.error.addClass('hidden');
+    this.error.attr("hidden", "");
   }
 
   removePermission(evt) {
      evt.preventDefault();
      let button = $(evt.target);
      let container = button.closest('tr');
-     container.addClass('hidden'); // do not show the block
+     container.attr("hidden", ""); // do not show the block
      this.addDestroyField(container, button.attr('data-index'));
      this.showPermissionNote();
   }
@@ -47,7 +47,7 @@ export class Registry {
   }
 
   showPermissionNote() {
-     $('#save_perm_note').removeClass('hidden');
+     $('#save_perm_note').removeAttr("hidden");
   }
 
   addDestroyField(element, index) {

data/app/assets/javascripts/hyrax/permissions/user_controls.es6

@@ -51,7 +51,9 @@ export class UserControls {
   }
 
   userName() {
-    return this.userField.val()
+    if (this.userField.select2('data')) {
+      return this.userField.select2('data').text
+    }
   }
 
   addError(message) {

data/app/assets/javascripts/hyrax/relationships/confirm_remove_dialog.es6

@@ -25,7 +25,7 @@ export default class ConfirmRemoveDialog {
               <div class="modal-content">
               <div class="modal-body">${this.text}</div>
               <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">${this.cancel}</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">${this.cancel}</button>
                 <button type="button" class="btn btn-danger" data-behavior="submit">${this.remove}</button>
               </div>
               </div>

data/app/assets/javascripts/hyrax/relationships/control.es6

@@ -86,13 +86,13 @@ export default class RelationshipsControl {
    * @param {String} message the warning message text to set
    */
   setWarningMessage(message) {
-    this.warning.text(message).removeClass("hidden");
+    this.warning.text(message).hidden= false;
   }
 
   /**
    * Hide the warning message on the appropriate row
    */
   hideWarningMessage(){
-    this.warning.addClass("hidden");
+    this.warning.hidden= true;
   }
 }

data/app/assets/javascripts/hyrax/relationships/registry_entry.es6

@@ -38,7 +38,7 @@ export default class RegistryEntry {
     removeResource(evt) {
        evt.preventDefault();
        let button = $(evt.target);
-       this.view.addClass('hidden'); // do not show the block
+       this.view.attr("hidden", ""); // do not show the block
        this.destroyed = true
        this.registry.showSaveNote();
     }