@quillsql/react 2.11.8 → 2.11.12

package/dist/esm/components/ReportBuilder/util.js

@@ -614,3 +614,49 @@ export const getDateFilterInfo = (node) => {
         intervalPaths,
     };
 };
+// NEED TO UPDATE FOR MORE POTENTIAL CASES
+function getNodeTable(node) {
+    if (node.table) {
+        return node.table;
+    }
+    if (node.args && node.args.value[0].table) {
+        return node.args.value[0].table;
+    }
+    return null;
+}
+// Recursively remove filters that don't apply to the given table
+function removeNonSelectedTableFilters(node, table) {
+    if (node.left.type !== 'binary_expr') {
+        const referencedTable = getNodeTable(node.left);
+        if (referencedTable && referencedTable !== table) {
+            return null;
+        }
+        else {
+            return node;
+        }
+    }
+    node.left = removeNonSelectedTableFilters(node.left, table);
+    node.right = removeNonSelectedTableFilters(node.right, table);
+    if (node.left && node.right) {
+        return node;
+    }
+    else if (node.left) {
+        return node.left;
+    }
+    else if (node.right) {
+        return node.right;
+    }
+    else {
+        return null;
+    }
+}
+export function removeNonSelectedTableReferences(ast, table) {
+    ast.columns = ast.columns.filter((col) => {
+        return col.table === table || col.expr.table === table || !col.expr.table;
+    });
+    if (!ast.where)
+        return ast;
+    ast.where = removeNonSelectedTableFilters(ast.where, table);
+    console.log(ast);
+    return ast;
+}

package/dist/esm/components/UiComponents.d.ts

