@trudb/tru-common-lib 0.4.1 → 0.4.2

package/fesm2022/trudb-tru-common-lib.mjs

@@ -5,7 +5,7 @@ import * as i1$1 from '@angular/common';
 import { CommonModule, DatePipe, NgIf, NgClass } from '@angular/common';
 import * as i8 from '@angular/forms';
 import { FormsModule, FormControl, ReactiveFormsModule, FormGroup, Validators } from '@angular/forms';
-import { BehaviorSubject, merge, defer, from, of, Subject, Observable, fromEvent, Subscription, interval, skip, forkJoin, first, finalize, throwError } from 'rxjs';
+import { BehaviorSubject, merge, defer, from, of, Subject, Observable, fromEvent, Subscription, interval, skip, forkJoin, first, throwError, finalize } from 'rxjs';
 import * as _ from 'underscore';
 import ___default from 'underscore';
 import * as i1$2 from '@angular/common/http';
@@ -10282,9 +10282,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.7", ngImpor
 
 class TruDesktopMenubar {
     contextFilters;
+    appEnvironment;
     desktopCtrl;
-    constructor(contextFilters) {
+    constructor(contextFilters, appEnvironment) {
         this.contextFilters = contextFilters;
+        this.appEnvironment = appEnvironment;
+    }
+    get environmentWarning() {
+        return this.appEnvironment.environmentWarning?.trim() ?? '';
     }
     options = null;
     configs = null;
@@ -10297,8 +10302,8 @@ class TruDesktopMenubar {
         this.configs = this.options.menubarConfig;
         this.filters = this.contextFilters.filters;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.7", ngImport: i0, type: TruDesktopMenubar, deps: [{ token: TruContextFilters }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "22.1.7", type: TruDesktopMenubar, isStandalone: true, selector: "tru-desktop-menubar", inputs: { desktopCtrl: "desktopCtrl" }, ngImport: i0, template: "<div class=\"desktop-main-menu\">\r\n  <tru-toolbar>\r\n    <tru-toolbar-menu *ngFor=\"let config of configs\" [config]=\"config\"></tru-toolbar-menu>\r\n    <tru-toolbar-separator *ngIf=\"filters.length\"></tru-toolbar-separator>\r\n    <tru-toolbar-context-filter></tru-toolbar-context-filter>\r\n  </tru-toolbar>\r\n  <tru-toolbar>\r\n    <tru-toolbar-app-customization></tru-toolbar-app-customization>\r\n    <tru-toolbar-user-profile></tru-toolbar-user-profile>\r\n  </tru-toolbar>\r\n</div>\r\n", styles: [".desktop-main-menu tru-toolbar{display:inline-block}tru-toolbar:nth-of-type(2){float:right}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: FormsModule }, { kind: "component", type: TruToolbar, selector: "tru-toolbar", inputs: ["config"] }, { kind: "component", type: TruToolbarMenu, selector: "tru-toolbar-menu", inputs: ["config"] }, { kind: "component", type: TruToolbarSeparator, selector: "tru-toolbar-separator" }, { kind: "component", type: TruToolbarContextFilter, selector: "tru-toolbar-context-filter" }, { kind: "component", type: TruToolbarUserProfile, selector: "tru-toolbar-user-profile" }, { kind: "component", type: TruToolbarAppCustomization, selector: "tru-toolbar-app-customization" }], changeDetection: i0.ChangeDetectionStrategy.Eager, encapsulation: i0.ViewEncapsulation.None });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.7", ngImport: i0, type: TruDesktopMenubar, deps: [{ token: TruContextFilters }, { token: TruAppEnvironment }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "22.1.7", type: TruDesktopMenubar, isStandalone: true, selector: "tru-desktop-menubar", inputs: { desktopCtrl: "desktopCtrl" }, ngImport: i0, template: "<div class=\"desktop-main-menu\">\r\n  <tru-toolbar>\r\n    <tru-toolbar-menu *ngFor=\"let config of configs\" [config]=\"config\"></tru-toolbar-menu>\r\n    <tru-toolbar-separator *ngIf=\"filters.length\"></tru-toolbar-separator>\r\n    <tru-toolbar-context-filter></tru-toolbar-context-filter>\r\n  </tru-toolbar>\r\n  <span class=\"desktop-environment-warning\" *ngIf=\"environmentWarning\" [title]=\"environmentWarning\">{{environmentWarning}}</span>\r\n  <tru-toolbar>\r\n    <tru-toolbar-app-customization></tru-toolbar-app-customization>\r\n    <tru-toolbar-user-profile></tru-toolbar-user-profile>\r\n  </tru-toolbar>\r\n</div>\r\n", styles: [".desktop-main-menu{display:flex;align-items:center}.desktop-main-menu>tru-toolbar{flex:none}.desktop-main-menu>tru-toolbar:last-child{margin-left:auto}.desktop-environment-warning{flex:1;min-width:0;color:red;font-size:20px;font-weight:700;line-height:1;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "ngmodule", type: FormsModule }, { kind: "component", type: TruToolbar, selector: "tru-toolbar", inputs: ["config"] }, { kind: "component", type: TruToolbarMenu, selector: "tru-toolbar-menu", inputs: ["config"] }, { kind: "component", type: TruToolbarSeparator, selector: "tru-toolbar-separator" }, { kind: "component", type: TruToolbarContextFilter, selector: "tru-toolbar-context-filter" }, { kind: "component", type: TruToolbarUserProfile, selector: "tru-toolbar-user-profile" }, { kind: "component", type: TruToolbarAppCustomization, selector: "tru-toolbar-app-customization" }], changeDetection: i0.ChangeDetectionStrategy.Eager, encapsulation: i0.ViewEncapsulation.None });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.7", ngImport: i0, type: TruDesktopMenubar, decorators: [{
             type: Component,
@@ -10315,8 +10320,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.1.7", ngImpor
                         TruToolbarContextFilter,
                         TruToolbarUserProfile,
                         TruToolbarAppCustomization,
-                    ], changeDetection: ChangeDetectionStrategy.Eager, encapsulation: ViewEncapsulation.None, template: "<div class=\"desktop-main-menu\">\r\n  <tru-toolbar>\r\n    <tru-toolbar-menu *ngFor=\"let config of configs\" [config]=\"config\"></tru-toolbar-menu>\r\n    <tru-toolbar-separator *ngIf=\"filters.length\"></tru-toolbar-separator>\r\n    <tru-toolbar-context-filter></tru-toolbar-context-filter>\r\n  </tru-toolbar>\r\n  <tru-toolbar>\r\n    <tru-toolbar-app-customization></tru-toolbar-app-customization>\r\n    <tru-toolbar-user-profile></tru-toolbar-user-profile>\r\n  </tru-toolbar>\r\n</div>\r\n", styles: [".desktop-main-menu tru-toolbar{display:inline-block}tru-toolbar:nth-of-type(2){float:right}\n"] }]
-        }], ctorParameters: () => [{ type: TruContextFilters }], propDecorators: { desktopCtrl: [{
+                    ], changeDetection: ChangeDetectionStrategy.Eager, encapsulation: ViewEncapsulation.None, template: "<div class=\"desktop-main-menu\">\r\n  <tru-toolbar>\r\n    <tru-toolbar-menu *ngFor=\"let config of configs\" [config]=\"config\"></tru-toolbar-menu>\r\n    <tru-toolbar-separator *ngIf=\"filters.length\"></tru-toolbar-separator>\r\n    <tru-toolbar-context-filter></tru-toolbar-context-filter>\r\n  </tru-toolbar>\r\n  <span class=\"desktop-environment-warning\" *ngIf=\"environmentWarning\" [title]=\"environmentWarning\">{{environmentWarning}}</span>\r\n  <tru-toolbar>\r\n    <tru-toolbar-app-customization></tru-toolbar-app-customization>\r\n    <tru-toolbar-user-profile></tru-toolbar-user-profile>\r\n  </tru-toolbar>\r\n</div>\r\n", styles: [".desktop-main-menu{display:flex;align-items:center}.desktop-main-menu>tru-toolbar{flex:none}.desktop-main-menu>tru-toolbar:last-child{margin-left:auto}.desktop-environment-warning{flex:1;min-width:0;color:red;font-size:20px;font-weight:700;line-height:1;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}\n"] }]
+        }], ctorParameters: () => [{ type: TruContextFilters }, { type: TruAppEnvironment }], propDecorators: { desktopCtrl: [{
                 type: Input
             }] } });
 
