@esfaenza/core 15.2.315 → 15.2.317

package/fesm2015/esfaenza-core-services.mjs

@@ -9,8 +9,9 @@ import * as i1$1 from '@angular/router';
 import { Router } from '@angular/router';
 import * as i1$2 from '@esfaenza/localizations';
 import { LocalizationService } from '@esfaenza/localizations';
-import * as i6 from '@esfaenza/extensions';
+import * as i5 from '@esfaenza/extensions';
 import { InboundMessageTypes, MessageService, CallResult } from '@esfaenza/extensions';
+import { HTTPService } from '@esfaenza/httpservice';
 import * as customParseFormat from 'dayjs/plugin/customParseFormat';
 import * as isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import * as isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
@@ -18,12 +19,10 @@ import * as isBetween from 'dayjs/plugin/isBetween';
 import * as duration from 'dayjs/plugin/duration';
 import * as minMax from 'dayjs/plugin/minMax';
 import * as utc from 'dayjs/plugin/utc';
-import * as i3 from '@esfaenza/httpservice';
-import { HTTPService } from '@esfaenza/httpservice';
-import * as i5 from '@esfaenza/signalr-notifications';
+import * as i4 from '@esfaenza/signalr-notifications';
 import * as i5$1 from '@esfaenza/access-control';
 import { AccessControlRouteGuard } from '@esfaenza/access-control';
-import * as i4 from '@esfaenza/preferences';
+import * as i4$1 from '@esfaenza/preferences';
 import { CachePersistor, PreferencesPersistor } from '@esfaenza/preferences';
 import { catchError, map } from 'rxjs/operators';
 import { __awaiter } from 'tslib';
@@ -1170,10 +1169,10 @@ class AppState {
         this.notifyDataChanged("modules.Retrieved", this._modules);
     }
     get Modules() { return this._modules; }
-    constructor(router, lc, http, bts, notifications, MessageDef, intercom, emb, fakeToken) {
+    constructor(router, lc, inj, bts, notifications, MessageDef, intercom, emb, fakeToken) {
         this.router = router;
         this.lc = lc;
-        this.http = http;
+        this.inj = inj;
         this.bts = bts;
         this.notifications = notifications;
         this.MessageDef = MessageDef;
@@ -1210,14 +1209,20 @@ class AppState {
         this.intercom.inbounds.subscribe((t) => { this.handleInboundMessage(t); });
     }
     getActiveJaceModules() {
-        if (this.fakeToken) {
-            this.Modules = [new ActiveModuleView("Modulo Esempio 1"), new ActiveModuleView("Modulo Esempio 2"), new ActiveModuleView("Modulo Esempio 3")];
-            this.Modules = this.Modules;
-            return;
-        }
-        this.http.get(GET_Jace_GetActiveJaceModules).subscribe(res => {
-            this.Modules = res;
-            this.Modules = this.Modules;
+        // Recupero i moduli dopo un frame. mi assicuro che l'injection tree sia stabile. 
+        // Altrimenti l'httpservice che prende l'httpserviceextensions providato da core quando anche l'appstate è providedin root
+        // si incasina e va in loop
+        requestAnimationFrame(() => {
+            let http = this.inj.get(HTTPService);
+            if (this.fakeToken) {
+                this.Modules = [new ActiveModuleView("Modulo Esempio 1"), new ActiveModuleView("Modulo Esempio 2"), new ActiveModuleView("Modulo Esempio 3")];
+                this.Modules = this.Modules;
+                return;
+            }
+            http.get(GET_Jace_GetActiveJaceModules).subscribe(res => {
+                this.Modules = res;
+                this.Modules = this.Modules;
+            });
         });
     }
     // Collego le informazioni dell'embedding che devono appoggiarsi all'app state in modo che possano comunicare col resto dell'applicazione
@@ -1375,13 +1380,13 @@ class AppState {
         this.headerHeight = height;
     }
 }
-AppState.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: AppState, deps: [{ token: i1$1.Router }, { token: i1$2.LocalizationService }, { token: i3.HTTPService }, { token: TokenService }, { token: i5.NotificationsService }, { token: i5.BaseMessageService }, { token: i6.InterComService }, { token: i6.AppEmbeddingExtensions }, { token: USE_FAKE_ACCESS_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable });
+AppState.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: AppState, deps: [{ token: i1$1.Router }, { token: i1$2.LocalizationService }, { token: i0.Injector }, { token: TokenService }, { token: i4.NotificationsService }, { token: i4.BaseMessageService }, { token: i5.InterComService }, { token: i5.AppEmbeddingExtensions }, { token: USE_FAKE_ACCESS_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable });
 AppState.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: AppState, providedIn: "root" });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: AppState, decorators: [{
             type: Injectable,
             args: [{ providedIn: "root" }]
         }], ctorParameters: function () {
-        return [{ type: i1$1.Router }, { type: i1$2.LocalizationService }, { type: i3.HTTPService }, { type: TokenService }, { type: i5.NotificationsService }, { type: i5.BaseMessageService }, { type: i6.InterComService }, { type: i6.AppEmbeddingExtensions }, { type: undefined, decorators: [{
+        return [{ type: i1$1.Router }, { type: i1$2.LocalizationService }, { type: i0.Injector }, { type: TokenService }, { type: i4.NotificationsService }, { type: i4.BaseMessageService }, { type: i5.InterComService }, { type: i5.AppEmbeddingExtensions }, { type: undefined, decorators: [{
                         type: Inject,
                         args: [USE_FAKE_ACCESS_TOKEN]
                     }] }];
@@ -1467,11 +1472,11 @@ class HTTPServiceExtensions {
         }
     }
 }
-HTTPServiceExtensions.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: HTTPServiceExtensions, deps: [{ token: i1$2.LocalizationService }, { token: TokenService }, { token: AppState }, { token: i1$1.Router }, { token: i5$1.AccessControlService }, { token: i6.MessageService }], target: i0.ɵɵFactoryTarget.Injectable });
+HTTPServiceExtensions.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: HTTPServiceExtensions, deps: [{ token: i1$2.LocalizationService }, { token: TokenService }, { token: AppState }, { token: i1$1.Router }, { token: i5$1.AccessControlService }, { token: i5.MessageService }], target: i0.ɵɵFactoryTarget.Injectable });
 HTTPServiceExtensions.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: HTTPServiceExtensions });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: HTTPServiceExtensions, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1$2.LocalizationService }, { type: TokenService }, { type: AppState }, { type: i1$1.Router }, { type: i5$1.AccessControlService }, { type: i6.MessageService }]; } });
