@quillsql/react 2.13.7 → 2.13.9

package/dist/cjs/utils/report.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchReportBuilderDataFromAST = exports.convertInternalReportToReport = exports.formatRowsFromReport = exports.saveReport = exports.fetchReportRowCount = exports.fetchReport = exports.EMPTY_INTERNAL_REPORT = exports.EMPTY_REPORT = void 0;
+exports.fetchReportBuilderDataFromAST = exports.formatRowsFromReport = exports.EMPTY_INTERNAL_REPORT = exports.EMPTY_REPORT = void 0;
+exports.fetchReport = fetchReport;
+exports.fetchReportRowCount = fetchReportRowCount;
+exports.saveReport = saveReport;
+exports.convertInternalReportToReport = convertInternalReportToReport;
 const ChartBuilder_1 = require("../ChartBuilder");
 const ast_1 = require("../components/ReportBuilder/ast");
 const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
@@ -13,7 +17,6 @@ const dates_1 = require("./dates");
 const error_1 = require("./error");
 const errorProcessing_1 = require("./errorProcessing");
 const logging_1 = require("./logging");
-const merge_1 = require("./merge");
 const paginationProcessing_1 = require("./paginationProcessing");
 const pivotProcessing_1 = require("./pivotProcessing");
 const tableProcessing_1 = require("./tableProcessing");
@@ -108,7 +111,6 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
                 client.databaseType.toLowerCase() === 'bigquery') {
                 (0, dataProcessing_1.parseValueFromBigQueryDates)(dashboardItem.compareRows, resp.fields);
             }
-            (0, merge_1.mergeComparisonRange)(dashboardItem);
         }
         reportInfo = await (0, dashboard_1.cleanDashboardItem)(dashboardItem, filters, client, dateBucket);
         if (additionalProcessing) {
@@ -123,6 +125,7 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
             reportInfo &&
             !reportInfo.pivot &&
             !reportInfo.pivotColumns &&
+            !reportInfo.error &&
             useReportTask &&
             reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
                 ?.length > 0) {
@@ -169,7 +172,6 @@ async function fetchReport(reportId, client, useReportTask = true, filters = [],
     }
     return { report: reportInfo || exports.EMPTY_INTERNAL_REPORT, error: errorMessage };
 }
