@quillsql/react 2.12.27 → 2.12.28

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePivotTable = exports.isDateField = exports.getDateString = exports.getDateRange = exports.generatePivotTitle = exports.generatePivotTableYAxis = exports.PivotModal = void 0;
+exports.generatePivotTableInMemory = exports.generatePivotTable = exports.isDateField = exports.getDateString = exports.getDateBuckets = exports.getDateRange = exports.generatePivotTitle = exports.generatePivotTableYAxis = exports.PivotModal = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const Context_1 = require("../../Context");
@@ -16,6 +16,8 @@ const QuillCard_1 = require("../../components/QuillCard");
 const pivotProcessing_1 = require("../../utils/pivotProcessing");
 const crypto_1 = require("../../utils/crypto");
 const tableProcessing_1 = require("../../utils/tableProcessing");
+const pivotConstructor_1 = require("../../utils/pivotConstructor");
+const dates_1 = require("../../utils/dates");
 const QuillHover = () => {
     return ((0, jsx_runtime_1.jsx)("style", { children: `
   .quill-hover {
@@ -29,7 +31,7 @@ const QuillHover = () => {
   }
 ` }));
 };
-const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent = UiComponents_1.QuillErrorMessageComponent, PivotRowContainer = UiComponents_1.QuillPivotRowContainer, PivotColumnContainer = UiComponents_1.QuillPivotColumnContainer, LoadingComponent = UiComponents_1.QuillLoadingComponent, CardComponent = QuillCard_1.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, }) => {
+const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, ErrorMessageComponent = UiComponents_1.QuillErrorMessageComponent, PivotRowContainer = UiComponents_1.QuillPivotRowContainer, PivotColumnContainer = UiComponents_1.QuillPivotColumnContainer, LoadingComponent = UiComponents_1.QuillLoadingComponent, CardComponent = QuillCard_1.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] = (0, react_1.useState)(false);
     const [selectedPivotType, setSelectedPivotType] = (0, react_1.useState)('recommended');
     const [errors, setErrors] = (0, react_1.useState)([]);
@@ -44,6 +46,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
     const [allowedRowFields, setAllowedRowFields] = (0, react_1.useState)([]);
     const [allowedValueFields, setAllowedValueFields] = (0, react_1.useState)([]);
     const [uniqueValues, setUniqueValues] = (0, react_1.useState)(initialUniqueValues);
+    const [dateRanges, setDateRanges] = (0, react_1.useState)({});
     const getDistinctValues = async () => {
         if (columns) {
             const stringColumns = columns.filter((column) => {
@@ -69,6 +72,23 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         }
         return { rowFields: [], columnFields: [], valueFields: [] };
     };
+    const getAllDateRangesByColumn = async () => {
+        // Don't reprocess dateRanges if they are already gathered
+        if (Object.keys(dateRanges).length > 0 ||
+            (client && client.databaseType !== 'postgresql')) {
+            return;
+        }
+        if (columns) {
+            const dateColumns = columns.filter((column) => {
+                return column.jsType === 'date';
+            });
+            if (dateColumns.length === 0) {
+                return [];
+            }
+            const dateRangeByColumn = await (0, tableProcessing_1.getDateRangeByColumns)(dateColumns, query || '', client, customFields);
+            setDateRanges(dateRangeByColumn || {});
+        }
+    };
     (0, react_1.useEffect)(() => {
         const calculatePivotCardSize = () => {
             // The pivot card should be the same width as the row of inputs
@@ -93,30 +113,65 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
             }, 500);
         }
     }, [showUpdatePivot, isOpen]);
+    (0, react_1.useEffect)(() => {
+        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 = (0, pivotProcessing_1.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);
+                    setSamplePivotTable({ pivot: pivot, rows, columns });
+                }
+            }
+        };
+        fetchPivotData();
+    }, []);
     (0, react_1.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();
+            getAllDateRangesByColumn();
         }
