@messaia/cdk 13.3.5-rc14 → 13.3.5-rc15

package/fesm2020/messaia-cdk.mjs

@@ -2807,6 +2807,8 @@ class BaseComponent {
                 this.currentRoute = btoa(x.url);
             }
         });
+        /* Get the return url if any */
+        this.route.queryParams.subscribe(x => this.setReturnUrl(x.returnUrl));
     }
     /**
      * Lifecycle hook that is called after a component's view has been fully initialized.
@@ -2831,6 +2833,25 @@ class BaseComponent {
         let currentUrl = this.router.url;
         this.router.navigateByUrl('/', { replaceUrl: true }).then(() => this.router.navigateByUrl(currentUrl, { replaceUrl: true }));
     }
+    /**
+     * Navigates back to return url
+     */
+    navigateToReturnUrl() {
+        if (this.returnUrl) {
+            var urlParts = Utils.getUrlParts(this.returnUrl);
+            this.router.navigate([urlParts.url], { queryParams: urlParts.params, fragment: urlParts.hash });
+        }
+    }
+    /**
+     * Sets return url
+     * @param returnUrl
+     */
+    setReturnUrl(returnUrl) {
+        try {
+            this.returnUrl = returnUrl ? decodeURIComponent(atob(returnUrl)) : null;
+        }
+        catch (error) { }
+    }
     /**
      * Listen for expansion panel changes
      */
