dbgate-datalib 6.5.5 → 6.5.6

package/lib/chartDefinitions.d.ts

@@ -17,6 +17,7 @@ export declare const ChartLimits: {
     VALID_VALUE_RATIO_LIMIT: number;
     PIE_RATIO_LIMIT: number;
     PIE_COUNT_LIMIT: number;
+    MAX_PIE_COUNT_LIMIT: number;
     CHART_FILL_LIMIT: number;
     CHART_GROUP_LIMIT: number;
 };

package/lib/chartDefinitions.js

@@ -16,6 +16,7 @@ exports.ChartLimits = {
     VALID_VALUE_RATIO_LIMIT: 0.5,
     PIE_RATIO_LIMIT: 0.05,
     PIE_COUNT_LIMIT: 10,
+    MAX_PIE_COUNT_LIMIT: 50,
     CHART_FILL_LIMIT: 10000,
     CHART_GROUP_LIMIT: 32, // limit for number of groups in a chart
 };

package/lib/chartProcessor.js

@@ -261,7 +261,7 @@ class ChartProcessor {
         this.availableColumns = Object.values(this.availableColumnsDict);
         for (const chart of this.chartsProcessing) {
             if (chart.errorMessage) {
-                this.charts.push(chart);
+                this.charts.push(Object.assign(Object.assign({}, chart), { availableColumns: this.availableColumns }));
                 continue;
             }
             let addedChart = chart;
@@ -315,14 +315,17 @@ class ChartProcessor {
     }
     groupPieOtherBuckets(chart) {
         var _a, _b, _c;
-        if (chart.definition.chartType !== 'pie') {
+        if (chart.definition.chartType != 'pie' && chart.definition.chartType != 'polarArea') {
             return; // only for pie charts
         }
         const ratioLimit = (_a = chart.definition.pieRatioLimit) !== null && _a !== void 0 ? _a : chartDefinitions_1.ChartLimits.PIE_RATIO_LIMIT;
-        const countLimit = (_b = chart.definition.pieCountLimit) !== null && _b !== void 0 ? _b : chartDefinitions_1.ChartLimits.PIE_COUNT_LIMIT;
-        if (ratioLimit == 0 && countLimit == 0) {
-            return; // no grouping if limit is 0
+        let countLimit = (_b = chart.definition.pieCountLimit) !== null && _b !== void 0 ? _b : chartDefinitions_1.ChartLimits.PIE_COUNT_LIMIT;
+        if (!countLimit || countLimit < 1 || countLimit > chartDefinitions_1.ChartLimits.MAX_PIE_COUNT_LIMIT) {
+            countLimit = chartDefinitions_1.ChartLimits.MAX_PIE_COUNT_LIMIT; // limit to max pie count
         }
+        // if (ratioLimit == 0 && countLimit == 0) {
+        //   return; // no grouping if limit is 0
+        // }
         const otherBucket = {};
         let newBuckets = {};
         const cardSum = (0, sum_1.default)(Object.values(chart.buckets).map(bucket => (0, chartTools_1.computeChartBucketCardinality)(bucket)));

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.5.5",
+  "version": "6.5.6",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -15,14 +15,14 @@
   ],
   "dependencies": {
     "date-fns": "^4.1.0",
-    "dbgate-filterparser": "^6.5.5",
-    "dbgate-sqltree": "^6.5.5",
-    "dbgate-tools": "^6.5.5",
+    "dbgate-filterparser": "^6.5.6",
+    "dbgate-sqltree": "^6.5.6",
+    "dbgate-tools": "^6.5.6",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.5.5",
+    "dbgate-types": "^6.5.6",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.7",
     "typescript": "^4.4.3"