@@ -14,6 +14,7 @@ export interface SelectComponentProps {
 export interface ButtonComponentProps {
     onClick: () => void;
     label: string;
+    isLoading?: boolean | undefined;
     primary?: boolean;
     width?: string;
 }
@@ -67,10 +68,11 @@ export declare const MemoizedTextInput: ({ value, onChange, placeholder, id }: {
     placeholder: any;
     id: any;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const MemoizedButton: ({ label, onClick, primary }: {
+export declare const MemoizedButton: ({ label, onClick, primary, isLoading, }: {
     label: any;
     onClick: any;
     primary?: boolean | undefined;
+    isLoading?: boolean | undefined;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const MemoizedSecondaryButton: ({ label, onClick }: {
     label: any;

package/dist/esm/components/UiComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UiComponents.d.ts","sourceRoot":"","sources":["../../../src/components/UiComponents.tsx"],"names":[],"mappings":"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"}

package/dist/esm/components/UiComponents.js

@@ -27,7 +27,7 @@ export const MemoizedTextInput = ({ value, onChange, placeholder, id }) => {
     .quill-text-input {
         background-color: white;
         height: 40px;
-       width: 180px;
+       width: 100%;
        color: #384151;
        border: 1px solid #e7e7e7;
        border-radius: 6px;
@@ -37,10 +37,10 @@ export const MemoizedTextInput = ({ value, onChange, placeholder, id }) => {
        padding-right: 12px;
        padding-top: 0px;
        padding-bottom: 0px;
-       box-sizing: content-box;
+       box-sizing: border-box;
     }` }), _jsx("input", { id: id, className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder, style: { fontFamily: theme?.fontFamily } })] }));
 };
-export const MemoizedButton = ({ label, onClick, primary = true }) => {
+export const MemoizedButton = ({ label, onClick, primary = true, isLoading = false, }) => {
     const [theme] = useContext(ThemeContext);
     return (_jsxs("button", { className: "quill-button", onClick: onClick, style: { fontFamily: theme?.fontFamily }, children: [_jsx("style", { children: `
     .quill-button {
@@ -60,7 +60,7 @@ export const MemoizedButton = ({ label, onClick, primary = true }) => {
     .quill-button:hover {
       background-color: rgba(56, 65, 81, 0.9);
       border-radius: 6px;
-    }` }), label] }));
+    }` }), isLoading ? (_jsx("div", { style: { padding: '0px 16px' }, children: _jsx(LoadingSpinner, {}) })) : (label)] }));
 };
 export const MemoizedSecondaryButton = ({ label, onClick }) => {
     const [theme] = useContext(ThemeContext);

package/dist/esm/hooks/useQuill.js

@@ -40,7 +40,7 @@ export const useQuill = (chartId) => {
                     };
                     const resp = await getData(client, 'itempost', 'same-origin', hostedBody, cloudBody);
                     if (resp) {
-                        if (resp.name === 'error') {
+                        if (resp.name === 'error' || resp.errorMessage) {
                             setError(JSON.stringify(resp));
                         }
                         else {

package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AA+BA,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAkBD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6CAwwBtB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA,EAAE,MAAM,KAAA,OAyB1D;AAkHD,wBAAgB,WAAW,CAAC,SAAS,KAAA,WAYpC;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,GAAG,EACd,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE,GAAU;;;;;;EA2YtB"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AA+BA,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAkBD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6CAotBtB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA,EAAE,MAAM,KAAA,OAyB1D;AAkHD,wBAAgB,WAAW,CAAC,SAAS,KAAA,WAYpC;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,GAAG,EACd,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE,GAAU;;;;;;EA6atB"}

package/dist/esm/internals/ReportBuilder/PivotModal.js

@@ -129,6 +129,9 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         onEditPivot(pivot, null);
     };
     const refreshPivots = useCallback(async () => {
+        if (!showTrigger) {
+            return;
+        }
         if (isLoading || Object.keys(columnsToShow).length === 0) {
             return;
         }
@@ -147,50 +150,6 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         try {
             const resp = await getDataFromCloud(client, 'pivotai', cloudBody);
             const recommendedPivots = resp?.data?.pivotTables.slice(0, recommendPivotCount) || [];
-            // for testing if needed
-            // const recommendedPivots = [
-            //   {
-            //     title: 'Total Amount by Merchant',
-            //     rowField: 'merchant',
-            //     valueField: 'amount',
-            //     aggregationType: 'sum',
-            //   },
-            //   {
-            //     title: 'Average Amount by User and Category',
-            //     rowField: 'user_name',
-            //     columnField: 'category',
-            //     valueField: 'amount',
-            //     aggregationType: 'average',
-            //   },
-            //   {
-            //     title: 'Count of Transactions by User and Merchant',
-            //     rowField: 'user_name',
-            //     columnField: 'merchant',
-            //     valueField: 'id',
-            //     aggregationType: 'count',
-            //   },
-            //   {
-            //     title: 'Total Amount by Merchant and Category',
-            //     rowField: 'merchant',
-            //     columnField: 'category',
-            //     valueField: 'amount',
-            //     aggregationType: 'sum',
-            //   },
-            //   {
-            //     title: 'Average Amount by Category and Date',
-            //     rowField: 'category',
-            //     columnField: 'created_at',
-            //     valueField: 'amount',
-            //     aggregationType: 'average',
-            //   },
-            //   {
-            //     title: 'Count of Transactions by Date and Category',
-            //     rowField: 'created_at',
-            //     columnField: 'category',
-            //     valueField: 'id',
-            //     aggregationType: 'count',
-            //   },
-            // ];
             setRecommendedPivots(recommendedPivots
                 .filter((pivot) => pivot.rowField != '')
                 .map((pivot) => {
@@ -207,7 +166,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             console.error('Failed parsing pivotai response', e);
         }
         setIsLoading(false);
-    }, [selectedTable, data, columnsToShow, isLoading]);
+    }, [selectedTable, data, columnsToShow, isLoading, showTrigger]);
     useEffect(() => {
         if (recommendedPivots.length === 0) {
             refreshPivots();
@@ -299,7 +258,6 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                             }, children: [_jsxs("div", { children: [_jsx(LabelComponent, { children: "Row Field" }), _jsx(SelectComponent, { id: "pivot-row-field", value: pivotRowField, onChange: (e) => {
                                                                 setPivotRowField(e === '' ? undefined : e);
                                                             }, options: [
-                                                                { label: 'Select', value: '' },
                                                                 ...columnSelectOptions.filter((option) => {
                                                                     const format = columns.find((col) => col.field === option.value)?.format;
                                                                     return (format === 'string' ||
@@ -308,7 +266,6 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                             ], theme: theme })] }), _jsxs("div", { children: [_jsx(LabelComponent, { children: "Column Field" }), _jsx(SelectComponent, { id: "pivot-row-field", value: pivotColumnField, onChange: (e) => {
                                                                 setPivotColumnField(e === '' ? undefined : e);
                                                             }, options: [
-                                                                { label: 'Select', value: '' },
                                                                 ...columnSelectOptions.filter((option) => {
                                                                     return (columns.find((col) => col.field === option.value)
                                                                         ?.format === 'string');
@@ -320,18 +277,12 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                 marginBottom: 20,
                                             }, children: [_jsxs("div", { children: [_jsx(LabelComponent, { children: "Value Field" }), _jsx(SelectComponent, { id: "pivot-row-field", value: pivotValueField, onChange: (e) => {
                                                                 setPivotValueField(e === '' ? undefined : e);
-                                                            }, options: pivotAggregation === 'count'
-                                                                ? [
-                                                                    { label: 'Select', value: '' },
-                                                                    ...columnSelectOptions,
-                                                                ]
-                                                                : [
-                                                                    { label: 'Select', value: '' },
-                                                                    ...columnSelectOptions.filter((option) => {
-                                                                        return (option.value === '' ||
-                                                                            numberFormatOptions.includes(columns.find((col) => col.field === option.value)?.format));
-                                                                    }),
-                                                                ], theme: theme })] }), _jsxs("div", { children: [_jsx(LabelComponent, { children: "Aggregation Type" }), _jsx(SelectComponent, { id: "pivot-row-field", value: pivotAggregation, theme: theme, onChange: (e) => {
+                                                            }, options: [
+                                                                ...columnSelectOptions.filter((option) => {
+                                                                    return (option.value === '' ||
+                                                                        numberFormatOptions.includes(columns.find((col) => col.field === option.value)?.format));
+                                                                }),
+                                                            ], theme: theme })] }), _jsxs("div", { children: [_jsx(LabelComponent, { children: "Aggregation Type" }), _jsx(SelectComponent, { id: "pivot-row-field", value: pivotAggregation, theme: theme, onChange: (e) => {
                                                                 if (e !== 'count' &&
                                                                     pivotValueField &&
                                                                     !numberFormatOptions.includes(columns.find((col) => col.field === pivotValueField)?.format)) {
@@ -339,8 +290,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                                 }
                                                                 setPivotAggregation(e === '' ? undefined : e);
                                                             }, options: [
-                                                                { label: 'Select', value: '' },
-                                                                ...['sum', 'average', 'count'].map((option) => {
+                                                                ...['sum', 'average', 'count', 'max', 'min'].map((option) => {
                                                                     return { label: option, value: option };
                                                                 }),
                                                             ] })] })] })] }), _jsx("div", { children: _jsx(ButtonComponent, { id: "custom-button", onClick: () => {
@@ -575,7 +525,7 @@ const handleBigQueryValue = (value) => {
     return value;
 };
 // Process out all the BigQuery dates.
-const fixBigQueryData = (data) => {
+const fixBigQueryData = (data = []) => {
     const newData = [];
     for (const row of data) {
         const newRow = {};
@@ -587,6 +537,10 @@ const fixBigQueryData = (data) => {
     return newData;
 };
 export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = null) {
+    // If there is no rowField, aggregate on the valueField
+    if (!pivot.rowField) {
+        return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType);
+    }
     // Handle edge-case for BigQuery objects.
     data = fixBigQueryData(data);
     if (dateRange[0] === null && dateRange[1] === null) {
@@ -814,6 +768,18 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
                             : 0;
                     }
                     break;
+                case 'max':
+                    value = filteredData.reduce((max, item) => Math.max(max, parseFloat(item[key] ?? 0)), -Infinity);
+                    if (isComparison) {
+                        comparisonValue = comparisonFilteredData.reduce((max, item) => Math.max(max, parseFloat(item[key] ?? 0)), -Infinity);
+                    }
+                    break;
+                case 'min':
+                    value = filteredData.reduce((min, item) => Math.min(min, parseFloat(item[key] ?? 0)), Infinity);
+                    if (isComparison) {
+                        comparisonValue = comparisonFilteredData.reduce((min, item) => Math.min(min, parseFloat(item[key] ?? 0)), Infinity);
+                    }
+                    break;
                 // Implement other aggregation types as needed
                 default:
                     throw new Error('Unsupported aggregation type');
@@ -892,12 +858,49 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
     if (pivot.sort) {
         pivotRows.sort((a, b) => {
             if (pivot.sortDirection === 'ASC') {
+                if (pivot.rowFieldType === 'date') {
+                    return new Date(a[pivot.rowField]) - new Date(b[pivot.rowField]);
+                }
                 return a[pivot.rowField].localeCompare(b[pivot.rowField]);
             }
             else {
+                if (pivot.rowFieldType === 'date') {
+                    return new Date(b[pivot.rowField]) - new Date(a[pivot.rowField]);
+                }
                 return b[pivot.rowField].localeCompare(a[pivot.rowField]);
             }
         });
     }
     return { rows: pivotRows, columns };
 }
+function valueFieldAggregation(data, valueField, aggregationType) {
+    let value;
+    switch (aggregationType) {
+        case 'sum':
+            value = data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0);
+            break;
+        case 'count':
+            value = filteredData.length;
+            break;
+        case 'average':
+            value = filteredData.length
+                ? filteredData.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0) / filteredData.length
+                : 0;
+            break;
+        case 'max':
+            value = data.reduce((max, item) => Math.max(max, parseFloat(item[valueField] ?? 0)), -Infinity);
+            break;
+        case 'min':
+            value = data.reduce((min, item) => Math.min(min, parseFloat(item[valueField] ?? 0)), Infinity);
+            break;
+        // Implement other aggregation types as needed
+        default:
+            throw new Error('Unsupported aggregation type');
+    }
+    const row = {};
+    row[valueField] = value;
+    return {
+        rows: [row],
+        columns: [{ label: snakeCaseToTitleCase(valueField), field: valueField }],
+    };
+}

package/dist/esm/utils/axisFormatter.js

@@ -49,51 +49,83 @@ const formatString = (value) => {
     }
     return value.toString();
 };
+// Formats large numbers like 12345.67 ->  $12K
+const formatterBigDollars = new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    currency: 'USD',
+    minimumSignificantDigits: 1,
+    maximumSignificantDigits: 2,
+    notation: 'compact',
+    compactDisplay: 'short',
+});
+// Formats to dollars like 1234.56 -> $1235
+const formatterDollar = new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    currency: 'USD',
+    maximumFractionDigits: 0,
+});
+// Formats to dollars like 1234.567 -> $1234.57
+const formatterDollarsCents = new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    currency: 'USD',
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+});
 /**
- * Formats the value as a (rounded) currency amount in dollars.
+ * Formats the value as a (rounded) currency amount in dollars.  If value is
+ * zero, returns '$0' with no cents. If value is greater than or equal to 1000,
+ * it will not show cents and shorten the value with a suffix such as K
+ * (for thousands) or M (for millions).
  *
- * eg. @example format(1234.567) => "$1.2K"
+ * @example format(1,234,567) => "$1.2M"
+ * @example format(1234.567) => "$1.2K"
+ * @example format(5000) => "$5K"
+ * @example format(123.45) => "$123"
+ * @example format(0.00) => "$0"
  */
 const formatDollarAmount = (value) => {
-    const formatter = new Intl.NumberFormat('en-US', {
-        style: 'currency',
-        currency: 'USD',
-        minimumSignificantDigits: 2,
-        maximumSignificantDigits: 2,
-        notation: 'compact',
-        compactDisplay: 'short',
-    });
-    return formatter.format(Number(value ?? 0));
+    const num = Number(value ?? 0);
+    if (num >= 1000 || num === 0) {
+        return formatterBigDollars.format(num);
+    }
+    else {
+        return formatterDollar.format(num);
+    }
 };
 /**
- * Formats the value as a (rounded) currency amount in dollars and cents.
+ * Formats the value as a (rounded) currency amount in dollars and cents. If
+ * value is zero, returns '$0' with no cents. If value is greater than or equal
+ * to 1000, it will not show cents and shorten the value with a suffix such
+ * as K (for thousands) or M (for millions).
  *
+ * @example format(1,234,567) => "$1.2M"
  * @example format(1234.567) => "$1.2K"
+ * @example format(5000) => "$5K"
+ * @example format(123.45) => "$123.45"
+ * @example format(0.00) => "$0"
  */
 const formatDollarCents = (value) => {
-    const formatter = new Intl.NumberFormat('en-US', {
-        style: 'currency',
-        currency: 'USD',
-        minimumSignificantDigits: 2,
-        maximumSignificantDigits: 2,
-        notation: 'compact',
-        compactDisplay: 'short',
-    });
-    return formatter.format(Number(value ?? 0));
+    const num = Number(value ?? 0);
+    if (num >= 1000 || num === 0) {
+        return formatterBigDollars.format(num);
+    }
+    else {
+        return formatterDollarsCents.format(num);
+    }
 };
+const formatterBigWholeNumber = new Intl.NumberFormat('en-US', {
+    minimumSignificantDigits: 1,
+    maximumSignificantDigits: 2,
+    notation: 'compact',
+    compactDisplay: 'short',
+});
 /**
  * Formats the value as a (rounded) integer.
  *
  * @example format(1234.567) => "1.2K"
  */
 const formatWholeNumber = (value) => {
-    const formatter = new Intl.NumberFormat('en-US', {
-        minimumSignificantDigits: 2,
-        maximumSignificantDigits: 2,
-        notation: 'compact',
-        compactDisplay: 'short',
-    });
-    return formatter.format(Number(value));
+    return formatterBigWholeNumber.format(Number(value));
 };
 /**
  * Formats the value as a number rounded to exactly one decimal place.
@@ -108,7 +140,13 @@ const formatOneDecimalPlace = (value) => {
         notation: 'compact',
         compactDisplay: 'short',
     });
-    return formatter.format(Number(value));
+    const num = Number(value ?? 0);
+    if (num >= 1000 || num === 0) {
+        return formatterBigWholeNumber.format(num);
+    }
+    else {
+        return formatter.format(num);
+    }
 };
 /**
  * Formats the value as a number rounded to exactly two decimal places.
@@ -123,7 +161,13 @@ const formatTwoDecimalPlaces = (value) => {
         notation: 'compact',
         compactDisplay: 'short',
     });
-    return formatter.format(Number(value));
+    const num = Number(value ?? 0);
+    if (num >= 1000 || num === 0) {
+        return formatterBigWholeNumber.format(num);
+    }
+    else {
+        return formatter.format(num);
+    }
 };
 /**
  * Formats the value as a percentage.

package/dist/esm/utils/dataFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA8ChB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA+BhB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA8DhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA+BhB"}

package/dist/esm/utils/dataFetcher.js

@@ -32,6 +32,16 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
                     compareRows: responseJson?.queries?.queryResults[1]?.rows,
                 };
             }
+            if (responseJson.data.columns &&
+                responseJson.data.fields &&
+                responseJson.data.columns.length != responseJson.data.fields) {
+                // Remove all columns that don't appear in fields, overtime this should never be the case
+                const columns = responseJson.data.columns.filter((columns) => responseJson.data.fields.find((field) => field.name === columns.field));
+                result = {
+                    ...result,
+                    columns,
+                };
+            }
             return result;
         }
         else {

package/dist/esm/utils/getDomain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CA8BtE"}
+{"version":3,"file":"getDomain.d.ts","sourceRoot":"","sources":["../../../src/utils/getDomain.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CA0BtE"}

package/dist/esm/utils/getDomain.js

@@ -21,8 +21,26 @@ export default function getDomain(data, fields) {
         });
     });
     const [minValue, maxValue] = numericValues.reduce(([min, max], value) => [Math.min(min, value), Math.max(max, value)], [Infinity, -Infinity]);
-    const adjustedMin = Math.min(minValue, 0);
-    const padding = Math.round(0.2 * (maxValue - minValue));
-    const adjustedMax = maxValue + padding;
-    return [adjustedMin, adjustedMax];
+    return fuzzyRound(Math.min(minValue, 0), maxValue);
+}
+// Rounds the range to 4 equally-spaced increments of nice,round numbers.
+function fuzzyRound(min, max) {
+    const range = parseFloat((max - min).toPrecision(1));
+    const increment = Math.ceil(range / 4);
+    let newMin = min;
+    // if (min % increment !== 0) {
+    //   newMin = min - (min % increment);
+    // }
+    if (Number.isNaN(newMin)) {
+        newMin = 0;
+    }
+    let newMax = min + increment * 4;
+    if (max % increment !== 0) {
+        const adjMax = max + (increment - (max % increment));
+        newMax = parseFloat(adjMax.toPrecision(2));
+    }
+    if (Number.isNaN(newMax)) {
+        newMax = 0;
+    }
+    return [newMin ?? 0, newMax ?? 0];
 }

package/dist/esm/utils/valueFormatter.d.ts

@@ -1,8 +1,9 @@
+import { type AxisFormat } from '../Dashboard';
 type Field = {
     _id: string;
     label: string;
     field: string;
-    format: 'percent';
+    format: AxisFormat;
 };
 type Props = {
     value: any;

package/dist/esm/utils/valueFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MAwChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAoCH,CAAC;AAmJF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MA2BF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MAwChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAoCH,CAAC;AAmJF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MA2BF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.11.8",
+  "version": "2.11.12",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",