@quillsql/react 2.13.43 → 2.13.44

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

@@ -3,21 +3,25 @@ import { ColumnInternal } from '../models/Columns';
 import { DashboardFilter, InternalFilter } from '../models/Filter';
 import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReport, QuillReportInternal } from '../models/Report';
-import { DateRangesByColumn, Table, UniqueValuesByTable } from '../models/Tables';
+import { DateRangesByColumn, UniqueValuesByTable, Table, UniqueValuesByColumn } from '../models/Tables';
 import { AdditionalProcessing } from './tableProcessing';
 import { CustomField } from '../models/Schema';
+import { ReportBuilderColumn } from '../models/ReportBuilder';
 export type ReportBuilderInfo = {
     rows: any[];
     columns: ColumnInternal[];
+    reportBuilderColumns: ReportBuilderColumn[];
     rowCount: number;
     pivot: Pivot | null;
     pivotData: PivotData | null;
     formattedRows: any[];
     report: QuillReportInternal;
-    table: string;
-    uniqueValues: UniqueValuesByTable;
+    tables: string[];
+    uniqueStringsByTable: UniqueValuesByTable;
+    uniqueStringsByColumn: UniqueValuesByColumn;
     dateRanges: DateRangesByColumn;
     query: string;
+    pivotHint: string;
     error?: string;
     itemQuery?: string[];
 };
@@ -72,9 +76,8 @@ export declare function saveReport({ report, dashboardItemId, client, }: {
 }): Promise<any>;
 export declare const formatRowsFromReport: (report: any, xAxisField?: string, xAxisFormat?: string) => any;
 export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[], initiator?: string): QuillReport;
-export declare const fetchReportBuilderDataFromAST: ({ baseAst, formData, schema, client, tenants, pivot, previousFormData, currentTable, previousRelevant, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, }: {
+export declare const fetchReportBuilderDataFromAST: ({ baseAst, schema, client, tenants, pivot, previousRelevant, requiresNewFilteredUniqueValues, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, }: {
     baseAst: any;
-    formData: any;
     schema: Table[];
     client: QuillProviderClient;
     tenants?: {
@@ -82,17 +85,17 @@ export declare const fetchReportBuilderDataFromAST: ({ baseAst, formData, schema
         tenantIds: (string | number)[];
     }[] | (string | number)[];
     pivot?: Pivot;
-    previousFormData?: any;
-    currentTable?: string;
     previousRelevant?: {
-        uniqueStrings: UniqueValuesByTable;
+        uniqueStringsByTable: UniqueValuesByTable;
+        uniqueStringsByColumn: UniqueValuesByColumn;
         dateRanges: DateRangesByColumn;
     };
+    requiresNewFilteredUniqueValues?: boolean;
     report?: QuillReportInternal;
     customFields?: any;
     skipUniqueValues?: boolean;
     skipRowCount?: boolean;
     processing?: AdditionalProcessing;
-    dashboardName?: string;
+    dashboardName: string;
 }) => Promise<ReportBuilderInfo>;
 //# sourceMappingURL=report.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/report.js

@@ -1,9 +1,7 @@
-import equal from 'fast-deep-equal';
 import { createInitialFormData } from '../ChartBuilder';
 import { getTableNames } from '../components/ReportBuilder/ast';
 import { generatePivotTable } from '../internals/ReportBuilder/PivotModal';
-import { InternalFilterType } from '../models/Filter';
-import { createBasicSelectASTFromColumns } from './astProcessing';
+import { InternalFilterType, } from '../models/Filter';
 import { getYAxisFields } from './columnProcessing';
 import { cleanDashboardItem } from './dashboard';
 import { fetchSqlQuery, getData } from './dataFetcher';
@@ -12,9 +10,12 @@ import { getDateBucketFromRange } from './dates';
 import { DataLoadError } from './error';
 import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { isPivotPossible, isValidPivot } from './pivotProcessing';
-import { fetchTableByAST, getQueryDateRangeByColumns, getRelevantInfoFromQuery, getUniqueStringValues, } from './tableProcessing';
+import { fetchTableByAST, getQueryDateRangeByColumns, getRelevantInfoFromQuery, } from './tableProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { quillAutoFormat, quillFormat } from './valueFormatter';
+import { getFieldFromExpression } from './astFilterProcessing';
+import { isValidPivotForReport, makePivotValid, setTypesOnPivot, } from './reportBuilder';
+import { createSelectStarFromAst } from './astProcessing';
 export const EMPTY_REPORT = {
     id: '',
     name: '',
@@ -42,6 +43,7 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
         id: reportInternal.id,
         name: reportInternal.name,
         dashboardName: reportInternal.dashboardName,
+        section: reportInternal.section,
         rows: reportInternal.rows,
         columns: reportInternal.columns,
         chartType: reportInternal.chartType,
@@ -63,7 +65,6 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
         columnsWithCustomFields: reportInternal.columnsWithCustomFields,
     };
 }
-// TODO: Convert this to take an object rather than a bunch of arguments
 export async function fetchReport({ reportId, client, tenants, flags, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getDefaultDashboardFilters, }) {
     let reportInfo = undefined;
     let errorMessage = undefined;
@@ -344,26 +345,72 @@ export function convertInternalReportToReport(report, dashboardFilters, initiato
         return EMPTY_REPORT;
     }
 }
-export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema, client, tenants, pivot, previousFormData, currentTable, previousRelevant, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, }) => {
+export const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants, pivot, previousRelevant, requiresNewFilteredUniqueValues, report, customFields, skipUniqueValues, skipRowCount, processing, dashboardName, }) => {
     let newRows = [];
     let newColumns = [];
     let newRowCount = 0;
     let newPivot = null;
     let newPivotData = null;
+    let pivotHint = '';
     let formattedRows = [];
     let curReport = report;
-    let table = '';
     let error;
-    const relevantInfo = previousRelevant ?? { uniqueStrings: {}, dateRanges: {} };
+    const relevantInfo = previousRelevant ?? {
+        uniqueStringsByTable: {},
+        dateRanges: {},
+        uniqueStringsByColumn: {},
+    };
     let query = '';
+    let tables = [];
+    const reportBuilderColumns = [];
     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, tenants, processing ?? { page: DEFAULT_PAGINATION }, customFields, skipRowCount, undefined, dashboardName);
