gamma-app-controller 1.1.16 → 1.1.17

package/fesm2020/gamma-app-controller.mjs

@@ -2512,6 +2512,7 @@ class ApplicationDatasetComponent {
         });
     }
     getDatasetForImpala(dataset) {
+        debugger;
         let request = dataset.config.queryConfig;
         let transformedObject = {};
         for (let item of request.reqFields) {
@@ -2524,11 +2525,19 @@ class ApplicationDatasetComponent {
                 transformedObject[key] = value;
             }
         }
-        transformedObject['measures'] = request.measures;
-        transformedObject['dimensions'] = request.dimensions;
         transformedObject['filters'] = this.transformDataForMFilter([], request.mapedFilters);
         transformedObject['sorters'] = request.sorters;
         transformedObject["paginationRequired"] = false;
+        if (dataset.config.api == "/kpi/genericAggregatePaginatedKpiServiceResponse") {
+            transformedObject['measures'] = request.measures;
+            transformedObject['dimensions'] = request.dimensions;
+        }
+        else {
+            transformedObject['columns'] = this.getFormatObjectForColumn(request.columns);
+        }
+        if (request.havings && request.havings.length !== 0) {
+            transformedObject['havings'] = request.havings;
+        }
         console.log(transformedObject);
         this.service.getData(transformedObject, dataset.config.api).subscribe({
             next: (data) => {
@@ -2538,6 +2547,19 @@ class ApplicationDatasetComponent {
             }
         });
     }
+    getFormatObjectForColumn(columns) {
+        let columnData = [];
+        columns.forEach(element => {
+            const { advancedColumn, columnName, enrichFunction, dataField } = element;
+            columnData.push({
+                "advancedColumn": advancedColumn,
+                "columnName": columnName,
+                "enrichFunction": enrichFunction,
+                "aliasName": dataField
+            });
+        });
+        return columnData;
+    }
     transformDataForMFilter(filterdata, mapData) {
         let result = [];
         mapData.forEach(mapping => {
@@ -6322,6 +6344,7 @@ class CreateCompViewComponent {
         });
     }
     getDatasetForImpala(dataset) {
+        debugger;
         let request = dataset.config.queryConfig;
         this.dataSourceModal = {};
         let transformedObject = {};
@@ -6335,11 +6358,19 @@ class CreateCompViewComponent {
                 transformedObject[key] = value;
             }
         }
-        transformedObject['measures'] = request.measures;
-        transformedObject['dimensions'] = request.dimensions;
         transformedObject['filters'] = this.transformDataForMFilter([], request.mapedFilters);
         transformedObject['sorters'] = request.sorters;
         transformedObject["paginationRequired"] = false;
+        if (dataset.config.api == "/kpi/genericAggregatePaginatedKpiServiceResponse") {
+            transformedObject['measures'] = request.measures;
+            transformedObject['dimensions'] = request.dimensions;
+        }
+        else {
+            transformedObject['columns'] = this.getFormatObjectForColumn(request.columns);
+        }
+        if (request.havings && request.havings.length !== 0) {
+            transformedObject['havings'] = request.havings;
+        }
         console.log(transformedObject);
         const columnData = this.transformColumnsForColumns(request.columns);
         this.service.getData(transformedObject, dataset.config.api).subscribe({
@@ -6356,6 +6387,19 @@ class CreateCompViewComponent {
             }
         });
     }
+    getFormatObjectForColumn(columns) {
+        let columnData = [];
+        columns.forEach(element => {
+            const { advancedColumn, columnName, enrichFunction, dataField } = element;
+            columnData.push({
+                "advancedColumn": advancedColumn,
+                "columnName": columnName,
+                "enrichFunction": enrichFunction,
+                "aliasName": dataField
+            });
+        });
+        return columnData;
+    }
     transformColumnsForColumns(inputColumns) {
         const columns = [];
         inputColumns.forEach(col => {
@@ -8570,9 +8614,6 @@ class GammaAdvanceChartComponent {
                         this.getBubbleChartData();
                     }
                     else {
-                        value.kpiConfig.dataSource = value.kpiConfig.dataSource
-                            .filter(record => record[value.kpiConfig.dataConfig['argumentField']])
-                            .sort((a, b) => moment(a[value.kpiConfig.dataConfig['argumentField']]).diff(moment(b[value.kpiConfig.dataConfig['argumentField']])));
                         this.getMonthlyChart(value.kpiConfig.dataSource, value.kpiConfig.dataConfig);
                         this.isChartvisible == true;
                     }
@@ -8607,6 +8648,15 @@ class GammaAdvanceChartComponent {
     }
     getMonthlyChart(data, dataConfig) {
         const valueFields = dataConfig.chart_config.map(config => config.valueField);
+        data.forEach((entry) => {
+            valueFields.forEach((field) => {
+                if (entry.hasOwnProperty(field)) {
+                    if (typeof entry[field] === "string") {
+                        entry[field] = Number(entry[field]);
+                    }
+                }
+            });
+        });
         if (data) {
             let content = this.chartConfig.argumentField.toLowerCase();
             if (content.includes('date')) {
@@ -10205,11 +10255,16 @@ class ApplicationDatssetsCall {
                 }
             }
             const operator = (filters && filters.length !== 0) ? Object.keys(filters.operationFilter).map(key => ({ [key]: filters.operationFilter[key] })) : [];
-            transformedObject['measures'] = request.measures;
             transformedObject['filters'] = this.transformDataForMFilter(operator, request.mapedFilters);
             transformedObject['sorters'] = request.sorters;
             transformedObject["paginationRequired"] = false;
-            transformedObject['dimensions'] = request.dimensions;
+            if (dataset.config.api == "/kpi/genericAggregatePaginatedKpiServiceResponse") {
+                transformedObject['measures'] = request.measures;
+                transformedObject['dimensions'] = request.dimensions;
+            }
+            else {
+                transformedObject['columns'] = this.getFormatObjectForColumn(request.columns);
+            }
             if (request.havings && request.havings.length !== 0) {
                 transformedObject['havings'] = request.havings;
             }
@@ -10226,6 +10281,19 @@ class ApplicationDatssetsCall {
             });
         });
     }
+    getFormatObjectForColumn(columns) {
+        let columnData = [];
+        columns.forEach(element => {
+            const { advancedColumn, columnName, enrichFunction, dataField } = element;
+            columnData.push({
+                "advancedColumn": advancedColumn,
+                "columnName": columnName,
+                "enrichFunction": enrichFunction,
+                "aliasName": dataField
+            });
+        });
+        return columnData;
+    }
     transformDataForMFilter(filterdata, mapData) {
         let result = [];
         mapData.forEach(mapping => {