autoql-fe-utils 1.0.69 → 1.0.71

package/dist/index.d.ts

@@ -1484,7 +1484,7 @@ declare const getBinLinearScale: ({ columns, columnIndex, axis, buckets, bins, e
     dataFormatting: DataFormatting;
     changeNumberColumnIndices: Function;
 }) => any;
-declare const getHistogramScale: ({ axis, buckets, columnIndex, height, width, minValue, maxValue, tickValues, numTicks, stacked, isScaled, columns, columnIndices, dataFormatting, changeNumberColumnIndices, enableAxisDropdown, aggregated, }: {
+declare const getHistogramScale: ({ axis, buckets, columnIndex, height, width, minValue, maxValue, tickValues, numTicks, stacked, isScaled, columns, originalColumns, columnIndices, dataFormatting, changeNumberColumnIndices, enableAxisDropdown, aggregated, }: {
     buckets: any[];
     minValue: number;
     maxValue: number;
@@ -1496,6 +1496,7 @@ declare const getHistogramScale: ({ axis, buckets, columnIndex, height, width, m
     stacked: boolean;
     isScaled: boolean;
     columns: Column[];
+    originalColumns?: Column[];
     units: string;
     title: string;
     columnIndex: number;
@@ -1510,9 +1511,10 @@ declare const getHistogramScale: ({ axis, buckets, columnIndex, height, width, m
     width: number;
     aggregated: boolean;
 }) => any;
-declare const getLinearScale: ({ minValue, maxValue, axis, range, domain, tickValues, numTicks, stacked, isScaled, columns, units, title, columnIndex, columnIndices, hasDropdown, allowMultipleSeries, disableAutoScale, dataFormatting, changeNumberColumnIndices, changeColumnIndices, changeAggConfig, enableAxisDropdown, height, width, aggregated, colorScale, adjustRange, }: {
+declare const getLinearScale: ({ minValue, maxValue, axis, range, domain, tickValues, numTicks, stacked, isScaled, columns, units, title, columnIndex, columnIndices, hasDropdown, allowMultipleSeries, disableAutoScale, dataFormatting, changeNumberColumnIndices, changeColumnIndices, changeAggConfig, enableAxisDropdown, height, width, aggregated, colorScale, adjustRange, originalColumns, }: {
     axis: string;
     columns: Column[];
+    originalColumns?: Column[];
     columnIndex: number;
     columnIndices: number[];
     height: number;
@@ -1539,7 +1541,7 @@ declare const getLinearScale: ({ minValue, maxValue, axis, range, domain, tickVa
     colorScale?: any;
     adjustRange?: boolean;
 }) => any;
-declare const getLinearScales: ({ data, columnIndices1, columnIndices2, axis, stacked, isScaled, columns, hasDropdown, allowMultipleSeries, disableAutoScale, dataFormatting, changeNumberColumnIndices, changeAggConfig, enableAxisDropdown, stringColumnIndex, height, width, aggregated, colorScales, }: {
+declare const getLinearScales: ({ data, columnIndices1, columnIndices2, axis, stacked, isScaled, columns, originalColumns, hasDropdown, allowMultipleSeries, disableAutoScale, dataFormatting, changeNumberColumnIndices, changeAggConfig, enableAxisDropdown, stringColumnIndex, height, width, aggregated, colorScales, }: {
     data: Rows;
     columnIndices1: number[];
     columnIndices2: number[];
@@ -1547,6 +1549,7 @@ declare const getLinearScales: ({ data, columnIndices1, columnIndices2, axis, st
     stacked: boolean;
     isScaled: boolean;
     columns: Column[];
+    originalColumns?: Column[];
     hasDropdown: boolean;
     allowMultipleSeries: boolean;
     disableAutoScale: boolean;

package/dist/index.global.js

@@ -14732,14 +14732,13 @@
       return false;
     }
     const groupbyColumns = getGroupableColumns(columns);
-    const hasTwoGroupables = (groupbyColumns == null ? void 0 : groupbyColumns.length) === 2;
+    const hasTwoGroupables = (groupbyColumns == null ? void 0 : groupbyColumns.length) >= 2;
     if (!hasTwoGroupables) {
       return false;
     }
     const visibleColumns = getVisibleColumns(columns);
-    const groupbyColumn1 = columns[groupbyColumns[0]];
-    const groupbyColumn2 = columns[groupbyColumns[1]];
-    if (!groupbyColumn1.is_visible || !groupbyColumn2.is_visible || !((visibleColumns == null ? void 0 : visibleColumns.length) >= 3)) {
+    const visibleGroupbyColumns = groupbyColumns.filter((index) => columns[index].is_visible);
+    if ((visibleGroupbyColumns == null ? void 0 : visibleGroupbyColumns.length) < 2 || (visibleColumns == null ? void 0 : visibleColumns.length) < 3) {
       return false;
     }
     return true;
@@ -22943,6 +22942,7 @@
     stacked,
     isScaled,
     columns,
+    originalColumns,
     columnIndices,
     dataFormatting,
     changeNumberColumnIndices,
@@ -22984,7 +22984,8 @@
       height,
       width,
       aggregated,
-      adjustRange: false
+      adjustRange: false,
+      originalColumns
     });
   };
   var getLinearScale = ({
@@ -23014,9 +23015,10 @@
     width,
     aggregated = false,
     colorScale,
-    adjustRange = true
+    adjustRange = true,
+    originalColumns
   }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     let domainFinal = domain;
     if (!domain) {
       let min2 = (_a = minValue != null ? minValue : tickValues == null ? void 0 : tickValues[0]) != null ? _a : 0;
@@ -23046,7 +23048,7 @@
     scale.columnIndex = columnIndex;
     scale.column = columns == null ? void 0 : columns[columnIndex];
     scale.fields = axisColumns;
-    scale.allFields = (_d = getNumberColumnIndices(columns)) == null ? void 0 : _d.allNumberColumnIndices;
+    scale.allFields = aggregated ? (_d = getNumberColumnIndices(originalColumns)) == null ? void 0 : _d.allNumberColumnIndices : (_e = getNumberColumnIndices(columns)) == null ? void 0 : _e.allNumberColumnIndices;
     scale.dataFormatting = config;
     scale.hasDropdown = hasDropdown != null ? hasDropdown : enableAxisDropdown;
     scale.stacked = !!stacked;
@@ -23081,6 +23083,7 @@
     stacked,
     isScaled,
     columns,
+    originalColumns,
     hasDropdown,
     allowMultipleSeries,
     disableAutoScale,
@@ -23109,7 +23112,8 @@
       height,
       width,
       aggregated,
-      changeAggConfig
+      changeAggConfig,
+      originalColumns
     };
     const minMax = getMinAndMaxValues(data, columnIndices1, isScaled, stacked, stringColumnIndex);
     const minValue = minMax.minValue;