@quillsql/react 2.11.25 → 2.11.26

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

@@ -46,7 +46,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
     const getDistinctValues = async () => {
         if (columns) {
             const stringColumns = columns.filter((column) => {
-                return (0, ast_1.isTextColumnType)(column.fieldType || column.format);
+                return column.format === 'string';
             });
             if (stringColumns.length === 0) {
                 const possibleColumns = (0, pivotProcessing_1.getPossiblePivotFieldOptions)(columns, {});
@@ -156,15 +156,6 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         pivotValueField,
         pivotAggregation,
     ]);
-    (0, react_1.useEffect)(() => {
-        setSelectedPivotIndex(-1);
-        setSelectedPivotType('');
-        setPivotRowField(undefined);
-        setPivotColumnField(undefined);
-        setPivotValueField(undefined);
-        setPivotAggregation(undefined);
-        setErrors([]);
-    }, [selectedTable]);
     (0, react_1.useEffect)(() => {
         if (!initialUniqueValues) {
             return;
@@ -445,7 +436,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                                                         }), width: 200 }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", label: "Aggregation type", value: pivotAggregation, onChange: (e) => {
                                                             if (e.target.value !== 'count' &&
                                                                 pivotValueField &&
-                                                                !ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === pivotValueField)?.format)) {
+                                                                !ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === pivotValueField).format)) {
                                                                 setPivotValueField(null);
                                                             }
                                                             pivotFieldChange('aggregationType', e.target.value);
@@ -569,7 +560,7 @@ function castValueToDate(value) {
     }
     return new Date(value);
 }