+        tables = getTableNames(baseAst);
+        const astColumnsByTable = {};
+        baseAst.columns.forEach((col) => {
+            if (!astColumnsByTable[col.expr?.table ?? '']) {
+                astColumnsByTable[col.expr?.table ?? ''] = [];
+            }
+            const field = getFieldFromExpression(col.expr ?? col);
+            const table = tables.length === 1 ? tables[0] : col.expr?.table;
+            if (field) {
+                astColumnsByTable[table ?? '']?.push(field);
+                if (table) {
+                    reportBuilderColumns.push({ field, table, alias: col.as });
+                }
+            }
+        });
+        const columnInfo = tables.flatMap((table) => {
+            const tableInfo = schema.find((tableInfo) => tableInfo.name === table);
+            if (!tableInfo) {
+                return [];
+            }
+            return tableInfo.columns
+                .map((col) => ({ ...col, table }))
+                .filter((col) => {
+                return (astColumnsByTable[table]?.includes(col.field) ||
+                    astColumnsByTable['']?.includes(col.field));
+            });
+        });
+        const aliasedColumnInfo = tables.flatMap((table) => {
+            const tableInfo = schema.find((tableInfo) => tableInfo.name === table);
+            if (!tableInfo) {
+                return [];
+            }
+            return tableInfo.columns
+                .map((col) => ({ ...col, table }))
+                .filter((col) => {
+                return (astColumnsByTable[table]?.includes(col.field) ||
+                    astColumnsByTable['']?.includes(col.field));
+            })
+                .map((col) => {
+                const reportBuilderColumn = reportBuilderColumns.find((c) => c.field === col.field && c.table === col.table);
+                return {
+                    ...col,
+                    field: reportBuilderColumn?.alias ?? col.field,
+                };
+            });
+        });
+        const tableData = await fetchTableByAST(baseAst, client, tenants, processing ?? { page: DEFAULT_PAGINATION }, customFields, skipRowCount, undefined, dashboardName);
         if (tableData.error) {
             throw new Error(tableData.error);
         }
@@ -394,36 +441,56 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
             referenceLines: report?.referenceLines,
             referenceLineYValues: report?.referenceLineYValues,
         };
