115491: Restructure bitstream update code

Author: AAwouters

src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts

@@ -51,6 +51,15 @@ interface DataObjects {
   item: Item,
 }
 
+/**
+ * The results after updating all the fields on submission.
+ */
+interface UpdateResult {
+  metadataUpdateRD: RemoteData<Bitstream>,
+  primaryUpdateRD: RemoteData<Bundle>,
+  formatUpdateRD: RemoteData<Bitstream>,
+}
+
 /**
  * Key prefix used to generate form messages
  */
@@ -645,46 +654,21 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onSubmit() {
     const updatedValues = this.formGroup.getRawValue();
 
-    const metadataUpdateRD$ = this.updateBitstreamMetadataRD$(updatedValues);
-    const primaryUpdateRD$ = this.updatePrimaryBitstreamRD$(updatedValues);
-    const formatUpdateRD$ = this.updateBitstreamFormatRD$(updatedValues);
-
-    this.subs.push(combineLatest([metadataUpdateRD$, primaryUpdateRD$, formatUpdateRD$])
-      .subscribe(([metadataUpdateRD, primaryUpdateRD, formatUpdateRD]) => {
-        let errorWhileSaving = false;
-
-        // Check for errors during the primary bitstream update
-        if (hasValue(primaryUpdateRD) && primaryUpdateRD.hasFailed) {
-          this.notificationsService.error(
-            this.translate.instant(NOTIFICATIONS_PREFIX + 'error.primaryBitstream.title'),
-            primaryUpdateRD.errorMessage
-          );
-
-          errorWhileSaving = true;
-        }
-
-        // Check for errors during the bitstream format update
-        if (hasValue(formatUpdateRD) && formatUpdateRD.hasFailed) {
-          this.notificationsService.error(
-            this.translate.instant(NOTIFICATIONS_PREFIX + 'error.format.title'),
-            formatUpdateRD.errorMessage
-          );
-
-          errorWhileSaving = true;
-        }
-
-        this.bitstreamService.commitUpdates();
-        this.notificationsService.success(
-          this.translate.instant(NOTIFICATIONS_PREFIX + 'saved.title'),
-          this.translate.instant(NOTIFICATIONS_PREFIX + 'saved.content')
-        );
-        if (!errorWhileSaving) {
-          this.navigateToItemEditBitstreams();
-        }
+    this.subs.push(combineLatest(this.getUpdateObservables(updatedValues))
+      .subscribe((updateResult: UpdateResult) => {
+        this.handleUpdateResult(updateResult);
       })
     );
   }
 
+  getUpdateObservables(updatedValues: any): ObservablesDictionary<UpdateResult> {
+    return {
+      metadataUpdateRD: this.updateBitstreamMetadataRD$(updatedValues),
+      primaryUpdateRD: this.updatePrimaryBitstreamRD$(updatedValues),
+      formatUpdateRD: this.updateBitstreamFormatRD$(updatedValues),
+    };
+  }
+
   updateBitstreamMetadataRD$(updatedValues: any): Observable<RemoteData<Bitstream>> {
     const updatedBitstream = this.formToBitstream(updatedValues);
 
@@ -792,6 +776,42 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     return updatedBitstream;
   }
 
+  handleUpdateResult(updateResult: UpdateResult) {
+    let errorWhileSaving = false;
+
+    // Check for errors during the primary bitstream update
+    const primaryUpdateRD = updateResult.primaryUpdateRD;
+    if (hasValue(primaryUpdateRD) && primaryUpdateRD.hasFailed) {
+      this.notificationsService.error(
+        this.translate.instant(NOTIFICATIONS_PREFIX + 'error.primaryBitstream.title'),
+        primaryUpdateRD.errorMessage
+      );
+
+      errorWhileSaving = true;
+    }
+
+    // Check for errors during the bitstream format update
+    const formatUpdateRD = updateResult.formatUpdateRD;
+    if (hasValue(formatUpdateRD) && formatUpdateRD.hasFailed) {
+      this.notificationsService.error(
+        this.translate.instant(NOTIFICATIONS_PREFIX + 'error.format.title'),
+        formatUpdateRD.errorMessage
+      );
+
+      errorWhileSaving = true;
+    }
+
+    this.bitstreamService.commitUpdates();
+    this.notificationsService.success(
+      this.translate.instant(NOTIFICATIONS_PREFIX + 'saved.title'),
+      this.translate.instant(NOTIFICATIONS_PREFIX + 'saved.content')
+    );
+
+    if (!errorWhileSaving) {
+      this.navigateToItemEditBitstreams();
+    }
+  }
+
   /**
    * Cancel the form and return to the previous page
    */