-exports.fetchReport = fetchReport;
 async function fetchReportRowCount(reportId, client, useReportTask = true, filters = [], additionalProcessing, customFields, abortSignal) {
     // Remove extra fields on each filter so we don't confuse the backend.
     const hostedBody = {
@@ -195,7 +197,6 @@ async function fetchReportRowCount(reportId, client, useReportTask = true, filte
     const resp = await (0, dataFetcher_1.getData)(client, 'itempost', 'omit', hostedBody, cloudBody, 'POST', 'fetch-data', abortSignal);
     return resp.rowCount;
 }
-exports.fetchReportRowCount = fetchReportRowCount;
 async function saveReport({ report, dashboardItemId, client, }) {
     const { publicKey, organizationId, databaseType } = client;
     const cloudBody = {
@@ -231,7 +232,6 @@ async function saveReport({ report, dashboardItemId, client, }) {
         : { clientId: publicKey }).toString();
     return await (0, dataFetcher_1.getData)(client, `dashedit2?${searchParams}`, 'same-origin', hostedBody, cloudBody);
 }
-exports.saveReport = saveReport;
 const formatRowsFromReport = (report) => {
     if (!report.rows || !report.columns) {
         return [];
@@ -305,7 +305,6 @@ function convertInternalReportToReport(report) {
         return exports.EMPTY_REPORT;
     }
 }
-exports.convertInternalReportToReport = convertInternalReportToReport;
 const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client, pivot, previousFormData, currentTable, previousRelevant, report, customFields, skipUniqueValues, skipRowCount, processing) => {
     let newRows = [];
     let newColumns = [];
@@ -333,11 +332,16 @@ const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client,
             ? report
             : (0, ChartBuilder_1.createInitialFormData)(tableData.columns);
         curReport = {
-            ...formData,
+            id: report?.id ?? '',
+            dashboardName: report?.dashboardName ?? '',
+            order: report?.order ?? 1,
+            compareRows: report?.compareRows ?? [],
+            queryString: report?.queryString ?? '',
+            ...report,
             ...processedFormData,
-            pivot: pivot,
+            pivot: pivot ?? null,
             itemQuery: tableData.itemQuery,
-            rowCount: tableData.rowCount,
+            rowCount: tableData.rowCount ?? 0,
             filtersApplied: [],
             rows: tableData.rows,
             columns: tableData.columns.map((col) => {
@@ -368,7 +372,7 @@ const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client,
                     return column.fieldType === 'date';
                 });
                 if (dateColumns.length > 0) {
-                    const dateRanges = await (0, tableProcessing_1.getDateRangeByColumns)(dateColumns, queryResult.query, client, customFields ?? []);
+                    const dateRanges = await (0, tableProcessing_1.getQueryDateRangeByColumns)(dateColumns, queryResult.query, client, customFields ?? []);
                     if (dateRanges === null) {
                         throw new Error("Couldn't fetch date ranges");
                     }
@@ -386,7 +390,13 @@ const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client,
                 if (rowFieldDateRange) {
                     dateBucket = (0, dates_1.getDateBucketFromRange)(rowFieldDateRange.dateRange);
                 }
-                newPivotData = await (0, PivotModal_1.generatePivotTable)(pivot, tableData.rows, undefined, false, -1, undefined, dateBucket, curReport, client, relevantInfo.uniqueStrings[table]);
+                newPivotData = await (0, PivotModal_1.generatePivotTable)({
+                    pivot,
+                    dateBucket,
+                    report: curReport,
+                    client,
+                    uniqueValues: relevantInfo.uniqueStrings[table],
+                });
                 newPivot = pivot;
             }
             if (!newPivotData) {

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAyDzC,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,oCAqF5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,mBAAmB,8BAEhB,MAAM,EAAE,KAClB,QAAQ;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAoD3D,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAyDzC,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,oCAqF5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,mBAAmB,8BAEhB,MAAM,EAAE,KAClB,OAAO,CAAC;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAoD3D,CAAC"}

package/dist/cjs/utils/styles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.styleToProps = void 0;
+exports.styleToProps = styleToProps;
 /**
  * Converts the given styles to a props object that can be passed directly into
  * a jsx/tsx component. Converts to className if styles is a string, otherwise
@@ -17,4 +17,3 @@ function styleToProps(styles) {
     }
     return { style: styles };
 }
-exports.styleToProps = styleToProps;

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

@@ -20,15 +20,15 @@ export declare const getUniqueValuesByColumns: (columns: Column[], query: string
 } | null>;
 export declare const getUniqueStringValues: (columns: ColumnInternal[], tableName: string, client: any, customFields?: any, previousUniqueValues?: any, withExceededColumns?: boolean, query?: string) => Promise<any>;
 export declare const getRelevantInfoFromQuery: (columns: ColumnInternal[], client: QuillProviderClient, query: string, customFields?: any) => Promise<{
-    uniqueStrings?: UniqueValuesByColumn | undefined;
-    dateRanges?: DateRangesByColumn | undefined;
-    error?: string | undefined;
+    uniqueStrings?: UniqueValuesByColumn;
+    dateRanges?: DateRangesByColumn;
+    error?: string;
 }>;
 export declare const getCountsByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
     filteredColumns: Column[];
     exceededColumns: Column[] | undefined;
 }>;
-export declare const getDateRangeByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
+export declare const getQueryDateRangeByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
     [column: string]: {
         dateRange: {
             start: Date;
@@ -48,22 +48,22 @@ export declare const fetchResultsByQuery: (query: string, client: QuillProviderC
 } | null, rowsOnly?: boolean, rowCountOnly?: boolean) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
-    rowCount?: number | undefined;
-    error?: string | undefined;
-    itemQuery?: string[] | undefined;
+    rowCount?: number;
+    error?: string;
+    itemQuery?: string[];
 }>;
 export declare const fetchResultsByReport: (reportId: string, client: QuillProviderClient, processing?: AdditionalProcessing, filters?: any, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean, abortSignal?: AbortSignal) => Promise<{
     columns: Column[];
     rows: any[];
-    rowCount?: number | undefined;
-    error?: string | undefined;
+    rowCount?: number;
+    error?: string;
 }>;
 export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: QuillProviderClient, processing?: AdditionalProcessing, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
-    rowCount?: number | undefined;
-    error?: string | undefined;
-    itemQuery?: string[] | undefined;
+    rowCount?: number;
+    error?: string;
+    itemQuery?: string[];
 }>;
 export declare const convertUniqueValuesByColumnToUniqueValueStrings: (uniqueValuesByColumns: UniqueValuesByColumn) => {
     [columnName: string]: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAgB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,mBAAmB,gBACb,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,cAAc,EAAE,aACd,MAAM,UACT,GAAG,iBACI,GAAG,yBACK,GAAG,wBACJ,OAAO,UACrB,MAAM,iBA2Cf,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,mBAAmB,SACpB,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE,KAClB,QAAQ;IACT,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACvC,CAiDA,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,mBAAmB,UACnB,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,YACR,eAAe,EAAE,cACf;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,aACxC,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EA2DZ,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACrB,MAAM,UACR,mBAAmB,eACd,oBAAoB,YACvB,GAAG,iBACE,GAAG,aACP,OAAO,iBACH,OAAO,gBACR,WAAW;aAEhB,MAAM,EAAE;UACX,GAAG,EAAE;;;EAyFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,aACP,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAyDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/tableProcessing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertUniqueValuesByColumnToUniqueValueStrings = exports.fetchTableByAST = exports.fetchResultsByReport = exports.fetchResultsByQuery = exports.getPaginatedRows = exports.getDateRangeByColumns = exports.getCountsByColumns = exports.getRelevantInfoFromQuery = exports.getUniqueStringValues = exports.getUniqueValuesByColumns = exports.hasColumnAlias = void 0;
+exports.convertUniqueValuesByColumnToUniqueValueStrings = exports.fetchTableByAST = exports.fetchResultsByReport = exports.fetchResultsByQuery = exports.getPaginatedRows = exports.getQueryDateRangeByColumns = exports.getCountsByColumns = exports.getRelevantInfoFromQuery = exports.getUniqueStringValues = exports.getUniqueValuesByColumns = exports.hasColumnAlias = void 0;
 const ast_1 = require("../components/ReportBuilder/ast");
 const util_1 = require("../components/ReportBuilder/util");
 const columnProcessing_1 = require("./columnProcessing");
@@ -9,7 +9,6 @@ const dataFetcher_1 = require("./dataFetcher");
 const dataProcessing_1 = require("./dataProcessing");
 const dates_1 = require("./dates");
 const errorProcessing_1 = require("./errorProcessing");
-const merge_1 = require("./merge");
 const paginationProcessing_1 = require("./paginationProcessing");
 const queryConstructor_1 = require("./queryConstructor");
 const hasColumnAlias = (columns, referencedColumns) => {
@@ -49,9 +48,9 @@ const getUniqueValuesByColumns = async (columns, query, rows, client, customFiel
             rows = data.rows;
         }
         for (const column of columns) {
-            const values = Array.from(
-            //@ts-ignore
-            new Set(rows.map((row) => row[column.name || column.field])));
+            const values = Array.from(new Set(rows
+                .map((row) => row[column.name || column.field])
+                .filter((value) => value !== null && value !== undefined)));
             // @ts-ignore
             uniqueValues[column.name || column.field] = values.reduce((result, value) => {
                 result[value] = false;
@@ -79,7 +78,12 @@ const getUniqueStringValues = async (columns, tableName, client, customFields, p
     const stringNames = convertedStringColumns.map((column) => (0, queryConstructor_1.processColumnReference)(column.field, client.databaseType));
     const { filteredColumns: smallStringColumns, exceededColumns } = await (0, exports.getCountsByColumns)(convertedStringColumns, query ?? `Select ${stringNames.join(', ')} from ${tableName}`, client, customFields ?? []);
     const smallStringNames = smallStringColumns.map((column) => (0, queryConstructor_1.processColumnReference)(column.field, client.databaseType));
-    const newUniqueValues = await (0, exports.getUniqueValuesByColumns)(smallStringColumns, query ?? `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, customFields ?? []);
+    const newUniqueValues = await (0, exports.getUniqueValuesByColumns)(
+    // returns null if data error
+    smallStringColumns, query ?? `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, customFields ?? []);
+    if (!newUniqueValues) {
+        return {};
+    }
     if (withExceededColumns) {
         exceededColumns?.forEach((column) => {
             if (newUniqueValues) {
@@ -116,7 +120,7 @@ const getRelevantInfoFromQuery = async (columns, client, query, customFields) =>
             return column.fieldType === 'date';
         });
         if (dateColumns.length > 0) {
-            dateRanges = await (0, exports.getDateRangeByColumns)(dateColumns, query, client, customFields);
+            dateRanges = await (0, exports.getQueryDateRangeByColumns)(dateColumns, query, client, customFields);
             if (dateRanges === null) {
                 throw new Error("Couldn't fetch date ranges");
             }
@@ -153,7 +157,10 @@ const getCountsByColumns = async (columns, query, client, customFields) => {
             return { filteredColumns: columns, exceededColumns: undefined };
         }
         const results = data.rows.map((columnInfo) => {
-            return { field: columnInfo.field, count: columnInfo.count };
+            return {
+                field: columnInfo.field || columnInfo.FIELD, // Snowflake
+                count: columnInfo.count || columnInfo.COUNT, // Snowflake
+            };
         });
         const filteredColumns = columns.filter((column) => {
             const columnInfo = results.find((result) => result.field === column.field);
@@ -166,6 +173,7 @@ const getCountsByColumns = async (columns, query, client, customFields) => {
         return { filteredColumns, exceededColumns };
     }
     catch (e) {
+        console.error(e);
         return { filteredColumns: columns, exceededColumns: undefined };
     }
 };
@@ -189,12 +197,18 @@ const fetchDistinctStrings = async (query, client, customFields) => {
             return null;
         }
         const results = data.rows.map((columnInfo) => {
-            const column = columnInfo.field;
+            const column = columnInfo.field || columnInfo.FIELD;
             if (!columnInfo.string_values) {
                 return { column, values: {} };
             }
+            // This function is used in ReportBuilder and PivotModal to fetch distinct values. However, neither PivotModal or FilterModal
+            // are currently built to handle null values (FilterModal uses SQL IN, which doesn't handle null values). For now, filtering
+            // out null values.
             const values = columnInfo.string_values.reduce((result, value) => {
-                result[value] = false;
+                if (value !== null && value !== undefined) {
+                    // filter out null values for now, TODO: handle
+                    result[value] = false;
+                }
                 return result;
             }, {});
             return { column, values };
@@ -205,16 +219,16 @@ const fetchDistinctStrings = async (query, client, customFields) => {
         return null;
     }
 };
-const getDateRangeByColumns = async (columns, query, client, customFields) => {
+const getQueryDateRangeByColumns = async (columns, query, client, customFields) => {
     const columnNames = columns.map(
     // @ts-ignore
     (column) => column.field || column.name);
     const distinctValueQuery = (0, queryConstructor_1.generateMinMaxRangeQueries)(columnNames, query, client.databaseType || 'postgresql');
-    const dateRanges = await fetchDateRanges(distinctValueQuery, client, customFields);
+    const dateRanges = await fetchQueryDateRanges(distinctValueQuery, client, customFields);
     return dateRanges;
 };
-exports.getDateRangeByColumns = getDateRangeByColumns;
-const fetchDateRanges = async (query, client, customFields) => {
+exports.getQueryDateRangeByColumns = getQueryDateRangeByColumns;
+const fetchQueryDateRanges = async (query, client, customFields) => {
     try {
         const hostedBody = {
             metadata: {
@@ -234,10 +248,7 @@ const fetchDateRanges = async (query, client, customFields) => {
         }
         const results = data.rows.reduce((acc, currentValue) => {
             acc[currentValue.field] = {
-                dateRange: {
-                    start: (0, dates_1.parseDateByDatabaseType)(currentValue.min_range, client.databaseType || 'postgresql'),
-                    end: (0, dates_1.parseDateByDatabaseType)(currentValue.max_range, client.databaseType || 'postgresql'),
-                },
+                dateRange: (0, dates_1.parseQueryDateRangeByDatabaseType)(currentValue.min_range, currentValue.max_range, client.databaseType || 'postgresql'),
             };
             return acc;
         }, {});
@@ -285,6 +296,27 @@ const fetchResultsByQuery = async (query, client, processing, customFields, filt
             },
         };
         const cloudBody = { query };
+        let parsedSuccessfully = true;
+        let parsingError = '';
+        if (!rowCountOnly) {
+            const localURL = `${constants_1.QUILL_SERVER}/astify`;
+            const response = await fetch(localURL, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    query,
+                    publicKey: client.publicKey,
+                    useNewNodeSql: true,
+                }),
+            });
+            const results = await response.json();
+            if (results.success == false) {
+                parsedSuccessfully = false;
+                parsingError = results.message;
+            }
+        }
         const resp = await (0, dataFetcher_1.getData)(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
         if (resp && resp.errorMessage) {
             throw new Error(resp.errorMessage);
@@ -292,6 +324,23 @@ const fetchResultsByQuery = async (query, client, processing, customFields, filt
         if (resp.rowCount) {
             rowCount = resp.rowCount;
         }
+        if (!resp.error && !parsedSuccessfully) {
+            fetch(`${constants_1.QUILL_SERVER}${constants_1.QUILL_QUERY_ENDPOINT}`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    metadata: {
+                        task: 'log-broken-query',
+                        query,
+                        clientId: client.clientId,
+                        error: parsingError,
+                    },
+                }),
+            });
+            throw new Error('Quill parsing error' + parsingError.replace(`Error parsing query`, ''));
+        }
         columns = resp.fields.map((elem) => (0, columnProcessing_1.convertPostgresColumn)(elem));
         rows = resp.rows;
         itemQuery = resp.itemQuery;
@@ -323,9 +372,9 @@ const fetchResultsByReport = async (reportId, client, processing, filters, custo
             const newFilter = { ...filter };
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
-                delete newFilter['options'];
                 delete newFilter['selectedValue'];
             }
+            delete newFilter['options'];
             return newFilter;
         })
         : [];
@@ -362,18 +411,12 @@ const fetchResultsByReport = async (reportId, client, processing, filters, custo
         const gatheredRows = resp.rows && resp.rows.length ? resp.rows : [];
         columns = resp.fields.map((elem) => (0, columnProcessing_1.convertPostgresColumn)(elem));
         rows = gatheredRows;
-        if (resp && resp.name !== 'error') {
-            if (resp.compareRows) {
-                (0, merge_1.mergeComparisonRange)(resp);
-            }
-        }
-        else {
+        if (resp && resp.name === 'error') {
             throw new Error(resp.errorMessage);
         }
     }
     catch (e) {
         if (e instanceof Error && e.name === 'AbortError') {
-            console.log('Aborted fetch results by report');
             throw e;
         }
         rows = [];

package/dist/cjs/utils/textProcessing.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeDoubleQuotes = exports.snakeAndCamelCaseToTitleCase = exports.snakeCaseToTitleCase = exports.depluralize = exports.capitalize = void 0;
+exports.capitalize = capitalize;
+exports.depluralize = depluralize;
+exports.snakeCaseToTitleCase = snakeCaseToTitleCase;
+exports.snakeAndCamelCaseToTitleCase = snakeAndCamelCaseToTitleCase;
+exports.removeDoubleQuotes = removeDoubleQuotes;
 function capitalize(text) {
     return text.charAt(0).toUpperCase() + text.slice(1);
 }
-exports.capitalize = capitalize;
 function depluralize(text) {
     if (text.endsWith('ies')) {
         return text.slice(0, -3) + 'y';
@@ -14,7 +17,6 @@ function depluralize(text) {
     }
     return text;
 }
-exports.depluralize = depluralize;
 function snakeCaseToTitleCase(str) {
     if (!str) {
         return str;
@@ -27,7 +29,6 @@ function snakeCaseToTitleCase(str) {
         : word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
         .join(' ');
 }
-exports.snakeCaseToTitleCase = snakeCaseToTitleCase;
 function snakeAndCamelCaseToTitleCase(str) {
     if (!str) {
         return str;
@@ -47,11 +48,9 @@ function snakeAndCamelCaseToTitleCase(str) {
         return newText;
     }
 }
-exports.snakeAndCamelCaseToTitleCase = snakeAndCamelCaseToTitleCase;
 function removeDoubleQuotes(str) {
     if (!str) {
         return str;
     }
     return str.replace(/"/g, '');
 }
-exports.removeDoubleQuotes = removeDoubleQuotes;

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

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,eAAO,MAAM,cAAc,aACf,gBAAgB,iBACX;IAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,qBACjC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAC1C,GAAG,EAAE,UA+BjB,CAAC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,eAAO,MAAM,cAAc,aACf,gBAAgB,iBACX;IAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,qBACjC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAC1C,GAAG,EAAE,UAmCjB,CAAC"}

package/dist/cjs/utils/validation.js

@@ -6,7 +6,9 @@ const validateReport = (formData, dashboardData, defaultDateFilter, allTables) =
     const issues = [];
     const filters = dashboardData.filters || [];
     const dateFilter = dashboardData.dateFilter;
-    if (dateFilter && dateFilter.comparison && formData.chartType === 'pie') {
+    if (dateFilter &&
+        dateFilter.comparison &&
+        !['line', 'column'].includes(formData.chartType)) {
         issues.push(`"${formData.dashboardName}" is a date comparison dashboard that only supports line and column charts.`);
     }
     if (dateFilter &&

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

@@ -18,6 +18,7 @@ export declare const quillFormat: ({ value, format, }: {
     value: any;
     format: string;
 }) => string;
+export declare function getValidDate(dateString: string): Date | undefined;
 export declare const compareValues: (a: {
     [key: string]: any;
 }, b: {

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

@@ -1 +1 @@
-{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA8ChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAgDH,CAAC;AAoNF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MAkDF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAO/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA8ChE,CAAC;AAEF,eAAO,MAAM,WAAW,uBAGrB;IACD,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,MAgDH,CAAC;AA+MF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,oBAG9C;AAED,eAAO,MAAM,aAAa,MACrB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KACtB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,UACjB,MAAM,KACb,MAkDF,CAAC"}

package/dist/cjs/utils/valueFormatter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compareValues = exports.quillFormat = exports.valueFormatter = exports.NUMBER_FORMAT_TYPES = exports.DATE_FORMAT_TYPES = void 0;
+exports.getValidDate = getValidDate;
 const date_fns_1 = require("date-fns");
 const date_fns_tz_1 = require("date-fns-tz");
 exports.DATE_FORMAT_TYPES = [
@@ -16,6 +17,7 @@ exports.NUMBER_FORMAT_TYPES = [
     'whole_number',
     'one_decimal_place',
     'two_decimal_places',
+    'percent',
     'dollar_amount',
     'dollar_cents',
 ];

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

@@ -1 +1 @@
-{"version":3,"file":"width.d.ts","sourceRoot":"","sources":["../../../src/utils/width.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,iBAClB,MAAM,SAAS,CAAC,WAAW,CAAC,oBACxB,MAAM,cAAc,CAAC,MAAM,CAAC,KAAK,IAAI,YAC9C;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,SAazB,CAAC"}
+{"version":3,"file":"width.d.ts","sourceRoot":"","sources":["../../../src/utils/width.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,iBAClB,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,YAChC,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,IAAI,YAC9C;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,SAazB,CAAC"}

package/dist/esm/Chart.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode, ChangeEvent } from 'react';
 import { QuillTheme } from './QuillProvider';
 import { QuillReport } from './models/Report';
-import { Filter } from './models/Filter';
+import { InternalFilter } from './models/Filter';
 import { MultiSelectComponentProps, SelectComponentProps } from './components/UiComponents';
 interface BaseChartProps {
     colors?: string[];
@@ -20,7 +20,7 @@ interface BaseChartProps {
     comparisonLineStyle?: 'solid' | 'dashed';
     mapColorsToFields?: (_report: QuillReport, _theme: QuillTheme) => ColorMapType;
     LoadingComponent?: () => JSX.Element;
-    filters?: Filter[];
+    filters?: InternalFilter[];
     onClickChartElement?: (data: any) => void;
 }
 interface WithConfig extends BaseChartProps {
@@ -147,8 +147,8 @@ export interface ChartProps {
         label?: string;
         selectWidth?: number;
         dateRange: {
-            startDate: Date;
-            endDate: Date;
+            startDate?: Date;
+            endDate?: Date;
         };
         presetOptions: {
             label: string;
@@ -175,7 +175,7 @@ export interface ChartProps {
      */
     containerStyle?: React.CSSProperties;
     /** An array of dashboard filters that are indicated by the frontend dev. */
-    filters?: Filter[];
+    filters?: InternalFilter[];
     /** A callback function that process specific chart element clicks */
     onClickChartElement?: (data: any) => void;
     /** An override for the pivot date bucketing. */

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

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

package/dist/esm/Chart.js

@@ -20,6 +20,7 @@ import { convertInternalReportToReport, EMPTY_REPORT, fetchReport, } from './uti
 import { shouldFetchMore, DEFAULT_PAGINATION, shouldSortInMemory, } from './utils/paginationProcessing';
 import { fetchResultsByReport } from './utils/tableProcessing';
 import QuillMetricComponent from './components/Dashboard/MetricComponent';
+import { mergeComparisonRange } from './utils/merge';
 const MAX_ROWS_FOR_GENERIC_TABLE = 500;
 // @ts-ignore
 function sumByKey(arr, key) {
@@ -101,6 +102,12 @@ export function isEquivalent(filters1, filters2) {
             if (filter1.comparison !== filter2.comparison) {
                 return false;
             }
+            if (filter1.comparisonRange && !filter2.comparisonRange) {
+                return false;
+            }
+            if (!filter1.comparisonRange && filter2.comparisonRange) {
+                return false;
+            }
             if (filter1.comparisonRange && filter2.comparisonRange) {
                 if (!filter1.comparisonRange.startDate &&
                     !filter2.comparisonRange.endDate) {
@@ -135,6 +142,11 @@ export default function Chart({ colors, reportId, className, containerStyle, isA
         page: 0,
     });
     const [report, setReport] = useState(undefined);
+    const chartReport = useMemo(() => {
+        return report
+            ? convertInternalReportToReport(mergeComparisonRange(report))
+            : undefined;
+    }, [report]);
     const [chartFilters, setChartFilters] = useState([]);
     const [previousPage, setPreviousPage] = useState(0);
     const [filterUpdateIndex, setFilterUpdateIndex] = useState(-1);
@@ -316,7 +328,7 @@ export default function Chart({ colors, reportId, className, containerStyle, isA
                                 updateIndex: filterUpdateIndex + 1,
                             },
                         });
-                    }, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))) })), _jsx(ChartDisplay, { config: report ? convertInternalReportToReport(report) : undefined, reportId: reportId, colors: colors, className: className, containerStyle: containerStyle, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, hideHorizontalCartesianGrid: hideHorizontalCartesianGrid, hideVerticalCartesianGrid: hideVerticalCartesianGrid, hideSubsequentXAxisTicks: hideSubsequentXAxisTicks, cartesianGridLineStyle: cartesianGridLineStyle, cartesianGridLineColor: cartesianGridLineColor, hideDateRangeFilter: hideDateRangeFilter, comparisonLineStyle: comparisonLineStyle, isAnimationActive: isAnimationActive, loading: loading || initialLoad, paginating: paginating, scrollable: true, colorMap: colorMap, LoadingComponent: LoadingComponent, onPageChange: onPageChange, onSortChange: onSortChange, onClickChartElement: onClickChartElement })] }));
+                    }, theme: theme, SelectComponent: SelectComponent, MultiSelectComponent: MultiSelectComponent, DateRangePickerComponent: DateRangePickerComponent }, index))) })), _jsx(ChartDisplay, { config: chartReport ? chartReport : undefined, reportId: reportId, colors: colors, className: className, containerStyle: containerStyle, hideXAxis: hideXAxis, hideYAxis: hideYAxis, hideCartesianGrid: hideCartesianGrid, hideHorizontalCartesianGrid: hideHorizontalCartesianGrid, hideVerticalCartesianGrid: hideVerticalCartesianGrid, hideSubsequentXAxisTicks: hideSubsequentXAxisTicks, cartesianGridLineStyle: cartesianGridLineStyle, cartesianGridLineColor: cartesianGridLineColor, hideDateRangeFilter: hideDateRangeFilter, comparisonLineStyle: comparisonLineStyle, isAnimationActive: isAnimationActive, loading: loading || initialLoad, paginating: paginating, scrollable: true, colorMap: colorMap, LoadingComponent: LoadingComponent, onPageChange: onPageChange, onSortChange: onSortChange, onClickChartElement: onClickChartElement })] }));
 }
 export const ChartDisplay = ({ reportId, config, colors, className, containerStyle, hideXAxis, hideYAxis, hideCartesianGrid, hideDateRangeFilter = false, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', cartesianGridLineColor, comparisonLineStyle, isAnimationActive, scrollable = false, loading = false, paginating = false, ErrorComponent = ChartError, colorMap, LoadingComponent = QuillLoadingSkeleton, onPageChange, onSortChange, onClickChartElement, overrideTheme, }) => {
     const { downloadCSV } = useExport(reportId);
@@ -349,12 +361,11 @@ export const ChartDisplay = ({ reportId, config, colors, className, containerSty
         setDateFilter(getDateFilter());
     }, [config]);
     if (config &&
-        !config.pivot &&
         config.chartType !== 'metric' &&
         config.chartType !== 'table' &&
         ((config.rowCount && config.rowCount > MAX_ROWS_FOR_GENERIC_TABLE) ||
             (config?.rows && config?.rows.length > MAX_ROWS_FOR_GENERIC_TABLE))) {
-        return (_jsx("div", { style: containerStyle, className: className, children: _jsx(ErrorComponent, { errorMessage: `Charts can only display ${MAX_ROWS_FOR_GENERIC_TABLE} rows. Please add a pivot or modify the query.` }) }));
+        return (_jsx("div", { style: containerStyle, className: className, children: _jsx(ErrorComponent, { errorMessage: `Charts can only display ${MAX_ROWS_FOR_GENERIC_TABLE} rows. Please modify the query.` }) }));
     }
     else if (loading) {
         return (_jsx("div", { className: className, style: containerStyle, children: _jsx(LoadingComponent, {}) }));
@@ -368,7 +379,7 @@ export const ChartDisplay = ({ reportId, config, colors, className, containerSty
                     // @ts-ignore
                     parseInt(row[config?.yAxisFields[0]?.field]) /
                         // @ts-ignore
-                        sumByKey(config?.rows, config?.yAxisFields[0].field),
+                        sumByKey(config?.rows, config?.yAxisFields[0]?.field),
                 };
             }) || [], category: config?.yAxisFields[0]?.field, index: config?.xAxisField, colors: chartColors, theme: overrideTheme ?? theme, colorMap: colorMap, onClickChartElement: onClickChartElement }));
     }