Merge branch 'bugfix/cancel-large-upload' into 'devel'

Fix upload after cancelling large uploads

Closes #1194

See merge request sds-dev/sd-connect/swift-browser-ui!234

swift_browser_ui_frontend/wasm/js/crypt-post-upworker.js

@@ -159,6 +159,7 @@ function createUploadSessionFile(container, path) {
 
 // Encrypt a single chunk of an upload
 function encryptChunk(container, path, deChunk) {
+  if (!uploads[container]) return undefined;
   let chunk = Module.ccall(
     "encrypt_chunk",
     "number",
@@ -241,7 +242,7 @@ class StreamSlicer{
   }
 
   retryChunk(iter) {
-    this.getChunk(iter).then(async (chunk) => {
+    this.getChunk(iter).then(async () => {
       if (uploads[this.container]) {
         let chunk = await this.getChunk(iter);
 
@@ -298,12 +299,14 @@ class StreamSlicer{
     while (uploadCount > 4) {
       await timeout(250);
     }
-    uploadCount++;
-    postMessage({
-      eventType: "activeFile",
-      object: this.file.name,
-    });
-    await this.sendChunks();
+    if (!uploadCancelled) {
+      uploadCount++;
+      postMessage({
+        eventType: "activeFile",
+        object: this.file.name,
+      });
+      await this.sendChunks();
+    }
   }
 
   finishFile() {