ichec-angular-core 1.0.1 → 1.0.2

package/fesm2022/ichec-angular-core.mjs

@@ -11,6 +11,7 @@ import { ActivatedRoute, UrlSerializer, createUrlTreeFromSnapshot, RouterModule,
 import { MatDialogRef, MAT_DIALOG_DATA, MatDialogTitle, MatDialogContent, MatDialogActions, MatDialogClose, MatDialog } from '@angular/material/dialog';
 import * as i2 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import * as i1 from '@angular/material/table';
 import { MatTable, MatTableModule } from '@angular/material/table';
 import * as i2$1 from '@angular/material/form-field';
@@ -967,6 +968,7 @@ class EditView {
     _userService = inject(UserService);
     form;
     itemService;
+    snackBar = inject(MatSnackBar);
     uploadedFiles = [];
     constructor(itemService, form) {
         this.itemService = itemService;
@@ -1026,14 +1028,28 @@ class EditView {
     }
     postItem() {
         this.submitting.set(true);
-        this.itemService.postItem(this.createItem()).subscribe(item => this.saveFiles(item));
+        this.itemService.postItem(this.createItem()).subscribe({
+            next: (item) => this.saveFiles(item),
+            error: (e) => this.onPostError(e)
+        });
+    }
+    onPostError(e) {
+        console.log(e);
     }
     putItem(item) {
         this.submitting.set(true);
-        this.itemService.putItem(this.updateItem(item)).subscribe(item => this.saveFiles(item));
+        this.itemService.putItem(this.updateItem(item)).subscribe({
+            next: (item) => this.saveFiles(item),
+            error: (e) => this.onPutError(e)
+        });
+    }
+    onPutError(e) {
+        console.log(e);
     }
     saveFiles(item) {
+        this.item.set(item);
         const next_file = this.getNextFileForUpload();
+        console.log(next_file, this.form);
         if (next_file) {
             this.saveFile(item, next_file);
         }
@@ -1042,14 +1058,33 @@ class EditView {
         }
     }
     saveFile(item, record) {
-        this.uploadedFiles.push(record.name);
         if (record.file) {
-            this.itemService.putFile(item.id, record.name, record.file).subscribe(item => this.saveFiles(item));
+            this.itemService.putFile(item.id, record.name, record.file).subscribe({
+                next: (item) => { this.uploadedFiles.push(record.name); this.saveFiles(item); },
+                error: (e) => this.onPutFileError(e)
+            });
         }
         else {
+            this.uploadedFiles.push(record.name);
             this.saveFiles(item);
         }
     }
+    onPutFileError(e) {
+        const item = this.item();
+        if (item) {
+            // Since the item is already created on the backend 
+            // switch to 'edit mode' for a file resubmit attempt
+            this.form.setValue(item);
+            this.createMode.set(false);
+        }
+        console.log(e);
+        this.onPutFileErrorSnackbar(e);
+    }
+    onPutFileErrorSnackbar(_e) {
+        this.snackBar.open("File upload failed - please try submitting again", "Dismiss", { verticalPosition: "bottom",
+            duration: 5000
+        });
+    }
     getNextFileForUpload() {
         for (const key of this.fileKeys) {
             if (!this.uploadedFiles.includes(key)) {
@@ -1087,6 +1122,12 @@ class EditView {
         this.submitting.set(false);
         this.uploadedFiles = [];
         this.item.set(item);
+        this.postItemUpdated();
+    }
+    postItemUpdated() {
+        this.snackBar.open(this.itemService.typename + " updated ok", "Dismiss", { verticalPosition: "top",
+            duration: 5000
+        });
         this.goBack();
     }
     onOptions(options) {