[ActiveStorage for All] Replace blueimp jQuery-File-Upload with a dependency-free chunked uploader

app/assets/javascripts/hyrax.js

@@ -22,9 +22,12 @@
 //= require action_cable
 
 //= require hyrax/monkey_patch_turbolinks
-//= require hyrax/fileupload
+// blueimp's standalone micro-templating helper, used by the permissions and
+// relationships editors (formerly loaded via the old upload widget)
+//= require fileupload/tmpl
 // Provide AMD module support
 //= require almond
+//= require hyrax/fileupload
 //= require hyrax/notification
 //= require hyrax/app
 //= require hyrax/config

app/assets/javascripts/hyrax/fileupload.js

@@ -1,8 +1,18 @@
 //= require hyrax/uploader
-// This file is the default initialization of the fileupload.  If you want to call
-// hyraxUploader with other options (like afterSubmit), then override this file.
+// This file is the default initialization of the file upload widgets. If you
+// want to initialize Hyrax.Uploader with other options, override this file.
 Blacklight.onLoad(function() {
-  var options = {};
-  $('#fileupload').hyraxUploader(options);
-  $('#fileuploadlogo').hyraxUploader({downloadTemplateId: 'logo-template-download'});
+  // expose the uploader for view-level initializers and overrides
+  window.Hyrax = window.Hyrax || {};
+  if (!window.Hyrax.Uploader) {
+    window.Hyrax.Uploader = require('hyrax/uploader').Uploader;
+  }
+
+  var main = document.getElementById('fileupload');
+  if (main && !main.hyraxUploader) { new Hyrax.Uploader(main, {}); }
+
+  var logo = document.getElementById('fileuploadlogo');
+  if (logo && !logo.hyraxUploader) {
+    new Hyrax.Uploader(logo, { rowTemplate: 'hyrax-upload-row-logo' });
+  }
 });

app/assets/javascripts/hyrax/save_work/uploaded_files.es6

@@ -12,6 +12,11 @@ export class UploadedFiles {
       this.uploadsInProgress -= 1
       callback(e, data)
     })
+    // canceled or errored uploads no longer count as in progress
+    this.element.on('fileuploadfail', (e, data) => {
+      this.uploadsInProgress -= 1
+      callback(e, data)
+    })
     this.element.on('fileuploaddestroyed', callback)
   }