@quillsql/react 2.12.29 → 2.12.31

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

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA2BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,GAAG,GACd;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAqCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,GAAG,EACX,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAqG/B"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA4BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,GAAG,GACd;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAqCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,GAAG,EACX,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAqG/B"}

package/dist/esm/utils/astProcessing.js

@@ -76,8 +76,9 @@ export function createTableNameToTableAliasMap(ast) {
     }
     if (ast.with) {
         for (const withStmt of ast.with) {
-            if (withStmt.stmt.ast.from) {
-                for (const table of withStmt.stmt.ast.from) {
+            const astFrom = withStmt.stmt.from ?? withStmt.stmt.ast.from;
+            if (astFrom) {
+                for (const table of astFrom) {
                     const tableObject = recursiveSearchByKeys(table, ['table', 'as']);
                     if (tableObject.as) {
                         tableNameToTableAliasMap[tableObject.as] = tableObject.table;
@@ -168,7 +169,7 @@ export function getColumnAndTableInfo(tableAliasMap, column, schemaInfo) {
     return { tableName, columnName };
 }
 export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
-    let referencedColumns = {};
+    const referencedColumns = {};
     if (ast.columns === '*' || ast.columns[0].expr.column === '*') {
         // Be sure to select everything from stars
         const tableList = ast.from.map((table) => recursiveSearchByKey(table, 'table'));

package/dist/esm/utils/axisFormatter.js

@@ -66,13 +66,6 @@ const formatterDollar = new Intl.NumberFormat('en-US', {
     currency: 'USD',
     maximumFractionDigits: 0,
 });
-// Formats to dollars like 1234.567 -> $1234.57
-const formatterDollarsCents = new Intl.NumberFormat('en-US', {
-    style: 'currency',
-    currency: 'USD',
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-});
 /**
  * Formats the value as a (rounded) currency amount in dollars.  If value is
  * zero, returns '$0' with no cents. If value is greater than or equal to 1000,
@@ -94,27 +87,6 @@ const formatDollarAmount = (value) => {
         return formatterDollar.format(num);
     }
 };
-/**
- * Formats the value as a (rounded) currency amount in dollars and cents. If
- * value is zero, returns '$0' with no cents. If value is greater than or equal
- * to 1000, it will not show cents and shorten the value with a suffix such
- * as K (for thousands) or M (for millions).
- *
- * @example format(1,234,567) => "$1.2M"
- * @example format(1234.567) => "$1.2K"
- * @example format(5000) => "$5K"
- * @example format(123.45) => "$123.45"
- * @example format(0.00) => "$0"
- */
-const formatDollarCents = (value) => {
-    const num = Number(value ?? 0);
-    if (num >= 1000 || num === 0) {
-        return formatterBigDollars.format(num);
-    }
-    else {
-        return formatterDollarsCents.format(num);
-    }
-};
 const formatterBigWholeNumber = new Intl.NumberFormat('en-US', {
     minimumSignificantDigits: 1,
     maximumSignificantDigits: 2,
@@ -129,48 +101,6 @@ const formatterBigWholeNumber = new Intl.NumberFormat('en-US', {
 const formatWholeNumber = (value) => {
     return formatterBigWholeNumber.format(Number(value));
 };
-/**
- * Formats the value as a number rounded to exactly one decimal place.
- *
- * @example format(1234.567) => "1.2K"
- * @example format(123.456) => "1,234.6"
- */
-const formatOneDecimalPlace = (value) => {
-    const formatter = new Intl.NumberFormat('en-US', {
-        minimumFractionDigits: 1,
-        maximumFractionDigits: 1,
-        notation: 'compact',
-        compactDisplay: 'short',
-    });
-    const num = Number(value ?? 0);
-    if (num >= 1000 || num === 0) {
-        return formatterBigWholeNumber.format(num);
-    }
-    else {
-        return formatter.format(num);
-    }
-};
-/**
- * Formats the value as a number rounded to exactly two decimal places.
- *
- * @example format(1234.567) => "1.23K"
- * @example format(123.456) => "123.46"
- */
-const formatTwoDecimalPlaces = (value) => {
-    const formatter = new Intl.NumberFormat('en-US', {
-        minimumFractionDigits: 2,
-        maximumFractionDigits: 2,
-        notation: 'compact',
-        compactDisplay: 'short',
-    });
-    const num = Number(value ?? 0);
-    if (num >= 1000 || num === 0) {
-        return formatterBigWholeNumber.format(num);
-    }
-    else {
-        return formatter.format(num);
-    }
-};
 /**
  * Formats the value as a percentage.
  *
@@ -225,7 +155,6 @@ const format_MMM_ww_yyyy = (value) => {
     const utcDate = utcToZonedTime(new Date(value), 'UTC');
     if (!isValid(utcDate))
         return 'Invalid date';
-    const currentDate = new Date();
     const startOfWeekDate = startOfWeek(utcDate, { weekStartsOn: 1 });
     const endOfWeekDate = endOfWeek(utcDate, { weekStartsOn: 1 });
     const month = format(utcDate, 'MMM');

package/dist/esm/utils/color.js

@@ -69,7 +69,7 @@ function interpolateBetween(leftColor, rightColor, length = 3) {
  * @param length - The number of interpolated colors to generate.
  */
 function monochromaticInterpolation(color, length) {
-    const [h, s, _l] = colorToHSL(color);
+    const [h, s] = colorToHSL(color);
     const hues = linspace(h, h, length);
     const saturations = linspace(s, s, length);
     const lightnesses = linspace(0.6, 0.9, length);
@@ -360,15 +360,15 @@ const COLOR_TO_HEX = {
  */
 export function rgbToHsl(r, g, b) {
     (r /= 255), (g /= 255), (b /= 255);
-    var max = Math.max(r, g, b), min = Math.min(r, g, b);
-    var h = (max + min) / 2;
-    var s = (max + min) / 2;
-    var l = (max + min) / 2;
+    const max = Math.max(r, g, b), min = Math.min(r, g, b);
+    let h = (max + min) / 2;
+    let s = (max + min) / 2;
+    const l = (max + min) / 2;
     if (max == min) {
         h = s = 0; // achromatic
     }
     else {
-        var d = max - min;
+        const d = max - min;
         s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
         switch (max) {
             case r:
@@ -397,7 +397,7 @@ export function rgbToHsl(r, g, b) {
  * @return  Array           The RGB representation
  */
 export function HSLtoRGB(h, s, l) {
-    var r, g, b;
+    let r, g, b;
     if (s == 0) {
         r = g = b = l; // achromatic
     }
@@ -415,89 +415,11 @@ export function HSLtoRGB(h, s, l) {
                 return p + (q - p) * (2 / 3 - t) * 6;
             return p;
         };
-        var q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-        var p = 2 * l - q;
+        const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+        const p = 2 * l - q;
         r = hue2rgb(p, q, h + 1 / 3);
         g = hue2rgb(p, q, h);
         b = hue2rgb(p, q, h - 1 / 3);
     }
     return [r * 255, g * 255, b * 255];
 }
-/**
- * Converts an RGB color value to HSV. Conversion formula
- * adapted from http://en.wikipedia.org/wiki/HSV_color_space.
- * Assumes r, g, and b are contained in the set [0, 255] and
- * returns h, s, and v in the set [0, 1].
- *
- * @param   Number  r       The red color value
- * @param   Number  g       The green color value
- * @param   Number  b       The blue color value
- * @return  Array           The HSV representation
- */
-function rgbToHsv(r, g, b) {
-    (r = r / 255), (g = g / 255), (b = b / 255);
-    var max = Math.max(r, g, b), min = Math.min(r, g, b);
-    var h = max;
-    var s = max;
-    var v = max;
-    var d = max - min;
-    s = max == 0 ? 0 : d / max;
-    if (max == min) {
-        h = 0; // achromatic
-    }
-    else {
-        switch (max) {
-            case r:
-                h = (g - b) / d + (g < b ? 6 : 0);
-                break;
-            case g:
-                h = (b - r) / d + 2;
-                break;
-            case b:
-                h = (r - g) / d + 4;
-                break;
-        }
-        h /= 6;
-    }
-    return [h, s, v];
-}
-/**
- * Converts an HSV color value to RGB. Conversion formula
- * adapted from http://en.wikipedia.org/wiki/HSV_color_space.
- * Assumes h, s, and v are contained in the set [0, 1] and
- * returns r, g, and b in the set [0, 255].
- *
- * @param   Number  h       The hue
- * @param   Number  s       The saturation
- * @param   Number  v       The value
- * @return  Array           The RGB representation
- */
-function hsvToRgb(h, s, v) {
-    var r, g, b;
-    var i = Math.floor(h * 6);
-    var f = h * 6 - i;
-    var p = v * (1 - s);
-    var q = v * (1 - f * s);
-    var t = v * (1 - (1 - f) * s);
-    switch (i % 6) {
-        case 0:
-            (r = v), (g = t), (b = p);
-            break;
-        case 1:
-            (r = q), (g = v), (b = p);
-            break;
-        case 2:
-            (r = p), (g = v), (b = t);
-            break;
-        case 3:
-            (r = p), (g = q), (b = v);
-            break;
-        case 4:
-            (r = t), (g = p), (b = v);
-            break;
-        case 5:
-            (r = v), (g = p), (b = q);
-            break;
-    }
-    return [r * 255, g * 255, b * 255];
-}

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

@@ -1,5 +1,6 @@
 import { ColumnInfo } from '../components/ReportBuilder/schema';
 import { Column, ColumnInternal } from '../models/Columns';
+import { QuillReportInternal } from '../models/Report';
 export declare function convertPostgresColumn(field: {
     name: string;
     dataTypeID: number;
@@ -8,4 +9,5 @@ export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo
 export declare function convertFieldTypeToJSType(fieldType: string): string;
 export declare function convertFormatToJsType(column: Column): string;
 export declare function processColumnName(columnName: string): string;
+export declare const getYAxisFields: (report: QuillReportInternal) => any[];
 //# sourceMappingURL=columnProcessing.d.ts.map

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

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

package/dist/esm/utils/columnProcessing.js

@@ -1,3 +1,4 @@
+import { findAndProcessDateFilter } from './filterProcessing';
 function removeBigQuerySpecialChars(columnName) {
     return columnName.replaceAll('quill_forward_slash', '/');
 }
@@ -206,3 +207,54 @@ export function convertFormatToJsType(column) {
 export function processColumnName(columnName) {
     return removeBigQuerySpecialChars(columnName);
 }
+export const getYAxisFields = (report) => {
+    try {
+        const curDateFilter = findAndProcessDateFilter(Object.values(report.filtersApplied));
+        if (report.pivot && report.pivotColumns && report.pivot.columnField) {
+            return (report.pivotColumns
+                .slice(1)
+                .map((column) => {
+                // @ts-ignore
+                return { ...column, format: report.yAxisFields[0].format };
+            }) ?? []);
+        }
+        else if (report.pivot && report.pivotColumns) {
+            return (report.pivotColumns
+                .slice(1)
+                .map((column) => {
+                return {
+                    ...column,
+                    // @ts-ignore
+                    label: report?.yAxisFields[0].label,
+                    // @ts-ignore
+                    format: report?.yAxisFields[0].format,
+                };
+            }) ?? []);
+        }
+        else {
+            if (curDateFilter?.comparison &&
+                curDateFilter.comparisonRange.value !== 'NO_COMPARISON') {
+                const comparisonYAxisFields = report.yAxisFields?.map((field) => {
+                    return {
+                        ...field,
+                        field: `comparison_${field.field}`,
+                        label: `comparison ${field.label ?? field.field}`,
+                    };
+                });
+                if (report.pivotColumns) {
+                    return report.pivotColumns;
+                }
+                else if (comparisonYAxisFields || report.yAxisFields) {
+                    const yAxisFields = report.yAxisFields ?? [];
+                    const compYAxisFields = comparisonYAxisFields ?? [];
+                    return [...yAxisFields, ...compYAxisFields];
+                }
+                return [];
+            }
+            return report.pivotColumns ?? report.yAxisFields ?? [];
+        }
+    }
+    catch (e) {
+        return report.yAxisFields;
+    }
+};

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=columnProcessing.uspec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"columnProcessing.uspec.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.uspec.ts"],"names":[],"mappings":""}

package/dist/esm/utils/columnProcessing.uspec.js

@@ -0,0 +1,65 @@
+import { DEFAULT_COMPARISON_DATE_FILTER, TWO_D_PIVOT, GENERIC_REPORT_INTERNAL, ONE_D_PIVOT, } from '../test-utils/constants';
+import { createRows } from '../test-utils/generators';
+import { getYAxisFields } from './columnProcessing';
+describe('columnProcessing', () => {
+    describe('getYAxisFields', () => {
+        it('should return an array of fields for generic reports', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'id', format: 'whole_number', label: 'ID' },
+            ]);
+        });
+        it('should return an array of fields for comparison reports', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                compareRows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                filtersApplied: [DEFAULT_COMPARISON_DATE_FILTER],
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'id', format: 'whole_number', label: 'ID' },
+                {
+                    field: 'comparison_id',
+                    format: 'whole_number',
+                    label: 'comparison ID',
+                },
+            ]);
+        });
+        it('should return the proper fields for a 2d pivot report', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                pivotColumns: TWO_D_PIVOT.pivotColumns,
+                pivotRows: TWO_D_PIVOT.pivotRows,
+                pivot: TWO_D_PIVOT.pivot,
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'Food', format: 'whole_number', label: 'Food' },
+                { field: 'Fuel', format: 'whole_number', label: 'Fuel' },
+                { field: 'Other', format: 'whole_number', label: 'Other' },
+            ]);
+        });
+        it('should return the proper fields for a 1d pivot report', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                pivotColumns: ONE_D_PIVOT.pivotColumns,
+                pivotRows: ONE_D_PIVOT.pivotRows,
+                pivot: ONE_D_PIVOT.pivot,
+                yAxisFields: [
+                    { field: 'amount', format: 'whole_number', label: 'Amount' },
+                ],
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'amount', format: 'whole_number', label: 'Amount' },
+            ]);
+        });
+    });
+});

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

@@ -1 +1 @@
-{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}
+{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}

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

@@ -1,4 +1,4 @@
-import { QuillReportInternal } from '../Dashboard';
+import { QuillReportInternal } from '../models/Report';
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
  * the dashboard item so that we aren't exposing unnecessary details to the

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,cAAc,CAAC;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"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+BpE;;;;;;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,CAyC9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}

package/dist/esm/utils/dashboard.js

@@ -1,4 +1,3 @@
-import { valueFormatter } from './valueFormatter';
 import { generatePivotTable, generatePivotTableYAxis, } from '../internals/ReportBuilder/PivotModal';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { getData } from './dataFetcher';
@@ -14,15 +13,14 @@ const defaultDashboardItem = {
     chartType: '',
     dateField: null,
     pivot: null,
-    primaryAggregation: '',
-    comparisonAggregation: '',
-    aggregationPercentChange: undefined,
     yAxisFields: [],
     xAxisLabel: '',
     xAxisField: '',
     xAxisFormat: 'string',
     order: -1,
     filtersApplied: {},
+    queryString: '',
+    rowCount: 0,
 };
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
@@ -41,7 +39,6 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
             name: item.name,
         };
     const pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
-    const { primaryAggregation, comparisonAggregation, aggregationPercentChange, } = getAggragations(pivotTable, item);
     return {
         id: item._id,
         name: item.name,
@@ -56,9 +53,6 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: item.pivot,
-        primaryAggregation,
-        comparisonAggregation,
-        aggregationPercentChange,
         yAxisFields: pivotTable
             ? extractPivotedYAxis(pivotTable, item)
             : item.yAxisFields,
@@ -69,52 +63,18 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         filtersApplied: item.filtersApplied,
         rowCount: parseInt(item.rowCount),
         sort: item.sort,
-        page: item.page,
         itemQuery: item.itemQuery,
+        queryString: item.queryString,
     };
 }
