@quillsql/react 2.13.34 → 2.13.36

package/dist/esm/utils/pivotConstructor.js

@@ -2,11 +2,21 @@ import { getDateString } from '../internals/ReportBuilder/PivotModal';
 import { isStringType, processColumnName } from './columnProcessing';
 import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
 import { getData } from './dataFetcher';
+import { parseValueFromBigQueryDates } from './dataProcessing';
 import { getComparisonInterval } from './dates';
-import { generatePivotQuery } from './queryConstructor';
+import { mergeComparisonPivotColumns, mergeComparisonPivotRows } from './merge';
+import { additionalProcessingOnPivotQuery, generatePivotQuery, generateRowCountQuery, } from './queryConstructor';
 import { snakeCaseToTitleCase } from './textProcessing';
-import { compareValues } from './valueFormatter';
-export async function generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, distinctStrings, rowLimit, dashboardName, tenants) {
+export async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount = true, }) {
+    let sqlQuery = pivotQuery;
+    let comparisonPivotSql = comparisonPivotQuery;
+    const databaseType = client.databaseType || 'postgresql';
+    if (!pivotQuery &&
+        pivot.columnField &&
+        !pivot.columnValues &&
+        !distinctStrings) {
+        throw 'No distinct strings provided for column field';
+    }
     let comparisonInterval = undefined;
     if (dateFilter && dateFilter.comparisonRange) {
         comparisonInterval = getComparisonInterval({
@@ -15,31 +25,48 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
         }, dateBucket);
     }
     if (pivot.rowField && !pivot.rowFieldType) {
-        const rowColumn = report.columns.find((column) => column.field === pivot.rowField);
+        const rowColumn = report?.columns.find((column) => column.field === pivot.rowField);
         pivot.rowFieldType = rowColumn?.format || 'string';
     }
-    let distinctStringValues = undefined;
-    if (!distinctStrings && report.rows && pivot.columnField) {
-        const distinctValues = Array.from(new Set(report.rows.map((row) => row[pivot.columnField])));
-        distinctStringValues = distinctValues
-            .filter((value) => value !== null && value !== undefined)
-            .map((value) => value.toString());
-    }
-    if (!report.itemQuery) {
-        throw Error('No item query found in report');
-    }
     const filteredDistinctStrings = distinctStrings?.filter((value) => value !== null && value !== undefined);
-    const sqlQuery = generatePivotQuery(pivot, report.itemQuery, client.databaseType || 'postgresql', comparisonInterval, filteredDistinctStrings?.slice(0, MAX_PIVOT_UNIQUE_VALUES) ??
-        distinctStringValues?.slice(0, MAX_PIVOT_UNIQUE_VALUES), dateBucket, rowLimit);
+    const pivotColumnFields = filteredDistinctStrings?.slice(0, MAX_PIVOT_UNIQUE_VALUES);
+    if (!pivotQuery && report) {
+        if (!report.itemQuery) {
+            throw Error('No item query found in report');
+        }
+        const itemQuery = report.itemQuery[0];
+        const comparisonQuery = report.itemQuery[1];
+        if (!itemQuery) {
+            throw Error('No item query found in report');
+        }
+        sqlQuery =
+            pivotQuery ??
+                generatePivotQuery(pivot, itemQuery, databaseType, pivotColumnFields, dateBucket);
+        comparisonPivotSql = comparisonQuery
+            ? generatePivotQuery(pivot, comparisonQuery, databaseType, pivotColumnFields, dateBucket)
+            : '';
+    }
     if (!sqlQuery) {
         throw 'Error generating pivot query';
     }
+    const paginatedSqlQuery = additionalProcessingOnPivotQuery(pivot, sqlQuery, additionalProcessing, client.databaseType);
+    const paginatedComparisonQuery = comparisonPivotSql
+        ? additionalProcessingOnPivotQuery(pivot, comparisonPivotSql, additionalProcessing, client.databaseType)
+        : '';
+    const preQueries = [paginatedSqlQuery];
+    if (getPivotRowCount && report?.chartType === 'table') {
+        const pivotRowCountQuery = generateRowCountQuery(sqlQuery, client.databaseType);
+        preQueries.push(pivotRowCountQuery);
+    }
+    if (paginatedComparisonQuery) {
+        preQueries.push(paginatedComparisonQuery);
+    }
     const hostedBody = {
         metadata: {
-            preQueries: [sqlQuery],
+            preQueries,
             task: 'query',
             clientId: client.publicKey,
-            databaseType: client?.databaseType,
+            databaseType: databaseType,
             getCustomFields: false,
             runQueryConfig: {
                 overridePost: true,
@@ -55,10 +82,33 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
     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 queryResponseRows = resp?.queryResults?.[0]?.rows || [];
+    const queryResponseFields = resp?.queryResults?.[0]?.fields || [];
+    const queryComparisonResponseRows = (getPivotRowCount
+        ? resp?.queryResults?.[2]?.rows
+        : resp?.queryResults?.[1]?.rows) || [];
+    const queryComparisonResponseFields = (getPivotRowCount
+        ? resp?.queryResults?.[2]?.fields
+        : resp?.queryResults?.[1]?.fields) || [];
+    parseValueFromBigQueryDates(queryResponseRows, queryResponseFields);
+    parseValueFromBigQueryDates(queryComparisonResponseRows, queryComparisonResponseFields);
+    const responseRows = mergeComparisonPivotRows({
+        pivot,
+        rows: queryResponseRows,
+        compRows: queryComparisonResponseRows,
+        databaseType,
+        dateBucket,
+        comparisonInterval,
+        columnFieldValues: pivotColumnFields,
+    });
+    const responseFields = mergeComparisonPivotColumns({
+        pivot,
+        rows: queryResponseFields,
+        compRows: queryComparisonResponseFields,
+    });
     const rows = pivot.rowField
-        ? (resp?.queryResults?.[0]?.rows || []).map((row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: '-' } : row)
-        : resp?.queryResults?.[0]?.rows || [];
+        ? responseRows.map((row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: '-' } : row)
+        : responseRows;
     if (pivot.columnField && client.databaseType?.toLowerCase() === 'bigquery') {
         rows.forEach((row) => {
             Object.keys(row).forEach((key) => {
@@ -70,14 +120,14 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             });
         });
     }
-    const columns = resp?.queryResults?.[0]?.fields
+    const columns = responseFields
         ?.map((field) => ({
         field: processColumnName(field.name),
         label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
         format: field.name === pivot.rowField
             ? 'string'
             : (pivot.valueFieldType ?? pivot.aggregationType === 'percentage')
-                ? 'percentage'
+                ? 'percent'
                 : 'whole_number',
         fieldType: field.fieldType,
         jsType: field.jsType,
@@ -116,7 +166,7 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             }
             const dateString = getDateString(value, dateFilter?.startDate && dateFilter?.endDate
                 ? { start: dateFilter.startDate, end: dateFilter.endDate }
-                : undefined, dateBucket);
+                : undefined, dateBucket, databaseType);
             row[pivot.rowField || ''] = dateString;
         });
         // add a row for each date in the range that doesn't have a value
@@ -128,7 +178,7 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             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.toISOString(), { start: dateFilter.startDate, end: dateFilter.endDate }, dateBucket);
+                const formattedDate = getDateString(date.toISOString(), { start: dateFilter.startDate, end: dateFilter.endDate }, dateBucket, databaseType);
                 if (!dateSet.has(formattedDate)) {
                     const newRow = {};
                     newRow[pivot.rowField] = formattedDate;
@@ -153,16 +203,16 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
         //   delete row.__quillRawDate;
         // });
     }
-    if (pivot.sort) {
-        rows.sort((a, b) => {
-            if (pivot.sortDirection === 'ASC') {
-                return compareValues(a, b, pivot.sortField || '');
-            }
-            else {
-                return compareValues(b, a, pivot.sortField || '');
-            }
-        });
-    }
+    // should be doing this in the query
+    // if (pivot.sort) {
+    //   rows.sort((a: any, b: any) => {
+    //     if (pivot.sortDirection === 'ASC') {
+    //       return compareValues(a, b, pivot.sortField || '');
+    //     } else {
+    //       return compareValues(b, a, pivot.sortField || '');
+    //     }
+    //   });
+    // }
     // for the case of count agg on no value field
     columns?.forEach((column) => {
         if (column.label &&
@@ -182,5 +232,11 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
     return {
         rows: rows,
         columns: columns ?? [],
+        rowCount: getPivotRowCount
+            ? (Number(resp?.queryResults?.[1]?.rows?.[0]?.['row_count']) ??
+                rows.length)
+            : 0,
+        pivotQuery: sqlQuery,
+        comparisonPivotQuery: comparisonPivotSql,
     };
 }

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

@@ -1,8 +1,15 @@
 import { Pivot } from '../models/Pivot';
+import { AdditionalProcessing } from './tableProcessing';
+export declare function processSingleQuotes(value: string, databaseType: string): string;
+export declare function processAggType(aggType: string, hasColumnField?: 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 processDateTrunc(dateBucket: string, rowField: string, databaseType: string, comparisonInterval?: string): string;
+export declare function processValueField(aggType: string, databaseType: string, valueField: 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 generateMinMaxDateRangeQueries(columnFields: string[], query: string, databaseType: string): string;
-export declare function generatePivotQuery(pivot: Pivot, itemQueries: string[], databaseType: string, comparisonInterval?: string, distinctStrings?: string[], dateBucket?: string, rowLimit?: number): string | undefined;
+export declare function generatePivotQuery(pivot: Pivot, itemQuery: string, databaseType: string, distinctStrings?: string[], dateBucket?: string): string | undefined;
+export declare function additionalProcessingOnPivotQuery(pivot: Pivot, query?: string, additionalProcessing?: AdditionalProcessing, databaseType?: string): string | undefined;
+export declare function generateRowCountQuery(query?: string, databaseType?: string): 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;AA0BxC,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,UA+EjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAkED,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,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAgBrB;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,CAgCpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,UAStE;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,UAGrE;AAMD,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,UAkGjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAmBD,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,UA8B5B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,UAYnB;AAED,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,UAcrB;AAmFD,wBAAgB,8BAA8B,CAC5C,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAkBrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAkBpB;AA6aD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBAmD5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}