Cleanup file upload susbcriptions

src-ui/src/app/services/upload-documents.service.ts

@@ -6,11 +6,14 @@ import {
   FileStatusPhase,
 } from './consumer-status.service'
 import { DocumentService } from './rest/document.service'
+import { Subscription } from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
 })
 export class UploadDocumentsService {
+  private uploadSubscriptions: Array<Subscription> = []
+
   constructor(
     private documentService: DocumentService,
     private consumerStatusService: ConsumerStatusService
@@ -27,36 +30,43 @@ export class UploadDocumentsService {
 
           status.message = $localize`Connecting...`
 
-          this.documentService.uploadDocument(formData).subscribe({
+          this.uploadSubscriptions[file.name] = this.documentService
-            next: (event) => {
+            .uploadDocument(formData)
-              if (event.type == HttpEventType.UploadProgress) {
+            .subscribe({
-                status.updateProgress(
+              next: (event) => {
-                  FileStatusPhase.UPLOADING,
+                if (event.type == HttpEventType.UploadProgress) {
-                  event.loaded,
+                  status.updateProgress(
-                  event.total
+                    FileStatusPhase.UPLOADING,
-                )
+                    event.loaded,
-                status.message = $localize`Uploading...`
+                    event.total
-              } else if (event.type == HttpEventType.Response) {
-                status.taskId = event.body['task_id']
-                status.message = $localize`Upload complete, waiting...`
-              }
-            },
-            error: (error) => {
-              switch (error.status) {
-                case 400: {
-                  this.consumerStatusService.fail(status, error.error.document)
-                  break
-                }
-                default: {
-                  this.consumerStatusService.fail(
-                    status,
-                    $localize`HTTP error: ${error.status} ${error.statusText}`
                   )
-                  break
+                  status.message = $localize`Uploading...`
+                } else if (event.type == HttpEventType.Response) {
+                  status.taskId = event.body['task_id']
+                  status.message = $localize`Upload complete, waiting...`
+                  this.uploadSubscriptions[file.name]?.complete()
                 }
-              }
+              },
-            },
+              error: (error) => {
-          })
+                switch (error.status) {
+                  case 400: {
+                    this.consumerStatusService.fail(
+                      status,
+                      error.error.document
+                    )
+                    break
+                  }
+                  default: {
+                    this.consumerStatusService.fail(
+                      status,
+                      $localize`HTTP error: ${error.status} ${error.statusText}`
+                    )
+                    break
+                  }
+                }
+                this.uploadSubscriptions[file.name]?.complete()
+              },
+            })
         })
       }
     }