@quillsql/react 2.12.27 → 2.12.29

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

@@ -12,7 +12,9 @@ import { isNumericColumnType, } from '../../components/ReportBuilder/ast';
 import { QuillCard } from '../../components/QuillCard';
 import { cleanPivot, getPossiblePivotFieldOptions, isValidPivot, } from '../../utils/pivotProcessing';
 import { hashCode } from '../../utils/crypto';
-import { getUniqueValuesByColumns } from '../../utils/tableProcessing';
+import { getCountsByColumns, getDateRangeByColumns, getUniqueValuesByColumns, } from '../../utils/tableProcessing';
+import { generatePivotWithSQL } from '../../utils/pivotConstructor';
+import { getDateBucketFromRange, } from '../../utils/dates';
 const QuillHover = () => {
     return (_jsx("style", { children: `
   .quill-hover {
@@ -26,7 +28,7 @@ const QuillHover = () => {
   }
 ` }));
 };
-export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent = QuillErrorMessageComponent, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, CardComponent = QuillCard, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText = 'Pivot', showPivotEditButton = false, showEditOnPivotClick = true, selectPivotOnEdit = false, showTrigger = true, rightAlign = false, parentRef, pivotCountRequest = 6, query, initialUniqueValues, initialSelectedPivotTable, disabled = false, pivotRecommendationsEnabled = true, }) => {
+export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent = QuillErrorMessageComponent, PivotRowContainer = QuillPivotRowContainer, PivotColumnContainer = QuillPivotColumnContainer, LoadingComponent = QuillLoadingComponent, CardComponent = QuillCard, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText = 'Pivot', showPivotEditButton = false, showEditOnPivotClick = true, selectPivotOnEdit = false, showTrigger = true, rightAlign = false, parentRef, pivotCountRequest = 6, query, initialUniqueValues, initialSelectedPivotTable, disabled = false, pivotRecommendationsEnabled = true, report, }) => {
     const [isLoading, setIsLoading] = useState(false);
     const [selectedPivotType, setSelectedPivotType] = useState('recommended');
     const [errors, setErrors] = useState([]);
@@ -41,6 +43,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
     const [allowedRowFields, setAllowedRowFields] = useState([]);
     const [allowedValueFields, setAllowedValueFields] = useState([]);
     const [uniqueValues, setUniqueValues] = useState(initialUniqueValues);
+    const [dateRanges, setDateRanges] = useState({});
     const getDistinctValues = async () => {
         if (columns) {
             const stringColumns = columns.filter((column) => {
@@ -51,9 +54,10 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 setAllowedRowFields(possibleColumns.rowFields);
                 setAllowedColumnFields(possibleColumns.columnFields);
                 setAllowedValueFields(possibleColumns.valueFields);
-                return possibleColumns;
+                return { possibleColumns, uniqueValues: {} };
             }
-            const newUniqueValues = await getUniqueValuesByColumns(stringColumns, query || '', data.rows || [], client, customFields);
+            const smallStringColumns = await getCountsByColumns(stringColumns, query || '', client, customFields);
+            const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, query || '', data.rows || [], client, customFields);
             if (!uniqueValues ||
                 hashCode(uniqueValues) !== hashCode(newUniqueValues)) {
                 const possibleColumns = getPossiblePivotFieldOptions(columns, newUniqueValues || {});
@@ -61,10 +65,26 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                 setAllowedColumnFields(possibleColumns.columnFields);
                 setAllowedValueFields(possibleColumns.valueFields);
                 setUniqueValues(newUniqueValues);
-                return possibleColumns;
+                return { possibleColumns, uniqueValues: newUniqueValues };
             }
         }
-        return { rowFields: [], columnFields: [], valueFields: [] };
+        return {
+            possibleColumns: { rowFields: [], columnFields: [], valueFields: [] },
+            uniqueValues: {},
+        };
+    };
+    const getAllDateRangesByColumn = async () => {
+        // Don't reprocess dateRanges if they are already gathered
+        if (columns) {
+            const dateColumns = columns.filter((column) => {
+                return column.jsType === 'date';
+            });
+            if (dateColumns.length === 0) {
+                return [];
+            }
+            const dateRangeByColumn = await getDateRangeByColumns(dateColumns, query || '', client, customFields);
+            setDateRanges(dateRangeByColumn || {});
+        }
     };
     useEffect(() => {
         const calculatePivotCardSize = () => {
@@ -91,76 +111,62 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         }
     }, [showUpdatePivot, isOpen]);
     useEffect(() => {
-        if (pivotRowField && data && columns) {
-            const pivot = {
-                rowField: pivotRowField || '',
-                rowFieldType: columnsToShow[pivotRowField || ''],
-                columnField: pivotColumnField,
-                columnFieldType: columnsToShow[pivotColumnField || ''],
-                valueField: pivotValueField || '',
-                aggregationType: pivotAggregation || '',
-            };
-            const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
-            setSamplePivotTable({ pivot: pivot, rows, columns });
-        }
-        if ((pivotRowField && data && columns) || initialSelectedPivotTable) {
-            getDistinctValues();
-        }
-        if (initialUniqueValues) {
-            const possibleColumns = getPossiblePivotFieldOptions(columns, initialUniqueValues);
-            setAllowedRowFields(possibleColumns.rowFields);
-            setAllowedColumnFields(possibleColumns.columnFields);
-            setAllowedValueFields(possibleColumns.valueFields);
-            setUniqueValues(initialUniqueValues);
-        }
-        if (pivotRowField && data && columns) {
-            const pivot = {
-                rowField: pivotRowField || '',
-                rowFieldType: columnsToShow[pivotRowField || ''],
-                columnField: pivotColumnField,
-                columnFieldType: columnsToShow[pivotColumnField || ''],
-                valueField: pivotValueField || '',
-                aggregationType: pivotAggregation || '',
-            };
-            if (initialSelectedPivotTable) {
-                setSamplePivotTable({
-                    pivot: pivot,
-                    rows: initialSelectedPivotTable.rows,
-                    columns: initialSelectedPivotTable.columns,
-                });
-            }
-            else {
-                const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
+        const fetchPivotData = async () => {
+            if (pivotRowField && data && columns) {
+                const pivot = {
+                    rowField: pivotRowField || '',
+                    rowFieldType: columnsToShow[pivotRowField || ''],
+                    columnField: pivotColumnField,
+                    columnFieldType: columnsToShow[pivotColumnField || ''],
+                    valueField: pivotValueField || '',
+                    aggregationType: pivotAggregation || '',
+                };
+                const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, undefined, report, client, uniqueValues);
                 setSamplePivotTable({ pivot: pivot, rows, columns });
             }
-        }
+            if ((pivotRowField && data && columns) || initialSelectedPivotTable) {
+                getDistinctValues();
+            }
+            if (initialUniqueValues) {
+                const possibleColumns = getPossiblePivotFieldOptions(columns, initialUniqueValues);
+                setAllowedRowFields(possibleColumns.rowFields);
+                setAllowedColumnFields(possibleColumns.columnFields);
+                setAllowedValueFields(possibleColumns.valueFields);
+                setUniqueValues(initialUniqueValues);
+            }
+            if (pivotRowField && data && columns) {
+                const pivot = {
+                    rowField: pivotRowField || '',
+                    rowFieldType: columnsToShow[pivotRowField || ''],
+                    columnField: pivotColumnField,
+                    columnFieldType: columnsToShow[pivotColumnField || ''],
+                    valueField: pivotValueField || '',
+                    aggregationType: pivotAggregation || '',
+                };
+                if (initialSelectedPivotTable) {
+                    setSamplePivotTable({
+                        pivot: pivot,
+                        rows: initialSelectedPivotTable.rows,
+                        columns: initialSelectedPivotTable.columns,
+                    });
+                }
+                else {
+                    const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, undefined, report, client, uniqueValues);
+                    setSamplePivotTable({ pivot: pivot, rows, columns });
+                }
+            }
+        };
+        fetchPivotData();
     }, []);
     useEffect(() => {
-        if ((pivotRowField && data && columns) || initialSelectedPivotTable) {
+        if (pivotRowField && data && columns) {
             getDistinctValues();
+            getAllDateRangesByColumn();
         }
-    }, [initialSelectedPivotTable, columns, data, pivotRowField]);
-    useEffect(() => {
-        const pivot = {
-            rowField: pivotRowField || '',
-            rowFieldType: columnsToShow[pivotRowField || ''],
-            columnField: pivotColumnField,
-            columnFieldType: columnsToShow[pivotColumnField || ''],
-            valueField: pivotValueField || '',
-            aggregationType: pivotAggregation || '',
-        };
-        if (isValidPivot(pivot) && data && columns) {
-            const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
-            setSamplePivotTable({ pivot: pivot, rows, columns });
+        else if (initialSelectedPivotTable) {
+            getDistinctValues();
         }
-    }, [
-        data,
-        columns,
-        pivotRowField,
-        pivotColumnField,
-        pivotValueField,
-        pivotAggregation,
-    ]);
+    }, [initialSelectedPivotTable, columns, data, pivotRowField]);
     useEffect(() => {
         if (!initialUniqueValues) {
             return;
@@ -181,21 +187,25 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             return map;
         }, {});
     }, [columns]);