+        }], ctorParameters: function () { return [{ type: i1$2.LocalizationService }, { type: TokenService }, { type: AppState }, { type: i1$1.Router }, { type: i5$1.AccessControlService }, { type: i5.MessageService }]; } });
 
 // Angular
 class MenuFilteringService {
@@ -1612,11 +1617,11 @@ class ApplicationCachePersistor extends CachePersistor {
         return `${this.getItemsUrl(sessionKey)}/${itemKey}`;
     }
 }
-ApplicationCachePersistor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationCachePersistor, deps: [{ token: i1$2.LocalizationService }, { token: i2.HttpClient }, { token: TokenService }, { token: i4.BaseSessionRetriever }], target: i0.ɵɵFactoryTarget.Injectable });
+ApplicationCachePersistor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationCachePersistor, deps: [{ token: i1$2.LocalizationService }, { token: i2.HttpClient }, { token: TokenService }, { token: i4$1.BaseSessionRetriever }], target: i0.ɵɵFactoryTarget.Injectable });
 ApplicationCachePersistor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationCachePersistor });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationCachePersistor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1$2.LocalizationService }, { type: i2.HttpClient }, { type: TokenService }, { type: i4.BaseSessionRetriever }]; } });
+        }], ctorParameters: function () { return [{ type: i1$2.LocalizationService }, { type: i2.HttpClient }, { type: TokenService }, { type: i4$1.BaseSessionRetriever }]; } });
 
 // Angular
 // Chiamate ai Repository
@@ -1694,11 +1699,11 @@ class ApplicationPreferencesPersistor extends PreferencesPersistor {
         return `${this.getItemsUrl(sessionKey)}/${itemKey}`;
     }
 }
-ApplicationPreferencesPersistor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationPreferencesPersistor, deps: [{ token: i1$2.LocalizationService }, { token: i2.HttpClient }, { token: TokenService }, { token: i4.BaseSessionRetriever }], target: i0.ɵɵFactoryTarget.Injectable });
+ApplicationPreferencesPersistor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationPreferencesPersistor, deps: [{ token: i1$2.LocalizationService }, { token: i2.HttpClient }, { token: TokenService }, { token: i4$1.BaseSessionRetriever }], target: i0.ɵɵFactoryTarget.Injectable });
 ApplicationPreferencesPersistor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationPreferencesPersistor });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ApplicationPreferencesPersistor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i1$2.LocalizationService }, { type: i2.HttpClient }, { type: TokenService }, { type: i4.BaseSessionRetriever }]; } });
+        }], ctorParameters: function () { return [{ type: i1$2.LocalizationService }, { type: i2.HttpClient }, { type: TokenService }, { type: i4$1.BaseSessionRetriever }]; } });
 
 // Chiamate ai Repository
 const GET_UserProfile_GetAccountPicture = "/api/UserProfile/GetAccountPicture";
@@ -1808,11 +1813,11 @@ class BaseRouterGuard extends AccessControlRouteGuard {
             acc.initializeIdentity(ts.getJaceIdentity());
     }
 }
-BaseRouterGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: BaseRouterGuard, deps: [{ token: i6.MessageService }, { token: i5$1.AccessControlService }, { token: i1$1.Router }, { token: TokenService }], target: i0.ɵɵFactoryTarget.Injectable });
+BaseRouterGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: BaseRouterGuard, deps: [{ token: i5.MessageService }, { token: i5$1.AccessControlService }, { token: i1$1.Router }, { token: TokenService }], target: i0.ɵɵFactoryTarget.Injectable });
 BaseRouterGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: BaseRouterGuard });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: BaseRouterGuard, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: i6.MessageService }, { type: i5$1.AccessControlService }, { type: i1$1.Router }, { type: TokenService }]; } });
+        }], ctorParameters: function () { return [{ type: i5.MessageService }, { type: i5$1.AccessControlService }, { type: i1$1.Router }, { type: TokenService }]; } });
 
 /**
  * Generated bundle index. Do not edit.