@quillsql/react 2.12.40 → 2.12.41

package/dist/esm/utils/report.js

@@ -1,12 +1,19 @@
+import { createInitialFormData } from '../ChartBuilder';
+import { getTableNames } from '../components/ReportBuilder/ast';
+import { generatePivotTable } from '../internals/ReportBuilder/PivotModal';
+import { createBasicSelectASTFromColumns } from './astProcessing';
 import { getYAxisFields } from './columnProcessing';
 import { cleanDashboardItem } from './dashboard';
-import { getData } from './dataFetcher';
+import { fetchSqlQuery, getData } from './dataFetcher';
 import { parseValueFromBigQueryDates } from './dataProcessing';
+import { getDateBucketFromRange } from './dates';
 import { DataLoadError } from './error';
 import { processFilterErrorList } from './errorProcessing';
 import { internalLog } from './logging';
 import { mergeComparisonRange } from './merge';
-import { isValidPivot } from './pivotProcessing';
+import { DEFAULT_PAGINATION } from './paginationProcessing';
+import { isPivotPossible, isValidPivot } from './pivotProcessing';
+import { fetchTableByAST, getRelevantInfoFromQuery, } from './tableProcessing';
 import { quillFormat } from './valueFormatter';
 export const EMPTY_REPORT = {
     id: '',
@@ -110,7 +117,7 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
             errorMessage = error.message;
         }
     }
-    return { report: reportInfo, error: errorMessage };
+    return { report: reportInfo || EMPTY_REPORT, error: errorMessage };
 }
 export const formatRowsFromReport = (report) => {
     if (!report.rows || !report.columns) {
@@ -184,3 +191,107 @@ export function convertInternalReportToReport(report) {
         return EMPTY_REPORT;
     }
 }
+export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, client, pivot, previousFormData, currentTable, previousRelevant, report, customFields) => {
+    let newRows = [];
+    let newColumns = [];
+    let newRowCount = 0;
+    let newPivot = null;
+    let newPivotData = null;
+    let formattedRows = [];
+    let curReport = report;
+    let table = '';
+    let error;
+    const relevantInfo = previousRelevant ?? { uniqueStrings: {}, dateRanges: {} };
+    let query = '';
+    try {
+        const tables = getTableNames(baseAst);
+        table = tables[0] ? tables[0] : '';
+        const tableInfo = schema.find((tableInfo) => tableInfo.name === table);
+        if (!table || !tableInfo) {
+            throw new Error('No table found;');
+        }
+        const tableData = await fetchTableByAST({ ...baseAst, where: formData }, client, { page: DEFAULT_PAGINATION });
+        if (tableData.error) {
+            throw new Error(tableData.error);
+        }
+        const processedFormData = report
+            ? report
+            : createInitialFormData(tableData.columns);
+        curReport = {
+            ...formData,
+            ...processedFormData,
+            pivot: pivot,
+            itemQuery: tableData.itemQuery,
+            rowCount: tableData.rowCount,
+            filtersApplied: [],
+            rows: tableData.rows,
+            columns: tableData.columns,
+        };
+        const queryResult = await fetchSqlQuery({
+            ...createBasicSelectASTFromColumns(tableInfo.columns, table),
+            where: formData,
+        }, client, formData);
+        if (queryResult.error) {
+            throw new Error(queryResult.error);
+        }
+        query = queryResult.query;
+        if (table !== currentTable || previousFormData !== formData) {
+            const { uniqueStrings, dateRanges } = await getRelevantInfoFromQuery(tableInfo.columns, client, queryResult.query, customFields);
+            relevantInfo.uniqueStrings[table] = uniqueStrings ?? {};
+            relevantInfo.dateRanges = dateRanges ?? {};
+        }
+        if (!!relevantInfo.error) {
+            throw new Error(relevantInfo.error);
+        }
+        if (pivot) {
+            if (isPivotPossible(tableData.columns, pivot)) {
+                let dateBucket = undefined;
+                const rowFieldDateRange = relevantInfo.dateRanges[pivot.rowField ?? ''] ?? undefined;
+                if (rowFieldDateRange) {
+                    dateBucket = getDateBucketFromRange(rowFieldDateRange.dateRange);
+                }
+                newPivotData = await generatePivotTable(pivot, tableData.rows, undefined, false, -1, undefined, dateBucket, curReport, client, relevantInfo.uniqueStrings[table]);
+                newPivot = pivot;
+            }
+            if (!newPivotData) {
+                newPivot = null;
+                formattedRows = formatRowsFromReport({
+                    rows: tableData.rows,
+                    columns: tableData.columns,
+                });
+            }
+            else {
+                formattedRows = formatRowsFromReport({
+                    rows: newPivotData.rows,
+                    columns: newPivotData.columns,
+                });
+            }
+        }
+        else {
+            formattedRows = formatRowsFromReport({
+                rows: tableData.rows,
+                columns: tableData.columns,
+            });
+        }
+        newRowCount = tableData.rowCount ?? tableData.rows.length;
+        newRows = tableData.rows;
+        newColumns = tableData.columns;
+    }
+    catch (e) {
+        error = e.message;
+    }
+    return {
+        rows: newRows,
+        columns: newColumns,
+        rowCount: newRowCount,
+        pivot: newPivot,
+        pivotData: newPivotData,
+        formattedRows,
+        report: curReport ?? EMPTY_REPORT,
+        table,
+        uniqueValues: relevantInfo.uniqueStrings,
+        dateRanges: relevantInfo.dateRanges,
+        query,
+        error: error,
+    };
+};

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAmDA,eAAO,MAAM,kBAAkB,WAAkB,GAAG,oCAgFnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,GAAG;;;EAoDZ,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AAmDA,eAAO,MAAM,kBAAkB,WAAkB,GAAG,oCA8EnD,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,GAAG;;;EAoDZ,CAAC"}

