@esfaenza/dashboard-feature 11.2.7 → 11.2.8

package/bundles/esfaenza-dashboard-feature.umd.js

@@ -356,8 +356,10 @@
             this.lastdate = "";
             this.chartName = "";
         }
-        JaceChartWidgetComponent.prototype.setWidgetModel = function (widgetModel) {
+        JaceChartWidgetComponent.prototype.setWidgetModel = function (dshBackendId, widgetModel) {
             this.model = widgetModel;
+            if (this.model.backendid === undefined || this.model.backendid == "default_backend")
+                this.model.backendid = dshBackendId;
             this.refreshData();
         };
         JaceChartWidgetComponent.prototype.ngOnInit = function () { };
@@ -387,7 +389,7 @@
                     pars[k] = this.model.options[k];
                 }
             }
-            this.dshService.GetWidgetData(this.model.name, pars).subscribe(function (data) {
+            this.dshService.GetWidgetData(this.model.backendid, this.model.name, pars).subscribe(function (data) {
                 if (_this.model) {
                     _this.model.setData(data);
                     _this.chartName = _this.model.name;
@@ -432,8 +434,10 @@
             this.dataReady = false;
             this.lastdate = "";
         }
-        JaceCounterWidgetComponent.prototype.setWidgetModel = function (widgetModel) {
+        JaceCounterWidgetComponent.prototype.setWidgetModel = function (dshBackendId, widgetModel) {
             this.model = widgetModel;
+            if (this.model.backendid === undefined || this.model.backendid == "default_backend")
+                this.model.backendid = dshBackendId;
             this.refreshData();
         };
         JaceCounterWidgetComponent.prototype.ngOnInit = function () { };
@@ -463,7 +467,7 @@
                     pars[k] = this.model.options[k];
                 }
             }
-            this.dshService.GetWidgetData(this.model.name, pars).subscribe(function (data) {
+            this.dshService.GetWidgetData(this.model.backendid, this.model.name, pars).subscribe(function (data) {
                 if (_this.model) {
                     _this.model.setData(data);
                     _this.dataReady = true;
@@ -509,8 +513,10 @@
             this.dataReady = false;
             this.lastdate = "";
         }
-        JaceListWidgetComponent.prototype.setWidgetModel = function (widgetModel) {
+        JaceListWidgetComponent.prototype.setWidgetModel = function (dshBackendId, widgetModel) {
             this.model = widgetModel;
+            if (this.model.backendid === undefined || this.model.backendid == "default_backend")
+                this.model.backendid = dshBackendId;
             this.refreshData();
         };
         JaceListWidgetComponent.prototype.ngOnInit = function () { };
@@ -540,7 +546,7 @@
                     pars[k] = this.model.options[k];
                 }
             }
-            this.dshService.GetWidgetData(this.model.name, pars).subscribe(function (data) {
+            this.dshService.GetWidgetData(this.model.backendid, this.model.name, pars).subscribe(function (data) {
                 if (_this.model) {
                     _this.model.setData(data);
                     _this.dataReady = true;
@@ -597,8 +603,10 @@
             this.dataReady = false;
             this.lastdate = "";
         }
-        JaceMultiprogWidgetComponent.prototype.setWidgetModel = function (widgetModel) {
+        JaceMultiprogWidgetComponent.prototype.setWidgetModel = function (dshBackendId, widgetModel) {
             this.model = widgetModel;
+            if (this.model.backendid === undefined || this.model.backendid == "default_backend")
+                this.model.backendid = dshBackendId;
             this.refreshData();
         };
         JaceMultiprogWidgetComponent.prototype.ngOnInit = function () { };
@@ -628,7 +636,7 @@
                     pars[k] = this.model.options[k];
                 }
             }
-            this.dshService.GetWidgetData(this.model.name, pars).subscribe(function (data) {
+            this.dshService.GetWidgetData(this.model.backendid, this.model.name, pars).subscribe(function (data) {
                 if (_this.model) {
                     _this.model.setData(data);
                     _this.dataReady = true;
@@ -667,11 +675,13 @@
 
     var BaseJaceWidgetModel = /** @class */ (function () {
         function BaseJaceWidgetModel() {
+            this.backendid = "default_backend";
             this.resizeEnabled = false;
             this.dataError = false;
             this.options = {};
         }
         BaseJaceWidgetModel.prototype.configureFromInstanceDetails = function (details) {
+            var _a;
             this.name = details.name;
             this.widgetType = details.type;
             this.title = details.title;
@@ -684,6 +694,7 @@
             this.options = details.options;
             this.dataError = details.queryerror;
             this.resizeEnabled = details.resizeenabled;
+            this.backendid = (_a = details.backendid) !== null && _a !== void 0 ? _a : "default_backend";
         };
         return BaseJaceWidgetModel;
     }());
@@ -846,6 +857,24 @@
         return DefaultDashboardModuleOptions;
     }());
 
+    /**NOTA
+    * per essere sicuro che la Factory venga creata dall'injector dei moduli lazy nel template di FE e quindi sappia come creare i componenti dinamici,
+    * al momento è dichiarata con provideIn: null in modo da 'costringere' ad esplicitarla nei provider del proprio modulo
+    * dove si vuole usare la dashboard
+    *
+    * @NgModule({
+    *   imports: [...MODULES],
+    *   declarations: [...COMPONENTS],
+    *   providers: [
+    *       // url backend per la dashboard
+    *       { provide: DSH_BACKEND_URL, useValue: myconfig.BACKEND_URL},
+    *   ==>    DashboardWidgetFactory
+    *   ]
+    * })
+    * export class MyLazyModule {}
+    *
+    * sperabilmente in futuro (ng12+ con Ivy) la si potrà dichiarare provideIn: root se si supera il problema dei componenti dinamici
+     */
     //singleton
     var DashboardWidgetFactory = /** @class */ (function () {
         //verione ng 13
@@ -862,6 +891,7 @@
                 });
             }
         };
+        //TODO
         //versione ng 13+
         /* resolveComponent(type: string, vcr: ViewContainerRef): ComponentRef<IWidgetComponent> | null {
 
@@ -877,7 +907,12 @@
 
             return componentRef;
         } */
-        //versione ng11 
+        /**
+         * Versione ng11 della creazione dei componenti dinamici delle widget
+         * @param type
+         * @param vcr
+         * @returns
+         */
         DashboardWidgetFactory.prototype.resolveComponent = function (type, vcr) {
             if (!this.types)
                 return null;
@@ -930,6 +965,7 @@
 
     var SaveJaceDashboardLayoutDTO = /** @class */ (function () {
         function SaveJaceDashboardLayoutDTO() {
+            this.backendid = "default_backend";
         }
         return SaveJaceDashboardLayoutDTO;
     }());
@@ -995,7 +1031,7 @@
         };
         DashboardComponent.prototype.reloadData = function () {
             var _this = this;
-            this.dshService.GetUserDashboard(this.Configuration.accountId, this.Configuration.dashboardName).subscribe(function (c) {
+            this.dshService.GetUserDashboard(this.Configuration.backendId, this.Configuration.accountId, this.Configuration.dashboardName).subscribe(function (c) {
                 _this.dashboardLayout = c;
                 _this.widgetDefinitions = c.widgets.map(function (i) {
                     return _this.cmpFactory.resolveDefinition(i.type, i);
@@ -1012,6 +1048,7 @@
             if (!this.dashboardLayout)
                 return;
             var dto = new SaveJaceDashboardLayoutDTO();
+            dto.backendid = this.Configuration.backendId;
             dto.widgets = [];
             for (var index = 0; index < this.widgetDefinitions.length; index++) {
                 var w = this.widgetDefinitions[index];
@@ -1056,7 +1093,7 @@
                 if (_this.Configuration.showDateInput)
                     componentRef.instance.DashboardDate = _this.dashboardDate;
                 //setta il modello
-                componentRef.instance.setWidgetModel(widgetData);
+                componentRef.instance.setWidgetModel(_this.Configuration.backendId, widgetData);
                 //setta la callback per OnRemove
                 var s = componentRef.instance.OnRemove.subscribe(function (name) { return _this.removeItem(name); });
                 _this.trackedSubscriptions.push(s);
@@ -1105,8 +1142,9 @@
             this.http = http;
             this.backend = backend;
         }
-        DashboardFeatureAPIDataService.prototype.GetUserDashboard = function (idaccount, dashboardName) {
+        DashboardFeatureAPIDataService.prototype.GetUserDashboard = function (backendid, idaccount, dashboardName) {
             var params = new http.HttpParams();
+            params = params.append("backendid", backendid.toString());
             params = params.append("idaccount", idaccount.toString());
             params = params.append("name", dashboardName);
             return this.http.get(this.backend + Repository["GET_Dashboard_GetLayout"], params);
@@ -1114,8 +1152,9 @@
         DashboardFeatureAPIDataService.prototype.SaveUserDashboard = function (dto) {
             return this.http.post(this.backend + Repository["POST_Dashboard_SaveLayout"], dto);
         };
-        DashboardFeatureAPIDataService.prototype.GetWidgetData = function (name, options) {
+        DashboardFeatureAPIDataService.prototype.GetWidgetData = function (backendid, name, options) {
             var params = new http.HttpParams();
+            params = params.append("backendid", backendid.toString());
             params = params.append("name", name.toString());
             if (options && Object.keys(options).length != 0) {
                 for (var index = 0; index < Object.keys(options).length; index++) {
@@ -1168,6 +1207,11 @@
         JaceChartWidgetComponent,
         JaceMultiprogWidgetComponent
     ];
+    // NOTA
+    // questa cosa è deprecata, ma serve perchè nel template di FE usiamo per adesso una versione di 
+    // compilatore (pre ng12 / pre Ivy) che altrimenti non riesce a capire come creare dinamicamente i componenti delle widget a runtime
+    // se non sono dichiarati così (entrycomponent)
+    // se una prossima widget di default usasse un componente di libreria esterno (es. una select, un pulsante), anche quello andrebbe dichiarato qui
     var ENTRY_COMPONENTS = [
         JaceListWidgetComponent,
         JaceCounterWidgetComponent,
@@ -1229,8 +1273,12 @@
             this.dataReady = false;
             this.lastdate = "";
         }
-        BaseWidgetComponent.prototype.setWidgetModel = function (widgetModel) {
+        BaseWidgetComponent.prototype.setWidgetModel = function (dshBackendId, widgetModel) {
             this.model = widgetModel;
+            if (dshBackendId != "default_backend") {
+                if (this.model.backendid === undefined || this.model.backendid == "default_backend")
+                    this.model.backendid = dshBackendId;
+            }
             this.refreshData();
         };
         BaseWidgetComponent.prototype.ngOnInit = function () { };
@@ -1265,7 +1313,7 @@
                 }
             }
             this.prepareGetDataParameters(pars);
-            this.dshService.GetWidgetData(this.model.name, pars).subscribe(function (data) {
+            this.dshService.GetWidgetData(this.model.backendid, this.model.name, pars).subscribe(function (data) {
                 if (_this.model) {
                     _this.model.setData(data);
                     _this.dataReady = true;
@@ -1304,6 +1352,11 @@
      */
     var JaceDashboardConfig = /** @class */ (function () {
         function JaceDashboardConfig() {
+            /**
+             * Id del backend a cui verranno indirizzate le chiamate di questa dashboard.
+             * Deve essere uno di quelli definiti in appsetting.json del FE nella sezione **Backends**.
+             */
+            this.backendId = "default_backend";
             /**
              * Se questa dashboard contiene widget che mostrano dati che dipendono dalla data corrente
              * mostra il controllo (datetimepicker) per variare la data in base a cui mostrare i dati.