@quillsql/react 2.15.2 → 2.15.3

package/dist/cjs/utils/pivotConstructor.d.ts

@@ -1,7 +1,11 @@
+import { AxisFormat } from '../models/Chart';
 import { QuillProviderClient } from '../models/Client';
+import { EventTracking } from '../models/Event';
+import { InternalDashboardDateFilter } from '../models/Filter';
+import { AdditionalProcessing } from '../models/Pagination';
 import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
-import { AdditionalProcessing } from './tableProcessing';
+import { UniqueValuesByColumn } from '../models/Tables';
 export declare function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount, caller, getToken, }: {
     pivot: Pivot;
     report?: QuillReportInternal;
@@ -21,5 +25,35 @@ export declare function generatePivotWithSQL({ pivot, report, client, dateBucket
     caller?: string;
     getToken: () => Promise<string>;
 }): Promise<PivotData>;
-export declare function disambiguatedValueField(pivot: Pivot): string | undefined;
+export declare function generatePivotTableYAxis(pivot: Pivot, cols: {
+    label: string;
+    field: string;
+}[], yAxisField: {
+    field: string;
+    label: string;
+    format: AxisFormat;
+}): {
+    field: string;
+    label: string;
+    format: AxisFormat;
+}[];
+export declare function generatePivotTitle(pivot: Pivot): string;
+export declare function generatePivotTable({ pivot, dateBucket, dateFilter, report, client, getToken, eventTracking, uniqueValues, dashboardName, tenants, additionalProcessing, caller, pivotQuery, }: {
+    pivot: Pivot;
+    dateBucket?: string;
+    dateFilter?: InternalDashboardDateFilter;
+    report?: QuillReportInternal;
+    client: QuillProviderClient | null;
+    getToken: () => Promise<string>;
+    eventTracking: EventTracking | null;
+    uniqueValues?: UniqueValuesByColumn;
+    dashboardName?: string;
+    tenants?: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+    additionalProcessing?: AdditionalProcessing;
+    caller?: string;
+    pivotQuery?: string;
+}): Promise<PivotData>;
 //# sourceMappingURL=pivotConstructor.d.ts.map

package/dist/cjs/utils/pivotConstructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,EACvB,MAAM,EACN,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,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,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC,GAAG,OAAO,CAAC,SAAS,CAAC,CAuXrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/pivotConstructor.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePivotWithSQL = generatePivotWithSQL;
-exports.disambiguatedValueField = disambiguatedValueField;
-const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
+exports.generatePivotTableYAxis = generatePivotTableYAxis;
+exports.generatePivotTitle = generatePivotTitle;
+exports.generatePivotTable = generatePivotTable;
 const columnProcessing_1 = require("./columnProcessing");
+const columnType_1 = require("./columnType");
 const constants_1 = require("./constants");
 const dataFetcher_1 = require("./dataFetcher");
 const dataProcessing_1 = require("./dataProcessing");
@@ -184,7 +186,7 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
         }
         return 0;
     });
