@wavemaker/app-ng-runtime 11.8.0-next.24904 → 11.8.0-next.27301

app-ng-runtime/components/chart/bundles/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@wm/components/base'), require('@wm/components/basic'), require('@wm/core')) :
-    typeof define === 'function' && define.amd ? define(['exports', '@angular/core', '@angular/common', '@wm/components/base', '@wm/components/basic', '@wm/core'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.wm = global.wm || {}, global.wm.components = global.wm.components || {}, global.wm.components.chart = {}), global.ng.core, global.ng.common, global.wm.components.base, global.wm.components.basic, global.wm.core));
-})(this, (function (exports, i0, i3, base, i2, i1) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@wm/components/base'), require('@wm/components/basic'), require('@wm/core'), require('lodash-es')) :
+    typeof define === 'function' && define.amd ? define(['exports', '@angular/core', '@angular/common', '@wm/components/base', '@wm/components/basic', '@wm/core', 'lodash-es'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.wm = global.wm || {}, global.wm.components = global.wm.components || {}, global.wm.components.chart = {}), global.ng.core, global.ng.common, global.wm.components.base, global.wm.components.basic, global.wm.core, global._));
+})(this, (function (exports, i0, i3, base, i2, i1, lodashEs) { 'use strict';
 
     function _interopNamespaceDefault(e) {
         var n = Object.create(null);
@@ -168,7 +168,7 @@
         'small': 0.3,
         'medium': 0.6,
         'large': 0.7
-    }, barSpacingMapInvert = _.invert(barSpacingMap), donutRatioMapInvert = _.invert(donutRatioMap), tickformats = {
+    }, barSpacingMapInvert = lodashEs.invert(barSpacingMap), donutRatioMapInvert = lodashEs.invert(donutRatioMap), tickformats = {
         'Thousand': {
             'prefix': 'K',
             'divider': 1000
@@ -207,11 +207,11 @@
     // returns true if chart type is area
     const isPieType = type => isPieChart(type) || isDonutChart(type);
     // The format of chart data is array of json objects in case of the following types of chart
-    const isChartDataJSON = type => _.includes(dataTypeJSON, type) || !_.includes(chartTypes, type);
+    const isChartDataJSON = type => lodashEs.includes(dataTypeJSON, type) || !lodashEs.includes(chartTypes, type);
     // The format of chart data is array of objects in case of the following types of chart
-    const isChartDataArray = type => _.includes(dataTypeArray, type);
+    const isChartDataArray = type => lodashEs.includes(dataTypeArray, type);
     // returns true is the chart type is 'line', 'area' or 'cumulative line' else false
-    const isLineTypeChart = type => _.includes(lineTypeCharts, type);
+    const isLineTypeChart = type => lodashEs.includes(lineTypeCharts, type);
     // X/Y Domain properties are supported only for Column and Area charts
     const isAxisDomainSupported = type => isColumnChart(type) || isAreaChart(type);
     // Returns bar spacing value
@@ -412,7 +412,7 @@
         return isChartDataJSON(type) ? 'jsonFormat' : 'arrayFormat';
     };
     // Sample data to populate when no data is bound
-    const getSampleData = widgetContext => constructSampleData(getDataType(widgetContext), _.split(widgetContext.yaxisdatakey, ',').length, widgetContext.shape);
+    const getSampleData = widgetContext => constructSampleData(getDataType(widgetContext), lodashEs.split(widgetContext.yaxisdatakey, ',').length, widgetContext.shape);
     // Check whether X/Y Domain was set to Min and is supported for the present chart
     const isAxisDomainValid = (widgetContext, axis) => {
         if (widgetContext[axis + 'domain'] === 'Min' && (isAxisDomainSupported(widgetContext.type))) {
@@ -422,7 +422,7 @@
     };
     // Check whether min and max values are finite or not
     const areMinMaxValuesValid = values => {
-        if (_.isFinite(values.min) && _.isFinite(values.max)) {
+        if (lodashEs.isFinite(values.min) && lodashEs.isFinite(values.max)) {
             return true;
         }
         return false;
@@ -462,8 +462,8 @@
         if (!propertyValueMap || i1.isEmptyObject(propertyValueMap)) {
             propertyValueMap = {};
         }
-        _.forEach(basicProperties, prop => {
-            if (_.isUndefined(propertyValueMap[prop])) {
+        lodashEs.forEach(basicProperties, prop => {
+            if (lodashEs.isUndefined(propertyValueMap[prop])) {
                 propertyValueMap[prop] = widgetContext[prop];
             }
         });
@@ -668,7 +668,7 @@
         }
         // Setting the legend type choosen by user or default it will be furious
         chart.legend.vers((propertyValueMap.legendtype && propertyValueMap.legendtype.toLowerCase()) || 'furious');
-        if (!_.includes(chartTypes, widgetContext.type)) {
+        if (!lodashEs.includes(chartTypes, widgetContext.type)) {
             chart = nv.models.multiBarChart()
                 .x(d => d.x)
                 .y(d => d.y);
@@ -738,10 +738,10 @@
             }
         }
         // Support for custom colors if user gives direct string of colors in text box
-        if (_.isString(propertyValueMap.customcolors) && propertyValueMap.customcolors) {
-            colors = _.split(propertyValueMap.customcolors, ',');
+        if (lodashEs.isString(propertyValueMap.customcolors) && propertyValueMap.customcolors) {
+            colors = lodashEs.split(propertyValueMap.customcolors, ',');
         }
-        if (_.isArray(propertyValueMap.customcolors)) {
+        if (lodashEs.isArray(propertyValueMap.customcolors)) {
             colors = propertyValueMap.customcolors;
         }
         showLegend = isShowLegend(propertyValueMap.showlegend);
@@ -858,8 +858,8 @@
     const getLodashOrderByFormat = orderby => {
         let columns;
         const orderByColumns = [], orders = [];
-        _.forEach(_.split(orderby, ','), function (col) {
-            columns = _.split(col, ':');
+        lodashEs.forEach(lodashEs.split(orderby, ','), function (col) {
+            columns = lodashEs.split(col, ':');
             orderByColumns.push(columns[0]);
             orders.push(columns[1]);
         });
@@ -907,7 +907,7 @@
             other than integer unlike the column and bar.It is a nvd3 issue. Inorder to
             support that this is a fix*/
         getxAxisVal(dataObj, xKey, index) {
-            const value = _.get(dataObj, xKey);
+            const value = lodashEs.get(dataObj, xKey);
             // If x axis is other than number type then add indexes
             if (isLineTypeChart(this.type) && !i1.isNumberType(this.xAxisDataType)) {
                 // Verification to get the unique data keys
@@ -937,7 +937,7 @@
                 input: [[10, 20], [20, 30], [30, 40]];
                 min x: 10
             */
-            xValues.min = _.minBy(datum.values, dataObject => dataObject.x || dataObject[0]);
+            xValues.min = lodashEs.minBy(datum.values, dataObject => dataObject.x || dataObject[0]);
             /*
              compute the max x value
              eg: When data has objects
@@ -947,7 +947,7 @@
                 input: [[10, 20], [20, 30], [30, 40]];
                 max x: 30
              */
-            xValues.max = _.maxBy(datum.values, dataObject => dataObject.x || dataObject[0]);
+            xValues.max = lodashEs.maxBy(datum.values, dataObject => dataObject.x || dataObject[0]);
             return xValues;
         }
         // Getting the min and max values among all the y values
@@ -969,13 +969,17 @@
                 min y values : '20'(among first set) & '30'(among second set)
                 max y values : '40'(among first set) & '50'(among second set)
              */
-            _.forEach(datum, data => {
-                minValues.push(_.minBy(data.values, function (dataObject) { return dataObject.y || dataObject[1]; }));
-                maxValues.push(_.maxBy(data.values, function (dataObject) { return dataObject.y || dataObject[1]; }));
+            lodashEs.forEach(datum, data => {
+                minValues.push(lodashEs.minBy(data.values, function (dataObject) {
+                    return dataObject.y || dataObject[1];
+                }));
+                maxValues.push(lodashEs.maxBy(data.values, function (dataObject) {
+                    return dataObject.y || dataObject[1];
+                }));
             });
             // Gets the least and highest values among all the min and max values of respective series of data
-            yValues.min = _.minBy(minValues, dataObject => dataObject.y || dataObject[1]);
-            yValues.max = _.maxBy(maxValues, dataObject => dataObject.y || dataObject[1]);
+            yValues.min = lodashEs.minBy(minValues, dataObject => dataObject.y || dataObject[1]);
+            yValues.max = lodashEs.maxBy(maxValues, dataObject => dataObject.y || dataObject[1]);
             return yValues;
         }
         // If the x-axis values are undefined, we return empty array else we return the values
@@ -984,7 +988,7 @@
         }
         // Returns the single data point based on the type of the data chart accepts
         valueFinder(dataObj, xKey, yKey, index, shape) {
-            const xVal = this.getxAxisVal(dataObj, xKey, index), value = _.get(dataObj, yKey), yVal = parseFloat(value) || value, size = parseFloat(dataObj[this.bubblesize]) || 2;
+            const xVal = this.getxAxisVal(dataObj, xKey, index), value = lodashEs.get(dataObj, yKey), yVal = parseFloat(value) || value, size = parseFloat(dataObj[this.bubblesize]) || 2;
             let dataPoint = {};
             if (isChartDataJSON(this.type)) {
                 dataPoint.x = xVal;
@@ -1025,10 +1029,10 @@
             }
             let datum = [], yAxisKey, shapes = [], values = [];
             const xAxisKey = this.xaxisdatakey, yAxisKeys = this.yaxisdatakey ? this.yaxisdatakey.split(',') : [], dataSet = this.chartData;
-            if (_.isArray(dataSet)) {
+            if (lodashEs.isArray(dataSet)) {
                 if (isPieType(this.type)) {
                     yAxisKey = yAxisKeys[0];
-                    datum = _.map(dataSet, (dataObj, index) => {
+                    datum = lodashEs.map(dataSet, (dataObj, index) => {
                         if (!i1.isEmptyObject(dataSet[index])) {
                             return this.valueFinder(dataSet[index], xAxisKey, yAxisKey);
                         }
@@ -1040,9 +1044,9 @@
                         shapes = this.shape === 'random' ? allShapes : this.shape;
                     }
                     yAxisKeys.forEach((yAxisKey, series) => {
-                        values = _.map(dataSet, (dataObj, index) => {
+                        values = lodashEs.map(dataSet, (dataObj, index) => {
                             if (!i1.isEmptyObject(dataSet[index])) {
-                                return this.valueFinder(dataSet[index], xAxisKey, yAxisKey, index, (_.isArray(shapes) && shapes[series]) || this.shape);
+                                return this.valueFinder(dataSet[index], xAxisKey, yAxisKey, index, (lodashEs.isArray(shapes) && shapes[series]) || this.shape);
                             }
                         });
                         values = this.getValidData(values);
@@ -1066,21 +1070,21 @@
         // constructing the grouped data based on the selection of orderby, x & y axis
         getVisuallyGroupedData(queryResponse, groupingColumn) {
             let groupData = {}, groupValues = [], orderByDetails, maxLength;
-            const chartData = [], _isAreaChart = isAreaChart(this.type), yAxisKey = _.first(_.split(this.yaxisdatakey, ','));
+            const chartData = [], _isAreaChart = isAreaChart(this.type), yAxisKey = lodashEs.first(lodashEs.split(this.yaxisdatakey, ','));
             this.xDataKeyArr = [];
-            queryResponse = _.orderBy(queryResponse, _.split(this.groupby, ','));
+            queryResponse = lodashEs.orderBy(queryResponse, lodashEs.split(this.groupby, ','));
             if (this.orderby) {
                 orderByDetails = getLodashOrderByFormat(this.orderby);
-                queryResponse = _.orderBy(queryResponse, orderByDetails.columns, orderByDetails.orders);
+                queryResponse = lodashEs.orderBy(queryResponse, orderByDetails.columns, orderByDetails.orders);
             }
-            queryResponse = _.groupBy(queryResponse, groupingColumn);
+            queryResponse = lodashEs.groupBy(queryResponse, groupingColumn);
             // In case of area chart all the series data should be of same length
             if (_isAreaChart) {
-                maxLength = _.max(_.map(queryResponse, obj => obj.length));
+                maxLength = lodashEs.max(lodashEs.map(queryResponse, obj => obj.length));
             }
-            _.forEach(queryResponse, (values, groupKey) => {
-                groupValues = isAreaChart ? _.fill(new Array(maxLength), [0, 0]) : [];
-                _.forEachRight(values, (value, index) => {
+            lodashEs.forEach(queryResponse, (values, groupKey) => {
+                groupValues = isAreaChart ? lodashEs.fill(new Array(maxLength), [0, 0]) : [];
+                lodashEs.forEachRight(values, (value, index) => {
                     groupValues[index] = this.valueFinder(value, this.xaxisdatakey, yAxisKey, index);
                 });
                 groupData = {
@@ -1114,14 +1118,14 @@
                         columns.push(visualGroupingColumn);
                     }
                     if (groupbyColumns.length) {
-                        columns = _.concat(columns, groupbyColumns);
+                        columns = lodashEs.concat(columns, groupbyColumns);
                     }
                 }
                 // If x and y axis are not included in aggregation need to be included in groupby
                 if (this.xaxisdatakey !== this.aggregationcolumn) {
                     columns.push(this.xaxisdatakey);
                 }
-                _.forEach(yAxisKeys, key => {
+                lodashEs.forEach(yAxisKeys, key => {
                     if (key !== this.aggregationcolumn) {
                         columns.push(key);
                     }
@@ -1149,16 +1153,17 @@
                 return;
             }
             if (this.isGroupByEnabled()) {
-                groupByFields = _.split(this.groupby, ',');
+                groupByFields = lodashEs.split(this.groupby, ',');
             }
             if (this.orderby) {
-                sortExpr = _.replace(this.orderby, /:/g, ' ');
-                columns = _.uniq(_.concat(columns, groupByFields, [this.aggregationcolumn]));
+                sortExpr = lodashEs.replace(this.orderby, /:/g, ' ');
+                columns = lodashEs.uniq(lodashEs.concat(columns, groupByFields, [this.aggregationcolumn]));
                 orderByColumns = getLodashOrderByFormat(this.orderby).columns;
                 // If the orderby column is chosen either in groupby or orderby then replace . with $ for that column
-                _.forEach(_.intersection(columns, orderByColumns), col => {
+                lodashEs.forEach(lodashEs.intersection(columns, orderByColumns), col => {
                     colAlias = getValidAliasName(col);
-                    sortExpr = _.replace(sortExpr, col, colAlias);
+                    // @ts-ignore
+                    sortExpr = lodashEs.replace(sortExpr, col, colAlias);
                 });
             }
             if (this.isAggregationEnabled()) {
@@ -1180,17 +1185,17 @@
                 // Transform the result into a format supported by the chart.
                 const chartData = [], aggregationAlias = getValidAliasName(this.aggregationcolumn), xAxisAliasKey = getValidAliasName(this.xaxisdatakey), yAxisAliasKeys = [];
                 yAxisKeys.forEach(yAxisKey => yAxisAliasKeys.push(getValidAliasName(yAxisKey)));
-                _.forEach(response.body.content, (responseContent) => {
+                lodashEs.forEach(response.body.content, (responseContent) => {
                     const obj = {};
                     // Set the response in the chartData based on 'aggregationColumn', 'xAxisDataKey' & 'yAxisDataKey'.
                     if (this.isAggregationEnabled()) {
                         obj[this.aggregationcolumn] = responseContent[aggregationAlias];
-                        obj[this.aggregationcolumn] = _.get(responseContent, aggregationAlias) || _.get(responseContent, this.aggregationcolumn);
+                        obj[this.aggregationcolumn] = lodashEs.get(responseContent, aggregationAlias) || lodashEs.get(responseContent, this.aggregationcolumn);
                     }
-                    obj[this.xaxisdatakey] = _.get(responseContent, xAxisAliasKey) || _.get(responseContent, this.xaxisdatakey);
+                    obj[this.xaxisdatakey] = lodashEs.get(responseContent, xAxisAliasKey) || lodashEs.get(responseContent, this.xaxisdatakey);
                     yAxisKeys.forEach((yAxisKey, index) => {
                         obj[yAxisKey] = responseContent[yAxisAliasKeys[index]];
-                        obj[yAxisKey] = _.get(responseContent, yAxisAliasKeys[index]) || _.get(responseContent, yAxisKey);
+                        obj[yAxisKey] = lodashEs.get(responseContent, yAxisAliasKeys[index]) || lodashEs.get(responseContent, yAxisKey);
                     });
                     chartData.push(obj);
                 });
@@ -1316,7 +1321,11 @@
                         break;
                 }
                 this.selecteditem = dataObj;
-                this.invokeEventCallback('select', { $event: d3.event, selectedChartItem: data, selectedItem: this.selecteditem });
+                this.invokeEventCallback('select', {
+                    $event: event,
+                    selectedChartItem: data,
+                    selectedItem: this.selecteditem
+                });
             });
         }
         /*  Returns Y Scale min value
@@ -1355,7 +1364,7 @@
                 }
             }
             // prepare text style props object and set
-            _.forEach(styleProps, (value, key) => {
+            lodashEs.forEach(styleProps, (value, key) => {
                 if (key === 'fontsize' || key === 'fontunit') {
                     styleObj[value] = this.fontsize + this.fontunit;
                 }
@@ -1400,7 +1409,7 @@
             }
             // get the chart object
             chart = initChart(this, xDomainValues, yDomainValues, null, !this.binddataset);
-            if (_.isArray(this._processedData)) {
+            if (lodashEs.isArray(this._processedData)) {
                 // WMS-19499:  To remove chart X-axis old ticks when chart data loaded dynamically.
                 const oldgTicks = $('#wmChart' + this.$id + ' svg').find('g.nv-x').find('g.tick');
                 if (oldgTicks && oldgTicks.length) {
@@ -1491,7 +1500,7 @@
             this.yaxisdatakey = defaultColumns[1] || null;
         }
         getCutomizedOptions(prop, fields) {
-            const groupByColumns = _.split(this.groupby, ','), aggColumns = _.split(this.aggregationcolumn, ',');
+            const groupByColumns = lodashEs.split(this.groupby, ','), aggColumns = lodashEs.split(this.aggregationcolumn, ',');
             if (!this.binddataset) {
                 return fields;
             }
@@ -1531,7 +1540,7 @@
                 case 'orderby':
                     // Set the 'aggregationColumn' to show all keys in case of aggregation function is count or to numeric keys in all other cases.
                     if (this.isLiveVariable && this.isAggregationEnabled()) {
-                        newOptions = _.uniq(_.concat(groupByColumns, aggColumns));
+                        newOptions = lodashEs.uniq(lodashEs.concat(groupByColumns, aggColumns));
                     }
                     break;
                 case 'bubblesize':
@@ -1549,12 +1558,12 @@
             this.numericColumns = [];
             this.nonPrimaryColumns = [];
             // Fetching all the columns
-            if (this.dataset && !_.isEmpty(propertiesMap)) {
+            if (this.dataset && !lodashEs.isEmpty(propertiesMap)) {
                 columns = []; // TODO: fetchPropertiesMapColumns(propertiesMap);
             }
             if (columns) {
                 // Iterating through all the columns and fetching the numeric and non primary key columns
-                _.forEach(Object.keys(columns), (key) => {
+                lodashEs.forEach(Object.keys(columns), (key) => {
                     type = columns[key].type;
                     if (i1.isNumberType(type)) {
                         this.numericColumns.push(key);
@@ -1577,9 +1586,9 @@
                 this.axisoptions = null;
             }
             // liveVariables contain data in 'data' property' of the variable
-            this.chartData = this.isLiveVariable ? newVal || '' : (newVal && newVal.dataValue === '' && _.keys(newVal).length === 1) ? '' : newVal;
+            this.chartData = this.isLiveVariable ? newVal || '' : (newVal && newVal.dataValue === '' && lodashEs.keys(newVal).length === 1) ? '' : newVal;
             // if the data returned is an object make it an array of object
-            if (!_.isArray(this.chartData) && _.isObject(this.chartData)) {
+            if (!lodashEs.isArray(this.chartData) && lodashEs.isObject(this.chartData)) {
                 this.chartData = [this.chartData];
             }
             if (newVal && newVal.filterFields) {
@@ -1649,7 +1658,7 @@
                     this._plotChartProxy();
                     break;
             }
-            if (_.includes(advanceDataProps, key)) {
+            if (lodashEs.includes(advanceDataProps, key)) {
                 this._plotChartProxy();
             }
         }
@@ -1688,7 +1697,7 @@
             this.chartData = [];
             this._processedData = [];
             this._subsciptions = [];
-            this._plotChartProxy = _.debounce(this.plotChartProxy.bind(this), 100);
+            this._plotChartProxy = lodashEs.debounce(this.plotChartProxy.bind(this), 100);
             this.redraw = this._plotChartProxy.bind(this);
             base.styler(this.nativeElement, this, base.APPLY_STYLES_TYPE.CONTAINER, ['fontsize', 'fontunit', 'color', 'fontfamily', 'fontweight', 'fontstyle', 'textdecoration']);
             // generate unique id for the component
@@ -1705,7 +1714,7 @@
         ngAfterViewInit() {
             super.ngAfterViewInit();
             // For old projects
-            if (!_.includes(['outside', 'inside', 'hide'], this.showlabels)) {
+            if (!lodashEs.includes(['outside', 'inside', 'hide'], this.showlabels)) {
                 this.showlabels = getBooleanValue(this.showlabels);
                 this.showlabelsoutside = getBooleanValue(this.showlabelsoutside);
                 this.showlabels = this.showlabels ? (this.showlabelsoutside ? 'outside' : 'inside') : 'hide';
@@ -1764,7 +1773,7 @@
                 type: i0.HostBinding,
                 args: ['class.panel']
             }] }); })();
-    (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassDebugInfo(ChartComponent, { className: "ChartComponent", filePath: "chart.component.ts", lineNumber: 122 }); })();
+    (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassDebugInfo(ChartComponent, { className: "ChartComponent", filePath: "chart.component.ts", lineNumber: 139 }); })();
 
     const components = [
         ChartComponent

app-ng-runtime/components/chart/chart.component.d.ts

@@ -84,7 +84,7 @@ export declare class ChartComponent extends StylableComponent implements AfterVi
     getCutomizedOptions(prop: any, fields: any): any;
     setNumericandNonPrimaryColumns(): void;
     handleDataSet(newVal: any): void;
-    _plotChartProxy: any;
+    _plotChartProxy: import("lodash").DebouncedFunc<any>;
     setDonutCenterLabel(labelValue: any): void;
     onPropertyChange(key: any, newVal: any, oldVal?: any): void;
     handleLoading(data: any): void;

app-ng-runtime/components/chart/chart.utils.d.ts

@@ -7,9 +7,9 @@ export declare const isBubbleChart: (type: any) => boolean;
 export declare const isColumnChart: (type: any) => boolean;
 export declare const isAreaChart: (type: any) => boolean;
 export declare const isPieType: (type: any) => boolean;
-export declare const isChartDataJSON: (type: any) => any;
-export declare const isChartDataArray: (type: any) => any;
-export declare const isLineTypeChart: (type: any) => any;
+export declare const isChartDataJSON: (type: any) => boolean;
+export declare const isChartDataArray: (type: any) => boolean;
+export declare const isLineTypeChart: (type: any) => boolean;
 export declare const isAxisDomainSupported: (type: any) => boolean;
 export declare const getBarSpacingValue: (value: any, prop: any) => any;
 export declare const getRadiusValue: (value: any, prop: any) => any;