@esfaenza/core 19.2.73 → 19.2.76

package/components/base/base.component.d.ts

@@ -1,5 +1,5 @@
 import { Injector } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { Data, UrlSegment } from "@angular/router";
 import { ReactiveComponent } from "./reactive.component";
 import * as i0 from "@angular/core";
 export declare abstract class BaseComponent extends ReactiveComponent {
@@ -18,7 +18,7 @@ export declare abstract class BaseComponent extends ReactiveComponent {
     private _emb;
     private _location;
     constructor(injector: Injector);
-    gatherRouteInformations(_activatedRoute: ActivatedRoute): void;
+    gatherRouteInformations(segs: UrlSegment[], data: Data): void;
     protected navigate(command: any[], extras?: any): void;
     back(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<BaseComponent, never>;

package/fesm2022/esfaenza-core-components.mjs

@@ -1053,21 +1053,21 @@ class BaseComponent extends ReactiveComponent {
         // Parametri in maniera "dinamica"
         _activatedRoute.params.pipe(takeUntil$1(this.destroyed$)).subscribe(t => { this.Parameters = t; });
         _activatedRoute.queryParams.pipe(takeUntil$1(this.destroyed$)).subscribe(t => { this.QueryParameters = t; });
-        this.gatherRouteInformations(_activatedRoute);
+        combineLatest([_activatedRoute.url, _activatedRoute.data]).subscribe((t) => {
+            this.gatherRouteInformations(t[0], t[1]);
+        });
         // Per i componenti navigabili non embeddati è inutile mandare il messaggio di navigazione
         // Così come per quelli per cui non esiste un titolo (cioè compoennti verso cui non si è navigato direttamente)
         if (!this._emb.Embedded || !this.NavigationTitle)
             return;
         this._emb.MainWindow.postMessage({ type: "navigation", url: this.CompletePath, internalNavigation: this.InternalNavigation, title: this.NavigationTitle }, "*");
     }
-    gatherRouteInformations(_activatedRoute) {
-        // Angular 15 -> 16: non si lavora più coi segmenti. Tiro fuori l'url del router (escludendo parametri e queryparams) e li rigenero
-        let segs = _activatedRoute.snapshot._routerState.url.split('?')[0].split(';')[0].split('/').filter((t, i) => i != 0).map(t => { return { path: t }; });
+    gatherRouteInformations(segs, data) {
         this.CompletePath = "/" + segs.map(t => t.path).join('/');
         this.ComponentPath = "/" + segs.filter((t, i) => i != 0).map(t => t.path).join('/');
         this.BasePath = "/" + segs[0].path;
-        this.InternalNavigation = _activatedRoute.snapshot.data["internalNavigation"] || false;
-        this.NavigationTitle = _activatedRoute.snapshot.data["title"] || "";
+        this.InternalNavigation = data["internalNavigation"] || false;
+        this.NavigationTitle = data["title"] || "";
     }
     navigate(command, extras) {
         let commands = command;
@@ -1333,10 +1333,9 @@ class EmbeddingComponent extends BaseComponent {
     }
     ngOnInit() {
         let route = this.injector.get(ActivatedRoute);
-        combineLatest([route.url, route.params]).pipe(debounceTime(100)).subscribe((res) => {
-            this.Module = res[1]["module"];
+        route.params.pipe(debounceTime(100)).subscribe((res) => {
+            this.Module = res["module"];
             this.Localhost = this.LocalhostModuleMap[this.Module];
-            this.gatherRouteInformations(route);
             console.log(`Recognized a new navigation to the embedding component: ${this.Module} - ${this.CompletePath}`);
             let reloadAllowed = this.emb.IsReloadAllowed();
             if (this.Page && reloadAllowed) {