@esfaenza/core 19.2.186 → 19.2.187

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

@@ -16,7 +16,6 @@ export declare abstract class BaseComponent extends ReactiveComponent {
     protected NavigationTitle: string;
     private _router;
     private _emb;
-    private _location;
     constructor(injector: Injector);
     gatherRouteInformations(segs: UrlSegment[], data: Data): void;
     protected navigate(command: any[], extras?: any): void;

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

@@ -1,24 +1,18 @@
 import { Injector } from "@angular/core";
-import { Location } from "@angular/common";
 import { AppEmbeddingExtensions } from "@esfaenza/extensions";
 import { BaseComponent } from "./base.component";
 import * as i0 from "@angular/core";
 export declare class EmbeddingComponent extends BaseComponent {
     private injector;
     private emb;
-    private location;
-    private LocalhostModuleMap;
     Module: string;
     Localhost: string;
     Page: string;
     Pars: string;
     QueryPars: string;
     EmbeddingSuccesfull: boolean;
-    Reloading: boolean;
-    constructor(injector: Injector, emb: AppEmbeddingExtensions, location: Location);
+    constructor(injector: Injector, emb: AppEmbeddingExtensions);
     ngOnInit(): void;
-    performNewEmbeddingOperations(module: string): void;
-    assignPageLoadParameters(reloadAllowed?: boolean): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<EmbeddingComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<EmbeddingComponent, "embedding", never, {}, {}, never, never, true, never>;
 }

package/components/external-page/external_pages.component.d.ts

@@ -1,29 +1,12 @@
-import { ActivatedRoute, Router } from "@angular/router";
-import { AccessControlService } from "@esfaenza/access-control";
-import { LocalizationService } from "@esfaenza/localizations";
+import { ActivatedRoute } from "@angular/router";
 import { AppEmbeddingExtensions } from "@esfaenza/extensions";
-import { HTTPService } from "@esfaenza/httpservice";
 import { AppState, TokenService } from "@esfaenza/core/services";
-import { ActiveModuleView } from "@esfaenza/core/domain";
+import { AccessControlService } from "@esfaenza/access-control";
 import * as i0 from "@angular/core";
 export declare class ExternalPagesComponent {
-    private aac;
-    lc: LocalizationService;
-    private http;
     emb: AppEmbeddingExtensions;
-    private _state;
     private route;
-    private router;
-    private bts;
-    private Username;
-    private Password;
-    private Tenant;
-    private EmbeddingSource;
-    private LocalhostModuleMap;
-    private Localhost;
-    constructor(aac: AccessControlService, lc: LocalizationService, http: HTTPService, emb: AppEmbeddingExtensions, _state: AppState, route: ActivatedRoute, router: Router, bts: TokenService);
-    ngOnInit(): void;
-    afterModulesRetrieve(modules: ActiveModuleView[]): void;
+    constructor(emb: AppEmbeddingExtensions, _state: AppState, route: ActivatedRoute, bts: TokenService, aac: AccessControlService);
     static ɵfac: i0.ɵɵFactoryDeclaration<ExternalPagesComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ExternalPagesComponent, "external-pages", never, {}, {}, never, never, true, never>;
 }

package/directives/es-modal/es-modal.directive.d.ts

@@ -8,11 +8,8 @@ export declare class EsModalDirective extends ModalDirective {
     HideSubscription: Subscription;
     private emb;
     ngOnInit(): void;
-    ngOnDestroy(): void;
     show(): void;
-    doFixBody(): void;
     hide(): void;
-    doHide(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<EsModalDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<EsModalDirective, "[esModal]", ["es-modal"], {}, {}, never, never, true, never>;
 }

package/fesm2022/esfaenza-core-components.mjs

@@ -3,9 +3,9 @@ import { HostListener, ViewChild, Input, ViewEncapsulation, Component, EventEmit
 import * as i2 from '@angular/router';
 import { NavigationEnd, RouterLink, RouterLinkActive, RouterOutlet, ActivatedRoute, Router, RouterModule } from '@angular/router';
 import * as i4 from '@angular/common';
-import { NgIf, NgFor, NgTemplateOutlet, NgClass, Location, CommonModule, AsyncPipe } from '@angular/common';
+import { NgIf, NgFor, NgTemplateOutlet, NgClass, CommonModule, AsyncPipe, Location } from '@angular/common';
 import { filter, map, mergeMap, takeUntil as takeUntil$1 } from 'rxjs/operators';
-import { combineLatest, of, firstValueFrom, ReplaySubject, interval, startWith, takeUntil, takeWhile, Subject, debounceTime, take, map as map$1 } from 'rxjs';
+import { combineLatest, of, firstValueFrom, ReplaySubject, interval, startWith, takeUntil, takeWhile, Subject, take, map as map$1 } from 'rxjs';
 import * as i1 from '@esfaenza/core/services';
 import { AppState } from '@esfaenza/core/services';
 import * as i3 from '@angular/platform-browser';
@@ -260,11 +260,7 @@ class ErrorPageComponent {
         location.reload();
     }
     goDashboard() {
-        let url = `/pages/dashboard`;
-        if (this.emb.Embedded)
-            this.emb.MainWindow.postMessage({ type: "navigate", url }, "*");
-        else
-            this.router.navigate([url]);
+        this.emb.navigate(`/pages/dashboard`);
     }
     openTicket() {
         let dto = {
@@ -885,81 +881,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
 
 // Angular
 class ExternalPagesComponent {
-    constructor(aac, lc, http, emb, _state, route, router, bts) {
-        this.aac = aac;
-        this.lc = lc;
-        this.http = http;
+    constructor(emb, _state, route, bts, aac) {
         this.emb = emb;
-        this._state = _state;
         this.route = route;
-        this.router = router;
-        this.bts = bts;
-        this.Username = "";
-        this.Password = "";
-        this.Tenant = "";
-        this.EmbeddingSource = "";
-        // TODO: Automatizzare
-        this.LocalhostModuleMap = {
-            "crm": "31813",
-            "sii": "21645",
-            "pp": "1616"
-        };
-        this.Localhost = "";
-        this.Username = this.route.snapshot.params["user"];
-        this.Password = this.route.snapshot.params["pswd"];
-        this.Tenant = this.route.snapshot.params["tnt"];
-        this.EmbeddingSource = this.route.snapshot.params["source"];
-    }
-    ngOnInit() {
-        if (!this.emb.Embedded) {
-            console.log("Pagina ext richiamata in ambiente non embeddato. Sono in una nuova scheda!!");
-            console.log("L'embedder originale doveva essere: " + this.EmbeddingSource);
-            console.log("Dato che sono in una nuova scheda devo in realtà navigare a lui, con link su emb/ecc in modo da aprire una scheda embeddata su questa pagina. Se funziona già fino a qui sono a cavallo");
-            this.Localhost = this.LocalhostModuleMap[this.EmbeddingSource];
-            if (this._state.Modules?.length > 0)
-                this.afterModulesRetrieve(this._state.Modules);
-            else {
-                this._state.subscribe("modules.Retrieved", (modules) => {
-                    this.afterModulesRetrieve(modules);
-                });
-            }
-            return;
-        }
-        console.log("Caricamento pagina nell'IFRAME completato!");
-        console.log("[" + this.Tenant + "]" + this.Username + " - " + this.Password);
-        // Le info di login che ho passato sono le stesse delle info di login salvate nel token --> È un redirect da un sito esterno ma il token c'è già. Esco
-        // Ho un token di login e non ho nessuna info sull'utente da usare --> È un redirect da Jace, quindi sono a posto. Esco
-        let currentIdentity = this.bts.getJaceIdentity();
-        if ((!(this.Tenant + this.Username + this.Password) || currentIdentity.Idtenant == this.Tenant && currentIdentity.DsUser == this.Username)) {
-            this.aac.initializeIdentity(currentIdentity);
-            return;
-        }
-        // Altrimenti devo effettuare il login
-        // Non è utilizzata, porcoddinci
-        let LoginDTO = { tenant: "FX", username: this.Username, password: this.Password, client_id: "jacedev" };
-        this.http.post(`${myconfig.AuthUrl}/api/login/dologin`, LoginDTO).subscribe(t => {
-        });
-    }
-    afterModulesRetrieve(modules) {
-        // Sto navigando a {sito}/#/pages_ext/{origine}/etc...
-        // Devo ridirezionare a {sorgente}/#/pages/embed/{thisModule}/etc...
-        let module = modules.find(t => t.altname == this.EmbeddingSource);
-        if (!module) {
-            console.error(`Impossibile trovare il modulo con altname uguale a ${this.EmbeddingSource}`);
-        }
-        let afterPagesExt = this.router.url.split("pages_ext")[1].substring(1).split("/").slice(1).join("/");
-        let sourceModuleUrl = myconfig.AuthUrl.includes("localhost") ? `http://localhost:${this.Localhost}` : module.uiurl;
-        let finalUrl = `${sourceModuleUrl}/#/pages/embed/${myconfig.AppData.ModuleId}/${afterPagesExt}`;
-        console.log("@esfaenza/core: navigating to " + finalUrl);
-        location.replace(finalUrl);
+        emb.loadExternalPage(this.route.snapshot.params["user"], this.route.snapshot.params["pswd"], this.route.snapshot.params["tnt"], this.route.snapshot.params["source"], _state, bts.getJaceIdentity(), aac);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: ExternalPagesComponent, deps: [{ token: i5$1.AccessControlService }, { token: i1$1.LocalizationService }, { token: i3$1.HTTPService }, { token: i2$1.AppEmbeddingExtensions }, { token: i1.AppState }, { token: i2.ActivatedRoute }, { token: i2.Router }, { token: i1.TokenService }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: ExternalPagesComponent, deps: [{ token: i2$1.AppEmbeddingExtensions }, { token: i1.AppState }, { token: i2.ActivatedRoute }, { token: i1.TokenService }, { token: i5$1.AccessControlService }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: ExternalPagesComponent, isStandalone: true, selector: "external-pages", ngImport: i0, template: "<!-- Creo il router outlet solo se sono una pagina embeddata, altrimenti vuol dire che avr\u00F2 un redirect al parent embeddato a dovere -->\r\n<router-outlet *ngIf=\"this.emb.Embedded\"></router-outlet>", dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name", "routerOutletData"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }, { kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: ExternalPagesComponent, decorators: [{
             type: Component,
             args: [{ selector: "external-pages", imports: [RouterOutlet, NgIf], template: "<!-- Creo il router outlet solo se sono una pagina embeddata, altrimenti vuol dire che avr\u00F2 un redirect al parent embeddato a dovere -->\r\n<router-outlet *ngIf=\"this.emb.Embedded\"></router-outlet>" }]
-        }], ctorParameters: () => [{ type: i5$1.AccessControlService }, { type: i1$1.LocalizationService }, { type: i3$1.HTTPService }, { type: i2$1.AppEmbeddingExtensions }, { type: i1.AppState }, { type: i2.ActivatedRoute }, { type: i2.Router }, { type: i1.TokenService }] });
+        }], ctorParameters: () => [{ type: i2$1.AppEmbeddingExtensions }, { type: i1.AppState }, { type: i2.ActivatedRoute }, { type: i1.TokenService }, { type: i5$1.AccessControlService }] });
 
 // Angular
 class JaceLoginComponent {
@@ -1026,7 +959,7 @@ class RedirecterComponent {
                 this.Error = "Il numero di parametri richiesti per navigare all'entità richiesta è diverso dal numero di parametri passato";
                 return;
             }
-            let url = (this.emb.Embedded ? "pages_ext/" : "pages/") + redirectItem.url;
+            let url = this.emb.getPageRoute() + redirectItem.url;
             let parObject = {};
             redirectItem.params.forEach((t, i) => parObject[t] = parts[i + 1]);
             console.log(`Navigating to ${url} with the current parameters: ${JSON.stringify(parObject)}`);
@@ -1056,7 +989,6 @@ class BaseComponent extends ReactiveComponent {
         let _activatedRoute = injector.get(ActivatedRoute);
         let _state = injector.get(AppState);
         this._emb = injector.get(AppEmbeddingExtensions);
-        this._location = injector.get(Location);
         this._router = injector.get(Router);
         _state.registerNavigationIfMeaningful(_activatedRoute.snapshot);
         // Parametri in maniera "dinamica"
@@ -1065,11 +997,7 @@ class BaseComponent extends ReactiveComponent {
         combineLatest([_activatedRoute.url, _activatedRoute.data]).subscribe((t) => {
             this.gatherRouteInformations(null, 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 }, "*");
+        this._emb.onComponentCreation(this.CompletePath, this.InternalNavigation, this.NavigationTitle);
     }
     gatherRouteInformations(segs, data) {
         if (segs == null)
@@ -1081,21 +1009,10 @@ class BaseComponent extends ReactiveComponent {
         this.NavigationTitle = data?.["title"] || "";
     }
     navigate(command, extras) {
-        let commands = command;
-        // Fix della path esattamente come in esRouterLink
-        commands = Array.isArray(commands) ? commands : [commands];
-        let route = commands[0];
-        if (!route.startsWith("/" + EMBEDDED_ROUTE) && !route.startsWith("/" + ROUTE))
-            commands[0] = this.BasePath + commands[0];
-        this._router.navigate(command, extras);
+        this._emb.handleNavigation(command, extras, EMBEDDED_ROUTE, ROUTE, this.BasePath);
     }
     back() {
-        if (this._emb.Embedded) {
-            this._emb.MainWindow.postMessage({ type: "navigate-back" }, "*");
-            setTimeout(() => { this._location.back(); });
-        }
-        else
-            this._location.back();
+        this._emb.handleBack();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: BaseComponent, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: BaseComponent, isStandalone: false, selector: "ng-component", usesInheritance: true, ngImport: i0, template: '', isInline: true }); }
@@ -1728,84 +1645,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
 
 // Angular
 class EmbeddingComponent extends BaseComponent {
-    constructor(injector, emb, location) {
+    constructor(injector, emb) {
         super(injector);
         this.injector = injector;
         this.emb = emb;
-        this.location = location;
-        // TODO: Automatizzare
-        this.LocalhostModuleMap = {
-            "crm": "31813",
-            "sii": "21645",
-            "sales": "19112"
-        };
         this.EmbeddingSuccesfull = true;
-        this.Reloading = false;
     }
     ngOnInit() {
-        let route = this.injector.get(ActivatedRoute);
-        route.url.subscribe(_ => { this.performNewEmbeddingOperations(null); });
-        route.params.pipe(debounceTime(100)).subscribe((res) => {
-            this.performNewEmbeddingOperations(res["module"]);
-        });
-    }
-    performNewEmbeddingOperations(module) {
-        if (!module && !this.Module) {
-            console.log(`Module parameter missing. Ignoring embed request`);
-            return;
-        }
-        if (this.Reloading) {
-            console.log(`Already reloading. Embedding ignored`);
-            return;
-        }
-        if (module)
-            this.Module = module;
-        this.Localhost = this.LocalhostModuleMap[this.Module];
-        this.Reloading = true;
-        console.log(`Recognized a new navigation to the embedding component: ${this.Module} - ${this.CompletePath}`);
-        let reloadAllowed = this.emb.IsReloadAllowed();
-        if (this.Page && reloadAllowed) {
-            this.Page = this.Pars = null;
-            requestAnimationFrame(() => {
-                this.assignPageLoadParameters();
-                requestAnimationFrame(() => { this.Reloading = false; });
-            });
-        }
-        else {
-            this.assignPageLoadParameters(reloadAllowed);
-            requestAnimationFrame(() => { this.Reloading = false; });
-        }
-    }
-    assignPageLoadParameters(reloadAllowed = true) {
-        // Esempio di Complete path: "/pages/embed/crm/leads/leads_search"
-        // Esempio di slices: ["", "pages", "embed", "crm", "leads", "leads_search"]
-        // Io devo sostanzialmente prendere dal nome del modulo ("crm") in poi. Nome del modulo embeddato eslcuso
-        console.log("Embedding...");
-        if (reloadAllowed)
-            this.EmbeddingSuccesfull = false;
-        // Per seccare e ricreare il componente che altrimenti non prenderebbe gli input nuovi
-        requestAnimationFrame(() => {
-            this.Page = this.CompletePath.split("/").slice(4).join("/");
-            console.log("Page: " + this.Page);
-            let navParKeys = Object.keys(this.Parameters)?.filter(p => p != "module");
-            this.Pars = (navParKeys?.length || 0) == 0 ? "" : ";" + navParKeys.map(t => `${t}=${this.Parameters[t]}`).join(";");
-            console.log("Pars: " + this.Pars);
-            let queryParKeys = Object.keys(this.QueryParameters);
-            this.QueryPars = (queryParKeys?.length || 0) == 0 ? "" : "?" + queryParKeys.map(t => `${t}=${this.QueryParameters[t]}`).join(";");
-            console.log("QueryPars: " + this.QueryPars);
-            let QueryPAramsWithoutIgnoreStorage = queryParKeys.map(t => t == "ignoreStorage" ? null : `${t}=${this.QueryParameters[t]}`).filter(t => !!t).join(";");
-            // Per rimuovere eventuali ignoreStorage se sto navigando a una ricerca
-            this.location.replaceState(this.CompletePath + this.Pars + (QueryPAramsWithoutIgnoreStorage ? '?' + QueryPAramsWithoutIgnoreStorage : ""));
-            this.EmbeddingSuccesfull = !!this.Page && !!this.Module && !!this.Localhost;
+        this.emb.setupEmbedding(this.injector.get(ActivatedRoute), () => this.Parameters, () => this.QueryParameters, () => this.CompletePath, () => this.Module, () => this.Page, (EmbeddingSuccesfull, Page, Pars, QueryPars, Module, Localhost) => {
+            this.Module = Module;
+            this.EmbeddingSuccesfull = EmbeddingSuccesfull;
+            this.Page = Page;
+            this.Pars = Pars;
+            this.QueryPars = QueryPars;
+            this.Localhost = Localhost;
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: EmbeddingComponent, deps: [{ token: i0.Injector }, { token: i2$1.AppEmbeddingExtensions }, { token: i4.Location }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: EmbeddingComponent, deps: [{ token: i0.Injector }, { token: i2$1.AppEmbeddingExtensions }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.15", type: EmbeddingComponent, isStandalone: true, selector: "embedding", usesInheritance: true, ngImport: i0, template: "<jace-resource *ngIf=\"EmbeddingSuccesfull && Page\" [Module]=\"Module\" [Localhost]=\"Localhost\" Page=\"{{Page}}{{Pars}}{{QueryPars}}\"></jace-resource>\r\n<div *ngIf=\"!EmbeddingSuccesfull\">\r\n    Errori nell'embeddare risorsa {{Page}};{{Pars}} del modulo {{Module}} (Localhost {{Localhost}})\r\n</div>", dependencies: [{ kind: "directive", type: NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: JaceResourceComponent, selector: "jace-resource", inputs: ["Module", "ModuleKeyType", "Page", "Localhost", "Params"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: EmbeddingComponent, decorators: [{
             type: Component,
             args: [{ selector: 'embedding', imports: [NgIf, JaceResourceComponent], template: "<jace-resource *ngIf=\"EmbeddingSuccesfull && Page\" [Module]=\"Module\" [Localhost]=\"Localhost\" Page=\"{{Page}}{{Pars}}{{QueryPars}}\"></jace-resource>\r\n<div *ngIf=\"!EmbeddingSuccesfull\">\r\n    Errori nell'embeddare risorsa {{Page}};{{Pars}} del modulo {{Module}} (Localhost {{Localhost}})\r\n</div>" }]
-        }], ctorParameters: () => [{ type: i0.Injector }, { type: i2$1.AppEmbeddingExtensions }, { type: i4.Location }] });
+        }], ctorParameters: () => [{ type: i0.Injector }, { type: i2$1.AppEmbeddingExtensions }] });
 
 class UserInfoComponentLoc extends LocalizationService {
     constructor(injector) {