zek 14.2.74 → 14.2.76

package/fesm2020/zek.mjs

@@ -1630,25 +1630,10 @@ class HttpErrorHandler {
             else {
                 error = response.error;
             }
-            let data;
             if (error instanceof ErrorEvent) {
-                data = {
-                    errors: [
-                        { '': [response.error.message] }
-                    ]
-                };
-            }
-            if (typeof error === 'string') {
-                data = {
-                    errors: [
-                        { '': [response.error] }
-                    ]
-                };
-            }
-            else if (typeof error === 'object') {
-                data = error;
+                error = response.error.message;
             }
-            return ObjectHelper.isDefined(data) ? of(data) : of(result);
+            return ObjectHelper.isDefined(error) ? of(error) : of(result);
         };
     }
     showError(serviceName, operation, response) {
@@ -1944,15 +1929,18 @@ class BaseComponent extends CoreComponent {
     getParam(name) {
         return this.route.snapshot.paramMap.get(name);
     }
+    getQueryParam(name) {
+        return this.route.snapshot.queryParamMap.get(name);
+    }
     navigateReturnUrl() {
-        const returnUrl = this.route.snapshot.paramMap.get('returnUrl');
+        const returnUrl = this.getQueryParam('returnUrl') || this.getParam('returnUrl');
         if (returnUrl) {
             let urlTree = this.router.parseUrl(returnUrl);
             const urlWithoutParams = urlTree.root.children[PRIMARY_OUTLET].segments.map(it => it.path).join('/');
             this.router.navigate([urlWithoutParams, urlTree.root.children[PRIMARY_OUTLET].segments[urlTree.root.children[PRIMARY_OUTLET].segments.length - 1].parameters]);
             return;
         }
-        this.router.navigate([this.router.url.substr(0, this.router.url.lastIndexOf('/'))]);
+        this.router.navigate([this.router.url.substring(0, this.router.url.lastIndexOf('/'))]);
     }
     cancel() {
         this.navigateReturnUrl();
@@ -2211,10 +2199,10 @@ class EditFormComponent extends BaseComponent {
     // @ViewChild('submitModal', { static: false }) protected readonly submitModal?: ModalComponent;
     init() {
         super.init();
-        const idParam = this.getParam('id');
+        const idParam = this.getParam('id') || this.getQueryParam('id');
         if (idParam)
             this.id = +idParam;
-        const id2Param = this.getParam('id2');
+        const id2Param = this.getParam('id2') || this.getQueryParam('id2');
         if (id2Param)
             this.id2 = +id2Param;
     }
@@ -2241,18 +2229,9 @@ class EditFormComponent extends BaseComponent {
         }
         return false;
     }
-    // saveAndNavigateToReturnUrl(f: NgForm) {
-    //   if (!f || f.valid) {
-    //     this.internalSave(true);
-    //   }
-    // }
     internalSave(navigateToReturnUrl) {
         throw 'Not implemented internalSave';
     }
-    // protected navigateEditUrl() {
-    //   if (this.getAction().toLowerCase() === 'create')
-    //     this.router.navigate([this.router.url.substr(0, this.router.url.lastIndexOf('/') + 1), this.id]);
-    // }
     showApproveModal() {
         this.approveModel = {};
         if (this.approveModal) {
@@ -2311,14 +2290,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImpor
                 args: ['disapproveModal', { static: false }]
             }] } });
 class EditBaseComponent extends EditFormComponent {
-    constructor(service, translateService, alertService, route, router) {
+    constructor(service, translate, alert, route, router) {
         super(route, router);
         this.service = service;
-        this.translateService = translateService;
-        this.alertService = alertService;
+        this.translate = translate;
+        this.alert = alert;
     }
     async internalSave(navigateToReturnUrl) {
-        this.alertService.clear();
+        this.alert.clear();
         let data = await firstValueFrom(this.service.save(this.model));
         let success = false;
         if (typeof data === 'number' && data > 0) {
@@ -2329,8 +2308,8 @@ class EditBaseComponent extends EditFormComponent {
             success = true;
         }
         if (success) {
-            let message = await firstValueFrom(this.translateService.get('Alert.SaveSuccess'));
-            this.alertService.success(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.SaveSuccess'));
+            this.alert.success(message, null, 'fas fa-save');
             if (navigateToReturnUrl === true) {
                 this.navigateReturnUrl();
             }
@@ -2342,47 +2321,47 @@ class EditBaseComponent extends EditFormComponent {
             // }
         }
         else {
-            let message = await firstValueFrom(this.translateService.get('Alert.SaveError'));
-            this.alertService.error(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.SaveError'));
+            this.alert.error(message, null, 'fas fa-save');
             return false;
         }
     }
     async internalApprove(model) {
         let data = await firstValueFrom(this.service.approve(model));
         if (data && data.length > 0) {
-            let message = await firstValueFrom(this.translateService.get('Alert.Approved'));
-            this.alertService.success(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.Approved'));
+            this.alert.success(message, null, 'fas fa-save');
             return true;
         }
         else {
-            let message = await firstValueFrom(this.translateService.get('Alert.ApproveError'));
-            this.alertService.error(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.ApproveError'));
+            this.alert.error(message, null, 'fas fa-save');
             return false;
         }
     }
     async internalDisapprove(model) {
         let data = await firstValueFrom(this.service.disapprove(model));
         if (data && data.length > 0) {
-            let message = await firstValueFrom(this.translateService.get('Alert.Disapproved'));
-            this.alertService.success(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.Disapproved'));
+            this.alert.success(message, null, 'fas fa-save');
             return true;
         }
         else {
-            let message = await firstValueFrom(this.translateService.get('Alert.DisapproveError'));
-            this.alertService.error(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.DisapproveError'));
+            this.alert.error(message, null, 'fas fa-save');
             return false;
         }
     }
     async internalSubmit(model) {
         let data = await firstValueFrom(this.service.approve(model));
         if (data && data.length > 0) {
-            let message = await firstValueFrom(this.translateService.get('Alert.Submitted'));
-            this.alertService.success(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.Submitted'));
+            this.alert.success(message, null, 'fas fa-save');
             return true;
         }
         else {
-            let message = await firstValueFrom(this.translateService.get('Alert.SubmitError'));
-            this.alertService.error(message, null, 'fas fa-save');
+            let message = await firstValueFrom(this.translate.get('Alert.SubmitError'));
+            this.alert.error(message, null, 'fas fa-save');
             return false;
         }
     }
@@ -2401,8 +2380,8 @@ class EditBaseComponent extends EditFormComponent {
     async restore() {
         let data = await firstValueFrom(this.service.restore(this.id));
         if (data?.success) {
-            let message = await firstValueFrom(this.translateService.get('Alert.Restored'));
-            this.alertService.success(message);
+            let message = await firstValueFrom(this.translate.get('Alert.Restored'));
+            this.alert.success(message);
             this.load();
         }
     }
@@ -2418,8 +2397,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImpor
             type: Directive
         }], ctorParameters: function () { return [{ type: undefined }, { type: i1$1.TranslateService }, { type: AlertService }, { type: i1.ActivatedRoute }, { type: i1.Router }]; } });
 class EditComponent extends EditBaseComponent {
-    constructor(ctorModel, service, translateService, alertService, route, router) {
-        super(service, translateService, alertService, route, router);
+    constructor(ctorModel, service, translate, alert, route, router) {
+        super(service, translate, alert, route, router);
         this.ctorModel = ctorModel;
     }
     initCreate() {
@@ -2434,11 +2413,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImpor
 
 // declare let bootstrap: any;
 class ListBaseComponent extends BaseComponent {
-    constructor(service, translateService, alertService, route, router) {
+    constructor(service, translate, alert, route, router) {
         super(route, router);
         this.service = service;
-        this.translateService = translateService;
-        this.alertService = alertService;
+        this.translate = translate;
+        this.alert = alert;
         this.filter = new FilterBase();
         this.saveFilter = true;
         this.internalFilter = new FilterBase();
@@ -2468,7 +2447,7 @@ class ListBaseComponent extends BaseComponent {
     initDefaultFilter() {
     }
     initStoredFilter() {
-        let filterParam = this.getParam('filter');
+        let filterParam = this.getQueryParam('filter') || this.getParam('filter');
         if (filterParam) {
             const tmp = StorageHelper.get('filter');
             if (tmp && tmp.url && tmp.url === this.url && tmp.filter) {
@@ -2526,31 +2505,36 @@ class ListBaseComponent extends BaseComponent {
     }
     create() {
         const url = UrlHelper.getNoParam(this.router.url);
-        this.router.navigate([url, 'create', { returnUrl: url + ';filter=1' }]);
+        // this.router.navigate([url, 'create', { returnUrl: url + ';filter=1' }]);
+        this.router.navigate([url, 'create'], { queryParams: { returnUrl: url + '?filter=1' } });
     }
     async delete(id) {
-        this.alertService.clear();
+        this.alert.clear();
         let data = await firstValueFrom(this.service.delete(id));
         if (data?.success) {
-            let message = await firstValueFrom(this.translateService.get('Alert.Deleted'));
-            this.alertService.error(message, null, 'fas fa-trash');
+            let message = await firstValueFrom(this.translate.get('Alert.Deleted'));
+            this.alert.error(message, null, 'fas fa-trash');
             this.refresh();
         }
     }
     async delete2(id, id2) {
-        this.alertService.clear();
+        this.alert.clear();
         let data = await firstValueFrom(this.service.delete2(id, id2));
         if (data?.success) {
-            let message = await firstValueFrom(this.translateService.get('Alert.Deleted'));
-            this.alertService.error(message, null, 'fas fa-trash');
+            let message = await firstValueFrom(this.translate.get('Alert.Deleted'));
+            this.alert.error(message, null, 'fas fa-trash');
             this.refresh();
         }
     }
     edit(id) {
-        this.router.navigate([this.url, id, { returnUrl: this.url + ';filter=1' }]);
+        // this.router.navigate([this.url, id],
+        //     { queryParams: { returnUrl: this.url + ';filter=1' } }
+        // );
+        this.router.navigate([this.url, id], { queryParams: { returnUrl: this.url + '?filter=1' } });
     }
     edit2(id, id2) {
-        this.router.navigate([this.url, id, id2, { returnUrl: this.url + ';filter=1' }]);
+        // this.router.navigate([this.url, id, id2, { returnUrl: this.url + ';filter=1' }]);
+        this.router.navigate([this.url, id, id2], { queryParams: { returnUrl: this.url + '?filter=1' } });
     }
     select(item) {
         item.selected = !item.selected;
@@ -2581,12 +2565,12 @@ class ListBaseComponent extends BaseComponent {
     async approve(m) {
         if (!m)
             return;
-        this.alertService.clear();
+        this.alert.clear();
         let data = await firstValueFrom(this.service.approve(m));
         if (!data || data.length === 0)
             return;
-        let message = await firstValueFrom(this.translateService.get('Alert.Approved'));
-        this.alertService.success(message, undefined, 'fas fa-thumbs-up');
+        let message = await firstValueFrom(this.translate.get('Alert.Approved'));
+        this.alert.success(message, undefined, 'fas fa-thumbs-up');
         this.refresh();
     }
     showDisapproveModal(id) {
@@ -2611,12 +2595,12 @@ class ListBaseComponent extends BaseComponent {
             if (!m.comment)
                 delete m.comment;
         }
-        this.alertService.clear();
+        this.alert.clear();
         let data = await firstValueFrom(this.service.disapprove(m));
         if (!data || data.length === 0)
             return;
-        let message = await firstValueFrom(this.translateService.get('Alert.Disapproved'));
-        this.alertService.success(message, undefined, 'fas fa-thumbs-down');
+        let message = await firstValueFrom(this.translate.get('Alert.Disapproved'));
+        this.alert.success(message, undefined, 'fas fa-thumbs-down');
         this.refresh();
     }
     getSelectedIds() {
@@ -2638,8 +2622,8 @@ class ListBaseComponent extends BaseComponent {
             this.showSum();
         }
         else {
-            let message = await firstValueFrom(this.translateService.get('Alert.SumError'));
-            this.alertService.error(message);
+            let message = await firstValueFrom(this.translate.get('Alert.SumError'));
+            this.alert.error(message);
         }
     }
     export(fileTypeId) {
@@ -2710,6 +2694,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImpor
 class AlertComponent {
     constructor() {
         this._type = AlertType.Info;
+        this._showClose = true;
         this.cssAlert = '';
         this.cssIcon = '';
     }
@@ -2734,12 +2719,18 @@ class AlertComponent {
             }
         }
     }
+    get showClose() {
+        return this._showClose;
+    }
+    set showClose(v) {
+        this._showClose = Convert.toBoolean(v);
+    }
 }
 AlertComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0", ngImport: i0, type: AlertComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-AlertComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.0", type: AlertComponent, selector: "zek-alert", inputs: { type: "type", title: "title" }, ngImport: i0, template: "<div class=\"alert {{cssAlert}} alert-dismissible fade show\" role=\"alert\">\r\n    <button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"alert\" aria-label=\"Close\"></button>\r\n    <div class=\"row\">\r\n        <div class=\"col-auto pe-1\" *ngIf=\"cssIcon\">\r\n            <span class=\"flex-shrink-0\"><i class=\"{{cssIcon}}\"></i></span>\r\n        </div>\r\n        <div class=\"col-auto\">\r\n            <div *ngIf=\"title\">\r\n                <h5 class=\"alert-heading\">{{title}}</h5>\r\n            </div>\r\n            <ng-content></ng-content>\r\n        </div>\r\n    </div>\r\n</div>", styles: [":host{display:block}\n"], dependencies: [{ kind: "directive", type: i1$3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
+AlertComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.0", type: AlertComponent, selector: "zek-alert", inputs: { type: "type", title: "title" }, ngImport: i0, template: "<div class=\"alert {{cssAlert}} alert-dismissible fade show\" role=\"alert\">\r\n    <button *ngIf=\"_showClose\" type=\"button\" class=\"btn-close\" data-bs-dismiss=\"alert\" aria-label=\"Close\"></button>\r\n    <div class=\"row\">\r\n        <div class=\"col-auto pe-1\" *ngIf=\"cssIcon\">\r\n            <span class=\"flex-shrink-0\"><i class=\"{{cssIcon}}\"></i></span>\r\n        </div>\r\n        <div class=\"col-auto\">\r\n            <div *ngIf=\"title\">\r\n                <h5 class=\"alert-heading\">{{title}}</h5>\r\n            </div>\r\n            <ng-content></ng-content>\r\n        </div>\r\n    </div>\r\n</div>", styles: [":host{display:block}\n"], dependencies: [{ kind: "directive", type: i1$3.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImport: i0, type: AlertComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'zek-alert', template: "<div class=\"alert {{cssAlert}} alert-dismissible fade show\" role=\"alert\">\r\n    <button type=\"button\" class=\"btn-close\" data-bs-dismiss=\"alert\" aria-label=\"Close\"></button>\r\n    <div class=\"row\">\r\n        <div class=\"col-auto pe-1\" *ngIf=\"cssIcon\">\r\n            <span class=\"flex-shrink-0\"><i class=\"{{cssIcon}}\"></i></span>\r\n        </div>\r\n        <div class=\"col-auto\">\r\n            <div *ngIf=\"title\">\r\n                <h5 class=\"alert-heading\">{{title}}</h5>\r\n            </div>\r\n            <ng-content></ng-content>\r\n        </div>\r\n    </div>\r\n</div>", styles: [":host{display:block}\n"] }]
+            args: [{ selector: 'zek-alert', template: "<div class=\"alert {{cssAlert}} alert-dismissible fade show\" role=\"alert\">\r\n    <button *ngIf=\"_showClose\" type=\"button\" class=\"btn-close\" data-bs-dismiss=\"alert\" aria-label=\"Close\"></button>\r\n    <div class=\"row\">\r\n        <div class=\"col-auto pe-1\" *ngIf=\"cssIcon\">\r\n            <span class=\"flex-shrink-0\"><i class=\"{{cssIcon}}\"></i></span>\r\n        </div>\r\n        <div class=\"col-auto\">\r\n            <div *ngIf=\"title\">\r\n                <h5 class=\"alert-heading\">{{title}}</h5>\r\n            </div>\r\n            <ng-content></ng-content>\r\n        </div>\r\n    </div>\r\n</div>", styles: [":host{display:block}\n"] }]
         }], propDecorators: { type: [{
                 type: Input
             }], title: [{
@@ -4584,7 +4575,8 @@ class ListToolbarComponent {
     }
     create() {
         const url = UrlHelper.getNoParam(this.router.url);
-        this.router.navigate([url, 'create', { returnUrl: url + ';filter=1' }]);
+        // this.router.navigate([url, 'create', { returnUrl: url + ';filter=1' }]);
+        this.router.navigate([url, 'create'], { queryParams: { returnUrl: url + '?filter=1' } });
     }
     filter() {
         this.onFilter.emit();