-function getRecentDate(a, b) {
+function getLatestDate(a, b) {
     return a > b ? a : b;
 }
 function getEarliestDate(a, b) {
@@ -580,7 +571,7 @@ function getDateRange(dateRange, column, data) {
     const ONE_CENTURY_IN_MILLISECONDS = 100 * 365 * 24 * 60 * 60 * 1000;
     const maxDate = new Date(currentTime + ONE_CENTURY_IN_MILLISECONDS);
     const minDate = new Date(0);
-    if (!dateRange || !dateRange[0]) {
+    if (!dateRange) {
         if (data.length == 0 || !data[0][column]) {
             return { start: new Date(), end: new Date() };
         }
@@ -591,22 +582,30 @@ function getDateRange(dateRange, column, data) {
                 end: firstDate || new Date(),
             };
         }
-        let earliestDate = firstDate;
-        let lastestDate = firstDate;
+        let earliestDate = undefined;
+        let latestDate = undefined;
+        for (let i = 0; i < data.length; i++) {
+            if (earliestDate && latestDate) {
+                break;
+            }
+            const value = castValueToDate(data[i][column]);
+            earliestDate = value && value > minDate ? value : null;
+            latestDate = value && value < maxDate ? value : null;
+        }
+        if (!earliestDate || !latestDate) {
+            return {
+                start: earliestDate || new Date(),
+                end: latestDate || new Date(),
+            };
+        }
         for (let i = 0; i < data.length; i++) {
             if (data[i][column]) {
                 const value = castValueToDate(data[i][column]);
-                if (lastestDate && lastestDate > minDate) {
-                    lastestDate = value;
-                }
                 if (value && value < maxDate) {
-                    lastestDate =
-                        lastestDate === null ? value : getRecentDate(lastestDate, value);
+                    latestDate =
+                        latestDate === null ? value : getLatestDate(latestDate, value);
                 }
                 if (value && value > minDate) {
-                    if (earliestDate && earliestDate < minDate) {
-                        earliestDate = value;
-                    }
                     earliestDate =
                         earliestDate === null
                             ? value
@@ -615,40 +614,40 @@ function getDateRange(dateRange, column, data) {
             }
         }
         return {
-            start: earliestDate,
-            end: lastestDate,
+            start: earliestDate || new Date(),
+            end: latestDate || new Date(),
         };
     }
     else {
-        return { start: dateRange[0], end: dateRange[1] };
+        return dateRange;
     }
 }
 function getDateBuckets(dateRange, column, data) {
-    if (!dateRange || !dateRange[0]) {
+    if (!dateRange) {
         return (0, date_fns_1.eachMonthOfInterval)(getDateRange(dateRange, column, data));
     }
-    const dayDifference = (0, date_fns_1.differenceInDays)(new Date(dateRange[1]), new Date(dateRange[0]));
+    const dayDifference = (0, date_fns_1.differenceInDays)(dateRange.end, dateRange.start);
     return dayDifferenceToInterval(dayDifference, dateRange);
 }
 function getCompDateBuckets(dateRange, compDateRange, column, data) {
-    if (!dateRange || !dateRange[0]) {
-        return (0, date_fns_1.eachMonthOfInterval)(getDateRange(dateRange, column, data));
+    if (!dateRange) {
+        return (0, date_fns_1.eachMonthOfInterval)(getDateRange(undefined, column, data));
     }
-    const dayDifference = (0, date_fns_1.differenceInDays)(new Date(dateRange[1]), new Date(dateRange[0]));
+    const dayDifference = (0, date_fns_1.differenceInDays)(dateRange.end, dateRange.start);
     return dayDifferenceToInterval(dayDifference, compDateRange);
 }
 function dayDifferenceToInterval(dayDifference, dateRange) {
     if (dayDifference < 14) {
-        return (0, date_fns_1.eachDayOfInterval)({ start: dateRange[0], end: dateRange[1] });
+        return (0, date_fns_1.eachDayOfInterval)(dateRange);
     }
     else if (dayDifference < 60) {
-        return (0, date_fns_1.eachWeekOfInterval)({ start: dateRange[0], end: dateRange[1] }, { weekStartsOn: 1 });
+        return (0, date_fns_1.eachWeekOfInterval)(dateRange, { weekStartsOn: 1 });
     }
     else if (dayDifference < 365 * 3) {
-        return (0, date_fns_1.eachMonthOfInterval)({ start: dateRange[0], end: dateRange[1] });
+        return (0, date_fns_1.eachMonthOfInterval)(dateRange);
     }
     else {
-        return (0, date_fns_1.eachYearOfInterval)({ start: dateRange[0], end: dateRange[1] });
+        return (0, date_fns_1.eachYearOfInterval)(dateRange);
     }
 }
 function getDateString(value, dateRange) {
@@ -714,23 +713,22 @@ const fixBigQueryData = (data = []) => {
     }
     return newData;
 };
-function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = null) {
+function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined) {
     // If there is no rowField, aggregate on the valueField
     if (!pivot.rowField) {
         return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType, isComparison);
     }
     // Handle edge-case for BigQuery objects.
     data = fixBigQueryData(data);
-    if (dateRange[0] === null && dateRange[1] === null) {
-        dateRange = [new Date(0), (0, date_fns_1.add)(new Date(), { years: 5 })];
+    if (!dateRange) {
         if (isDateField(pivot.rowFieldType)) {
             dateRange = getDateRange(dateRange, pivot.rowField, data);
         }
     }
     if (!compRange ||
-        isNullUndefinedOrInvalidDate(compRange[0]) ||
-        isNullUndefinedOrInvalidDate(compRange[1])) {
-        compRange = null;
+        isNullUndefinedOrInvalidDate(compRange.start) ||
+        isNullUndefinedOrInvalidDate(compRange.end)) {
+        compRange = undefined;
     }
     const pivotRows = [];
     const uniqueRows = (isDateField(pivot.rowFieldType)
@@ -987,6 +985,13 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
                 }
             }
         });
+        if (pivot.aggregationType === 'max' || pivot.aggregationType === 'min') {
+            for (const [key, value] of Object.entries(row)) {
+                if (value === '-Infinity' || value === 'Infinity') {
+                    row[key] = null;
+                }
+            }
+        }
         pivotRows.push(row);
     });
     const columns = [

package/dist/cjs/models/Columns.d.ts

@@ -0,0 +1,11 @@
+export interface Column {
+    field: string;
+    label: string;
+    format: string;
+}
+export interface ColumnInternal extends Column {
+    fieldType: string;
+    dataTypeID: number;
+    jsType: string;
+}
+//# sourceMappingURL=Columns.d.ts.map

package/dist/cjs/models/Columns.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Columns.d.ts","sourceRoot":"","sources":["../../../src/models/Columns.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAe,SAAQ,MAAM;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB"}

package/dist/cjs/models/Columns.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/models/Tables.d.ts

@@ -1,11 +1,3 @@
-export interface Column {
-    label: string;
-    field: string;
-    name: string;
-    displayName: string;
-    fieldType: string;
-    format: string;
-}
 export interface Table {
 }
 export interface YAxisField {

package/dist/cjs/models/Tables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tables.d.ts","sourceRoot":"","sources":["../../../src/models/Tables.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;CAAG;AAEzB,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB"}
+{"version":3,"file":"Tables.d.ts","sourceRoot":"","sources":["../../../src/models/Tables.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;CAAG;AAEzB,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB"}

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

@@ -0,0 +1,3 @@
+import { Column } from '../models/Columns';
+export declare function processStarColumn(ast: any, columns: Column[]): any;
+//# sourceMappingURL=astProcessing.d.ts.map

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

@@ -0,0 +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,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D"}

package/dist/cjs/utils/astProcessing.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processStarColumn = void 0;
+function processStarColumn(ast, columns) {
+    if (ast.columns === '*') {
+        ast.columns = columns.map((column) => {
+            return {
+                type: 'expr',
+                expr: {
+                    type: 'column_ref',
+                    table: null,
+                    column: column.field,
+                },
+                as: null,
+            };
+        });
+    }
+    return ast;
+}
+exports.processStarColumn = processStarColumn;

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

@@ -0,0 +1,9 @@
+import { ColumnInfo } from '../components/ReportBuilder/schema';
+import { Column, ColumnInternal } from '../models/Columns';
+export declare function convertPostgresColumn(field: {
+    name: string;
+    dataTypeID: number;
+}): ColumnInternal;
+export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo): ColumnInternal;
+export declare function convertFormatToJsType(column: Column): string;
+//# sourceMappingURL=columnProcessing.d.ts.map

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

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

package/dist/cjs/utils/columnProcessing.js

@@ -0,0 +1,207 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertFormatToJsType = exports.convertColumnInfoToColumnInternal = exports.convertPostgresColumn = void 0;
+function convertPostgresColumn(field) {
+    let format;
+    let fieldType;
+    let jsType;
+    switch (field.dataTypeID) {
+        case 16: // bool
+            format = 'string';
+            break;
+        case 20: // int8
+        case 21: // int2
+        case 23: // int4
+            format = 'whole_number';
+            break;
+        case 700: // float4
+        case 701: // float8
+        case 1700: // numeric
+            format = 'two_decimal_places';
+            break;
+        case 1082: // date
+        case 1083: // time
+        case 1184: // timestamptz
+        case 1114: // timestamp
+            format = 'MMM_dd_yyyy';
+            break;
+        case 1186: // interval
+        case 1043: // varchar
+        default:
+            format = 'string';
+    }
+    switch (field.dataTypeID) {
+        case 16: // boolean
+            fieldType = 'bool';
+            break;
+        case 20: // int8
+            fieldType = 'int8';
+            break;
+        case 21: // int2
+            fieldType = 'int2';
+            break;
+        case 23: // int4
+            fieldType = 'int4';
+            break;
+        case 700: // float4
+            fieldType = 'float4';
+            break;
+        case 701: // float8
+            fieldType = 'float8';
+            break;
+        case 1700: // numeric
+            fieldType = 'numeric';
+            break;
+        case 1082: // date
+            fieldType = 'date';
+            break;
+        case 1083: // time
+            fieldType = 'time';
+            break;
+        case 1184: // timestamptz
+            fieldType = 'timestamptz';
+            break;
+        case 1186: // interval
+            fieldType = 'interval';
+            break;
+        case 1114: // timestamp
+            fieldType = 'timestamp';
+            break;
+        case 1043: // varchar
+        default:
+            fieldType = 'varchar';
+    }
+    switch (field.dataTypeID) {
+        case 16: // boolean
+            jsType = 'bool';
+            break;
+        case 20: // int8
+        case 21: // int2
+        case 23: // int4
+        case 700: // float4
+        case 701: // float8
+        case 1700: // numeric
+            jsType = 'number';
+            break;
+        case 1082: // date
+        case 1083: // time
+        case 1184: // timestamptz
+        case 1186: // interval
+        case 1114: // timestamp
+            jsType = 'date';
+            break;
+        case 1043: // varchar
+        default:
+            jsType = 'string';
+    }
+    return {
+        label: field.name,
+        field: field.name,
+        format,
+        fieldType,
+        dataTypeID: field.dataTypeID,
+        jsType: jsType,
+    };
+}
+exports.convertPostgresColumn = convertPostgresColumn;
+function convertColumnInfoToColumnInternal(columnInfo) {
+    return {
+        label: columnInfo.name,
+        field: columnInfo.name,
+        format: fieldTypeToFormat(columnInfo.fieldType),
+        fieldType: columnInfo.fieldType,
+        dataTypeID: fieldTypeToDataTypeID(columnInfo.fieldType),
+        jsType: convertFieldTypeToJSType(columnInfo.fieldType),
+    };
+}
+exports.convertColumnInfoToColumnInternal = convertColumnInfoToColumnInternal;
+function fieldTypeToFormat(fieldType) {
+    switch (fieldType) {
+        case 'bool':
+            return 'string';
+        case 'int8':
+        case 'int2':
+        case 'int4':
+            return 'whole_number';
+        case 'float4':
+        case 'float8':
+        case 'numeric':
+            return 'two_decimal_places';
+        case 'date':
+        case 'time':
+        case 'timestamptz':
+        case 'timestamp':
+            return 'MMM_dd_yyyy';
+        case 'interval':
+        case 'varchar':
+        default:
+            return 'string';
+    }
+}
+function fieldTypeToDataTypeID(fieldType) {
+    switch (fieldType) {
+        case 'bool':
+            return 16;
+        case 'int8':
+            return 20;
+        case 'int2':
+            return 21;
+        case 'int4':
+            return 23;
+        case 'float4':
+            return 700;
+        case 'float8':
+            return 701;
+        case 'numeric':
+            return 1700;
+        case 'date':
+            return 1082;
+        case 'time':
+            return 1083;
+        case 'timestamptz':
+            return 1184;
+        case 'timestamp':
+            return 1114;
+        case 'interval':
+            return 1186;
+        case 'varchar':
+        default:
+            return 1043;
+    }
+}
+function convertFieldTypeToJSType(fieldType) {
+    switch (fieldType) {
+        case 'bool':
+            return 'bool';
+        case 'int8':
+        case 'int2':
+        case 'int4':
+        case 'float4':
+        case 'float8':
+        case 'numeric':
+            return 'number';
+        case 'date':
+        case 'time':
+        case 'timestamptz':
+        case 'timestamp':
+            return 'date';
+        case 'interval':
+        case 'varchar':
+        default:
+            return 'string';
+    }
+}
+function convertFormatToJsType(column) {
+    switch (column.format) {
+        case 'string':
+            return 'string';
+        case 'whole_number':
+        case 'two_decimal_places':
+            return 'number';
+        case 'MMM_dd_yyyy':
+            return 'date';
+        default:
+            return 'string';
+    }
+}
+exports.convertFormatToJsType = convertFormatToJsType;

package/dist/cjs/utils/dashboard.js

@@ -121,15 +121,15 @@ function getPivotTable(itemInfo, dashboardFilters, config = undefined) {
     const data = itemInfo ? itemInfo : config;
     return pivot && data?.rows
         ? (0, PivotModal_1.generatePivotTable)(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
-        dateFilter?.startDate
-            ? [dateFilter?.startDate, dateFilter?.endDate, null]
-            : [null, null, null], Boolean(dateFilter?.comparisonRange?.startDate), -1, dateFilter?.comparisonRange?.startDate
-            ? [
-                dateFilter?.comparisonRange.startDate,
-                dateFilter?.comparisonRange.endDate,
-                null,
-            ]
-            : [null, null, null])
+        dateFilter?.startDate && dateFilter?.endDate
+            ? { start: dateFilter.startDate, end: dateFilter.endDate }
+            : undefined, Boolean(dateFilter?.comparisonRange?.startDate), -1, dateFilter?.comparisonRange?.startDate &&
+            dateFilter?.comparisonRange?.endDate
+            ? {
+                start: dateFilter.comparisonRange.startDate,
+                end: dateFilter.comparisonRange.endDate,
+            }
+            : undefined)
         : null;
 }
 /**

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

@@ -1,11 +1,12 @@
 import { Pivot } from '../internals/ReportBuilder/PivotModal';
+import { Column } from '../models/Columns';
 export declare function pivotToSql(pivot: Pivot, query: string, client: any): {
     query: string;
     preQueries?: string[];
     runQueryConfig?: any;
 } | undefined;
 export declare function isValidPivot(pivot: Pivot): boolean;
-export declare function getPossiblePivotFieldOptions(columns: any, uniqueValues: {
+export declare function getPossiblePivotFieldOptions(columns: Column[], uniqueValues: {
     [field: string]: any;
 }): {
     rowFields: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAG9D,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,GAAG,GACV;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAgD5E;AAmDD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WAgBxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,GAAG,EACZ,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EA8CvC;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,EAAE,MAAM,EAAkB,MAAM,mBAAmB,CAAC;AAG3D,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,GAAG,GACV;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAgD5E;AAmDD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WAgBxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,MAAM,EAAE,EACjB,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

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanPivot = exports.getPossiblePivotFieldOptions = exports.isValidPivot = exports.pivotToSql = void 0;
-const ChartBuilder_1 = require("../ChartBuilder");
-const ast_1 = require("../components/ReportBuilder/ast");
 const util_1 = require("../components/ReportBuilder/util");
+const valueFormatter_1 = require("./valueFormatter");
 function pivotToSql(pivot, query, client) {
     const processedAggType = pivot.aggregationType?.toLowerCase() === 'average'
         ? 'avg'
@@ -110,9 +109,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
     let valueFields = [];
     for (let column of columns) {
         // row fields can be dates or strings
-        if (column.format === 'date' ||
-            column.fieldType === 'date' ||
-            ChartBuilder_1.dateFormatOptions.includes(column.format)) {
+        if (valueFormatter_1.DATE_FORMAT_TYPES.includes(column.format)) {
             rowFields.push(column.field);
         }
         // column fields can be strings
@@ -129,9 +126,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
             }
         }
         // value fields can be numbers
-        if (column.format === 'whole_number' ||
-            ChartBuilder_1.numberFormatOptions.includes(column.format) ||
-            (0, ast_1.isNumericColumnType)(column.fieldType)) {
+        if (valueFormatter_1.NUMBER_FORMAT_TYPES.includes(column.format)) {
             if (!(0, util_1.isIdColumn)(column.field)) {
                 valueFields.push(column.field);
             }

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

@@ -1,5 +1,5 @@
-import { ColumnInfo } from '../components/ReportBuilder/schema';
-export declare const getUniqueValuesByColumns: (columns: ColumnInfo[], query: string, rows: any, client: any) => Promise<{
+import { Column } from '../models/Columns';
+export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: any) => Promise<{
     [column: string]: {
         [value: string]: boolean;
     };

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAa,MAAM,oCAAoC,CAAC;AAI3E,eAAO,MAAM,wBAAwB,YAC1B,UAAU,EAAE,SACd,MAAM,QACP,GAAG,UACD,GAAG;;;;SA2DZ,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG;;;;SAwDZ,CAAC"}

package/dist/cjs/utils/tableProcessing.js

@@ -4,9 +4,7 @@ exports.getUniqueValuesByColumns = void 0;
 const dataFetcher_1 = require("./dataFetcher");
 const queryConstructor_1 = require("./queryConstructor");
 const getUniqueValuesByColumns = async (columns, query, rows, client) => {
-    const stringNames = columns.map(
-    // @ts-ignore
-    (column) => column.name || column.field);
+    const stringNames = columns.map((column) => column.field);
     const uniqueValues = {};
     if (!client.databaseType ||
         client.databaseType.toLowerCase() === 'bigquery') {

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

@@ -1,5 +1,5 @@
 import { type AxisFormat } from '../Dashboard';
-type Field = {
+export type Field = {
     _id: string;
     label: string;
     field: string;
@@ -11,6 +11,7 @@ type Props = {
     fields: Field[];
 };
 export declare const DATE_FORMAT_TYPES: string[];
+export declare const NUMBER_FORMAT_TYPES: string[];
 /**
  * Pretty-prints the given values to their nice-looking string form.
  */

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,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,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;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MAwChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAoCH,CAAC;AAoMF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MA6CF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,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,MAwChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAwCH,CAAC;AAoMF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MA6CF,CAAC"}

package/dist/cjs/utils/valueFormatter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareValues = exports.quillFormat = exports.valueFormatter = exports.DATE_FORMAT_TYPES = void 0;
+exports.compareValues = exports.quillFormat = exports.valueFormatter = exports.NUMBER_FORMAT_TYPES = exports.DATE_FORMAT_TYPES = void 0;
 const date_fns_1 = require("date-fns");
 const date_fns_tz_1 = require("date-fns-tz");
 exports.DATE_FORMAT_TYPES = [
@@ -12,6 +12,13 @@ exports.DATE_FORMAT_TYPES = [
     'MMM_dd_hh:mm_ap_pm',
     'wo, yyyy',
 ];
+exports.NUMBER_FORMAT_TYPES = [
+    'whole_number',
+    'one_decimal_place',
+    'two_decimal_places',
+    'dollar_amount',
+    'dollar_cents',
+];
 /**
  * Pretty-prints the given values to their nice-looking string form.
  */
@@ -54,6 +61,10 @@ const valueFormatter = ({ value, field, fields }) => {
 };
 exports.valueFormatter = valueFormatter;
 const quillFormat = ({ value, format, }) => {
+    // Handle special case, if value is null and format is numeric display '-'
+    if (value === null && exports.NUMBER_FORMAT_TYPES.includes(format)) {
+        return '-';
+    }
     const HANDLERS = {
         percent: formatPercent,
         dollar_amount: formatDollarAmount,

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

@@ -1 +1 @@
-{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgB7C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAsGjD,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,WAQhE;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,aAAa,GAAG,GAAG,CAAC;IAE7B;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,iBAAiB,CAAC,EAAE,CAClB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,UAAU,KACd,YAAY,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CA2C/B,CAAC;AAulBF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgB7C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAsGjD,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,WAQhE;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,aAAa,GAAG,GAAG,CAAC;IAE7B;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;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;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,iBAAiB,CAAC,EAAE,CAClB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,UAAU,KACd,YAAY,CAAC;IAElB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CA2C/B,CAAC;AA4lBF,eAAe,KAAK,CAAC"}