-        if (initialUniqueValues) {
-            const possibleColumns = (0, pivotProcessing_1.getPossiblePivotFieldOptions)(columns, initialUniqueValues);
-            setAllowedRowFields(possibleColumns.rowFields);
-            setAllowedColumnFields(possibleColumns.columnFields);
-            setAllowedValueFields(possibleColumns.valueFields);
-            setUniqueValues(initialUniqueValues);
+        else if (initialSelectedPivotTable) {
+            getDistinctValues();
         }
-        if (pivotRowField && data && columns) {
+    }, [initialSelectedPivotTable, columns, data, pivotRowField]);
+    (0, react_1.useEffect)(() => {
+        const fetchPivotTables = async () => {
             const pivot = {
                 rowField: pivotRowField || '',
                 rowFieldType: columnsToShow[pivotRowField || ''],
@@ -125,37 +180,12 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                 valueField: pivotValueField || '',
                 aggregationType: pivotAggregation || '',
             };
-            if (initialSelectedPivotTable) {
-                setSamplePivotTable({
-                    pivot: pivot,
-                    rows: initialSelectedPivotTable.rows,
-                    columns: initialSelectedPivotTable.columns,
-                });
-            }
-            else {
-                const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
+            if ((0, pivotProcessing_1.isValidPivot)(pivot) && data && columns) {
+                const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false);
                 setSamplePivotTable({ pivot: pivot, rows, columns });
             }
-        }
-    }, []);
-    (0, react_1.useEffect)(() => {
-        if ((pivotRowField && data && columns) || initialSelectedPivotTable) {
-            getDistinctValues();
-        }
-    }, [initialSelectedPivotTable, columns, data, pivotRowField]);
-    (0, react_1.useEffect)(() => {
-        const pivot = {
-            rowField: pivotRowField || '',
-            rowFieldType: columnsToShow[pivotRowField || ''],
-            columnField: pivotColumnField,
-            columnFieldType: columnsToShow[pivotColumnField || ''],
-            valueField: pivotValueField || '',
-            aggregationType: pivotAggregation || '',
         };
-        if ((0, pivotProcessing_1.isValidPivot)(pivot) && data && columns) {
-            const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
-            setSamplePivotTable({ pivot: pivot, rows, columns });
-        }
+        fetchPivotTables();
     }, [
         data,
         columns,
@@ -184,17 +214,21 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
             return map;
         }, {});
     }, [columns]);