@@ -2999,8 +3020,23 @@ class BaseComponent {
         if (this.menu) {
             this.titleService.setTitle(this.menu.title);
             this.title = this.titleService.getTitle();
-            if (this.menu.items) {
-                var submenu = this.menu.items.filter(x => x.path == this.router.url)[0];
+            if (!this.menu.items) {
+                return;
+            }
+            /* Get subtitle from url params */
+            var subtitle = this.route?.snapshot?.paramMap?.get('subtitle');
+            if (subtitle) {
+                try {
+                    this.subtitle = atob(subtitle);
+                }
+                catch (e) {
+                    this.subtitle = subtitle;
+                }
+            }
+            else {
+                /* Get current route */
+                let currentRoute = this.router.url.split('?')[0]?.split(';')[0];
+                var submenu = this.menu.items.filter(x => x.path == currentRoute)[0];
                 if (submenu) {
                     this.subtitle = submenu.title;
                 }
@@ -3318,11 +3354,6 @@ class GenericFormBaseComponent extends BaseComponent {
             else if (!this.id && this.route.snapshot?.data?.id) {
                 this.id = this.route.snapshot?.data?.id;
             }
-            /* Get the return url if any */
-            this.route.queryParams.subscribe(x => {
-                this.returnUrl = x.returnUrl ? decodeURIComponent(atob(x.returnUrl)) : null;
-                this.listRoute = this.returnUrl || this.listRoute;
-            });
             /* Set panel ID from query */
             this.panelId = this.route.snapshot.queryParams?.panelId;
             this.subtitle || (this.subtitle = this.route.snapshot?.data?.subtitle);
@@ -3604,8 +3635,7 @@ class GenericFormBaseComponent extends BaseComponent {
      */
     back(action = SaveAction.SaveAndClose) {
         if (action == SaveAction.SaveAndClose && this.returnUrl) {
-            var urlParts = Utils.getUrlParts(this.returnUrl);
-            this.router.navigate([urlParts.url], { queryParams: urlParts.params, fragment: urlParts.hash });
+            this.navigateToReturnUrl();
         }
         else {
             if (this.isEditMode) {
@@ -3629,6 +3659,14 @@ class GenericFormBaseComponent extends BaseComponent {
             }
         }
     }
+    /**
+     * Sets return url
+     * @param returnUrl
+     */
+    setReturnUrl(returnUrl) {
+        super.setReturnUrl(returnUrl);
+        this.listRoute = this.returnUrl || this.listRoute;
+    }
     /**
      * Creates a new instance of the TEntity
      */
@@ -5430,7 +5468,8 @@ class GenericListComponent extends BaseComponent {
                 .subscribe(() => this.loadList(false));
         }
         else {
-            this.router.navigate([`${this.router.url}/add`]);
+            let currentRoute = this.router.url.split('?')[0]?.split(';')[0];
+            this.router.navigate([`${currentRoute}/add`]);
         }
     }
     /**
@@ -5439,7 +5478,8 @@ class GenericListComponent extends BaseComponent {
      */
     edit(item) {
         if (!this.isTextSelected()) {
-            this.router.navigate([`${this.router.url}/edit/${item.id}`]);
+            let currentRoute = this.router.url.split('?')[0]?.split(';')[0];
+            this.router.navigate([`${currentRoute}/edit/${item.id}`]);
         }
     }
     /**
@@ -15870,16 +15910,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImpor
             }] } });
 
 class VdListToolbarComponent {
+    constructor() {
+        /**
+         * back: EventEmitter<any>
+         */
+        this.back = new EventEmitter();
+    }
 }
 /** @nocollapse */ /** @nocollapse */ VdListToolbarComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: VdListToolbarComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-/** @nocollapse */ /** @nocollapse */ VdListToolbarComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.0", type: VdListToolbarComponent, selector: "vd-list-toolbar", inputs: { dataSource: "dataSource", subtitle: "subtitle", menuItems: "menuItems" }, ngImport: i0, template: "<mat-toolbar dense>\r\n    <div layout=\"row\" layout-align=\"start center\" flex>\r\n        <button mat-icon-button vdLayoutManageListOpen [hideWhenOpened]=\"true\">\r\n            <mat-icon>menu</mat-icon>\r\n        </button>\r\n        <span>{{subtitle}}</span>\r\n        <span flex></span>\r\n        <button mat-icon-button (click)=\"dataSource.reload()\" *ngIf=\"dataSource\">\r\n            <mat-icon>sync</mat-icon>\r\n        </button>\r\n        <vd-list-toolbar-menu [menuItems]=\"menuItems\"></vd-list-toolbar-menu>\r\n    </div>\r\n</mat-toolbar>", components: [{ type: i3$5.MatToolbar, selector: "mat-toolbar", inputs: ["color"], exportAs: ["matToolbar"] }, { type: i3.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i4$1.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { type: VdListToolbarMenuComponent, selector: "vd-list-toolbar-menu", inputs: ["menuItems", "item"] }], directives: [{ type: VdLayoutManageListOpenDirective, selector: "[vdLayoutManageListOpen]", inputs: ["vdLayoutManageListOpen"] }, { type: i4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
+/** @nocollapse */ /** @nocollapse */ VdListToolbarComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.0", type: VdListToolbarComponent, selector: "vd-list-toolbar", inputs: { dataSource: "dataSource", subtitle: "subtitle", backButton: "backButton", menuItems: "menuItems" }, outputs: { back: "back" }, ngImport: i0, template: "<mat-toolbar dense [ngClass]=\"{'pad-left-none': backButton}\">\r\n    <div layout=\"row\" layout-align=\"start center\" flex>\r\n        <button mat-icon-button vdLayoutManageListOpen [hideWhenOpened]=\"true\">\r\n            <mat-icon>menu</mat-icon>\r\n        </button>\r\n        <button mat-icon-button (click)=\"back.emit()\" *ngIf=\"backButton\">\r\n            <mat-icon>arrow_back</mat-icon>\r\n        </button>\r\n        <span>{{subtitle}}</span>\r\n        <span flex></span>\r\n        <button mat-icon-button (click)=\"dataSource.reload()\" *ngIf=\"dataSource\">\r\n            <mat-icon>sync</mat-icon>\r\n        </button>\r\n        <vd-list-toolbar-menu [menuItems]=\"menuItems\"></vd-list-toolbar-menu>\r\n    </div>\r\n</mat-toolbar>", components: [{ type: i3$5.MatToolbar, selector: "mat-toolbar", inputs: ["color"], exportAs: ["matToolbar"] }, { type: i3.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i4$1.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { type: VdListToolbarMenuComponent, selector: "vd-list-toolbar-menu", inputs: ["menuItems", "item"] }], directives: [{ type: i4.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { type: VdLayoutManageListOpenDirective, selector: "[vdLayoutManageListOpen]", inputs: ["vdLayoutManageListOpen"] }, { type: i4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: VdListToolbarComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'vd-list-toolbar', template: "<mat-toolbar dense>\r\n    <div layout=\"row\" layout-align=\"start center\" flex>\r\n        <button mat-icon-button vdLayoutManageListOpen [hideWhenOpened]=\"true\">\r\n            <mat-icon>menu</mat-icon>\r\n        </button>\r\n        <span>{{subtitle}}</span>\r\n        <span flex></span>\r\n        <button mat-icon-button (click)=\"dataSource.reload()\" *ngIf=\"dataSource\">\r\n            <mat-icon>sync</mat-icon>\r\n        </button>\r\n        <vd-list-toolbar-menu [menuItems]=\"menuItems\"></vd-list-toolbar-menu>\r\n    </div>\r\n</mat-toolbar>" }]
+            args: [{ selector: 'vd-list-toolbar', template: "<mat-toolbar dense [ngClass]=\"{'pad-left-none': backButton}\">\r\n    <div layout=\"row\" layout-align=\"start center\" flex>\r\n        <button mat-icon-button vdLayoutManageListOpen [hideWhenOpened]=\"true\">\r\n            <mat-icon>menu</mat-icon>\r\n        </button>\r\n        <button mat-icon-button (click)=\"back.emit()\" *ngIf=\"backButton\">\r\n            <mat-icon>arrow_back</mat-icon>\r\n        </button>\r\n        <span>{{subtitle}}</span>\r\n        <span flex></span>\r\n        <button mat-icon-button (click)=\"dataSource.reload()\" *ngIf=\"dataSource\">\r\n            <mat-icon>sync</mat-icon>\r\n        </button>\r\n        <vd-list-toolbar-menu [menuItems]=\"menuItems\"></vd-list-toolbar-menu>\r\n    </div>\r\n</mat-toolbar>" }]
         }], propDecorators: { dataSource: [{
                 type: Input
             }], subtitle: [{
                 type: Input
+            }], backButton: [{
+                type: Input
+            }], back: [{
+                type: Output
             }], menuItems: [{
                 type: Input
             }] } });