@quillsql/react 2.12.21 → 2.12.23

package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts

@@ -102,6 +102,17 @@ export declare function generatePivotTableYAxis(pivot: Pivot, cols: {
     format: AxisFormat;
 }[];
 export declare function generatePivotTitle(pivot: Pivot): string;
+export declare function getDateRange(dateRange: {
+    start: Date;
+    end: Date;
+} | undefined, column: string, data: any): {
+    start: Date;
+    end: Date;
+};
+export declare function getDateString(value: string, dateRange?: {
+    start: Date;
+    end: Date;
+}, dateBucket?: string): string;
 export declare function isDateField(fieldType: string): boolean;
 export declare function generatePivotTable(pivot: Pivot, data: any, dateRange: {
     start: Date;

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

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AAAA,OAAc,EAOZ,SAAS,EACV,MAAM,OAAO,CAAC;AAuBf,OAAO,EACL,oBAAoB,EAKrB,MAAM,+BAA+B,CAAC;AAavC,OAAO,EAAU,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,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;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAkBD,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,UAAU,EAAE,GAAG,CAAC;IAChB,aAAa,EAAE,GAAG,CAAC;IACnB,aAAa,EAAE,GAAG,CAAC;IACnB,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC;IACrB,aAAa,EAAE,GAAG,CAAC;IACnB,wBAAwB,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,gBAAgB,EAAE,CAAC,KAAK,EAAE;QACxB,MAAM,EAAE,OAAO,CAAC;QAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;QACrC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,eAAe,EAAE,SAAS,CAAC;KAC5B,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,cAAc,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1D,aAAa,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACzD,qBAAqB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACzE,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACpE,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC;IACvB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,GAAG,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC;IAC1B,yBAAyB,CAAC,EAAE,GAAG,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;AAED,eAAO,MAAM,UAAU,m3BAqDpB,eAAe,4CAoyBjB,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE;IACJ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,EAAE,EACH,UAAU,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE;;;;IAqBjE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAiBvD;AAoBD,wBAAgB,YAAY,CAC1B,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,GAAG,SAAS,EACjD,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,GAAG,GACR;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAuD5B;AAuED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,EACtC,UAAU,CAAC,EAAE,MAAM,UA+CpB;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,WAY5C;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,GAAG,SAAS,EACjD,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,GAAG,SAAqB,EAC7D,UAAU,CAAC,EAAE,MAAM;;;;;;EAqdpB"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePivotTable = exports.isDateField = exports.generatePivotTitle = exports.generatePivotTableYAxis = exports.PivotModal = void 0;
+exports.generatePivotTable = exports.isDateField = exports.getDateString = 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");
@@ -138,6 +138,11 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
             }
         }
     }, []);