-    const selectedPivotTable = (0, react_1.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] = (0, react_1.useState)(null);
+    (0, react_1.useEffect)(() => {
+        const fetchPivotTables = async () => {
+            if (selectedPivotIndex === -1) {
+                return null;
+            }
+            const pivot = createdPivots[selectedPivotIndex];
+            const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false);
+            setSelectedPivotTable({
+                pivot: pivot,
+                rows: rows,
+                columns: columns,
+            });
         };
+        fetchPivotTables();
     }, [selectedPivotIndex, data, dateRange, createdPivots]);
     const onSelectRecommendedPivot = (pivot, index) => {
         if (showEditOnPivotClick) {
@@ -211,12 +245,12 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         setIsOpen(false);
     };
     const onSelectCreatedPivot = (pivot, index) => {
-        selectPivot(pivot);
+        selectPivot(pivot, pivot.columnField ? uniqueValues : undefined, dateRanges[pivot.rowField]?.dateRange);
         setSelectedPivotType('created');
         setIsOpen(false);
         setPopUpTitle('Add pivot');
     };
-    const onEditPivot = (pivot, index) => {
+    const onEditPivot = async (pivot, index) => {
         setIsLoading(false);
         setPivotRowField(pivot.rowField);
         setPivotColumnField(pivot.columnField);
@@ -224,7 +258,11 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         setPivotAggregation(pivot.aggregationType);
         setShowUpdatePivot(true);
         if ((0, pivotProcessing_1.isValidPivot)(pivot)) {
-            const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
+            let dateBucket = undefined;
+            if (pivotRowField && dateRanges[pivotRowField]) {
+                dateBucket = (0, dates_1.getDateBucketFromRange)(dateRanges[pivotRowField].dateRange);
+            }
+            const { rows, columns } = await generatePivotTable(pivot, data, dateRange, false, -1, undefined, dateBucket, report, client, uniqueValues);
             setSamplePivotTable({ pivot, rows, columns });
             return;
         }
@@ -326,26 +364,38 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
             setSamplePivotTable(null);
             return;
         }
-        setTimeout(() => {
-            const { rows, columns } = generatePivotTable(pivot, data, dateRange, false);
+        let dateBucket = undefined;
+        if (pivotRowField && dateRanges[pivotRowField]) {
+            dateBucket = (0, dates_1.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 = (0, react_1.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 = (0, react_1.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] = (0, react_1.useState)([]);
+    (0, react_1.useEffect)(() => {
+        const fetchPivotTables = async () => {
+            const pts = await Promise.all(recommendedPivots.map(async (p) => {
+                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6);
+                return { pivot: p, rows, columns };
+            }));
+            setRecommendedPivotTables(pts);
+        };
+        fetchPivotTables();
+    }, [recommendedPivots, dateRange]);
+    const [createdPivotTables, setCreatedPivotTables] = (0, react_1.useState)([]);
+    (0, react_1.useEffect)(() => {
+        const fetchPivotTables = async () => {
+            const pts = await Promise.all(createdPivots.map(async (p) => {
+                const { rows, columns } = await generatePivotTable(p, data, dateRange, false, 6);
+                return { pivot: p, rows, columns };
+            }));
+            setCreatedPivotTables(pts);
+        };
+        fetchPivotTables();
+    }, [createdPivots, dateRange]);
     return ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', flexDirection: 'column' }, children: (0, jsx_runtime_1.jsxs)("div", { style: {
                 position: 'relative',
                 display: 'inline-block',
@@ -639,6 +689,7 @@ function getDateBuckets(dateRange, column, data, dateBucket) {
     const dayDifference = (0, date_fns_1.differenceInDays)(dateRange.end, dateRange.start);
     return dayDifferenceToInterval(dayDifference, dateRange);
 }
+exports.getDateBuckets = getDateBuckets;
 function getCompDateBuckets(dateRange, compDateRange, column, data) {
     if (!dateRange) {
         return (0, date_fns_1.eachMonthOfInterval)(getDateRange(undefined, column, data));
@@ -745,7 +796,31 @@ const fixBigQueryData = (data = []) => {
     }
     return newData;
 };
-function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined, dateBucket) {
+async function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined, dateBucket, report, client, uniqueValues) {
+    try {
+        if (report &&
+            report.rowCount &&
+            report.rowCount !== data.length &&
+            client &&
+            client.databaseType.toLowerCase() === 'postgresql') {
+            let dateFilter = report
+                ? report.filtersApplied.find((f) => f.filterType === 'date_range')
+                : undefined;
+            const pivotTable = await (0, pivotConstructor_1.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);
+}
+exports.generatePivotTable = generatePivotTable;
+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);
@@ -1095,7 +1170,7 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
     }
     return { rows: pivotRows, columns };
 }
-exports.generatePivotTable = generatePivotTable;
+exports.generatePivotTableInMemory = generatePivotTableInMemory;
 function valueFieldAggregation(data, valueField, aggregationType, isComparison) {
     if (!data || data.length === 0) {
         return {

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

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

package/dist/cjs/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/cjs/utils/constants.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_COLUMN_ROWS_LIMIT = void 0;
+exports.MAX_COLUMN_ROWS_LIMIT = 500;

package/dist/cjs/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/cjs/utils/dashboard.js

@@ -4,9 +4,9 @@ exports.getDashboard = exports.cleanDashboardItem = void 0;
 const valueFormatter_1 = require("./valueFormatter");
 const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
 const textProcessing_1 = require("./textProcessing");
-const queryConstructor_1 = require("./queryConstructor");
 const dataFetcher_1 = require("./dataFetcher");
-const date_fns_1 = require("date-fns");
+const dates_1 = require("./dates");
+const pivotConstructor_1 = require("./pivotConstructor");
 const defaultDashboardItem = {
     id: '',
     name: '',
@@ -70,8 +70,10 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
         xAxisFormat: item.xAxisFormat,
         order: item.order,
         filtersApplied: item.filtersApplied,
+        rowCount: parseInt(item.rowCount),
         sort: item.sort,
         page: item.page,
+        itemQuery: item.itemQuery,
     };
 }
 exports.cleanDashboardItem = cleanDashboardItem;
@@ -122,106 +124,34 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
     }
     const pivot = report?.pivot;
     const data = report || {};
-    if (client && client.databaseType.toLowerCase() === 'postgresql') {
+    if (pivot && client && client.databaseType.toLowerCase() === 'postgresql') {
+        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 = (0, PivotModal_1.getDateRange)(filterDateRange, pivot.rowField, data.rows);
-                const difference = (0, date_fns_1.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 = (0, date_fns_1.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 = (0, queryConstructor_1.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 (0, dataFetcher_1.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] = (0, PivotModal_1.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 = (0, PivotModal_1.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 = (0, dates_1.getDateBucketFromRange)(filterDateRange);
+            }
+            const pivotTable = await (0, pivotConstructor_1.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
         ? (0, PivotModal_1.generatePivotTable)(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy

package/dist/cjs/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,gBAmGhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}

package/dist/cjs/utils/dataFetcher.js

@@ -1,6 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDataFromCloud = exports.getData = void 0;
+function parseData(rows, queryType) {
+    if (!rows || rows.length === 0)
+        return [];
+    switch (queryType) {
+        case 'dateRange':
+            return {
+                start: new Date(rows[0]?.min_date),
+                end: new Date(rows[0]?.max_date),
+            };
+        case 'rowCount':
+            return parseInt(rows[0]?.count);
+        case 'distinctStrings':
+            return rows.map((row) => {
+                return row['column_field'];
+            });
+        default:
+            return rows;
+    }
+}
 // this function gets the data either from the self hosted endpoint or
 // our cloud server
 async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cloudRequestBody, method = 'POST') {
@@ -21,21 +40,45 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
                 return { success: false, errorMessage: responseJson.error };
             }
             let result;
-            if (responseJson.data?.data) {
-                result = {
-                    fields: responseJson?.data.queries?.queryResults[0]?.fields,
-                    ...responseJson.data.data,
-                    rows: responseJson?.data.queries?.queryResults[0]?.rows,
-                    compareRows: responseJson?.data.queries?.queryResults[1]?.rows,
-                };
+            if (hostedRequestBody &&
+                hostedRequestBody.metadata &&
+                hostedRequestBody.metadata.task === 'report') {
+                if (responseJson.data?.data) {
+                    result = {
+                        fields: responseJson?.data.queries?.queryResults[0]?.fields,
+                        ...responseJson.data.data,
+                    };
+                    responseJson.data.data.queryOrder.forEach((queryKey, index) => {
+                        result[queryKey] = parseData(responseJson.queries.queryResults[index].rows, queryKey);
+                    });
+                }
+                else {
+                    result = {
+                        fields: responseJson?.queries?.queryResults[0]?.fields,
+                        ...responseJson.data,
+                    };
+                    responseJson.data.queryOrder.forEach((queryKey, index) => {
+                        result[queryKey] = parseData(responseJson.queries.queryResults[index].rows, queryKey);
+                    });
+                }
             }
             else {
-                result = {
-                    fields: responseJson?.queries?.queryResults[0]?.fields,
-                    ...responseJson.data,
-                    rows: responseJson?.queries?.queryResults[0]?.rows,
-                    compareRows: responseJson?.queries?.queryResults[1]?.rows,
-                };
+                if (responseJson.data?.data) {
+                    result = {
+                        fields: responseJson?.data.queries?.queryResults[0]?.fields,
+                        ...responseJson.data.data,
+                        rows: responseJson?.data.queries?.queryResults[0]?.rows,
+                        compareRows: responseJson?.data.queries?.queryResults[1]?.rows,
+                    };
+                }
+                else {
+                    result = {
+                        fields: responseJson?.queries?.queryResults[0]?.fields,
+                        ...responseJson.data,
+                        rows: responseJson?.queries?.queryResults[0]?.rows,
+                        compareRows: responseJson?.queries?.queryResults[1]?.rows,
+                    };
+                }
             }
             if (responseJson.data.columns &&
                 responseJson.data.fields &&

package/dist/cjs/utils/dates.d.ts

@@ -7,4 +7,12 @@ export declare function convertComparisonRange(primaryRange: string, comparisonR
  * Returns whether the xAxisFormat is a date format.
  */
 export declare function isDateFormat(xAxisFormat: string): boolean;
+export declare function getComparisonInterval(comparisonRange: {
+    startDate: Date;
+    endDate: Date;
+}, dateBucket?: string): string | undefined;
+export declare function getDateBucketFromRange(dateRange: {
+    start: Date;
+    end: Date;
+}): "month" | "week" | "day" | "year";
 //# sourceMappingURL=dates.d.ts.map

package/dist/cjs/utils/dates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAY/C"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E"}