-/**
- * Extracts the aggregations from the item, if any.
- */
-function getAggragations(pivotTable, item) {
-    const yAxisFields = extractPivotedYAxis(pivotTable, item);
-    const rows = extractPivotedData(pivotTable, item);
-    // extract the aggragation for the primary range.
-    const mainKey = yAxisFields[0]?.field ?? item.pivot?.valueField;
-    const primary = mainKey
-        ? rows.reduce((sum, row) => sum + parseFloat(row[mainKey]), 0)
-        : 0;
-    // extract the aggragation for the comparison range, if applicable.
-    const compKey = yAxisFields[1]?.field ?? item.pivot?.valueField;
-    const comparison = compKey
-        ? rows.reduce((sum, row) => sum + parseFloat(row[compKey]), 0)
-        : 0;
-    return {
-        primaryAggregation: formatAggragation(item, primary),
-        comparisonAggregation: formatAggragation(item, comparison),
-        aggregationPercentChange: Number(primary - comparison),
-    };
-}
-/**
- * Applies a valueFormatter to the given value based on the format in the item.
- */
-function formatAggragation(item, value) {
-    if (!value)
-        return undefined;
-    return valueFormatter({
-        value,
-        field: item.pivot?.valueField,
-        fields: item.yAxisFields,
-    });
-}
 /**
  * Extract and transform the data from itemInfo.
  */
 async function getPivotTable(report, dashboardFilters, client, dateBucketInitial) {
     if (!report)
         return undefined;
-    let dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType === 'date_range' || filter.opterator === 'BETWEEN');
-    if (dateFilter?.opterator === 'BETWEEN') {
+    const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType === 'date_range' || filter.opterator === 'BETWEEN');
+    if (dateFilter?.operator === 'BETWEEN') {
         dateFilter.startDate = dateFilter.value[0];
         dateFilter.endDate = dateFilter.value[1];
     }