package/dist/esm/utils/schema.js

@@ -50,7 +50,7 @@ export const getCustomFieldInfo = async (client, caller = 'se') => {
     try {
         const { queryEndpoint, queryHeaders, publicKey, databaseType, customerId } = client;
         if (databaseType.toLowerCase() !== 'postgresql' ||
-            !['65d65b57cdd8ae70a5648d9c', '665610862cf7a3000be66453'].includes(publicKey)) {
+            !['665610862cf7a3000be66453'].includes(publicKey)) {
             throw new Error('CUSTOM FIELDS IS ONLY ALLOWED FOR POSTGRESQL DATABASES');
         }
         const response = await fetch(`${queryEndpoint}?cfr-${caller}`, {

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

@@ -1,5 +1,8 @@
+import { NodeSQLParser } from '../components/ReportBuilder/ast';
+import { ColumnInfo } from '../components/ReportBuilder/schema';
 import { Column, ColumnInternal } from '../models/Columns';
 import { Pagination } from '../models/Pagination';
+import { DateRangesByColumn, UniqueValuesByColumn } from '../models/Tables';
 export interface AdditionalProcessing {
     sort?: {
         field: string;
@@ -14,6 +17,11 @@ export declare const getUniqueValuesByColumns: (columns: Column[], query: string
         [value: string]: boolean;
     };
 } | null>;
+export declare const getRelevantInfoFromQuery: (columns: ColumnInfo[], client: any, query: string, customFields?: any) => Promise<{
+    uniqueStrings?: UniqueValuesByColumn | undefined;
+    dateRanges?: DateRangesByColumn | undefined;
+    error?: string | undefined;
+}>;
 export declare const getCountsByColumns: (columns: Column[], query: string, client: any, customFields: any[]) => Promise<Column[]>;
 export declare const getDateRangeByColumns: (columns: Column[], query: string, client: any, customFields: any[]) => Promise<{
     [column: string]: {
@@ -42,4 +50,14 @@ export declare const fetchTableByReport: (reportId: string, client: any, process
     rowCount?: number | undefined;
     error?: string | undefined;
 }>;
+export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: any, processing?: AdditionalProcessing, customFields?: any) => Promise<{
+    columns: ColumnInternal[];
+    rows: any[];
+    rowCount?: number | undefined;
+    error?: string | undefined;
+    itemQuery?: string[] | undefined;
+}>;
+export declare const convertUniqueValuesByColumnToUniqueValueStrings: (uniqueValuesByColumns: UniqueValuesByColumn) => {
+    [columnName: string]: string[];
+};
 //# 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":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAelD,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;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;;;;SAkEpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,GAAG,gBACG,GAAG,EAAE,KAClB,QAAQ,MAAM,EAAE,CA2ClB,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;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,GAAG,UACH,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,MAAM,UACL,GAAG,eACE,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAqDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,GAAG,eACE,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAkB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;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;;;;SAkEpB,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,UAAU,EAAE,UACb,GAAG,SACJ,MAAM,iBACE,GAAG;;;;EAiEnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,GAAG,gBACG,GAAG,EAAE,KAClB,QAAQ,MAAM,EAAE,CA2ClB,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;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,GAAG,UACH,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACrB,MAAM,UACL,GAAG,eACE,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAqDZ,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,MAAM,UACR,GAAG,eACE,oBAAoB,YACvB,GAAG,iBACE,GAAG;aAET,MAAM,EAAE;UACX,GAAG,EAAE;;;EAgFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,GAAG,eACE,oBAAoB,iBAClB,GAAG;aAET,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAuDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}

package/dist/esm/utils/tableProcessing.js

@@ -1,4 +1,5 @@
-import { convertPostgresColumn } from './columnProcessing';
+import { isTextColumnType, } from '../components/ReportBuilder/ast';
+import { convertColumnInfoToColumnInternal, convertPostgresColumn, } from './columnProcessing';
 import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
 import { getData } from './dataFetcher';
 import { parseValueFromBigQueryDates } from './dataProcessing';
@@ -65,6 +66,42 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client, cus
     }
     return uniqueValues;
 };
+export const getRelevantInfoFromQuery = async (columns, client, query, customFields) => {
+    let dateRanges = {};
+    let uniqueStrings = {};
+    let error = undefined;
+    try {
+        const convertedStringColumns = columns
+            .filter((column) => {
+            return isTextColumnType(column.fieldType);
+        })
+            .map((column) => convertColumnInfoToColumnInternal(column));
+        const stringNames = convertedStringColumns.map((column) => column.field);
+        if (stringNames.length > 0) {
+            const smallStringColumns = await getCountsByColumns(convertedStringColumns, query, client, customFields);
+            uniqueStrings = await getUniqueValuesByColumns(smallStringColumns, query, [], client, customFields);
+        }
+        const dateColumns = columns
+            .filter((column) => {
+            return column.fieldType === 'date';
+        })
+            .map((column) => convertColumnInfoToColumnInternal(column));
+        if (dateColumns.length > 0) {
+            dateRanges = await getDateRangeByColumns(dateColumns, query, client, customFields);
+            if (dateRanges === null) {
+                throw new Error("Couldn't fetch date ranges");
+            }
+        }
+    }
+    catch (e) {
+        error = "Couldn't fetch pivot info";
+    }
+    return {
+        uniqueStrings: uniqueStrings ?? undefined,
+        dateRanges: dateRanges ?? undefined,
+        error,
+    };
+};
 export const getCountsByColumns = async (columns, query, client, customFields) => {
     const stringNames = columns.map((column) => column.field);
     const countQuery = generateCountQuery(stringNames, query, client.databaseType);
@@ -299,3 +336,56 @@ export const fetchTableByReport = async (reportId, client, processing, filters,
     }
     return { rows, columns, rowCount, error };
 };
+export const fetchTableByAST = async (ast, client, processing, customFields) => {
+    let rows = [];
+    let columns = [];
+    let rowCount;
+    let error;
+    let itemQuery;
+    try {
+        const hostedBody = {
+            metadata: {
+                clientId: client.publicKey,
+                ast,
+                publicKey: client.publicKey,
+                orgId: client.customerId,
+                task: 'patterns',
+                getCustomFields: false,
+                customFields,
+                additionalProcessing: processing,
+                useUpdatedDataGathering: true,
+                useNewNodeSql: true,
+            },
+        };
+        const cloudBody = {};
+        const resp = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
+        if (resp.errorMessage || resp.name === 'error') {
+            throw new Error(resp.errorMessage);
+        }
+        processFilterErrorList(resp);
+        if (resp.rowCount) {
+            rowCount = resp.rowCount;
+        }
+        const gatheredRows = resp.rows && resp.rows.length ? resp.rows : [];
+        columns = resp.fields.map((elem) => convertPostgresColumn(elem));
+        rows = gatheredRows;
+        itemQuery = resp.itemQuery;
+    }
+    catch (e) {
+        rows = [];
+        columns = [];
+        rowCount = 0;
+        error = e.message;
+    }
+    if (client.databaseType && client.databaseType.toLowerCase() === 'bigquery') {
+        parseValueFromBigQueryDates(rows, columns);
+    }
+    return { rows, columns, rowCount, error, itemQuery };
+};
+export const convertUniqueValuesByColumnToUniqueValueStrings = (uniqueValuesByColumns) => {
+    return Object.keys(uniqueValuesByColumns).reduce((acc, column) => {
+        const uniqueValues = uniqueValuesByColumns[column] ?? [];
+        acc[column] = Object.keys(uniqueValues);
+        return acc;
+    }, {});
+};

package/package.json

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

package/dist/cjs/components/ReportBuilder/pivot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pivot.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/pivot.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,eAAe,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAC;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,aAAa,EAAE,KAAK,GAAG,MAAM,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GAAG,IAAI,CAAC"}

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

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

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

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

package/dist/cjs/models/Pivots.js

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

package/dist/esm/components/ReportBuilder/pivot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pivot.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/pivot.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,eAAe,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,CAAC;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,aAAa,EAAE,KAAK,GAAG,MAAM,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GAAG,IAAI,CAAC"}

package/dist/esm/models/Pivots.d.ts

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

package/dist/esm/models/Pivots.d.ts.map

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

package/dist/esm/models/Pivots.js

@@ -1 +0,0 @@
-export {};