@quillsql/react 2.13.7 → 2.13.9

package/dist/esm/utils/pivotConstructor.js

@@ -1,25 +1,16 @@
-import { dateFormatOptions } from '../ChartBuilder';
-import { isNumericColumnType } from '../components/ReportBuilder/ast';
 import { getDateString } from '../internals/ReportBuilder/PivotModal';
 import { processColumnName } from './columnProcessing';
 import { getData } from './dataFetcher';
 import { getComparisonInterval } from './dates';
 import { generatePivotQuery } from './queryConstructor';
 import { snakeCaseToTitleCase } from './textProcessing';
-export async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, distinctStrings) {
-    if (dateFilter && dateFilter.startDate) {
-        dateFilter.start = dateFilter.startDate;
-        dateFilter.end = dateFilter.endDate;
-        if (dateFilter.comparisonRange && dateFilter.comparisonRange.startDate) {
-            dateFilter.comparisonRange.start = dateFilter.comparisonRange.startDate;
-            dateFilter.comparisonRange.end = dateFilter.comparisonRange.endDate;
-        }
-    }
+import { compareValues } from './valueFormatter';
+export async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, distinctStrings, rowLimit) {
     let comparisonInterval = undefined;
     if (dateFilter && dateFilter.comparisonRange) {
         comparisonInterval = getComparisonInterval({
-            startDate: dateFilter.comparisonRange.start,
-            endDate: dateFilter.comparisonRange.end,
+            startDate: dateFilter.comparisonRange.startDate,
+            endDate: dateFilter.comparisonRange.endDate,
         }, dateBucket);
     }
     if (pivot.rowField && !pivot.rowFieldType) {
@@ -32,128 +23,115 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
         distinctStringValues = distinctValues.map((value) => value.toString());
     }
     if (!report.itemQuery) {
-        return undefined;
+        throw Error('No item query found in report');
+    }
+    const sqlQuery = generatePivotQuery(pivot, report.itemQuery, client.databaseType || 'postgresql', comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket, rowLimit);
+    if (!sqlQuery || report.rows.length == 0) {
+        throw 'No rows found in report';
     }
-    const sqlQuery = generatePivotQuery(pivot, report.itemQuery, client.databaseType || 'postgresql', comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
-    if (sqlQuery && report.rows.length > 0) {
-        const hostedBody = {
-            metadata: {
-                preQueries: [sqlQuery],
-                task: 'query',
-                orgId: client.organizationId || '*',
-                clientId: client.publicKey,
-                databaseType: client?.databaseType,
-                getCustomFields: false,
-                runQueryConfig: {
-                    overridePost: true,
-                    convertDatatypes: true,
-                },
-                useNewNodeSql: true,
+    const hostedBody = {
+        metadata: {
+            preQueries: [sqlQuery],
+            task: 'query',
+            orgId: client.organizationId || '*',
+            clientId: client.publicKey,
+            databaseType: client?.databaseType,
+            getCustomFields: false,
+            runQueryConfig: {
+                overridePost: true,
+                convertDatatypes: true,
             },
-        };
-        const cloudBody = { ...hostedBody };
-        const resp = await getData(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
-        if (resp.success === false) {
-            console.error('Error:', resp.errorMessage); // surface to devs
-        }
-        // With our current design we have to remove the second row field but leave the first for comparison purposes.
-        const rows = resp?.queryResults?.[0]?.rows || [];
-        if (pivot.columnField &&
-            client.databaseType?.toLowerCase() === 'bigquery') {
-            rows.forEach((row) => {
-                Object.keys(row).forEach((key) => {
-                    const processedKey = processColumnName(key);
-                    if (processedKey !== key) {
-                        row[processedKey] = row[key];
-                        delete row[key];
-                    }
-                });
+            useNewNodeSql: true,
+        },
+    };
+    const cloudBody = { ...hostedBody };
+    const resp = await getData(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
+    if (resp.success === false) {
+        throw resp.errorMessage;
+    }
+    // With our current design we have to remove the second row field but leave the first for comparison purposes.
+    const rows = pivot.rowField
+        ? (resp?.queryResults?.[0]?.rows || []).map((row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: '-' } : row)
+        : resp?.queryResults?.[0]?.rows || [];
+    if (pivot.columnField && client.databaseType?.toLowerCase() === 'bigquery') {
+        rows.forEach((row) => {
+            Object.keys(row).forEach((key) => {
+                const processedKey = processColumnName(key);
+                if (processedKey !== key) {
+                    row[processedKey] = row[key];
+                    delete row[key];
+                }
             });
+        });
+    }
+    const columns = resp?.queryResults?.[0]?.fields
+        ?.map((field) => ({
+        field: processColumnName(field.name),
+        label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
+        format: field.name === pivot.rowField
+            ? 'string'
+            : (pivot.valueFieldType ?? 'whole_number'),
+    }))
+        .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
+        .sort((a, b) => {
+        if (a.field === pivot.rowField) {
+            return -1;
         }
-        const columns = resp?.queryResults?.[0]?.fields
-            ?.map((field) => ({
-            field: processColumnName(field.name),
-            label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
-            format: field.name === pivot.rowField
-                ? 'string'
-                : (pivot.valueFieldType ?? 'whole_number'),
-        }))
-            .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
-            .sort((a, b) => {
-            if (a.field === pivot.rowField) {
-                return -1;
-            }
-            if (b.field === pivot.rowField) {
-                return 1;
-            }
-            return 0;
+        if (b.field === pivot.rowField) {
+            return 1;
+        }
+        return 0;
+    });
+    if (pivot.rowField &&
+        !['string', 'varchar'].includes(pivot.rowFieldType || '')) {
+        rows.forEach((row) => {
+            row[pivot.rowField || ''] = getDateString(typeof row[pivot.rowField || ''] === 'object' // BigQuery
+                ? row[pivot.rowField || ''].value
+                : row[pivot.rowField || ''], undefined, dateBucket);
         });
+        // add a row for each date in the range that doesn't have a value
         if (pivot.rowField &&
-            !['string', 'varchar'].includes(pivot.rowFieldType || '')) {
-            rows.forEach((row) => {
-                row[pivot.rowField || ''] = getDateString(row[pivot.rowField || ''], undefined, dateBucket);
-            });
-            // add a row for each date in the range that doesn't have a value
-            if (pivot.rowField &&
-                pivot.rowFieldType &&
-                !['string', 'varchar'].includes(pivot.rowFieldType) &&
-                dateFilter) {
-                const dateSet = new Set(rows.map((row) => row[pivot.rowField || '']));
-                // create a loop that will go through each formatted date and add a row if it doesn't exist going to the current date
-                for (let date = dateFilter.start ?? dateFilter.startDate; date <= dateFilter.end; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
-                    const formattedDate = getDateString(date.toDateString(), undefined, dateBucket);
-                    if (!dateSet.has(formattedDate)) {
-                        const newRow = {};
-                        newRow[pivot.rowField] = formattedDate;
-                        rows.push(newRow);
-                        dateSet.add(formattedDate);
-                    }
-                    // order the rows by the date field
-                    rows.sort((a, b) => {
-                        return new Date(a[pivot.rowField || '']) <
-                            new Date(b[pivot.rowField || ''])
-                            ? -1
-                            : 1;
-                    });
+            pivot.rowFieldType &&
+            !['string', 'varchar'].includes(pivot.rowFieldType) &&
+            dateFilter) {
+            const dateSet = new Set(rows.map((row) => row[pivot.rowField || '']));
+            // create a loop that will go through each formatted date and add a row if it doesn't exist going to the current date
+            for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
+                const formattedDate = getDateString(date.toDateString(), undefined, dateBucket);
+                if (!dateSet.has(formattedDate)) {
+                    const newRow = {};
+                    newRow[pivot.rowField] = formattedDate;
+                    rows.push(newRow);
+                    dateSet.add(formattedDate);
                 }
+                // order the rows by the date field
+                rows.sort((a, b) => {
+                    return compareValues(a, b, pivot.rowField ?? '');
+                });
             }
         }
-        if (pivot.sort) {
-            rows.sort((a, b) => {
-                if (pivot.sortDirection === 'ASC') {
-                    if (dateFormatOptions.includes(pivot.sortFieldType ?? '')) {
-                        // @ts-ignore
-                        return new Date(a[pivot.sortField]) - new Date(b[pivot.sortField]);
-                    }
-                    else if (isNumericColumnType(pivot.sortFieldType)) {
-                        return a[pivot.sortField] - b[pivot.sortField];
-                    }
-                    return a[pivot.sortField].localeCompare(b[pivot.sortField]);
-                }
-                else {
-                    if (dateFormatOptions.includes(pivot.sortFieldType ?? '')) {
-                        // @ts-ignore
-                        return new Date(b[pivot.sortField]) - new Date(a[pivot.sortField]);
-                    }
-                    else if (isNumericColumnType(pivot.sortFieldType)) {
-                        return b[pivot.sortField] - a[pivot.sortField];
-                    }
-                    return b[pivot.sortField].localeCompare(a[pivot.sortField]);
-                }
-            });
-        }
-        // for the case of count agg on no value field
-        columns?.forEach((column) => {
-            if (column.label &&
-                ['null', 'undefined'].includes(column.label.toLowerCase()) &&
-                !pivot.valueField &&
-                pivot.aggregationType === 'count') {
-                column.label = 'Count';
+    }
+    if (pivot.sort) {
+        rows.sort((a, b) => {
+            if (pivot.sortDirection === 'ASC') {
+                return compareValues(a, b, pivot.sortField ?? '');
+            }
+            else {
+                return compareValues(b, a, pivot.sortField ?? '');
             }
         });
-        return {
-            rows: rows,
-            columns: columns ?? [],
-        };
     }
+    // for the case of count agg on no value field
+    columns?.forEach((column) => {
+        if (column.label &&
+            ['null', 'undefined'].includes(column.label.toLowerCase()) &&
+            !pivot.valueField &&
+            pivot.aggregationType === 'count') {
+            column.label = 'Count';
+        }
+    });
+    return {
+        rows: rows,
+        columns: columns ?? [],
+    };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAqDnC;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;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAsDnC;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,CA8BP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}

package/dist/esm/utils/pivotProcessing.js

@@ -77,6 +77,10 @@ export function getPossiblePivotFieldOptions(columns, uniqueValues) {
         if (DATE_FORMAT_TYPES.includes(column.format)) {
             rowFields.push(column.field);
         }
+        // include ID fields as rowField pivot option
+        // if (isIdColumn(column.field)) { // TODO: this will cause problems elsewhere that are only expecting string or date: look into it
+        //   rowFields.push(column.field);
+        // }
         // column fields can be strings
         if (column.jsType === 'string') {
             const possibleValues = uniqueValues ? uniqueValues[column.field] : 0;
@@ -89,14 +93,13 @@ export function getPossiblePivotFieldOptions(columns, uniqueValues) {
                     possibleValues['EXCEEDS_LIMIT'] !== undefined)) {
                 columnFields.push(column.field);
             }
-            if (!isNullValuesOnly &&
-                Object.keys(possibleValues).length <= MAX_PIVOT_UNIQUE_VALUES &&
-                !(Object.keys(possibleValues).length === 1 &&
-                    possibleValues['EXCEEDS_LIMIT'] !== undefined)) {
+            if (!isNullValuesOnly // Used to limit rowFields with max unique values, no more
+            ) {
                 rowFields.push(column.field);
             }
         }
         // value fields can be numbers
+        // TODO: should "format" be used as the indicator, or fieldType?
         if (NUMBER_FORMAT_TYPES.includes(column.format)) {
             if (!isIdColumn(column.field)) {
                 valueFields.push(column.field);
@@ -110,11 +113,6 @@ export function getPossiblePivotFieldOptions(columns, uniqueValues) {
     };
 }
 export function cleanPivot(pivot, possibleColumns) {
-    if (possibleColumns.columnFields.length === 0 &&
-        possibleColumns.rowFields.length === 0 &&
-        possibleColumns.valueFields.length === 0) {
-        return pivot;
-    }
     // Swap row field and column field if the AI put a date field as the column field
     if (pivot.columnField &&
         !possibleColumns.columnFields.includes(pivot.columnField)) {
@@ -127,9 +125,9 @@ export function cleanPivot(pivot, possibleColumns) {
         }
     }
     if (pivot.rowField && !possibleColumns.rowFields.includes(pivot.rowField)) {
-        pivot.rowField = '';
+        pivot.rowField = undefined;
     }
-    if (pivot.valueField &&
+    if (!pivot.valueField ||
         !possibleColumns.valueFields.includes(pivot.valueField)) {
         pivot.valueField = '';
     }

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

@@ -1,8 +1,8 @@
 import { Pivot } from '../models/Pivot';
-export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string, isPivotFieldAlias?: boolean): string;
+export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string, isPivotColumnFieldAlias?: boolean, isPivotValueFieldAlias?: boolean): string;
 export declare function replaceSpacesWithUnderscores(column: string): string;
 export declare function generateCountQuery(fields: string[], query: string, databaseType: string): string;
 export declare function generateDistinctQuery(stringFields: string[], query: string, databaseType: string): string;
 export declare function generateMinMaxRangeQueries(columnFields: string[], query: string, databaseType: string): string;
-export declare function generatePivotQuery(pivot: Pivot, itemQueries: string[], databaseType: string, comparisonInterval?: string, distinctStrings?: string[], dateBucket?: string): string | undefined;
+export declare function generatePivotQuery(pivot: Pivot, itemQueries: string[], databaseType: string, comparisonInterval?: string, distinctStrings?: string[], dateBucket?: string, rowLimit?: number): string | undefined;
 //# sourceMappingURL=queryConstructor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,iBAAiB,CAAC,EAAE,OAAO,UAgC5B;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAsDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAyBpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAarB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAmCpB"}