@@ -162,20 +122,6 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             : undefined)
         : undefined;
 }
-/**
- * Returns the data list based on whether the table is pivoted and if there is
- * a config value passed into this component.
- */
-function extractPivotedData(pivotTable, item, config = undefined) {
-    if (pivotTable)
-        return pivotTable.rows;
-    if (config) {
-        if (config.bucketedRows.length > 0)
-            return config.bucketedRows;
-        return config.rows;
-    }
-    return item.rows;
-}
 /**
  * Extracts the yAxis from the pivot table, if one exists.
  */
@@ -217,6 +163,7 @@ export async function getDashboard(dashboardName, client) {
             clientId: client.publicKey,
             orgId: client.customerId || '*',
             databaseType: client.databaseType,
+            useNewNodeSql: true,
         },
     };
     const resp = await getData(client, `dashconfig?${searchParams}`, 'omit', hostedBody, null, 'GET');

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

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAqBA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBAwGpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAwEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBA0IpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}

package/dist/esm/utils/dataFetcher.js

@@ -1,3 +1,15 @@
+function fetchQuillData(responseData) {
+    if (!responseData) {
+        return null;
+    }
+    if (responseData.data && responseData.data?.data) {
+        return responseData.data;
+    }
+    else if (responseData.data) {
+        return responseData;
+    }
+    return null;
+}
 function parseData(rows, queryType) {
     if (!rows || rows.length === 0)
         return [];
@@ -17,6 +29,32 @@ function parseData(rows, queryType) {
             return rows;
     }
 }
