ichec-angular-core 1.0.1 → 1.0.3

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';
@@ -349,6 +350,9 @@ class RestService {
     }
 }
 
+function _toTitleCase(str) {
+    return str.replace(/\w\S*/g, text => text.charAt(0).toUpperCase() + text.substring(1).toLowerCase());
+}
 class ItemService extends RestService {
     typenamePlural = "";
     typename = "";
@@ -367,6 +371,9 @@ class ItemService extends RestService {
     typePlural() {
         return this.typenamePlural ? this.typenamePlural : this.typename + "s";
     }
+    get typeTitleCase() {
+        return _toTitleCase(this.typename.replaceAll("_", ""));
+    }
 }
 
 class ResolvedPermission {
@@ -956,17 +963,36 @@ class DetailView {
     }
 }
 
+class FeedbackService extends ItemWithUserService {
+    _url = Feedback.plural;
+    typename = Feedback.typename;
+    sendError(e) {
+        this.postItem({ comments: JSON.stringify(e) }).subscribe();
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.3", ngImport: i0, type: FeedbackService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.3", ngImport: i0, type: FeedbackService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.3", ngImport: i0, type: FeedbackService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
 class EditView {
     createMode = signal(false, ...(ngDevMode ? [{ debugName: "createMode" }] : []));
     heading = computed(() => { const prefix = this.createMode() ? "New " : "Edit "; return prefix + this.getTitle(); }, ...(ngDevMode ? [{ debugName: "heading" }] : []));
     submitting = signal(false, ...(ngDevMode ? [{ debugName: "submitting" }] : []));
+    errorType = signal("", ...(ngDevMode ? [{ debugName: "errorType" }] : []));
     item = signal(null, ...(ngDevMode ? [{ debugName: "item" }] : []));
     fileKeys = [];
     _route = inject(ActivatedRoute);
     _location = inject(Location);
     _userService = inject(UserService);
+    feedbackService = inject(FeedbackService);
     form;
     itemService;
+    snackBar = inject(MatSnackBar);
     uploadedFiles = [];
     constructor(itemService, form) {
         this.itemService = itemService;
@@ -1026,13 +1052,45 @@ class EditView {
     }
     postItem() {
         this.submitting.set(true);
-        this.itemService.postItem(this.createItem()).subscribe(item => this.saveFiles(item));
+        this.errorType.set("");
+        this.itemService.postItem(this.createItem()).subscribe({
+            next: (item) => this.saveFiles(item),
+            error: (e) => this.onPostError(e)
+        });
+    }
+    onPostError(e) {
+        this.submitting.set(false);
+        this.errorType.set("submit");
+        this.feedbackService.sendError(e);
+        console.log(e);
+        this.onPostErrorSnackBar(e);
+    }
+    onPostErrorSnackBar(_e) {
+        this.snackBar.open("Submission failed - request support in the top right menu", "Dismiss", { verticalPosition: "top",
+            duration: 5000
+        });
     }
     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) {
+        this.submitting.set(false);
+        this.errorType.set("submit");
+        this.feedbackService.sendError(e);
+        console.log(e);
+        this.onPutErrorSnackBar(e);
+    }
+    onPutErrorSnackBar(_e) {
+        this.snackBar.open("Submission failed - request support in the top right menu", "Dismiss", { verticalPosition: "top",
+            duration: 5000
+        });
     }
     saveFiles(item) {
+        this.item.set(item);
         const next_file = this.getNextFileForUpload();
         if (next_file) {
             this.saveFile(item, next_file);
@@ -1042,11 +1100,14 @@ 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);
         }
     }
@@ -1058,6 +1119,21 @@ class EditView {
         }
         return null;
     }
+    onPutFileError(e) {
+        // Since the item is already created on the backend 
+        // switch to 'edit mode' for a file resubmit attempt
+        this.createMode.set(false);
+        this.submitting.set(false);
+        this.errorType.set("submit");
+        this.feedbackService.sendError(e);
+        console.log(e);
+        this.onPutFileErrorSnackbar(e);
+    }
+    onPutFileErrorSnackbar(_e) {
+        this.snackBar.open("File upload failed - please re-attach and try submitting again", "Dismiss", { verticalPosition: "top",
+            duration: 5000
+        });
+    }
     isCreateRoute() {
         const urls = this._route.snapshot.url;
         if (!urls) {
@@ -1085,8 +1161,15 @@ class EditView {
     }
     onItemUpdated(item) {
         this.submitting.set(false);
+        this.errorType.set("");
         this.uploadedFiles = [];
         this.item.set(item);
+        this.postItemUpdated();
+    }
+    postItemUpdated() {
+        this.snackBar.open(this.itemService.typeTitleCase + " updated ok", "Dismiss", { verticalPosition: "top",
+            duration: 5000
+        });
         this.goBack();
     }
     onOptions(options) {
@@ -2534,19 +2617,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.3", ngImpor
                         MatDividerModule], template: "<mat-sidenav-container class=\"leftnav-container\">\n  @if(leftNavService.wide()){\n  <mat-sidenav mode=\"side\" class=\"leftnav-side\" [opened]=\"user()!== null\" style=\"width:200px; padding-top:0px\">\n        <mat-nav-list>\n          @for (grouping of leftNavService.activeGroupings(); track grouping; let idx=$index; let count=$count) {          \n          <ul>\n            @if(grouping.name)\n            {\n              <div style=\"display:flex; width: 100%; align-items: center; text-align: center;margin-top: 5px; margin-bottom: 5px;\">\n              <span style=\"width:100%\">{{grouping.name}}</span>\n              </div>\n            }\n            @for (option of grouping.options; track option) {\n              <li>\n              <a mat-list-item \n              [routerLink]=\"option.route\" \n              routerLinkActive #rla=\"routerLinkActive\" \n              [activated]=\"rla.isActive\">\n              <div style=\"display:flex; vertical-align:middle;\">\n              <mat-icon style=\"margin-right: 5px;\">{{option.icon}}</mat-icon><span>{{ option.name }}</span>\n              </div>\n            </a>\n              </li>\n            }\n            @if(idx < count-1)\n            {\n              <mat-divider></mat-divider>\n            }\n          </ul>\n        }\n        </mat-nav-list>\n    </mat-sidenav>\n  }\n  @else{\n  <mat-sidenav mode=\"side\" class=\"leftnav-side\" [opened]=\"user()!== null\" style=\"width: 70px;\">\n        <mat-nav-list>\n          @for (grouping of leftNavService.activeGroupings(); track grouping; let idx=$index; let count=$count) {          \n          <ul>\n            @if(grouping.name)\n            {\n              <div style=\"display:flex; width: 100%; flex-direction: row; align-items: center; text-align: center;margin-top: 5px; margin-bottom: 5px;\">\n              <span style=\"width:100%\">{{grouping.name}}</span>\n              </div>\n            }\n            @for (option of grouping.options; track option) {\n              <li>\n              <a mat-list-item \n              [routerLink]=\"option.route\" \n              routerLinkActive #rla=\"routerLinkActive\" \n              [activated]=\"rla.isActive\" matTooltip=\"{{option.name}}\">\n              <div style=\"display:flex; vertical-align:middle;\">\n                <mat-icon>{{option.icon}}</mat-icon>\n              </div>\n            </a>\n              </li>\n            }\n            @if(idx < count-1)\n            {\n              <mat-divider></mat-divider>\n            }\n          </ul>\n        }\n        </mat-nav-list>\n    </mat-sidenav>\n  }\n\n    <mat-sidenav-content class=\"leftnav-content\" [style.background-image]=\"backgroundStyle\"> \n        <router-outlet />\n    </mat-sidenav-content>\n</mat-sidenav-container>\n", styles: [":host{display:flex;flex-direction:column}.leftnav-container{flex-grow:1;display:flex}.leftnav-content{display:flex;flex-grow:1;height:90vh;background-blend-mode:lighten;background-color:#ffffffa6;background-size:cover}.leftnav-side{padding:5px}ul,li{margin:0;padding:0;list-style-type:none;padding-inline-start:0;list-style:none}\n"] }]
         }], ctorParameters: () => [], propDecorators: { background: [{ type: i0.Input, args: [{ isSignal: true, alias: "background", required: false }] }], sideNavContent: [{ type: i0.ViewChild, args: [i0.forwardRef(() => MatSidenavContent), { isSignal: true }] }] } });
 
-class FeedbackService extends ItemWithUserService {
-    _url = Feedback.plural;
-    typename = Feedback.typename;
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.3", ngImport: i0, type: FeedbackService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.0.3", ngImport: i0, type: FeedbackService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.3", ngImport: i0, type: FeedbackService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
 class FeedbackForm {
     fb = inject(FormBuilder);
     form;