@quillsql/react 2.12.26 → 2.12.28

package/dist/esm/utils/queryConstructor.js

@@ -18,29 +18,42 @@ export function generateDistinctQuery(stringFields, query) {
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
 }
-export function generatePivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval) {
+export function generateMinMaxRangeQueries(columnFields, query, databaseType) {
+    const distinctQueries = columnFields.map((field) => {
+        const wrappedField = ['postgresql', 'snowflake'].includes(databaseType.toLowerCase())
+            ? `"${field}"`
+            : field;
+        return `SELECT '${field}' AS field, MIN(${wrappedField}) AS min_range, MAX(${wrappedField}) AS max_range FROM querytable`;
+    });
+    const distinctQuery = distinctQueries.join(' UNION ALL ');
+    return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
+}
+export function generatePivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval, distinctStrings) {
     if (!isValidPivot(pivot)) {
         return undefined;
     }
-    if (!pivot.rowField) {
-        return undefined;
-    }
     if (pivot.columnField) {
-        return create2DPivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval);
+        return create2DPivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval, distinctStrings);
     }
-    return create1DPivotQuery(pivot, itemQueries, dateBucket, comparisonInterval);
+    if (pivot.rowField) {
+        return create1DPivotQuery(pivot, itemQueries, dateBucket, comparisonInterval);
+    }
+    return createAggregationValuePivot(pivot, itemQueries);
 }