+async function testSqlViewState(hostedRequestBody, client, referencedTables) {
+    let errorMessage = null;
+    await Promise.all(referencedTables.map(async (table) => {
+        const hostedBody = {
+            metadata: {
+                tables: [table],
+                task: 'test-view',
+                clientId: hostedRequestBody.metadata.clientId,
+            },
+        };
+        const cloudBody = { ...hostedBody };
+        const resp = await getData(client, 'test-view', 'same-origin', hostedBody, cloudBody);
+        if (resp.success === false) {
+            const brokenBody = {
+                metadata: {
+                    table: table,
+                    task: 'set-broken-view',
+                    clientId: hostedRequestBody.metadata.clientId,
+                },
+            };
+            getData(client, 'test-view', 'same-origin', brokenBody, cloudBody);
+            errorMessage = `SQL View Error: '${table}' is out of sync with datasource.`;
+        }
+    }));
+    return errorMessage;
+}
 // this function gets the data either from the self hosted endpoint or
 // our cloud server
 export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cloudRequestBody, method = 'POST', queryParam) {
@@ -37,6 +75,30 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
                 body: JSON.stringify(hostedRequestBody),
             });
             const responseJson = await resp.json();
+            if (responseJson.status === 'error' &&
+                ['query', 'patterns', 'item'].includes(hostedRequestBody.metadata.task)) {
+                const brokenReport = { ...responseJson };
+                let errorPrefix = 'Error: ';
+                let errorMessage = 'Failed to fetch chart';
+                if (hostedRequestBody.metadata.task === 'query' ||
+                    hostedRequestBody.metadata.task === 'patterns') {
+                    errorPrefix = 'SQL Error: ';
+                    errorMessage = errorPrefix + responseJson.error;
+                }
+                let adminErrorMessage = undefined;
+                const processedData = fetchQuillData(brokenReport);
+                if (processedData &&
+                    processedData.data &&
+                    processedData.data.referencedTables) {
+                    adminErrorMessage = await testSqlViewState(hostedRequestBody, client, processedData.data.referencedTables);
+                }
+                return {
+                    success: false,
+                    errorMessage,
+                    adminErrorMessage,
+                    data: brokenReport.data,
+                };
+            }
             if (responseJson.error) {
                 return { success: false, errorMessage: responseJson.error };
             }
@@ -50,7 +112,7 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
                         fields: responseJson?.data.queries?.queryResults[0]?.fields,
                         ...responseJson.data.data,
                     };
-                    responseJson.data.data.queryOrder.forEach((queryKey, index) => {
+                    responseJson.data.data?.queryOrder?.forEach((queryKey, index) => {
                         result[queryKey] = parseData(responseJson.queries.queryResults[index].rows, queryKey);
                     });
                 }

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

@@ -0,0 +1,10 @@
+import { QuillReportInternal } from '../models/Report';
+export declare enum Calculation {
+    PointToPointPercentageChange = "POINT_TO_POINT_PERCENTAGE_CHANGE",
+    SimplePercentageChange = "SIMPLE_PERCENTAGE_CHANGE",
+    Sum = "SUM"
+}
+export declare const getSimplePercentageChange: (data: QuillReportInternal) => number | undefined;
+export declare const getPointToPointPercentageChange: (data: QuillReportInternal) => number | undefined;
+export declare const getSumOfFields: (data: QuillReportInternal) => number;
+//# sourceMappingURL=dataProcessing.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,SAAU,mBAAmB,uBAsClE,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,mBAAmB,uBAkFxE,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,mBAAmB,WAavD,CAAC"}