-        if (table !== currentTable || previousFormData !== formData) {
-            const queryResult = await fetchSqlQuery({
-                ...createBasicSelectASTFromColumns(tableInfo.columns, table),
-                where: formData,
-            }, client, formData);
-            if (queryResult.error) {
-                throw new Error(queryResult.error);
-            }
-            query = queryResult.query;
-            if (!skipUniqueValues) {
-                const { uniqueStrings, dateRanges } = await getRelevantInfoFromQuery(tableInfo.columns, client, tenants, queryResult.query, customFields, dashboardName);
-                relevantInfo.uniqueStrings[table] = uniqueStrings ?? {};
-                relevantInfo.dateRanges = dateRanges ?? {};
-            }
-            else {
-                const dateColumns = tableInfo.columns.filter((column) => {
-                    return column.fieldType === 'date';
-                });
-                if (dateColumns.length > 0) {
-                    const dateRanges = await getQueryDateRangeByColumns(dateColumns, queryResult.query, client, tenants, customFields ?? [], dashboardName);
-                    if (dateRanges === null) {
-                        throw new Error("Couldn't fetch date ranges");
-                    }
-                    relevantInfo.dateRanges = dateRanges ?? {};
+        const queryResult = await fetchSqlQuery(baseAst, client);
+        if (queryResult.error) {
+            throw new Error(queryResult.error);
+        }
+        query = queryResult.query;
+        if (!skipUniqueValues || (pivot && requiresNewFilteredUniqueValues)) {
+            const starQuery = await fetchSqlQuery(createSelectStarFromAst(baseAst), client);
+            const { uniqueStrings, dateRanges, columnUniqueValues } = await getRelevantInfoFromQuery({
+                tables,
+                columns: columnInfo,
+                aliasedColumns: aliasedColumnInfo,
+                reportBuilderColumns,
+                client,
+                tenants,
+                query: queryResult.query,
+                queryTemplate: starQuery.query,
+                customFields,
+                dashboardName,
+            });
+            relevantInfo.uniqueStringsByTable = uniqueStrings ?? {};
+            relevantInfo.dateRanges = dateRanges ?? {};
+            relevantInfo.uniqueStringsByColumn = columnUniqueValues ?? {};
+        }
+        else {
+            const dateColumns = aliasedColumnInfo.filter((column) => {
+                return column.fieldType === 'date';
+            });
+            if (dateColumns.length > 0) {
+                const dateRanges = await getQueryDateRangeByColumns(dateColumns, queryResult.query, client, tenants, customFields ?? [], dashboardName);
+                if (dateRanges === null) {
+                    throw new Error("Couldn't fetch date ranges");
                 }
+                relevantInfo.dateRanges = dateRanges ?? {};
             }
         }
         if (!!relevantInfo.error) {
             throw new Error(relevantInfo.error);
         }
+        if (pivot &&
+            !isValidPivotForReport(pivot, relevantInfo.uniqueStringsByColumn, tableData.columns)) {
+            const { pivot: newValidPivot, hint } = makePivotValid(pivot, relevantInfo.uniqueStringsByColumn, tableData.columns);
+            if (newValidPivot) {
+                pivot = newValidPivot;
+                pivotHint = hint;
+            }
+            else {
+                pivot = undefined;
+                pivotHint = 'Pivot no longer valid';
+            }
+        }
         if (pivot) {
             if (isPivotPossible(tableData.columns, pivot)) {
                 let dateBucket = undefined;
@@ -431,19 +498,16 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
                 if (rowFieldDateRange) {
                     dateBucket = getDateBucketFromRange(rowFieldDateRange.dateRange);
                 }
-                if (!Object.values(relevantInfo.uniqueStrings[table] ?? {}).length ||
-                    !equal(formData, previousFormData)) {
-                    relevantInfo.uniqueStrings[table] = await getUniqueStringValues(tableInfo.columns.filter((column) => column.field === pivot?.columnField), table, client, tenants, customFields, undefined, undefined, query ? query : (report?.queryString ?? ''), report?.dashboardName);
-                }
                 newPivotData = await generatePivotTable({
                     pivot,
                     dateBucket,
                     report: curReport,
                     client,
-                    uniqueValues: relevantInfo.uniqueStrings[table],
+                    uniqueValues: relevantInfo.uniqueStringsByColumn,
                     dashboardName,
                     tenants,
                     additionalProcessing: processing,
+                    caller: 'ReportBuilder',
                 });
                 newPivot = pivot;
             }
@@ -474,18 +538,24 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
     catch (e) {
         error = e.message;
     }
+    if (newPivot) {
+        newPivot = setTypesOnPivot(newPivot, newColumns);
+    }
     return {
         rows: newRows,
         columns: newColumns,
+        reportBuilderColumns,
         rowCount: newRowCount,
         pivot: newPivot,
         pivotData: newPivotData,
         formattedRows,
         report: curReport ?? EMPTY_INTERNAL_REPORT,
-        table,
-        uniqueValues: relevantInfo.uniqueStrings,
+        tables,
+        uniqueStringsByTable: relevantInfo.uniqueStringsByTable,
+        uniqueStringsByColumn: relevantInfo.uniqueStringsByColumn,
         dateRanges: relevantInfo.dateRanges,
         query,
+        pivotHint,
         error: error,
         itemQuery: curReport?.itemQuery,
     };

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

@@ -0,0 +1,88 @@
+import { Column, ColumnInternal } from '../models/Columns';
+import { Pivot } from '../models/Pivot';
+import { ReportBuilderState } from '../models/ReportBuilder';
+import { Table, UniqueValuesByColumn } from '../models/Tables';
+export declare const reportBuilderStateToAst: (reportBuilderState: ReportBuilderState, databaseType: string) => {
+    from: {
+        db: null;
+        table: string;
+        as: string | null;
+        join: import("../models/ReportBuilder").JoinType | null;
+        on: {
+            type: string;
+            operator: string;
+            left: {
+                type: string;
+                table: string;
+                column: string;
+            };
+            right: {
+                type: string;
+                table: string;
+                column: string;
+            };
+        } | null;
+    }[];
+    columns: {
+        expr: {
+            type: string;
+            table: string;
+            column: string;
+        };
+        as: string | null;
+    }[] | null;
+    where: any;
+    orderby: {
+        expr: {
+            type: string;
+            table: null;
+            column: string;
+        };
+        type: import("../models/ReportBuilder").SortDirection;
+    }[] | null;
+    limit: {
+        value: number;
+        percent: null;
+        seperator?: undefined;
+    } | {
+        seperator: string;
+        value: {
+            type: string;
+            value: number;
+        }[];
+        percent?: undefined;
+    } | null;
+    top: {
+        value: number;
+        percent: null;
+        seperator?: undefined;
+    } | {
+        seperator: string;
+        value: {
+            type: string;
+            value: number;
+        }[];
+        percent?: undefined;
+    } | null;
+    with: null;
+    type: string;
+    options: null;
+    distinct: {
+        type: null;
+    };
+    into: {
+        position: null;
+    };
+    groupby: null;
+    having: null;
+    window: null;
+};
+export declare const astToReportBuilderState: (ast: any, databaseType: string, schema: Table[]) => ReportBuilderState;
+export declare const isValidPivotForReport: (pivot: Pivot, uniqueValuesByColumn: UniqueValuesByColumn, reportColumns: ColumnInternal[]) => boolean;
+export declare const makePivotValid: (pivot: Pivot, uniqueValuesForPivot: UniqueValuesByColumn, reportColumns: ColumnInternal[]) => {
+    pivot: Pivot | null;
+    hint: string;
+};
+export declare const formatRows: (rows: any[], columns: Column[], pivot?: boolean, aggregationType?: string, dateBucket?: string) => any;
+export declare const setTypesOnPivot: (newPivot: Pivot, searchColumns: ColumnInternal[]) => Pivot;
+//# sourceMappingURL=reportBuilder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reportBuilder.d.ts","sourceRoot":"","sources":["../../../src/utils/reportBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAEL,kBAAkB,EAKnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAmC/D,eAAO,MAAM,uBAAuB,uBACd,kBAAkB,gBACxB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBrB,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAC7B,GAAG,gBACM,MAAM,UACZ,KAAK,EAAE,KACd,kBAuBF,CAAC;AAwOF,eAAO,MAAM,qBAAqB,UACzB,KAAK,wBACU,oBAAoB,iBAC3B,cAAc,EAAE,YAuChC,CAAC;AAEF,eAAO,MAAM,cAAc,UAClB,KAAK,wBACU,oBAAoB,iBAC3B,cAAc,EAAE,KAC9B;IAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAgCrC,CAAC;AAEF,eAAO,MAAM,UAAU,SACf,GAAG,EAAE,WACF,MAAM,EAAE,UACT,OAAO,oBACG,MAAM,eACX,MAAM,QA6CpB,CAAC;AAEF,eAAO,MAAM,eAAe,aAChB,KAAK,iBACA,cAAc,EAAE,KAoBzB,KAAK,CAAC"}