@quillsql/react 2.13.39 → 2.13.41

package/dist/esm/utils/queryConstructor.js

@@ -18,14 +18,14 @@ function replaceBigQuerySpecialCharacters(column) {
 }
 export function processColumnReference(column, databaseType, fallbackOnNull, 
 // for mysql, we only want to use double quotes for pivot column field aliases
-isPivotColumnFieldAlias, isPivotValueFieldAlias) {
+isColumnFieldAlias, isValueFieldAlias) {
     switch (databaseType.toLowerCase()) {
         case 'postgresql':
         case 'clickhouse': {
             if (column === '') {
                 return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
             }
-            if (isPivotColumnFieldAlias) {
+            if (isColumnFieldAlias) {
                 return `"${column.replaceAll('"', '')}"`;
             }
             const columnParts = column.split('.');
@@ -40,7 +40,7 @@ isPivotColumnFieldAlias, isPivotValueFieldAlias) {
             if (column === '') {
                 return fallbackOnNull ? `${fallbackOnNull}` : '_';
             }
-            if (isPivotColumnFieldAlias) {
+            if (isColumnFieldAlias) {
                 return `\`${column.replaceAll(`\``, '').replaceAll(`"`, '')}\``;
             }
             const columnParts = column.split('.');
@@ -56,10 +56,10 @@ isPivotColumnFieldAlias, isPivotValueFieldAlias) {
             if (column === '') {
                 return fallbackOnNull ? `${fallbackOnNull}` : '_';
             }
-            if (isPivotColumnFieldAlias) {
+            if (isColumnFieldAlias) {
                 return `"${column.replaceAll('"', '')}"`;
             }
-            if (isPivotValueFieldAlias) {
+            if (isValueFieldAlias) {
                 const cleanedColumn = column.replaceAll(')', '').replaceAll('(', '_');
                 return `${cleanedColumn}`;
             }
@@ -73,7 +73,7 @@ isPivotColumnFieldAlias, isPivotValueFieldAlias) {
             if (column === '') {
                 return fallbackOnNull ? `\`${fallbackOnNull}\`` : '`_`';
             }
-            if (isPivotColumnFieldAlias) {
+            if (isColumnFieldAlias) {
                 return `\`${replaceBigQuerySpecialCharacters(column.replaceAll('`', ''))}\``;
             }
             const columnParts = column.split('.');
@@ -88,7 +88,7 @@ isPivotColumnFieldAlias, isPivotValueFieldAlias) {
             if (column === '') {
                 return fallbackOnNull ? `[${fallbackOnNull}]` : `[_]`;
             }
-            if (isPivotColumnFieldAlias) {
+            if (isColumnFieldAlias) {
                 return `[${column.replaceAll(']', '').replaceAll('[', '')}]`;
             }
             const columnParts = column.split('.');
@@ -165,7 +165,7 @@ export function generateCountQuery(fields, query, databaseType) {
     switch (databaseType.toLowerCase()) {
         case 'mysql':
             cte = fields.map((field, index) => {
-                return `, distinct_cte_${index} AS (SELECT DISTINCT ${processColumnReference(field, databaseType)} FROM querytable LIMIT ${MAX_PIVOT_UNIQUE_VALUES + 1})`;
+                return `, distinct_cte_${index} AS (SELECT DISTINCT ${processColumnReference(field, databaseType, undefined, true)} FROM querytable LIMIT ${MAX_PIVOT_UNIQUE_VALUES + 1})`;
             });
             countQuery = fields.map((field, index) => {
                 return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(*) AS ${processColumnReference('count', databaseType)} FROM distinct_cte_${index}`;
@@ -174,7 +174,7 @@ export function generateCountQuery(fields, query, databaseType) {
             break;
         default:
             countQuery = fields.map((field) => {
-                return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(DISTINCT ${processColumnReference(field, databaseType)}) AS ${processColumnReference('count', databaseType)} FROM querytable`;
+                return `SELECT '${field}' AS ${processColumnReference('field', databaseType)}, COUNT(DISTINCT ${processColumnReference(field, databaseType, undefined, true)}) AS ${processColumnReference('count', databaseType)} FROM querytable`;
             });
     }
     return cteQuery + countQuery.join(' UNION ALL ');
@@ -293,7 +293,10 @@ function create2DStringPivotQuery(pivot, itemQuery, columnFieldValues, databaseT
     if (!isValidBaseQuery || !pivot.columnField || !pivot.rowField)
         return undefined;
     const rowField = pivot.rowField;
-    if (!pivot.aggregations?.[0]?.valueField && !pivot.valueField)
+    if (!pivot.aggregations?.[0]?.valueField &&
+        pivot.aggregations?.[0]?.aggregationType !== 'count' &&
+        !pivot.valueField &&
+        pivot.aggregationType !== 'count')
         throw new Error('No value field provided for pivot');
     if (!pivot.aggregations?.[0]?.aggregationType && !pivot.aggregationType)
         throw new Error('No aggregation type provided for pivot');
@@ -317,7 +320,7 @@ function create2DStringPivotQuery(pivot, itemQuery, columnFieldValues, databaseT
         let disambiguationIndex = seenAggs[currentAgg.aggregationType ?? '']?.[currentAgg.valueField ?? '']?.toString();
         if (disambiguationIndex === '1')
             disambiguationIndex = '';
-        const valueFieldAlias = processColumnReference((currentAgg.valueField || rowField || 'count'), databaseType, undefined, false, true);
+        const valueFieldAlias = processColumnReference(currentAgg.valueField || rowField || 'count', databaseType, undefined, false, true);
         const valueAliasSubstring = currentAgg.valueField
             ? `${processColumnReference(currentAgg.valueField, databaseType, undefined, true)} AS ${valueFieldAlias}`
             : '';
@@ -340,7 +343,8 @@ function create2DStringPivotQuery(pivot, itemQuery, columnFieldValues, databaseT
             const value2Expr = (currentAgg.valueField2Type ?? currentAgg.valueFieldType) === 'bool'
                 ? `CASE WHEN ${valueField2Alias} THEN 1 ELSE 0 END`
                 : valueField2Alias;
-            if (currentAgg.valueField === currentAgg.valueField2 || !currentAgg.valueField2) {
+            if (currentAgg.valueField === currentAgg.valueField2 ||
+                !currentAgg.valueField2) {
                 caseWhens = columnFieldValues.map((column) => {
                     return `sum(CASE WHEN ${columnFieldAlias} = '${processSingleQuotes(column, databaseType)}' THEN ${valueExpr} END) / GREATEST(sum(${value2Expr}), 1) AS ${processColumnReference(column + disambiguation, databaseType, '_', true)}`;
                 });
@@ -372,7 +376,7 @@ function create2DStringPivotQuery(pivot, itemQuery, columnFieldValues, databaseT
     ];
     valueAliases = Array.from(new Set(valueAliases));
     const sortQuery = pivot.sort && pivot.sortField && pivot.rowLimit
-        ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType)} ${pivot.sortDirection || ''} `
+        ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType, undefined, true)} ${pivot.sortDirection || ''} `
         : '';
     const pivotQuery = `
     ,quill_alias AS (
@@ -401,7 +405,10 @@ function create2DDatePivotQuery(pivot, itemQuery, columnFieldValues, databaseTyp
     if (!isValidBaseQuery || !pivot.columnField || !pivot.rowField) {
         return undefined;
     }
-    if (!pivot.aggregations?.[0]?.valueField && !pivot.valueField)
+    if (!pivot.aggregations?.[0]?.valueField &&
+        pivot.aggregations?.[0]?.aggregationType !== 'count' &&
+        !pivot.valueField &&
+        pivot.aggregationType !== 'count')
         throw new Error('No value field provided for pivot');
     if (!pivot.aggregations?.[0]?.aggregationType && !pivot.aggregationType)
         throw new Error('No aggregation type provided for pivot');
@@ -427,12 +434,14 @@ function create2DDatePivotQuery(pivot, itemQuery, columnFieldValues, databaseTyp
         let disambiguationIndex = seenAggs[currentAgg.aggregationType ?? '']?.[currentAgg.valueField ?? '']?.toString();
         if (disambiguationIndex === '1')
             disambiguationIndex = '';
-        const valueFieldAlias = processColumnReference((currentAgg.valueField ?? rowField), databaseType, undefined, false, true);
+        const valueFieldAlias = processColumnReference(currentAgg.valueField ?? rowField, databaseType, undefined, false, true);
         const valueAliasSubstring = currentAgg.valueField
             ? `${processColumnReference(currentAgg.valueField, databaseType, undefined, true)} AS ${valueFieldAlias}`
             : '';
         let value2AliasSubstring = '';
-        const disambiguationField = Object.values(seenAggs[currentAgg.aggregationType ?? ''] ?? {}).reduce((acc, v) => acc + v) > 1 ? `_${currentAgg.valueField}${disambiguationIndex}` : '';
+        const disambiguationField = Object.values(seenAggs[currentAgg.aggregationType ?? ''] ?? {}).reduce((acc, v) => acc + v) > 1
+            ? `_${currentAgg.valueField}${disambiguationIndex}`
+            : '';
         const disambiguation = pivot.aggregations?.length > 1
             ? `${disambiguationField}_${disambiguationField ? matchCasing(currentAgg.aggregationType, currentAgg.valueField) : currentAgg.aggregationType}`
             : '';
@@ -449,7 +458,8 @@ function create2DDatePivotQuery(pivot, itemQuery, columnFieldValues, databaseTyp
                 ? `CASE WHEN ${valueField2Alias} THEN 1 ELSE 0 END`
                 : valueField2Alias;
             // edge case. if the user picks amount and amount, we assume they want a pie chart like breakdown of amount. so the summation of valueField2 has to be moved outside of the case whe
-            if (currentAgg.valueField === currentAgg.valueField2 || !currentAgg.valueField2) {
+            if (currentAgg.valueField === currentAgg.valueField2 ||
+                !currentAgg.valueField2) {
                 caseWhens = [
                     ...caseWhens,
                     ...columnFieldValues.map((column) => {
@@ -487,7 +497,7 @@ function create2DDatePivotQuery(pivot, itemQuery, columnFieldValues, databaseTyp
     ];
     valueFieldAliases = Array.from(new Set(valueFieldAliases));
     // pivot sort matters in the base query when there is a rowLimit. In mssql, an orderby must be accompanied by a limit in a subquery and not allowed in a cte
-    const sortQuery = `${pivot.sort && pivot.sortField && pivot.rowLimit ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType)} ${pivot.sortDirection || ''} ` : ''}`;
+    const sortQuery = `${pivot.sort && pivot.sortField && pivot.rowLimit ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType, undefined, true)} ${pivot.sortDirection || ''} ` : ''}`;
     const pivotQuery = `
     , quill_alias AS (SELECT ${valueFieldAliases.length > 0 ? `${valueFieldAliases.join(', ')}` : ''} FROM quill_base_table),
     quill_qt_agg AS (SELECT ${processDateTrunc(dateBucket, rowFieldAlias, databaseType)} as ${rowFieldAlias}${caseWhens.length > 0 ? `, ${caseWhens.join(', ')}` : ''} FROM quill_alias GROUP BY ${databaseType.toLowerCase() === 'clickhouse' ? processColumnReference(`${rowField}`, databaseType) : processDateTrunc(dateBucket, rowFieldAlias, databaseType)}),
@@ -534,7 +544,7 @@ function create1DStringPivotQuery(pivot, itemQuery, databaseType) {
         if (disambiguationIndex === '1')
             disambiguationIndex = '';
         // This is the alias (from quill_alias CTE) for the field
-        const valueFieldAlias = processColumnReference((currentAgg.valueField || rowField || 'count'), databaseType, undefined, false, true);
+        const valueFieldAlias = processColumnReference(currentAgg.valueField || rowField || 'count', databaseType, undefined, false, true);
         // In the base query, we select the raw column.
         const valueAliasSubstring = currentAgg.valueField
             ? `${processColumnReference(currentAgg.valueField, databaseType, undefined, true)} AS ${valueFieldAlias}`
@@ -557,10 +567,13 @@ function create1DStringPivotQuery(pivot, itemQuery, databaseType) {
             if ((currentAgg.valueField2Type ?? currentAgg.valueFieldType) === 'bool') {
                 value2Expr = `CASE WHEN ${valueField2Alias} THEN 1 ELSE 0 END`;
             }
-            value2AliasSubstring = currentAgg.valueField2 && currentAgg.valueField !== currentAgg.valueField2
-                ? `${processColumnReference(currentAgg.valueField2, databaseType, undefined, true)} AS ${valueField2Alias}`
-                : '';
-            const percentageExpr = currentAgg.valueField === currentAgg.valueField2 || !currentAgg.valueField2
+            value2AliasSubstring =
+                currentAgg.valueField2 &&
+                    currentAgg.valueField !== currentAgg.valueField2
+                    ? `${processColumnReference(currentAgg.valueField2, databaseType, undefined, true)} AS ${valueField2Alias}`
+                    : '';
+            const percentageExpr = currentAgg.valueField === currentAgg.valueField2 ||
+                !currentAgg.valueField2
                 ? `sum(${valueExpr}) / ${(currentAgg.valueField2Type ?? currentAgg.valueFieldType) === 'bool' ? 'COUNT(*)' : 'SUM(sum(' + valueExpr + ')) OVER ()'}`
                 : `sum(${valueExpr}) / GREATEST(sum(${value2Expr}), 1)`;
             quillAggSelects = [
@@ -581,7 +594,7 @@ function create1DStringPivotQuery(pivot, itemQuery, databaseType) {
     });
     valueFieldAliases = Array.from(new Set(valueFieldAliases));
     const sortQuery = `${pivot.sort && pivot.sortField && pivot.rowLimit
-        ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType)} ${pivot.sortDirection || ''} `
+        ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType, undefined, true)} ${pivot.sortDirection || ''} `
         : ''}`;
     const pivotQuery = `, quill_alias AS (
        SELECT ${processColumnReference(`${rowField}`, databaseType, undefined, true)} AS ${rowAlias}${valueFieldAliases.length > 0 ? `, ${valueFieldAliases.join(', ')}` : ''}
@@ -606,7 +619,9 @@ function create1DDatePivotQuery(pivot, itemQuery, dateBucket = 'month', database
     }
     const rowField = pivot.rowField || '';
     const rowFieldAlias = processColumnReference(rowField, databaseType, undefined);
-    let quillAggSelects = [`${processDateTrunc(dateBucket, rowFieldAlias, databaseType)} as ${processColumnReference(rowField, databaseType)}`];
+    let quillAggSelects = [
+        `${processDateTrunc(dateBucket, rowFieldAlias, databaseType)} as ${processColumnReference(rowField, databaseType)}`,
+    ];
     let valueFieldAliases = [];
     const seenAggs = {};
     pivot.aggregations?.forEach((currentAgg) => {
@@ -625,7 +640,7 @@ function create1DDatePivotQuery(pivot, itemQuery, dateBucket = 'month', database
         let disambiguationIndex = seenAggs[currentAgg.aggregationType ?? '']?.[currentAgg.valueField ?? '']?.toString() ?? '';
         if (disambiguationIndex === '1')
             disambiguationIndex = '';
-        const valueFieldAlias = processColumnReference((currentAgg.valueField || rowField || 'count'), databaseType, undefined, false, true);
+        const valueFieldAlias = processColumnReference(currentAgg.valueField || rowField || 'count', databaseType, undefined, false, true);
         const valueAliasSubstring = currentAgg.valueField
             ? `${processColumnReference(currentAgg.valueField, databaseType, undefined, true)} AS ${valueFieldAlias}`
             : '';
@@ -643,14 +658,17 @@ function create1DDatePivotQuery(pivot, itemQuery, dateBucket = 'month', database
                 throw new Error('No value field provided for percentage aggregation');
             }
             const valueField2Alias = processColumnReference(currentAgg.valueField2 ?? currentAgg.valueField, databaseType, undefined, false, true);
-            value2AliasSubstring = currentAgg.valueField2 && currentAgg.valueField !== currentAgg.valueField2
-                ? `${processColumnReference(currentAgg.valueField2, databaseType, undefined, true)} AS ${valueField2Alias}`
-                : '';
+            value2AliasSubstring =
+                currentAgg.valueField2 &&
+                    currentAgg.valueField !== currentAgg.valueField2
+                    ? `${processColumnReference(currentAgg.valueField2, databaseType, undefined, true)} AS ${valueField2Alias}`
+                    : '';
             let value2Expr = valueField2Alias;
             if ((currentAgg.valueField2Type ?? currentAgg.valueFieldType) === 'bool') {
                 value2Expr = `CASE WHEN ${valueField2Alias} THEN 1 ELSE 0 END`;
             }
-            const percentageExpr = currentAgg.valueField === currentAgg.valueField2 || !currentAgg.valueField2
+            const percentageExpr = currentAgg.valueField === currentAgg.valueField2 ||
+                !currentAgg.valueField2
                 ? `sum(${valueExpr}) / ${(currentAgg.valueField2Type ?? currentAgg.valueFieldType) === 'bool' ? 'COUNT(*)' : 'SUM(sum(' + valueExpr + ')) OVER ()'}`
                 : `sum(${valueExpr}) / GREATEST(sum(${value2Expr}), 1)`;
             quillAggSelects = [
@@ -671,7 +689,7 @@ function create1DDatePivotQuery(pivot, itemQuery, dateBucket = 'month', database
     });
     valueFieldAliases = Array.from(new Set(valueFieldAliases));
     // pivot sort matters in the base query when there is a rowLimit. In mssql, an orderby must be accompanied by a limit in a subquery and not allowed in a cte
-    const sortQuery = `${pivot.sort && pivot.sortField && pivot.rowLimit ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType)} ${pivot.sortDirection || ''} ` : ''}`;
+    const sortQuery = `${pivot.sort && pivot.sortField && pivot.rowLimit ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType, undefined, true)} ${pivot.sortDirection || ''} ` : ''}`;
     const pivotQuery = `, quill_alias AS (SELECT ${processColumnReference(`${rowField}`, databaseType, undefined, true)} AS ${rowFieldAlias}${valueFieldAliases.length > 0 ? `, ${valueFieldAliases.join(', ')}` : ''}
     FROM quill_base_table),
     quill_qt_agg AS (SELECT ${quillAggSelects.join(', ')}
@@ -707,7 +725,7 @@ function createAggregationValuePivot(pivot, itemQuery, databaseType) {
         let disambiguationIndex = seenAggs[currentAgg.aggregationType ?? '']?.[currentAgg.valueField ?? '']?.toString() ?? '';
         if (disambiguationIndex === '1')
             disambiguationIndex = '';
-        const valueFieldAlias = processColumnReference((currentAgg.valueField || 'count'), databaseType, undefined, false, true);
+        const valueFieldAlias = processColumnReference(currentAgg.valueField || 'count', databaseType, undefined, false, true);
         const valueAliasSubstring = currentAgg.valueField
             ? `${processColumnReference(currentAgg.valueField, databaseType, undefined, true)} AS ${valueFieldAlias}`
             : '';
@@ -717,9 +735,10 @@ function createAggregationValuePivot(pivot, itemQuery, databaseType) {
             : '';
         // If the field type is bool, wrap it in a CASE WHEN
         let valueExpr = !currentAgg.valueField ? '*' : valueFieldAlias;
-        valueExpr = currentAgg.valueFieldType === 'bool'
-            ? `CASE WHEN ${valueFieldAlias} THEN 1 ELSE 0 END`
-            : valueExpr;
+        valueExpr =
+            currentAgg.valueFieldType === 'bool'
+                ? `CASE WHEN ${valueFieldAlias} THEN 1 ELSE 0 END`
+                : valueExpr;
         if (currentAgg.aggregationType === 'percentage') {
             if (!currentAgg.valueField) {
                 throw new Error('No value field provided for percentage aggregation');
@@ -728,10 +747,13 @@ function createAggregationValuePivot(pivot, itemQuery, databaseType) {
             const value2Expr = (currentAgg.valueField2Type ?? currentAgg.valueFieldType) === 'bool'
                 ? `CASE WHEN ${valueField2Alias} THEN 1 ELSE 0 END`
                 : valueField2Alias;
-            value2AliasSubstring = currentAgg.valueField2 && currentAgg.valueField !== currentAgg.valueField2
-                ? `${processColumnReference(currentAgg.valueField2, databaseType, undefined, true)} AS ${valueField2Alias}`
-                : '';
-            const percentageExpr = currentAgg.valueField === currentAgg.valueField2 || !currentAgg.valueField2
+            value2AliasSubstring =
+                currentAgg.valueField2 &&
+                    currentAgg.valueField !== currentAgg.valueField2
+                    ? `${processColumnReference(currentAgg.valueField2, databaseType, undefined, true)} AS ${valueField2Alias}`
+                    : '';
+            const percentageExpr = currentAgg.valueField === currentAgg.valueField2 ||
+                !currentAgg.valueField2
                 ? `sum(${valueExpr}) / ${(currentAgg.valueField2Type ?? currentAgg.valueFieldType) === 'bool' ? 'COUNT(*)' : 'SUM(sum(' + valueExpr + ')) OVER ()'}`
                 : `sum(${valueExpr}) / GREATEST(sum(${value2Expr}), 1)`;
             quillAggSelects = [
@@ -752,7 +774,7 @@ function createAggregationValuePivot(pivot, itemQuery, databaseType) {
     });
     valueFieldAliases = Array.from(new Set(valueFieldAliases));
     const sortQuery = pivot.sort && pivot.sortField && pivot.rowLimit
-        ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType)} ${pivot.sortDirection || ''} `
+        ? ` ORDER BY ${processColumnReference(pivot.sortField, databaseType, undefined, true)} ${pivot.sortDirection || ''} `
         : '';
     const pivotQuery = `, quill_alias AS (
         SELECT ${valueFieldAliases.join(', ')} FROM quill_base_table
@@ -782,7 +804,13 @@ export function additionalProcessingOnPivotQuery(pivot, query, additionalProcess
     }
     if (!pivot.aggregations || pivot.aggregations.length === 0) {
         if (pivot.aggregationType) {
-            pivot.aggregations = [{ aggregationType: pivot.aggregationType, valueField: pivot.valueField, valueField2: pivot.valueField2 }];
+            pivot.aggregations = [
+                {
+                    aggregationType: pivot.aggregationType,
+                    valueField: pivot.valueField,
+                    valueField2: pivot.valueField2,
+                },
+            ];
         }
         else {
             throw new Error('No aggregations provided for pivot');
@@ -806,13 +834,13 @@ export function additionalProcessingOnPivotQuery(pivot, query, additionalProcess
         ? `_${matchCasing(pivot.aggregations?.[0]?.aggregationType, pivot.aggregations?.[0]?.valueField)}`
         : '';
     if (additionalProcessing.sort) {
-        sortQuery = `ORDER BY ${processColumnReference(additionalProcessing.sort.field, databaseType)} ${additionalProcessing.sort.direction || ''}`;
+        sortQuery = `ORDER BY ${processColumnReference(additionalProcessing.sort.field, databaseType, undefined, true)} ${additionalProcessing.sort.direction || ''}`;
     }
     else {
         const valueFieldAlias = processColumnReference((pivot.aggregations?.[0]?.valueField ?? '') + disambiguation, databaseType, undefined, false, true);
         const defaultSortField = pivot.sortField || pivot.rowField || valueFieldAlias;
         const defaultSortDirection = pivot.sortDirection || '';
-        sortQuery = `ORDER BY ${processColumnReference(defaultSortField, databaseType)} ${defaultSortDirection}`;
+        sortQuery = `ORDER BY ${processColumnReference(defaultSortField, databaseType, undefined, true)} ${defaultSortDirection}`;
     }
     const additionalProcessingQuery = `
     SELECT * 

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

@@ -5,6 +5,7 @@ import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReport, QuillReportInternal } from '../models/Report';
 import { DateRangesByColumn, Table, UniqueValuesByTable } from '../models/Tables';
 import { AdditionalProcessing } from './tableProcessing';
+import { CustomField } from '../models/Schema';
 export type ReportBuilderInfo = {
     rows: any[];
     columns: ColumnInternal[];
@@ -22,19 +23,36 @@ export type ReportBuilderInfo = {
 };
 export declare const EMPTY_REPORT: QuillReport;
 export declare const EMPTY_INTERNAL_REPORT: QuillReportInternal;
-export declare function fetchReport(reportId: string, client: QuillProviderClient, tenants?: {
-    tenantField: string;
-    tenantIds: (string | number)[];
-}[] | (string | number)[], flags?: string[], useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean, abortSignal?: AbortSignal, getDefaultDashboardFilters?: boolean): Promise<{
+export declare function fetchReport({ reportId, client, tenants, flags, useReportTask, filters, additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getDefaultDashboardFilters, }: {
+    reportId: string;
+    client: QuillProviderClient;
+    tenants?: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+    flags?: string[];
+    useReportTask?: boolean;
+    filters?: any[];
+    additionalProcessing?: AdditionalProcessing;
+    dateBucket?: string;
+    customFields?: any;
+    rowsOnly?: boolean;
+    rowCountOnly?: boolean;
+    abortSignal?: AbortSignal;
+    getDefaultDashboardFilters?: boolean;
+}): Promise<{
     report: QuillReportInternal;
     error?: string;
 }>;
-export declare function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, }: {
+export declare function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, customFields, }: {
     resp: any;
     client: QuillProviderClient;
     filters?: (DashboardFilter | InternalFilter)[];
     dateBucket?: string;
     additionalProcessing?: AdditionalProcessing;
+    customFields?: {
+        [tableName: string]: CustomField[];
+    } | null;
 }): Promise<QuillReportInternal>;
 export declare function fetchReportInfo(reportId: string, client: QuillProviderClient, tenants?: {
     tenantField: string;

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

@@ -2,7 +2,7 @@ import equal from 'fast-deep-equal';
 import { createInitialFormData } from '../ChartBuilder';
 import { getTableNames } from '../components/ReportBuilder/ast';
 import { generatePivotTable } from '../internals/ReportBuilder/PivotModal';
-import { FilterType } from '../models/Filter';
+import { InternalFilterType } from '../models/Filter';
 import { createBasicSelectASTFromColumns } from './astProcessing';
 import { getYAxisFields } from './columnProcessing';
 import { cleanDashboardItem } from './dashboard';
@@ -57,10 +57,14 @@ function extractAllReportValuesFromQuillInternalReport(reportInternal) {
         queryString: reportInternal.queryString,
         rowCount: reportInternal.rowCount,
         template: reportInternal.template,
+        referenceLineYValues: reportInternal.referenceLineYValues,
+        referenceLines: reportInternal.referenceLines,
+        includeCustomFields: reportInternal.includeCustomFields,
+        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) {
+export async function fetchReport({ reportId, client, tenants, flags, useReportTask = true, filters = [], additionalProcessing, dateBucket, customFields, rowsOnly, rowCountOnly, abortSignal, getDefaultDashboardFilters, }) {
     let reportInfo = undefined;
     let errorMessage = undefined;
     try {
@@ -95,6 +99,7 @@ export async function fetchReport(reportId, client, tenants, flags, useReportTas
             filters,
             dateBucket,
             additionalProcessing,
+            customFields,
         });
     }
     catch (error) {
@@ -123,10 +128,10 @@ export async function fetchReport(reportId, client, tenants, flags, useReportTas
     }
     return { report: reportInfo || EMPTY_INTERNAL_REPORT, error: errorMessage };
 }
-export async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, }) {
+export async function processReportResponse({ resp, client, filters, dateBucket, additionalProcessing, customFields, }) {
     const dashboardItem = {
         ...resp,
-        filtersApplied: filters?.filter((filter) => filter.filterType in FilterType),
+        filtersApplied: filters?.filter((filter) => filter.filterType in InternalFilterType),
     };
     if (resp.errorMessage) {
         throw new DataLoadError(resp?.errorMessage, {
@@ -143,7 +148,14 @@ export async function processReportResponse({ resp, client, filters, dateBucket,
             parseValueFromBigQueryDates(dashboardItem.compareRows, resp.fields);
         }
     }
-    const reportInfo = await cleanDashboardItem(dashboardItem, filters, client, dateBucket, additionalProcessing);
+    const reportInfo = await cleanDashboardItem({
+        item: dashboardItem,
+        dashboardFilters: filters,
+        client,
+        dateBucket,
+        additionalProcessing,
+        customFields,
+    });
     if (additionalProcessing) {
         reportInfo.pagination = additionalProcessing.page;
         reportInfo.sort = additionalProcessing.sort;
@@ -245,8 +257,13 @@ export const formatRowsFromReport = (report, xAxisField, xAxisFormat) => {
     if (!report.rows || !report.columns) {
         return [];
     }
+    const columns = report.includeCustomFields &&
+        report.columnsWithCustomFields &&
+        !report.pivot
+        ? report.columnsWithCustomFields
+        : report.columns;
     return report.rows.map((row) => {
-        return report.columns.reduce((formattedRow, column) => {
+        return columns.reduce((formattedRow, column) => {
             // Apply the format function to each field in the row
             const formattedValue = quillFormat({
                 value: row[column.field],
@@ -269,7 +286,8 @@ export function convertInternalReportToReport(report, dashboardFilters, initiato
         };
         if (formattedReport.pivot &&
             isValidPivot(formattedReport.pivot).valid &&
-            initiator !== 'useQuill') {
+            initiator !== 'useQuill' &&
+            initiator !== 'Table') {
             let columns = report.pivotColumns ?? report.columns;
             let rows = report.pivotRows ?? report.rows;
             if (report.chartType === 'table') {
@@ -343,7 +361,7 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
         if (!table || !tableInfo) {
             throw new Error('No table found');
         }
-        const tableData = await fetchTableByAST({ ...baseAst, where: formData }, client, tenants, processing ?? { page: DEFAULT_PAGINATION }, undefined, skipRowCount, undefined, dashboardName);
+        const tableData = await fetchTableByAST({ ...baseAst, where: formData }, client, tenants, processing ?? { page: DEFAULT_PAGINATION }, customFields, skipRowCount, undefined, dashboardName);
         if (tableData.error) {
             throw new Error(tableData.error);
         }
@@ -371,6 +389,8 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
                 };
             }),
             columnInternal: tableData.columns,
+            referenceLines: report?.referenceLines,
+            referenceLineYValues: report?.referenceLineYValues,
         };
         if (table !== currentTable || previousFormData !== formData) {
             const queryResult = await fetchSqlQuery({
@@ -411,7 +431,7 @@ export const fetchReportBuilderDataFromAST = async ({ baseAst, formData, schema,
                 }
                 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 ?? ''));
+                    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,

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

@@ -1,8 +1,31 @@
 import { QuillProviderClient } from '../models/Client';
+import { ColumnInternal } from '../models/Columns';
+import { CustomField } from '../models/Schema';
 import { Table } from '../models/Tables';
-export declare const getCustomFieldInfo: (client: QuillProviderClient, caller?: string) => Promise<any[]>;
-export declare const getSchemaInfo: (client: QuillProviderClient, caller?: string, tableIds?: string[]) => Promise<{
+export declare const getCustomFieldInfo: ({ client, tenants, caller, }: {
+    client: QuillProviderClient;
+    tenants: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+    caller?: string;
+}) => Promise<{
+    [tableName: string]: CustomField[];
+} | null>;
+export declare const getSchemaInfo: ({ client, caller, tenants, tableIds, }: {
+    client: QuillProviderClient;
+    tenants?: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+    caller?: string;
+    tableIds?: string[];
+}) => Promise<{
     schemaData: Table[];
-    customFieldsByTable: any;
+    customFieldsByTable: {
+        [tableName: string]: CustomField[];
+    } | null;
+    schemaWithCustomFields: Table[];
 }>;
+export declare const customFieldToColumnInternal: (customField: CustomField) => ColumnInternal;
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA0BzC,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,oCAmF5B,CAAC;AAEF,eAAO,MAAM,aAAa,WAChB,mBAAmB,8BAEhB,MAAM,EAAE,KAClB,OAAO,CAAC;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAqD3D,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AA8BzC,eAAO,MAAM,kBAAkB,iCAI5B;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,KAAG,OAAO,CAAC;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,GAAG,IAAI,CAkFxD,CAAC;AAEF,eAAO,MAAM,aAAa,2CAKvB;IACD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,KAAG,OAAO,CAAC;IACV,UAAU,EAAE,KAAK,EAAE,CAAC;IACpB,mBAAmB,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IACnE,sBAAsB,EAAE,KAAK,EAAE,CAAC;CACjC,CA6DA,CAAC;AA0BF,eAAO,MAAM,2BAA2B,gBACzB,WAAW,KACvB,cAaF,CAAC"}