-    if (pivot.rowField && !(0, columnProcessing_1.isStringType)(pivot.rowFieldType || '')) {
+    if (pivot.rowField && !(0, columnType_1.isStringType)(pivot.rowFieldType || '')) {
         rows.forEach((row) => {
             row.__quillRawDate =
                 typeof row[pivot.rowField || ''] === 'object' // BigQuery
@@ -205,7 +207,7 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
                     value = dateFilter.endDate.toISOString();
                 }
             }
-            const dateString = (0, PivotModal_1.getDateString)(value, dateFilter?.startDate && dateFilter?.endDate
+            const dateString = (0, dates_1.getDateString)(value, dateFilter?.startDate && dateFilter?.endDate
                 ? { start: dateFilter.startDate, end: dateFilter.endDate }
                 : undefined, dateBucket, databaseType);
             row[pivot.rowField || ''] = dateString;
@@ -213,13 +215,13 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
         // add a row for each date in the range that doesn't have a value
         if (pivot.rowField &&
             pivot.rowFieldType &&
-            !(0, columnProcessing_1.isStringType)(pivot.rowFieldType) &&
+            !(0, columnType_1.isStringType)(pivot.rowFieldType) &&
             dateFilter?.startDate &&
             dateFilter?.endDate) {
             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 = (0, PivotModal_1.getDateString)(date.toISOString(), { start: dateFilter.startDate, end: dateFilter.endDate }, dateBucket, databaseType);
+                const formattedDate = (0, dates_1.getDateString)(date.toISOString(), { start: dateFilter.startDate, end: dateFilter.endDate }, dateBucket, databaseType);
                 if (!dateSet.has(formattedDate)) {
                     const newRow = {};
                     newRow[pivot.rowField] = formattedDate;
@@ -284,17 +286,72 @@ async function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFil
         comparisonPivotQuery: comparisonPivotSql,
     };
 }
-function disambiguatedValueField(pivot) {
-    if (pivot.aggregations && pivot.aggregations.length > 0) {
-        if (!pivot.aggregations[0]?.valueField && !pivot.valueField) {
-            return undefined; // avoid returning empty string
-        }
-        if (pivot.aggregations.length === 1) {
-            return pivot.aggregations[0]?.valueField ?? pivot.valueField;
-        }
-        else {
-            return `${pivot.aggregations[0].valueField}_${(0, textProcessing_1.matchCasing)(pivot.aggregations[0].aggregationType, pivot.aggregations[0].valueField)}`;
+function generatePivotTableYAxis(pivot, cols, yAxisField) {
+    // For count aggregations, use 'count' for the label
+    if (pivot?.aggregationType === 'count') {
+        return [
+            {
+                field: pivot.valueField ?? 'count',
+                label: yAxisField.label,
+                format: yAxisField.format,
+            },
+        ];
+    }
+    // otherwise use the default (ie. the field label)
+    return [
+        {
+            field: pivot.valueField ?? 'count',
+            label: yAxisField.label,
+            format: yAxisField.format,
+        },
+    ];
+}
+function generatePivotTitle(pivot) {
+    if (pivot.rowField && !pivot.valueField && pivot.aggregations?.[0]) {
+        return (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(`${pivot.aggregations[0].aggregationType} of ${pivot.rowField}${pivot.columnField ? ` by ${pivot.columnField}` : ''}
+      `);
+    }
+    else if (!pivot.rowField && pivot.aggregations?.[0]?.valueField) {
+        return (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(`${pivot.aggregations[0].aggregationType} of ${pivot.aggregations[0].valueField}
+      `);
+    }
+    return (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(`${pivot.aggregations?.[0]?.aggregationType ?? 'Aggregation'} of ${pivot.aggregations?.[0]?.valueField ?? 'value'}${pivot.rowField ? ` by ${pivot.rowField}` : ''}${pivot.columnField ? ` and ${pivot.columnField}` : ''}`);
+}
+async function generatePivotTable({ pivot, dateBucket, dateFilter, report, client, getToken, eventTracking, uniqueValues, dashboardName, tenants, additionalProcessing, caller, pivotQuery, }) {
+    try {
+        if (report && client) {
+            const pivotTable = await generatePivotWithSQL({
+                pivotQuery,
+                pivot,
+                report,
+                client,
+                dateBucket,
+                dateFilter,
+                distinctStrings: pivot.columnField && uniqueValues?.[pivot.columnField]
+                    ? uniqueValues[pivot.columnField]
+                    : [],
+                dashboardName,
+                tenants,
+                additionalProcessing,
+                caller,
+                getToken,
+            });
+            return pivotTable;
         }
     }
-    return pivot.valueField ? pivot.valueField : undefined; // avoid returning empty string
+    catch (e) {
+        eventTracking?.logError?.({
+            type: 'bug', // TODO: determine type
+            severity: 'high',
+            message: 'Error generating pivot table',
+            errorMessage: e.message,
+            errorStack: e.stack,
+            errorData: {
+                caller: 'PivotModal',
+                function: 'generatePivotTable',
+            },
+        });
+        throw Error(`Failed to generate pivot table with SQL: ${e}`);
+    }
+    throw Error('Failed to generate pivot table: invalid report');
 }

package/dist/cjs/utils/pivotProcessing.d.ts

@@ -1,4 +1,4 @@
-import { AxisFormat } from '../Dashboard';
+import { AxisFormat } from '../models/Chart';
 import { ColumnInternal } from '../models/Columns';
 import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
@@ -30,4 +30,5 @@ export declare const pivotFormData: (pivot: Pivot, columns: ColumnInternal[], re
         format: AxisFormat;
     }[];
 };
+export declare function disambiguatedValueField(pivot: Pivot): string | undefined;
 //# sourceMappingURL=pivotProcessing.d.ts.map

package/dist/cjs/utils/pivotProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAWxD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA6C7E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAqDnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAsCP;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,GAAG,EAAE,OAAO,KAAK,YA8BxD,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,OAAO,KAAK,EACZ,SAAS,cAAc,EAAE,EACzB,SAAS,mBAAmB,EAC5B,gBAAgB,MAAM,EACtB,YAAY,SAAS;;;;;;;;;;;CAuDtB,CAAC"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAWxD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CA6C7E;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EAqDnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAsCP;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,GAAG,EAAE,OAAO,KAAK,YA8BxD,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,OAAO,KAAK,EACZ,SAAS,cAAc,EAAE,EACzB,SAAS,mBAAmB,EAC5B,gBAAgB,MAAM,EACtB,YAAY,SAAS;;;;;;;;;;;CAuDtB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}

package/dist/cjs/utils/pivotProcessing.js

@@ -4,12 +4,13 @@ exports.pivotFormData = exports.isPivotPossible = void 0;
 exports.isValidPivot = isValidPivot;
 exports.getPossiblePivotFieldOptions = getPossiblePivotFieldOptions;
 exports.cleanPivot = cleanPivot;
+exports.disambiguatedValueField = disambiguatedValueField;
 const util_1 = require("../components/ReportBuilder/util");
-const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
-const columnProcessing_1 = require("./columnProcessing");
+const dates_1 = require("./dates");
+const columnType_1 = require("./columnType");
 const constants_1 = require("./constants");
-const pivotConstructor_1 = require("./pivotConstructor");
 const valueFormatter_1 = require("./valueFormatter");
+const textProcessing_1 = require("./textProcessing");
 function isValidPivot(pivot) {
     if (!pivot.rowField &&
         !pivot.aggregations?.[0]?.valueField &&
@@ -49,7 +50,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
     const valueFields = [];
     for (const column of columns) {
         // row fields can be dates or strings
-        if ((0, columnProcessing_1.isDateType)(column.fieldType)) {
+        if ((0, columnType_1.isDateType)(column.fieldType)) {
             rowFields.push(column.field);
         }
         // include ID fields as rowField pivot option
@@ -57,7 +58,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
         //   rowFields.push(column.field);
         // }
         // column fields can be strings
-        if ((0, columnProcessing_1.isStringType)(column.fieldType)) {
+        if ((0, columnType_1.isStringType)(column.fieldType)) {
             const possibleValues = uniqueValues?.[column.field] ?? [];
             const isNullValuesOnly = !possibleValues ||
                 (Object.keys(possibleValues).length === 1 &&
@@ -74,7 +75,7 @@ function getPossiblePivotFieldOptions(columns, uniqueValues) {
             }
         }
         // value fields can be numbers or bools
-        if ((0, columnProcessing_1.isNumberType)(column.fieldType) || (0, columnProcessing_1.isBoolType)(column.fieldType)) {
+        if ((0, columnType_1.isNumberType)(column.fieldType) || (0, columnType_1.isBoolType)(column.fieldType)) {
             if (!(0, util_1.isIdColumn)(column.field)) {
                 valueFields.push(column.field);
             }
@@ -137,13 +138,13 @@ const isPivotPossible = (fields, pivot) => {
 };
 exports.isPivotPossible = isPivotPossible;
 const pivotFormData = (pivot, columns, report, formChartType, pivotData) => {
-    const yAxisField = pivot.columnField ?? (0, pivotConstructor_1.disambiguatedValueField)(pivot) ?? '';
+    const yAxisField = pivot.columnField ?? disambiguatedValueField(pivot) ?? '';
     const yAxisLabel = report?.yAxisFields && report?.yAxisFields?.length > 0
         ? (report.yAxisFields[0]?.label ?? '')
-        : ((0, pivotConstructor_1.disambiguatedValueField)(pivot) ?? '');
+        : (disambiguatedValueField(pivot) ?? '');
     // date labels for pivots should be treated like strings since they are
     const yAxisIsDate = pivot.columnField
-        ? (0, PivotModal_1.isDateField)(pivot.columnFieldType ?? '')
+        ? (0, dates_1.isDateField)(pivot.columnFieldType ?? '')
         : false;
     const chartType = formChartType ?? (pivot.rowField ? 'column' : 'metric');
     const rowColumn = (pivotData?.columns ?? columns).find((col) => col.field === pivot.rowField);
@@ -151,7 +152,7 @@ const pivotFormData = (pivot, columns, report, formChartType, pivotData) => {
         !(['metric', 'gauge'].includes(chartType) &&
             !valueFormatter_1.NUMBER_FORMAT_TYPES.includes(rowColumn?.format ?? ''))
         ? pivot.rowField
-        : (0, pivotConstructor_1.disambiguatedValueField)(pivot);
+        : disambiguatedValueField(pivot);
     const result = {
         pivot,
         chartType: chartType,
@@ -160,11 +161,11 @@ const pivotFormData = (pivot, columns, report, formChartType, pivotData) => {
             ? 'percent'
             : chartType === 'metric'
                 ? 'whole_number'
-                : (0, columnProcessing_1.isDateType)(pivot.rowFieldType ?? '')
+                : (0, columnType_1.isDateType)(pivot.rowFieldType ?? '')
                     ? 'string'
-                    : (0, columnProcessing_1.isNumberType)(pivot.rowFieldType ?? '')
+                    : (0, columnType_1.isNumberType)(pivot.rowFieldType ?? '')
                         ? 'whole_number'
-                        : (0, columnProcessing_1.isNumberType)((0, pivotConstructor_1.disambiguatedValueField)(pivot) ?? '')
+                        : (0, columnType_1.isNumberType)(disambiguatedValueField(pivot) ?? '')
                             ? 'whole_number'
                             : 'string',
         xAxisLabel: report?.xAxisLabel || pivot.rowField,
@@ -176,10 +177,24 @@ const pivotFormData = (pivot, columns, report, formChartType, pivotData) => {
                     ? 'string'
                     : report?.yAxisFields && report?.yAxisFields?.length > 0
                         ? (report?.yAxisFields[0]?.format ?? 'whole_number')
-                        : (report?.columns.find((col) => col.field === (0, pivotConstructor_1.disambiguatedValueField)(pivot))?.format ?? 'whole_number'),
+                        : (report?.columns.find((col) => col.field === disambiguatedValueField(pivot))?.format ?? 'whole_number'),
             },
         ],
     };
     return result;
 };
 exports.pivotFormData = pivotFormData;
+function disambiguatedValueField(pivot) {
+    if (pivot.aggregations && pivot.aggregations.length > 0) {
+        if (!pivot.aggregations[0]?.valueField && !pivot.valueField) {
+            return undefined; // avoid returning empty string
+        }
+        if (pivot.aggregations.length === 1) {
+            return pivot.aggregations[0]?.valueField ?? pivot.valueField;
+        }
+        else {
+            return `${pivot.aggregations[0].valueField}_${(0, textProcessing_1.matchCasing)(pivot.aggregations[0].aggregationType, pivot.aggregations[0].valueField)}`;
+        }
+    }
+    return pivot.valueField ? pivot.valueField : undefined; // avoid returning empty string
+}

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

@@ -1,5 +1,5 @@
+import { AdditionalProcessing } from '../models/Pagination';
 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, isColumnFieldAlias?: boolean, isValueFieldAlias?: boolean): string;

package/dist/cjs/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;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,kBAAkB,CAAC,EAAE,OAAO,EAC5B,iBAAiB,CAAC,EAAE,OAAO,UAqH5B;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,UAiC5B;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,UAmBrB;AA6GD,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;AA43BD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBA2E5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAMxC,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,kBAAkB,CAAC,EAAE,OAAO,EAC5B,iBAAiB,CAAC,EAAE,OAAO,UAqH5B;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,UAiC5B;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,UAmBrB;AA6GD,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;AA43BD,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,KAAK,EACZ,KAAK,CAAC,EAAE,MAAM,EACd,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,YAAY,SAAe,sBA2E5B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,sBAqB1E"}

package/dist/cjs/utils/queryConstructor.js

@@ -12,7 +12,7 @@ exports.generateMinMaxDateRangeQueries = generateMinMaxDateRangeQueries;
 exports.generatePivotQuery = generatePivotQuery;
 exports.additionalProcessingOnPivotQuery = additionalProcessingOnPivotQuery;
 exports.generateRowCountQuery = generateRowCountQuery;
-const columnProcessing_1 = require("./columnProcessing");
+const columnType_1 = require("./columnType");
 const constants_1 = require("./constants");
 const pivotProcessing_1 = require("./pivotProcessing");
 const textProcessing_1 = require("./textProcessing");
@@ -338,7 +338,7 @@ function create2DPivotQuery(pivot, itemQuery, databaseType, columnFieldValues, d
     if (!pivot || !pivot.columnField) {
         return undefined;
     }
-    if ((0, columnProcessing_1.isStringType)(pivot.rowFieldType ?? '') || !pivot.rowFieldType) {
+    if ((0, columnType_1.isStringType)(pivot.rowFieldType ?? '') || !pivot.rowFieldType) {
         return create2DStringPivotQuery(pivot, itemQuery, columnFieldValues, databaseType);
     }
     return create2DDatePivotQuery(pivot, itemQuery, columnFieldValues, databaseType, dateBucket);
@@ -571,7 +571,7 @@ function create2DDatePivotQuery(pivot, itemQuery, columnFieldValues, databaseTyp
     return itemQuery.replace(/SELECT \* FROM\s+["'[`]?quill_base_table["'\]`]?\s*$/, pivotQuery);
 }
 function create1DPivotQuery(pivot, itemQuery, dateBucket = 'month', databaseType) {
-    if ((0, columnProcessing_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
+    if ((0, columnType_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
         return create1DStringPivotQuery(pivot, itemQuery, databaseType);
     }
     return create1DDatePivotQuery(pivot, itemQuery, dateBucket, databaseType);

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

@@ -4,10 +4,10 @@ import { InternalDashboardFilter, InternalFilter } from '../models/Filter';
 import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReport, QuillReportInternal } from '../models/Report';
 import { DateRangesByColumn, UniqueValuesByTable, Table, UniqueValuesByColumn } from '../models/Tables';
-import { AdditionalProcessing } from './tableProcessing';
 import { CustomField } from '../models/Schema';
 import { ReportBuilderColumn } from '../models/ReportBuilder';
-import { EventTracking } from '../QuillProvider';
+import { EventTracking } from '../models/Event';
+import { AdditionalProcessing } from '../models/Pagination';
 export type ReportBuilderInfo = {
     rows: any[];
     columns: ColumnInternal[];

package/dist/cjs/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/cjs/utils/report.js

@@ -8,9 +8,9 @@ exports.fetchReportRowCount = fetchReportRowCount;
 exports.saveReport = saveReport;
 exports.formattedPivotRowsAndColumns = formattedPivotRowsAndColumns;
 exports.convertInternalReportToReport = convertInternalReportToReport;
-const ChartBuilder_1 = require("../ChartBuilder");
+const chartBuilder_1 = require("./chartBuilder");
 const ast_1 = require("../components/ReportBuilder/ast");
-const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
+const pivotConstructor_1 = require("./pivotConstructor");
 const Filter_1 = require("../models/Filter");
 const columnProcessing_1 = require("./columnProcessing");
 const dashboard_1 = require("./dashboard");
@@ -463,7 +463,7 @@ const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants,
         }
         const processedFormData = report && report.chartType
             ? report
-            : (0, ChartBuilder_1.createInitialFormData)(tableData.columns);
+            : (0, chartBuilder_1.createInitialFormData)(tableData.columns);
         curReport = {
             id: report?.id ?? '',
             dashboardName: report?.dashboardName ?? '',
@@ -549,7 +549,7 @@ const fetchReportBuilderDataFromAST = async ({ baseAst, schema, client, tenants,
                 if (rowFieldDateRange) {
                     dateBucket = (0, dates_1.getDateBucketFromRange)(rowFieldDateRange.dateRange);
                 }
-                newPivotData = await (0, PivotModal_1.generatePivotTable)({
+                newPivotData = await (0, pivotConstructor_1.generatePivotTable)({
                     pivot,
                     dateBucket,
                     report: curReport,

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

@@ -1,5 +1,7 @@
+import { NodeSQLParser as NSP } from '../components/ReportBuilder/ast';
 import { ForeignKeyMap } from '../components/ReportBuilder/schema';
 import { Column, ColumnInternal } from '../models/Columns';
+import { FilterTreeNode } from '../models/Filter';
 import { Pivot } from '../models/Pivot';
 import { ReportBuilderState, ReportBuilderTable, JoinType } from '../models/ReportBuilder';
 import { Table, UniqueValuesByColumn } from '../models/Tables';
@@ -94,4 +96,14 @@ export declare const orderTablesByBestPrimaryTable: (tables: ReportBuilderTable[
     }[];
 }) => ReportBuilderTable[];
 export declare const validatedReportBuilderState: (state: ReportBuilderState, foreignKeyMap: ForeignKeyMap) => ReportBuilderState;
+export declare function convertASTToPivotData(ast: NSP.Select, columnInfo: ColumnInternal[]): Pivot | null;
+/**
+ * Function that flattens a tree of filters into an array
+ */
+export declare function generateFilterStack(filterTree: any): FilterTreeNode[];
+/**
+ * Given an array of Filters (presumed to be in in-order state), generate
+ * the corresponding Filter tree. Essentially the reverse of what traverseTree does
+ */
+export declare function filterStackToFilterTree(stack: any[]): FilterTreeNode | null;
 //# sourceMappingURL=reportBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"reportBuilder.d.ts","sourceRoot":"","sources":["../../../src/utils/reportBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAEL,kBAAkB,EAGlB,kBAAkB,EAElB,QAAQ,EACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAmC/D,eAAO,MAAM,uBAAuB,GAClC,oBAAoB,kBAAkB,EACtC,cAAc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBrB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,KAAK,GAAG,EACR,cAAc,MAAM,EACpB,QAAQ,KAAK,EAAE,KACd,kBAuBF,CAAC;AA2OF,eAAO,MAAM,qBAAqB,GAChC,OAAO,KAAK,EACZ,sBAAsB,oBAAoB,EAC1C,eAAe,cAAc,EAAE,YAuChC,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,OAAO,KAAK,EACZ,sBAAsB,oBAAoB,EAC1C,eAAe,cAAc,EAAE,KAC9B;IAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAgCrC,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,MAAM,GAAG,EAAE,EACX,SAAS,MAAM,EAAE,EACjB,QAAQ,OAAO,EACf,kBAAkB,MAAM,EACxB,aAAa,MAAM,QA6CpB,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,UAAU,KAAK,EACf,eAAe,cAAc,EAAE,KAoBzB,KAAK,CAAC;AAEd,eAAO,MAAM,6BAA6B,GACxC,QAAQ,kBAAkB,EAAE,EAC5B,eAAe;IACb,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CACL,yBAqCF,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,OAAO,kBAAkB,EACzB,eAAe,aAAa,KAC3B,kBAoGF,CAAC"}
+{"version":3,"file":"reportBuilder.d.ts","sourceRoot":"","sources":["../../../src/utils/reportBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,aAAa,IAAI,GAAG,EACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAEL,kBAAkB,EAGlB,kBAAkB,EAElB,QAAQ,EACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAgC/D,eAAO,MAAM,uBAAuB,GAClC,oBAAoB,kBAAkB,EACtC,cAAc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBrB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,KAAK,GAAG,EACR,cAAc,MAAM,EACpB,QAAQ,KAAK,EAAE,KACd,kBAuBF,CAAC;AA2OF,eAAO,MAAM,qBAAqB,GAChC,OAAO,KAAK,EACZ,sBAAsB,oBAAoB,EAC1C,eAAe,cAAc,EAAE,YAuChC,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,OAAO,KAAK,EACZ,sBAAsB,oBAAoB,EAC1C,eAAe,cAAc,EAAE,KAC9B;IAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAgCrC,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,MAAM,GAAG,EAAE,EACX,SAAS,MAAM,EAAE,EACjB,QAAQ,OAAO,EACf,kBAAkB,MAAM,EACxB,aAAa,MAAM,QA6CpB,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,UAAU,KAAK,EACf,eAAe,cAAc,EAAE,KAoBzB,KAAK,CAAC;AAEd,eAAO,MAAM,6BAA6B,GACxC,QAAQ,kBAAkB,EAAE,EAC5B,eAAe;IACb,CAAC,KAAK,EAAE,MAAM,GAAG;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;KACpB,EAAE,CAAC;CACL,yBAqCF,CAAC;AAEF,eAAO,MAAM,2BAA2B,GACtC,OAAO,kBAAkB,EACzB,eAAe,aAAa,KAC3B,kBAoGF,CAAC;AAqIF,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,MAAM,EACf,UAAU,EAAE,cAAc,EAAE,GAC3B,KAAK,GAAG,IAAI,CA2Hd;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD"}