@@ -12563,40 +12568,75 @@ class TruErrorDialogConfig {
 }
 
 class TruServerError {
-    id;
-    type;
-    code;
+    id = '';
+    type = '';
+    code = 0;
     title = '';
     message = undefined;
     data = null;
-    stackTrace;
+    stackTrace = '';
     status;
     statusText;
     componentName = '';
     constructor(error) {
-        let parsedError = JSON.parse(error.error);
-        if (parsedError.ExceptionType && parsedError.ExceptionType === 'tru-db-custom-exception') {
-            parsedError = JSON.parse(parsedError.Message);
-            this.id = parsedError.$id;
+        this.status = error.status;
+        this.statusText = error.statusText;
+        this.type = error.name;
+        this.message = error.message;
+        // HttpClient already decodes JSON responses. Text error bodies must remain readable too.
+        let parsedError = TruServerError.readBody(error.error);
+        if (typeof parsedError === 'string') {
+            this.message = parsedError;
+            return;
+        }
+        if (!parsedError)
+            return;
+        if (parsedError.ExceptionType === 'tru-db-custom-exception') {
+            const customError = TruServerError.readBody(parsedError.Message);
+            if (typeof customError === 'string') {
+                this.message = customError;
+                return;
+            }
+            if (!customError)
+                return;
+            parsedError = customError;
+            this.id = parsedError.$id ?? '';
             this.type = 'tru-db-custom-exception';
-            this.code = parsedError.Code;
-            this.title = parsedError.data.exceptionObj.title;
+            this.code = parsedError.Code ?? 0;
+            this.title = parsedError.data?.exceptionObj?.title ?? '';
             this.message = parsedError.message;
-            this.stackTrace = parsedError.StackTrace;
-            this.status = error.status;
-            this.statusText = error.statusText;
-            this.data = parsedError.data.exceptionObj;
-            this.componentName = parsedError.componentName;
+            this.stackTrace = parsedError.StackTrace ?? '';
+            this.data = parsedError.data?.exceptionObj ?? null;
+            this.componentName = parsedError.componentName ?? '';
         }
         else {
-            this.id = parsedError.$id;
-            this.type = parsedError.$type;
-            this.code = parsedError.Code;
-            this.message = parsedError.Message;
-            this.stackTrace = parsedError.StackTrace;
-            this.status = error.status;
-            this.statusText = error.statusText;
+            this.id = parsedError.$id ?? '';
+            this.type = parsedError.$type ?? error.name;
+            this.code = parsedError.Code ?? 0;
+            this.message =
+                parsedError.Message ?? parsedError.message ?? error.message;
+            this.stackTrace = parsedError.StackTrace ?? '';
+        }
+    }
+    static readBody(value) {
+        if (typeof value === 'string') {
+            try {
+                const decoded = JSON.parse(value);
+                if (decoded !== null &&
+                    typeof decoded === 'object' &&
+                    !Array.isArray(decoded)) {
+                    return decoded;
+                }
+                return typeof decoded === 'string' ? decoded : value;
+            }
+            catch {
+                // Display the original text, including malformed JSON, without hiding the HTTP error.
+                return value;
+            }
         }
+        return value !== null && typeof value === 'object' && !Array.isArray(value)
+            ? value
+            : null;
     }
 }
 
@@ -12706,7 +12746,7 @@ class TruErrorInterceptor {
         return next.handle(request).pipe(catchError((error) => {
             if (error.status !== 401 && !(error.error instanceof Blob))
                 this.errorManager.handleError(error);
-            return next.handle(request);
+            return throwError(() => error);
         }));
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.1.7", ngImport: i0, type: TruErrorInterceptor, deps: [{ token: TruErrorManager }], target: i0.ɵɵFactoryTarget.Injectable });