-    const selectedPivotTable = useMemo(() => {
-        if (selectedPivotIndex === -1) {
-            return null;
-        }
-        const pivot = createdPivots[selectedPivotIndex];
-        const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
-        return {
-            pivot: pivot,
-            rows: rows,
-            columns: columns,
+    const [selectedPivotTable, setSelectedPivotTable] = useState(null);
+    useEffect(() => {
+        const fetchPivotTables = async () => {
+            if (selectedPivotIndex === -1) {
+                return null;
+            }
+            const pivot = createdPivots[selectedPivotIndex];
+            const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, undefined, report, client, uniqueValues);
+            setSelectedPivotTable({
+                pivot: pivot,
+                rows: rows,
+                columns: columns,
+            });
         };
+        fetchPivotTables();
     }, [selectedPivotIndex, data, dateRange, createdPivots]);
     const onSelectRecommendedPivot = (pivot, index) => {
         if (showEditOnPivotClick) {
-            onEditPivot(pivot, index);
+            onEditPivot(pivot, index, 'recommended');
             return;
         }
         if (index === selectedPivotIndex && selectedPivotType === 'recommended') {
@@ -208,20 +218,30 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         setIsOpen(false);
     };
     const onSelectCreatedPivot = (pivot, index) => {
-        selectPivot(pivot);
+        selectPivot(pivot, pivot.columnField ? uniqueValues : undefined, dateRanges[pivot.rowField]?.dateRange, samplePivotTable);
         setSelectedPivotType('created');
         setIsOpen(false);
         setPopUpTitle('Add pivot');
     };
-    const onEditPivot = (pivot, index) => {
+    const onEditPivot = async (pivot, index, pivotType) => {
         setIsLoading(false);
         setPivotRowField(pivot.rowField);
         setPivotColumnField(pivot.columnField);
         setPivotValueField(pivot.valueField);
         setPivotAggregation(pivot.aggregationType);
         setShowUpdatePivot(true);
+        if (pivotType === 'recommended' &&
+            index !== null &&
+            recommendedPivotTables[index]) {
+            setSamplePivotTable(recommendedPivotTables[index]);
+            return;
+        }
         if (isValidPivot(pivot)) {
-            const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
+            let dateBucket = undefined;
+            if (pivotRowField && dateRanges[pivotRowField]) {
+                dateBucket = getDateBucketFromRange(dateRanges[pivotRowField].dateRange);
+            }
+            const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, dateBucket, report, client, uniqueValues);
             setSamplePivotTable({ pivot, rows, columns });
             return;
         }
@@ -237,6 +257,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             return;
         }
         setIsLoading(true);
+        let tempUniqueValues = uniqueValues;
         let possibleColumns = {
             rowFields: allowedRowFields,
             columnFields: allowedColumnFields,
@@ -246,7 +267,9 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             allowedColumnFields.length === 0 &&
             allowedValueFields.length === 0) ||
             !uniqueValues) {
-            possibleColumns = await getDistinctValues();
+            const distinctValues = await getDistinctValues();
+            possibleColumns = distinctValues.possibleColumns;
+            tempUniqueValues = distinctValues.uniqueValues;
         }
         const cloudBody = {
             pivotCountRequest,
@@ -266,9 +289,8 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         try {
             const resp = await getDataFromCloud(client, 'pivotai', cloudBody);
             const recommendedPivots = resp?.data?.pivotTables.map((pivot) => cleanPivot(pivot, possibleColumns)) || [];
-            setRecommendedPivots(recommendedPivots.map((pivot) => {
-                if (pivot.columnField &&
-                    columnsToShow[pivot.columnField] === 'date') {
+            const cleanedPivots = recommendedPivots.map((pivot) => {
+                if (pivot.columnField && columnsToShow[pivot.columnField] === 'date') {
                     const columnField = pivot.columnField;
                     pivot.columnField = pivot.rowField;
                     pivot.rowField = columnField;
@@ -281,7 +303,13 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                         : undefined,
                     title: generatePivotTitle(pivot),
                 };
+            });
+            setRecommendedPivots(cleanedPivots);
+            const pts = await Promise.all(cleanedPivots.map(async (p) => {
+                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6, undefined, undefined, report, client, tempUniqueValues);
+                return { pivot: p, rows, columns };
             }));
+            setRecommendedPivotTables(pts);
             setSelectedPivotIndex(-1);
         }
         catch (e) {
@@ -323,26 +351,51 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
             setSamplePivotTable(null);
             return;
         }
-        setTimeout(() => {
-            const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
+        let dateBucket = undefined;
+        if (pivotRowField && dateRanges[pivotRowField]) {
+            dateBucket = getDateBucketFromRange(dateRanges[pivotRowField].dateRange);
+        }
+        setTimeout(async () => {
+            const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, dateBucket, report, client, uniqueValues);
             setSamplePivotTable({ pivot, rows, columns });
             setIsLoading(false);
         }, 500);
     };
-    const recommendedPivotTables = useMemo(() => {
-        const pts = recommendedPivots.map((p) => {
-            const { rows, columns } = generatePivotTable(p, data, dateRange, false, 6);
-            return { pivot: p, rows, columns };
-        });
-        return pts;
-    }, [recommendedPivots, data]);
-    const createdPivotTables = useMemo(() => {
-        const pts = createdPivots.map((p) => {
-            const { rows, columns } = generatePivotTable(p, data, dateRange, false, 6);
-            return { pivot: p, rows, columns };
-        });
-        return pts;
-    }, [createdPivots, data]);
+    const [recommendedPivotTables, setRecommendedPivotTables] = useState([]);
+    // useEffect(() => {
+    //   const fetchPivotTables = async () => {
+    //     const pts = await Promise.all(
+    //       recommendedPivots.map(async (p: Pivot) => {
+    //         const { rows, columns } = await generatePivotTable(
+    //           p,
+    //           data,
+    //           dateRange,
+    //           false,
+    //           6,
+    //           undefined,
+    //           undefined,
+    //           report,
+    //           client,
+    //           uniqueValues,
+    //         );
+    //         return { pivot: p, rows, columns };
+    //       }),
+    //     );
+    //     setRecommendedPivotTables(pts);
+    //   };
+    //   fetchPivotTables();
+    // }, [recommendedPivots, dateRange]);
+    const [createdPivotTables, setCreatedPivotTables] = useState([]);
+    useEffect(() => {
+        const fetchPivotTables = async () => {
+            const pts = await Promise.all(createdPivots.map(async (p) => {
+                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6, undefined, undefined, report, client, uniqueValues);
+                return { pivot: p, rows, columns };
+            }));
+            setCreatedPivotTables(pts);
+        };
+        fetchPivotTables();
+    }, [createdPivots, dateRange]);
     return (_jsx("div", { style: { display: 'flex', flexDirection: 'column' }, children: _jsxs("div", { style: {
                 position: 'relative',
                 display: 'inline-block',
@@ -619,7 +672,7 @@ function determineIntervalThroughOverride(dateBucket, dateRange) {
             return eachMonthOfInterval(dateRange);
     }
 }
-function getDateBuckets(dateRange, column, data, dateBucket) {
+export function getDateBuckets(dateRange, column, data, dateBucket) {
     if (!dateRange) {
         if (dateBucket) {
             return determineIntervalThroughOverride(dateBucket, getDateRange(undefined, column, data));
@@ -736,7 +789,26 @@ const fixBigQueryData = (data = []) => {
     }
     return newData;
 };
-export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined, dateBucket) {
+export async function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined, dateBucket, report, client, uniqueValues) {
+    try {
+        if (report && report.rowCount && report.rowCount !== data.length) {
+            let dateFilter = report
+                ? report.filtersApplied.find((f) => f.filterType === 'date_range')
+                : undefined;
+            const pivotTable = await generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, pivot.columnField && uniqueValues
+                ? Object.keys(uniqueValues[pivot.columnField])
+                : undefined);
+            if (pivotTable) {
+                return pivotTable;
+            }
+        }
+    }
+    catch (e) {
+        console.error('Error generating pivot table with SQL, using in memory process', e);
+    }
+    return generatePivotTableInMemory(pivot, data, dateRange, isComparison, rowLimit, compRange);
+}
+export function generatePivotTableInMemory(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined, dateBucket) {
     // If there is no rowField, aggregate on the valueField
     if (!pivot.rowField) {
         return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType, isComparison);

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

@@ -7,4 +7,5 @@ export declare function convertPostgresColumn(field: {
 export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo): ColumnInternal;
 export declare function convertFieldTypeToJSType(fieldType: string): string;
 export declare function convertFormatToJsType(column: Column): string;
+export declare function processColumnName(columnName: string): string;
 //# sourceMappingURL=columnProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/dist/esm/utils/columnProcessing.js

@@ -1,3 +1,6 @@
+function removeBigQuerySpecialChars(columnName) {
+    return columnName.replaceAll('quill_forward_slash', '/');
+}
 export function convertPostgresColumn(field) {
     let format;
     let fieldType;
@@ -200,3 +203,6 @@ export function convertFormatToJsType(column) {
             return 'string';
     }
 }
+export function processColumnName(columnName) {
+    return removeBigQuerySpecialChars(columnName);
+}

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

@@ -0,0 +1,2 @@
+export declare const MAX_COLUMN_ROWS_LIMIT = 500;
+//# sourceMappingURL=constants.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC"}

package/dist/esm/utils/constants.js

@@ -0,0 +1 @@
+export const MAX_COLUMN_ROWS_LIMIT = 500;

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAkC5E;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CA+C9B;AAwQD,wBAAsB,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAI,OAAO,CAAC,GAAG,CAAC,CA0BpF"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAoC5E;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAiD9B;AA0KD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA0Bd"}

package/dist/esm/utils/dashboard.js

@@ -1,9 +1,9 @@
 import { valueFormatter } from './valueFormatter';
-import { generatePivotTable, generatePivotTableYAxis, getDateRange, getDateString, } from '../internals/ReportBuilder/PivotModal';
+import { generatePivotTable, generatePivotTableYAxis, } from '../internals/ReportBuilder/PivotModal';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
-import { generatePivotQuery } from './queryConstructor';
 import { getData } from './dataFetcher';
-import { differenceInDays } from 'date-fns';
+import { getDateBucketFromRange } from './dates';
+import { generatePivotWithSQL } from './pivotConstructor';
 const defaultDashboardItem = {
     id: '',
     name: '',
@@ -67,8 +67,10 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         xAxisFormat: item.xAxisFormat,
         order: item.order,
         filtersApplied: item.filtersApplied,
+        rowCount: parseInt(item.rowCount),
         sort: item.sort,
         page: item.page,
+        itemQuery: item.itemQuery,
     };
 }
 /**
@@ -118,106 +120,34 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
     }
     const pivot = report?.pivot;
     const data = report || {};
-    if (client && client.databaseType.toLowerCase() === 'postgresql') {
+    if (pivot && client) {
+        if (report.rowCount === 0) {
+            return { rows: [], columns: [] };
+        }
         try {
-            let dateRange = undefined;
-            let comparisonInterval = undefined;
             let dateBucket = dateBucketInitial;
-            if (!dateBucket && pivot.rowFieldType !== 'string' && pivot.rowField) {
-                let filterDateRange = undefined;
-                if (dateFilter) {
-                    filterDateRange = {
-                        start: dateFilter.startDate,
-                        end: dateFilter.endDate,
-                    };
-                }
-                dateRange = getDateRange(filterDateRange, pivot.rowField, data.rows);
-                const difference = differenceInDays(dateRange.end, dateRange.start);
-                if (difference < 14) {
-                    dateBucket = 'day';
-                }
-                else if (difference < 60) {
-                    dateBucket = 'week';
-                }
-                else if (difference < 365 * 3) {
-                    dateBucket = 'month';
-                }
-                else {
-                    dateBucket = 'year';
-                }
+            let filterDateRange = undefined;
+            if (dateFilter) {
+                filterDateRange = {
+                    start: dateFilter.startDate,
+                    end: dateFilter.endDate,
+                };
             }
-            if (dateFilter && dateFilter && dateFilter.comparisonRange) {
-                const comparisonRange = differenceInDays(dateFilter?.comparisonRange.endDate, dateFilter?.comparisonRange.startDate);
-                if (!isNaN(comparisonRange)) {
-                    if (dateBucket === 'month') {
-                        comparisonInterval = comparisonRange / 30 + ' month';
-                    }
-                    else if (dateBucket === 'year') {
-                        comparisonInterval = comparisonRange / 365 + ' year';
-                    }
-                    else {
-                        comparisonInterval = comparisonRange + ' day';
-                    }
-                }
+            else if (report.dateRange) {
+                filterDateRange = report.dateRange;
             }
-            const sqlQuery = generatePivotQuery(pivot, report.itemQuery, report.rows, dateBucket, comparisonInterval);
-            if (sqlQuery && report.rows.length > 0) {
-                const hostedBody = {
-                    metadata: {
-                        preQueries: [sqlQuery],
-                        task: 'query',
-                        orgId: client.customerId || '*',
-                        clientId: client.publicKey,
-                        databaseType: client?.databaseType,
-                        getCustomFields: false,
-                        runQueryConfig: {
-                            overridePost: true,
-                            convertDatatypes: true,
-                        },
-                    },
-                };
-                const cloudBody = { ...hostedBody };
-                const resp = await getData(client, 'query', 'same-origin', hostedBody, cloudBody);
-                // With our current design we have to remove the second row field but leave the first for comparison purposes.
-                const rows = resp.queryResults[0].rows;
-                const columns = resp.queryResults[0].fields
-                    .map((field) => ({
-                    field: field.name,
-                    label: field.name.replace('comparison_', 'comparison '),
-                }))
-                    .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0);
-                if (pivot.rowFieldType !== 'string') {
-                    rows.forEach((row) => {
-                        row[pivot.rowField] = getDateString(row[pivot.rowField], undefined, dateBucket);
-                    });
-                    // add a row for each date in the range that doesn't have a value
-                    if (pivot.rowFieldType !== 'string') {
-                        const dateSet = new Set(rows.map((row) => row[pivot.rowField]));
-                        // create a loop that will go through each formatted date and add a row if it doesn't exist going to the current date
-                        for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
-                            const formattedDate = getDateString(date.toDateString(), undefined, dateBucket);
-                            if (!dateSet.has(formattedDate)) {
-                                const newRow = {};
-                                newRow[pivot.rowField] = formattedDate;
-                                rows.push(newRow);
-                                dateSet.add(formattedDate);
-                            }
-                            // order the rows by the date field
-                            rows.sort((a, b) => {
-                                return new Date(a[pivot.rowField]) < new Date(b[pivot.rowField])
-                                    ? -1
-                                    : 1;
-                            });
-                        }
-                    }
-                }
-                return {
-                    rows: rows,
-                    columns: columns,
-                };
+            if (!dateBucket && filterDateRange) {
+                dateBucket = getDateBucketFromRange(filterDateRange);
+            }
+            const pivotTable = await generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, report.distinctStrings);
+            if (pivotTable) {
+                return pivotTable;
             }
+            throw new Error('Error generating pivot table');
+        }
+        catch (e) {
+            throw new Error('Error generating pivot table: ' + e);
         }
-        catch (e) { }
     }
     return pivot && data.rows
         ? generatePivotTable(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy

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

@@ -1,3 +1,3 @@
-export declare function getData(client: any, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string): Promise<any>;
+export declare function getData(client: any, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
 export declare function getDataFromCloud(client: any, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
 //# sourceMappingURL=dataFetcher.d.ts.map

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,gBAgEhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAqBA,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,EACf,UAAU,CAAC,EAAE,MAAM,gBAwGpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}