-function create2DPivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval) {
+function create2DPivotQuery(pivot, itemQueries, rows, dateBucket, comparisonInterval, distinctStrings) {
     if (!pivot || !pivot.columnField) {
         return undefined;
     }
     // @ts-ignore
     const columnValues = rows.map((row) => row[pivot.columnField]);
-    const distinctColumnValues = Array.from(new Set(columnValues)).filter((value) => value !== undefined && value !== null);
+    const distinctColumnValues = distinctStrings
+        ? distinctStrings
+        : Array.from(new Set(columnValues)).filter((value) => value !== undefined && value !== null);
     if (distinctColumnValues.length === 0) {
         return undefined;
     }
-    if (pivot.rowFieldType === 'string') {
+    if (['string', 'varchar'].includes(pivot.rowFieldType) ||
+        !pivot.rowFieldType) {
         return create2DStringPivotQuery(pivot, itemQueries, distinctColumnValues);
     }
     return create2DDatePivotQuery(pivot, itemQueries, distinctColumnValues, dateBucket, comparisonInterval);
@@ -90,7 +103,8 @@ function create2DDatePivotQuery(pivot, itemQueries, distinctColumnValues, dateBu
   ${joinQuery} ORDER BY qt."${pivot.rowField}"`;
 }
 function create1DPivotQuery(pivot, itemQueries, dateBucket = 'month', comparisonInterval) {
-    if (pivot.rowFieldType === 'string') {
+    if (['string', 'varchar'].includes(pivot.rowFieldType) ||
+        !pivot.rowFieldType) {
         return create1DStringPivotQuery(pivot, itemQueries);
     }
     return create1DDatePivotQuery(pivot, itemQueries, dateBucket, comparisonInterval);
@@ -127,3 +141,23 @@ function create1DDatePivotQuery(pivot, itemQueries, dateBucket = 'month', compar
   SELECT * FROM quill_qt_agg qt 
   ${joinQuery} ORDER BY qt."${pivot.rowField}"`;
 }
+function createAggregationValuePivot(pivot, itemQueries) {
+    let aggregationType = processAggType(pivot.aggregationType);
+    if (pivot.aggregationType === 'count') {
+        aggregationType = 'COUNT';
+    }
+    if (!pivot.valueField)
+        return undefined;
+    const compareCTE = itemQueries[1]
+        ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`
+        : '';
+    const compareAggregation = itemQueries[1]
+        ? `, quill_ct_cw as (SELECT ${aggregationType}(${pivot.valueField}) as comparison_${pivot.valueField} FROM quill_ct)`
+        : '';
+    const joinQuery = itemQueries[1] ? `CROSS JOIN quill_ct_cw ct` : '';
+    return `WITH quill_qt AS (${itemQueries[0]?.replaceAll(';', '')}),
+      quill_qt_agg AS (SELECT ${aggregationType}(${pivot.valueField}) as ${pivot.valueField} FROM quill_qt)
+      ${compareCTE} ${compareAggregation}
+      SELECT * FROM quill_qt_agg qt 
+      ${joinQuery}`;
+}

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

@@ -1,8 +1,30 @@
+import { QuillReport } from '../Dashboard';
 import { Column } from '../models/Columns';
+export interface AdditionalProcessing {
+    sort?: {
+        field: string;
+        direction: string;
+    };
+    page?: {
+        currentPage: number;
+        rowsPerPage: number;
+    };
+}
 export declare const hasColumnAlias: (columns: Column[], referencedColumns: string[]) => boolean;
 export declare const getUniqueValuesByColumns: (columns: Column[], query: string, rows: any, client: any, customFields: any[]) => Promise<{
     [column: string]: {
         [value: string]: boolean;
     };
 } | null>;
+export declare const getDateRangeByColumns: (columns: Column[], query: string, client: any, customFields: any[]) => Promise<{
+    [column: string]: {
+        dateRange: {
+            start: Date;
+            end: Date;
+        };
+    };
+} | null>;
+export declare const getPaginatedRows: (report: QuillReport, client: any, processing?: any, filters?: any, customFields?: any) => Promise<{
+    [field: string]: any;
+}>;
 //# sourceMappingURL=tableProcessing.d.ts.map

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

@@ -1 +1 @@
-{"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,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG,gBACG,GAAG,EAAE;;;;SA6DpB,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAS3C,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,GAAG,gBACG,GAAG,EAAE;;;;SA6DpB,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,GAAG,gBACG,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAc1D,CAAC;AAqDF,eAAO,MAAM,gBAAgB,WACnB,WAAW,UACX,GAAG,eACE,GAAG,YACN,GAAG,iBACE,GAAG;;EA4CnB,CAAC"}

package/dist/esm/utils/tableProcessing.js

@@ -1,5 +1,7 @@
 import { getData } from './dataFetcher';
-import { generateDistinctQuery } from './queryConstructor';
+import { processFilterErrorList } from './errorProcessing';
+import { mergeComparisonRange } from './merge';
+import { generateDistinctQuery, generateMinMaxRangeQueries, } from './queryConstructor';
 export const hasColumnAlias = (columns, referencedColumns) => {
     if (!referencedColumns) {
         return true;
@@ -92,3 +94,85 @@ const fetchDistinctStrings = async (query, client, customFields) => {
         return null;
     }
 };
+export const getDateRangeByColumns = async (columns, query, client, customFields) => {
+    const columnNames = columns.map((column) => column.field);
+    const distinctValueQuery = generateMinMaxRangeQueries(columnNames, query, client.databaseType);
+    const dateRanges = await fetchDateRanges(distinctValueQuery, client, customFields);
+    return dateRanges;
+};
+const fetchDateRanges = async (query, client, customFields) => {
+    try {
+        const hostedBody = {
+            metadata: {
+                query,
+                task: 'query',
+                orgId: client.customerId || '*',
+                clientId: client.publicKey,
+                databaseType: client?.databaseType,
+                customFieldsByTable: customFields,
+            },
+        };
+        const cloudBody = { query };
+        const data = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+        if (data.errorMessage) {
+            return null;
+        }
+        const results = data.rows.reduce((acc, currentValue) => {
+            acc[currentValue.field] = {
+                dateRange: {
+                    start: new Date(currentValue.min_range),
+                    end: new Date(currentValue.max_range),
+                },
+            };
+            return acc;
+        }, {});
+        return results;
+    }
+    catch (e) {
+        console.error(e);
+        return null;
+    }
+};
+export const getPaginatedRows = async (report, client, processing, filters, customFields) => {
+    let updatedProcessing = { ...processing };
+    if (processing && processing.sort && !updatedProcessing.page) {
+        updatedProcessing.page = {};
+        updatedProcessing.page.currentPage = 0;
+    }
+    const minimalFilters = Object.values(filters).length
+        ? Object.values(filters).map((filter) => {
+            const newFilter = { ...filter };
+            if (newFilter.filterType === 'date_range') {
+                delete newFilter['field'];
+                delete newFilter['options'];
+                delete newFilter['selectedValue'];
+            }
+            return newFilter;
+        })
+        : [];
+    const hostedBody = {
+        metadata: {
+            dashboardItemId: report.id,
+            orgId: client?.customerId || '*',
+            task: 'item',
+            filters: minimalFilters,
+            clientId: client?.publicKey,
+            databaseType: client?.databaseType,
+            additionalProcessing: updatedProcessing,
+            forcePagination: true,
+            customFields,
+        },
+    };
+    const cloudBody = {
+        id: report.id,
+        filters: [],
+    };
+    const resp = await getData(client, 'itempost', 'omit', hostedBody, cloudBody);
+    processFilterErrorList(resp);
+    if (resp && resp.name !== 'error') {
+        if (resp.compareRows) {
+            mergeComparisonRange(resp);
+        }
+    }
+    return resp.rows;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.12.26",
+  "version": "2.12.28",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",