+    (0, react_1.useEffect)(() => {
+        if ((pivotRowField && data && columns) || initialSelectedPivotTable) {
+            getDistinctValues();
+        }
+    }, [initialSelectedPivotTable, columns, data, pivotRowField]);
     (0, react_1.useEffect)(() => {
         const pivot = {
             rowField: pivotRowField || '',
@@ -606,6 +611,7 @@ function getDateRange(dateRange, column, data) {
         return dateRange;
     }
 }
+exports.getDateRange = getDateRange;
 function determineIntervalThroughOverride(dateBucket, dateRange) {
     switch (dateBucket) {
         case 'day':
@@ -702,6 +708,7 @@ function getDateString(value, dateRange, dateBucket) {
         fields: [{ field: 'date', format }],
     });
 }
+exports.getDateString = getDateString;
 function isDateField(fieldType) {
     return (fieldType === 'date' ||
         fieldType === 'datetime' ||

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

@@ -8,5 +8,5 @@ import { QuillReportInternal } from '../Dashboard';
  */
 export declare function cleanDashboardItem(item: {
     [key: string]: any;
-} | undefined, dashboardFilters: any): QuillReportInternal;
+} | undefined, dashboardFilters: any, client?: any, dateBucket?: string): Promise<QuillReportInternal>;
 //# sourceMappingURL=dashboard.d.ts.map

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;AA6B5E;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,GACpB,mBAAmB,CA0CrB"}
+{"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"}

package/dist/cjs/utils/dashboard.js

@@ -4,6 +4,9 @@ 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 defaultDashboardItem = {
     id: '',
     name: '',
@@ -31,7 +34,7 @@ const defaultDashboardItem = {
  * interface to build amazing dashboards on top of.
  * @param item
  */
-function cleanDashboardItem(item, dashboardFilters) {
+async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
     if (!item)
         return defaultDashboardItem;
     if (!item.rows)
@@ -40,7 +43,7 @@ function cleanDashboardItem(item, dashboardFilters) {
             id: item._id,
             name: item.name,
         };
-    const pivotTable = getPivotTable(item, dashboardFilters);
+    const pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
     const { primaryAggregation, comparisonAggregation, aggregationPercentChange, } = getAggragations(pivotTable, item);
     return {
         id: item._id,
@@ -109,12 +112,117 @@ function formatAggragation(item, value) {
 /**
  * Extract and transform the data from itemInfo.
  */
-function getPivotTable(report, dashboardFilters) {
+async function getPivotTable(report, dashboardFilters, client, dateBucketInitial) {
     if (!report)
         return undefined;
-    const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType == 'date_range');
+    let dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType === 'date_range' || filter.opterator === 'BETWEEN');
+    if (dateFilter?.opterator === 'BETWEEN') {
+        dateFilter.startDate = dateFilter.value[0];
+        dateFilter.endDate = dateFilter.value[1];
+    }
     const pivot = report?.pivot;
     const data = report || {};
+    if (client && client.databaseType.toLowerCase() === 'postgresql') {
+        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';
+                }
+            }
+            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';
+                    }
+                }
+            }
+            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,
+                };
+            }
+        }
+        catch (e) { }
+    }
     return pivot && data.rows
         ? (0, PivotModal_1.generatePivotTable)(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
         dateFilter?.startDate && dateFilter?.endDate

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

@@ -1 +1 @@
-{"version":3,"file":"errorProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/errorProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,QAO/C"}
+{"version":3,"file":"errorProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/errorProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,GAAG,QAI/C"}

package/dist/cjs/utils/errorProcessing.js

@@ -5,8 +5,5 @@ function processFilterErrorList(resp) {
     if (!resp || !resp.filterErrorList || !Array.isArray(resp.filterErrorList)) {
         return;
     }
-    resp.filterErrorList.forEach((filterError) => {
-        console.error(filterError);
-    });
 }
 exports.processFilterErrorList = processFilterErrorList;

package/dist/cjs/utils/merge.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeComparisonRange = void 0;
 function mergeComparisonRange(resp) {
-    if (resp.chartType === "table")
+    if (resp.chartType === 'table')
         return;
     mergeForwards(resp);
     // mergeBackwards(resp); // uncomment to switch back and forth

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG3D,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAsCR;AAmED,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WAgBxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EAsCvC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG3D,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAsCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WAgBxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EAsCvC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP"}

package/dist/cjs/utils/pivotProcessing.js

@@ -34,48 +34,6 @@ function pivotToSql(pivot, query, columns) {
     return query;
 }
 exports.pivotToSql = pivotToSql;
-function createPivotSqlQuery(rowField, columnField, valueField, aggregationType, query) {
-    // const sqlAggregationType = convertToSqlAggregationType(aggregationType);
-    return `with query_table as (${query}),
-  distinct_column_fields as (
-    select distinct
-      ${columnField}
-    from
-      query_table
-  ),
-  case_when_query as (
-    select
-      string_agg(
-        concat(
-          '${aggregationType}(CASE WHEN ${columnField} = ''',
-          replace(${columnField}, '''', ''''''),
-          ''' THEN ${valueField} ELSE 0 END) AS ',
-          concat(concat('"', replace(${columnField}, ' ', '_')), '"')
-        ),
-        ',
-    '
-      ) as sql_part
-    from
-      distinct_column_fields
-  ),
-  joined_queries as (
-    select
-      concat(
-        'WITH query_table as (${query}) SELECT ${rowField}, ',
-        sql_part,
-        ' 
-    FROM query_table 
-    GROUP BY ${rowField} 
-    ORDER BY ${rowField}'
-      ) as query
-    from
-    case_when_query
-  )
-select
-  query
-from
-  joined_queries;`;
-}
 function generateTwoDPivotQuery(pivot, query, columns) {
     const caseWhens = columns.map((column) => {
         return `${pivot.aggregationType}(

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

@@ -1,2 +1,4 @@
+import { Pivot } from '../internals/ReportBuilder/PivotModal';
 export declare function generateDistinctQuery(stringFields: string[], query: string): string;
+export declare function generatePivotQuery(pivot: Pivot, itemQueries: string[], rows: any[], dateBucket?: string, comparisonInterval?: string): string | undefined;
 //# sourceMappingURL=queryConstructor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,UAQ1E"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAe9D,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,UAQ1E;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,IAAI,EAAE,GAAG,EAAE,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,MAAM,GAAG,SAAS,CAiBpB"}

package/dist/cjs/utils/queryConstructor.js

@@ -1,6 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDistinctQuery = void 0;
+exports.generatePivotQuery = exports.generateDistinctQuery = void 0;
+const pivotProcessing_1 = require("./pivotProcessing");
+function processAggType(aggType) {
+    if (aggType === 'count')
+        return 'SUM';
+    return aggType?.toLowerCase() === 'average' ? 'AVG' : aggType?.toLowerCase();
+}
+function processValueField(aggType, valueField) {
+    if (aggType === 'min' || aggType === 'max')
+        return `"${valueField}" ELSE null`;
+    if (aggType === 'count')
+        return `1 ELSE 0`;
+    return valueField ? `"${valueField}" ELSE 0` : `1 ELSE 0`;
+}
 function generateDistinctQuery(stringFields, query) {
     const distinctQueries = stringFields.map((field) => {
         return `SELECT '${field}' AS field, ARRAY_AGG(DISTINCT ${field}) AS string_values FROM querytable`;
@@ -9,3 +22,113 @@ function generateDistinctQuery(stringFields, query) {
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
 }
 exports.generateDistinctQuery = generateDistinctQuery;
+function generatePivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval) {
+    if (!(0, pivotProcessing_1.isValidPivot)(pivot)) {
+        return undefined;
+    }
+    if (!pivot.rowField) {
+        return undefined;
+    }
+    if (pivot.columnField) {
+        return create2DPivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval);
+    }
+    return create1DPivotQuery(pivot, itemQueries, dateBucket, comparisonInterval);
+}
+exports.generatePivotQuery = generatePivotQuery;
+function create2DPivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval) {
+    if (!pivot || !pivot.columnField) {
+        return undefined;
+    }
+    // @ts-ignore
+    const columnValues = rows.map((row) => row[pivot.columnField]);
+    const distinctColumnValues = Array.from(new Set(columnValues)).filter((value) => value !== undefined && value !== null);
+    if (distinctColumnValues.length === 0) {
+        return undefined;
+    }
+    if (pivot.rowFieldType === 'string') {
+        return create2DStringPivotQuery(pivot, itemQueries, distinctColumnValues);
+    }
+    return create2DDatePivotQuery(pivot, itemQueries, distinctColumnValues, dateBucket, comparisonInterval);
+}
+function create2DStringPivotQuery(pivot, itemQueries, distinctColumnValues) {
+    const caseWhens = distinctColumnValues.map((column) => {
+        return `${processAggType(pivot.aggregationType)}(CASE WHEN "${pivot.columnField}" = '${column.replaceAll("'", "''")}' THEN ${processValueField(pivot.aggregationType, pivot.valueField)} END) AS "${column}"`;
+    });
+    const caseWhensCompare = distinctColumnValues.map((column) => {
+        return `${processAggType(pivot.aggregationType)}(CASE WHEN "${pivot.columnField}" = '${column.replaceAll("'", "''")}' THEN ${processValueField(pivot.aggregationType, pivot.valueField)} END) AS "comparison_${column}"`;
+    });
+    const compareCTE = itemQueries[1]
+        ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`
+        : '';
+    const compareCaseWhenCTE = itemQueries[1]
+        ? `, quill_ct_cw as (SELECT "${pivot.rowField}" as "comparison_${pivot.rowField}", ${caseWhensCompare.join(', ')} FROM quill_ct GROUP BY ${pivot.rowField})`
+        : '';
+    const joinQuery = itemQueries[1]
+        ? `JOIN quill_ct_cw ct ON ct."comparison_${pivot.rowField}" = qt."${pivot.rowField}"`
+        : '';
+    return `WITH quill_qt AS (${itemQueries[0]?.replaceAll(';', '')}),
+  quill_qt_cw AS (SELECT ${pivot.rowField}, ${caseWhens.join(', ')} FROM quill_qt GROUP BY ${pivot.rowField})
+  ${compareCTE} ${compareCaseWhenCTE}
+  SELECT * FROM quill_qt_cw qt 
+  ${joinQuery}`;
+}
+function create2DDatePivotQuery(pivot, itemQueries, distinctColumnValues, dateBucket = 'month', comparisonInterval) {
+    const caseWhens = distinctColumnValues.map((column) => {
+        return `${processAggType(pivot.aggregationType)}(CASE WHEN qt."${pivot.columnField}" = '${column.replaceAll("'", "''")}' THEN ${processValueField(pivot.aggregationType, pivot.valueField)} END) AS "${column}"`;
+    });
+    const caseWhensCompare = distinctColumnValues.map((column) => {
+        return `${processAggType(pivot.aggregationType)}(CASE WHEN "${pivot.columnField}" = '${column.replaceAll("'", "''")}' THEN ${processValueField(pivot.aggregationType, pivot.valueField)} END) AS "comparison_${column}"`;
+    });
+    const compareCTE = itemQueries[1] && comparisonInterval
+        ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`
+        : '';
+    const compareCaseWhenCTE = itemQueries[1] && comparisonInterval
+        ? `, quill_ct_cw as (SELECT date_trunc('${dateBucket}', ${pivot.rowField}) as comparison_${pivot.rowField}, ${caseWhensCompare.join(', ')} FROM quill_ct GROUP BY date_trunc('${dateBucket}', ${pivot.rowField}))`
+        : '';
+    const joinQuery = itemQueries[1] && comparisonInterval
+        ? `LEFT JOIN quill_ct_cw ct ON qt."${pivot.rowField}" = date_trunc('${dateBucket}', (ct."comparison_${pivot.rowField}" + INTERVAL '${comparisonInterval} day'))`
+        : '';
+    return `WITH quill_query_table AS (${itemQueries[0]?.replaceAll(';', '')}),
+  quill_qt_agg as (SELECT date_trunc('${dateBucket}', ${pivot.rowField}) as ${pivot.rowField}, ${caseWhens.join(', ')} FROM quill_query_table qt GROUP BY date_trunc('${dateBucket}', ${pivot.rowField}))
+  ${compareCTE} ${compareCaseWhenCTE}
+  SELECT * FROM quill_qt_agg qt 
+  ${joinQuery} ORDER BY qt."${pivot.rowField}"`;
+}
+function create1DPivotQuery(pivot, itemQueries, dateBucket = 'month', comparisonInterval) {
+    if (pivot.rowFieldType === 'string') {
+        return create1DStringPivotQuery(pivot, itemQueries);
+    }
+    return create1DDatePivotQuery(pivot, itemQueries, dateBucket, comparisonInterval);
+}
+function create1DStringPivotQuery(pivot, itemQueries) {
+    const compareCTE = itemQueries[1]
+        ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`
+        : '';
+    const compareCaseWhenCTE = itemQueries[1]
+        ? `, quill_ct_cw as (SELECT ${pivot.rowField} as "comparison_${pivot.rowField}", ${processAggType(pivot.aggregationType)}(${pivot.valueField}) as comparison_${pivot.valueField} FROM quill_ct GROUP BY ${pivot.rowField})`
+        : '';
+    const joinQuery = itemQueries[1]
+        ? `JOIN quill_ct_cw ct ON ct."comparison_${pivot.rowField}" = qt."${pivot.rowField}"`
+        : '';
+    return `WITH quill_qt AS (${itemQueries[0]?.replaceAll(';', '')}),
+  quill_qt_cw AS (SELECT ${pivot.rowField}, ${processAggType(pivot.aggregationType)}(${pivot.valueField}) as ${pivot.valueField} FROM quill_qt GROUP BY ${pivot.rowField})
+  ${compareCTE} ${compareCaseWhenCTE}
+  SELECT * FROM quill_qt_cw qt 
+  ${joinQuery}`;
+}
+function create1DDatePivotQuery(pivot, itemQueries, dateBucket = 'month', comparisonInterval) {
+    const compareCTE = itemQueries[1] && comparisonInterval
+        ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`
+        : '';
+    const compareCaseWhenCTE = itemQueries[1] && comparisonInterval
+        ? `, quill_ct_cw as (SELECT date_trunc('${dateBucket}', ${pivot.rowField}) as comparison_${pivot.rowField}, ${processAggType(pivot.aggregationType)}(${pivot.valueField}) as comparison_${pivot.valueField} FROM quill_ct GROUP BY date_trunc('${dateBucket}', ${pivot.rowField}))`
+        : '';
+    const joinQuery = itemQueries[1] && comparisonInterval
+        ? `LEFT JOIN quill_ct_cw ct ON qt."${pivot.rowField}" = date_trunc('${dateBucket}', (ct."comparison_${pivot.rowField}" + INTERVAL '${comparisonInterval}'))`
+        : '';
+    return `WITH quill_qt AS (${itemQueries[0]?.replaceAll(';', '')}),
+  quill_qt_agg AS (SELECT date_trunc('${dateBucket}', ${pivot.rowField}) as ${pivot.rowField}, ${processAggType(pivot.aggregationType)}(${pivot.valueField}) as ${pivot.valueField} FROM quill_qt GROUP BY date_trunc('${dateBucket}', ${pivot.rowField}))
+  ${compareCTE} ${compareCaseWhenCTE}
+  SELECT * FROM quill_qt_agg qt 
+  ${joinQuery} ORDER BY qt."${pivot.rowField}"`;
+}

package/dist/esm/Chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAe7C,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AA6DzC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAkE5D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,WAKlE;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAeF;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,GAAG,CAAC;IAE3B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAEzC;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAE5C;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,KAAK,YAAY,CAAC;IAE7E;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAErC,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,qEAAqE;IACrE,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAE1C,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CAgD/B,CAAC;AAwyBF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAe7C,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AA6DzC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WA4F5D;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,WAKlE;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAeF;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,GAAG,CAAC;IAE3B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;IAEpC;;OAEG;IACH,wBAAwB,CAAC,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAEzC;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAE5C;;OAEG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,KAAK,YAAY,CAAC;IAE7E;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IAErC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAErC,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,qEAAqE;IACrE,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAE1C,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CAgD/B,CAAC;AA+yBF,eAAe,KAAK,CAAC"}

package/dist/esm/Chart.js

@@ -66,12 +66,34 @@ export function isEquivalent(filters1, filters2) {
                 return false;
             }
         }
+        else if (filter1?.operator === 'BETWEEN' &&
+            filter2?.operator === 'BETWEEN') {
+            if (!filter1?.values && !filter2?.values) {
+                continue;
+            }
+            else if (!filter1?.values || !filter2?.values) {
+                return false;
+            }
+            if (filter1?.values && filter2?.values) {
+                if (!areDatesNearby(filter1.values[0], filter2.values[0]) ||
+                    !areDatesNearby(filter1.values[1], filter2.values[1])) {
+                    return false;
+                }
+            }
+        }
         else if (filterType === 'date_range') {
+            if (!filter1.startDate && !filter2.startDate) {
+                continue;
+            }
             if (!areDatesNearby(filter1.startDate, filter2.startDate) ||
                 !areDatesNearby(filter1.endDate, filter2.endDate)) {
                 return false;
             }
             if (filter1.comparisonRange && filter2.comparisonRange) {
+                if (!filter1.comparisonRange.startDate &&
+                    !filter2.comparisonRange.endDate) {
+                    continue;
+                }
                 if (!areDatesNearby(filter1.comparisonRange.startDate, filter2.comparisonRange.startDate) ||
                     !areDatesNearby(filter1.comparisonRange.endDate, filter2.comparisonRange.endDate)) {
                     return false;
@@ -225,7 +247,7 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
                     ...resp,
                     filtersApplied: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
                 };
-                const cleanedReport = cleanDashboardItem(dashboardItem, filters);
+                const cleanedReport = await cleanDashboardItem(dashboardItem, filters);
                 setReport(cleanedReport);
                 dispatch({
                     type: 'UPDATE_DASHBOARD_ITEM',
@@ -310,7 +332,7 @@ const ChartUpdater = ({ colors, reportId, className, containerStyle, isAnimation
                     ...resp,
                     filtersApplied: minimalFilters.filter((f) => f.dashboardName === dashboard[reportId].dashboardName),
                 };
-                const cleanedReport = cleanDashboardItem(dashboardItem, filters);
+                const cleanedReport = await cleanDashboardItem(dashboardItem, filters);
                 if (cleanedReport.chartType === 'table' && cleanedReport.pivot) {
                     cleanedReport.columns = cleanedReport.yAxisFields;
                 }
@@ -356,6 +378,8 @@ const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hid
                 : ['#4E80EE', '#E14F62', '#55B5A6', '#E9A23B', '#6466E9', '#55B685'];
     }, [colors]);
     const rows = config?.pivotRows ?? config?.rows ?? [];
+    const dateFilter = !hideDateRangeFilter &&
+        findAndProcessDateFilter(Object.values(specificDashboardFilter ?? []));
     const getYAxisFields = () => {
         if (config && config.pivot && config.pivot.columnField) {
             return (config?.pivotColumns
@@ -376,12 +400,25 @@ const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hid
             }) ?? []);
         }
         else {
+            if (dateFilter?.comparison &&
+                dateFilter.comparisonRange.value !== 'NO_COMPARISON') {
+                const comparisonYAxisFields = config?.yAxisFields?.map((field) => {
+                    return {
+                        ...field,
+                        field: `comparison_${field.field}`,
+                        label: `comparison ${field.label ?? field.field}`,
+                    };
+                });
+                return (config?.pivotColumns ?? [
+                    ...config?.yAxisFields,
+                    ...comparisonYAxisFields,
+                ] ??
+                    []);
+            }
             return config?.pivotColumns ?? config?.yAxisFields ?? [];
         }
     };
     const yAxisFields = getYAxisFields();
-    const dateFilter = !hideDateRangeFilter &&
-        findAndProcessDateFilter(Object.values(specificDashboardFilter ?? []));
     if (error) {
         return _jsx(ChartError, { className: className, containerStyle: containerStyle });
     }
@@ -462,19 +499,6 @@ const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hid
     if (chartTypes.includes('bar')) {
         return (_jsx(BarList, { data: rows, theme: theme, yAxisFields: yAxisFields, colors: chartColors, xAxisField: config.xAxisField, xAxisFormat: config.xAxisFormat, containerStyle: containerStyle, className: className, colorMap: colorMap, onClickChartElement: onClickChartElement }));
     }
-    if (yAxisFields.length === 1) {
-        if (yAxisFields[0].label === '' && yAxisFields.length === 1) {
-            yAxisFields[0].label = yAxisFields[0].label;
-        }
-        if (dateFilter?.comparison) {
-            const sampleField = yAxisFields[0];
-            yAxisFields[yAxisFields.length] = {
-                ...sampleField,
-                field: `comparison_${sampleField?.field}`,
-                label: `comparison ${sampleField?.label}`,
-            };
-        }
-    }
     if (chartTypes.includes('column')) {
         // Autofill the column chart with an empty column if there are no rows
         let barChartData = rows;
@@ -500,7 +524,8 @@ const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hid
                     break;
             }
         }
-        return (_jsx(BarChart, { colors: chartColors, theme: theme, isStacked: config.pivot && yAxisFields.length > (dateFilter?.comparison ? 2 : 1), yAxisFields: yAxisFields, data: barChartData, xAxisField: config.xAxisField, xAxisLabel: config.xAxisLabel, xAxisFormat: xAxisFormat, containerStyle: containerStyle, className: className, comparison: dateFilter?.comparison, isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, colorMap: colorMap, onClickChartElement: onClickChartElement, dateFilter: dateFilter }));
+        return (_jsx(BarChart, { colors: chartColors, theme: theme, isStacked: config.pivot && yAxisFields.length > (dateFilter?.comparison ? 2 : 1), yAxisFields: yAxisFields, data: barChartData, xAxisField: config.xAxisField, xAxisLabel: config.xAxisLabel, xAxisFormat: xAxisFormat, containerStyle: containerStyle, className: className, comparison: dateFilter?.comparison &&
+                dateFilter.comparisonRange.value !== 'NO_COMPARISON', isAnimationActive: isAnimationActive, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, colorMap: colorMap, onClickChartElement: onClickChartElement, dateFilter: dateFilter }));
     }
     if (chartTypes.includes('metric')) {
         const isComparison = rows?.length > 0 &&

package/dist/esm/ChartEditor.js

@@ -150,7 +150,7 @@ export default function ChartEditor({ isOpen, reportId, isAdmin = false, destina
                         ...resp,
                         filtersApplied: specificDashboardFilter,
                     };
-                    const cleanedReport = cleanDashboardItem(curDashboardItem, specificDashboardFilter);
+                    const cleanedReport = await cleanDashboardItem(curDashboardItem, specificDashboardFilter);
                     setDashboardItem({ ...dashboardItem, ...cleanedReport });
                     dispatch({
                         type: 'UPDATE_DASHBOARD_ITEM',

package/dist/esm/Dashboard.d.ts

@@ -1,4 +1,4 @@
-import React, { ReactNode, ChangeEvent } from 'react';
+import React, { CSSProperties, ReactNode, ChangeEvent } from 'react';
 import { Column } from './models/Columns';
 import { Filter } from './models/Filter';
 /**
@@ -231,6 +231,14 @@ export interface DashboardProps {
     }) => JSX.Element;
     /** A fallback component displayed when an active dashboard has no items. */
     EmptyDashboardComponent?: () => JSX.Element;
+    /** A component that displays a loading state for charts. */
+    DashboardLoadingComponent?: ({ showFilterLoading, numCharts, containerStyle, chartContainerStyle, LoadingComponent, }: {
+        showFilterLoading?: boolean;
+        numCharts?: number;
+        containerStyle?: CSSProperties;
+        chartContainerStyle?: CSSProperties;
+        LoadingComponent?: () => JSX.Element;
+    }) => JSX.Element;
     /** A callback fired when a report is clicked. */
     onClickReport?: (report: QuillReport) => void;
     /** A callback that is fired when the loading status of the dashboard changes. */
@@ -306,5 +314,5 @@ export interface DashboardProps {
  * ### API Reference
  * @see https://docs.quillsql.com/components/dashboard
  */
-export default function Dashboard({ name, hidden, SelectComponent, MultiSelectComponent, EmptyDashboardComponent, DateRangePickerComponent, MetricComponent, ChartComponent, TableComponent, DashboardSectionComponent, DashboardSectionContainerComponent, FilterContainerComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter, hideXAxis, hideYAxis, hideCartesianGrid, comparisonLineStyle, containerStyle, className, chartContainerStyle, filters, onClickChartElement, dateBucket, additionalProcessing, }: DashboardProps): import("react/jsx-runtime").JSX.Element | null;
+export default function Dashboard({ name, hidden, SelectComponent, MultiSelectComponent, EmptyDashboardComponent, DateRangePickerComponent, MetricComponent, ChartComponent, TableComponent, DashboardSectionComponent, DashboardSectionContainerComponent, FilterContainerComponent, DashboardLoadingComponent, onClickReport, onChangeLoading, hideFilters, hideDateRangeFilter, hideXAxis, hideYAxis, hideCartesianGrid, comparisonLineStyle, containerStyle, className, chartContainerStyle, filters, onClickChartElement, dateBucket, additionalProcessing, }: DashboardProps): import("react/jsx-runtime").JSX.Element | null;
 //# sourceMappingURL=Dashboard.d.ts.map