@quillsql/react 2.15.2 → 2.15.3

package/dist/cjs/utils/chartBuilder.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ALL_FORMAT_OPTIONS = exports.DATE_OPTIONS = exports.NUMBER_OPTIONS = exports.dateFormatOptions = exports.numberFormatOptions = void 0;
+exports.createInitialFormData = createInitialFormData;
+const textProcessing_1 = require("./textProcessing");
+exports.numberFormatOptions = [
+    'whole_number',
+    'one_decimal_place',
+    'two_decimal_places',
+    'dollar_amount',
+    'dollar_cents',
+    'percentage',
+];
+exports.dateFormatOptions = [
+    'MMM_yyyy',
+    'MMM_dd',
+    'MMM_dd_yyyy',
+    'MMM_dd_hh:mm_ap_pm',
+    'hh_ap_pm',
+    'date',
+    'timestamptz',
+];
+exports.NUMBER_OPTIONS = [
+    { value: 'whole_number', label: 'whole number' },
+    { value: 'one_decimal_place', label: 'one decimal place' },
+    { value: 'two_decimal_places', label: 'two decimal places' },
+    { value: 'dollar_amount', label: 'dollar amount' },
+    { value: 'dollar_cents', label: 'dollar and cent amount' },
+    { value: 'percent', label: 'percentage' },
+];
+exports.DATE_OPTIONS = [
+    { value: 'MMM_yyyy', label: 'month' },
+    { value: 'MMM_dd', label: 'day' },
+    { value: 'MMM_dd_yyyy', label: 'day and year' },
+    { value: 'MMM_dd_hh:mm_ap_pm', label: 'day and time' },
+    { value: 'hh_ap_pm', label: 'hour' },
+];
+exports.ALL_FORMAT_OPTIONS = [
+    ...exports.NUMBER_OPTIONS,
+    ...exports.DATE_OPTIONS,
+    { value: 'string', label: 'string' },
+];
+function createInitialFormData(columns) {
+    const firstNumberColumn = columns?.find((col) => exports.numberFormatOptions.includes(col.format));
+    const firstStringColumn = columns?.find((col) => !exports.numberFormatOptions.includes(col.format) &&
+        !exports.dateFormatOptions.includes(col.format));
+    const firstDateColumn = columns?.find((col) => exports.dateFormatOptions.includes(col.format));
+    const xAxisField = firstStringColumn?.field ||
+        firstDateColumn?.field ||
+        firstNumberColumn?.field ||
+        columns?.[0]?.field ||
+        '';
+    const xAxisFormat = firstStringColumn?.format ||
+        firstDateColumn?.format ||
+        firstNumberColumn?.format ||
+        columns?.[0]?.format ||
+        'string';
+    const formEmptyState = {
+        name: '',
+        columns: columns.map((col) => {
+            return { ...col, label: (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(col.label) };
+        }),
+        xAxisField,
+        xAxisFormat,
+        yAxisFields: [
+            {
+                field: firstNumberColumn?.field || columns?.[0]?.field || '',
+                label: '',
+                format: firstNumberColumn?.format || columns?.[0]?.format || 'string',
+            },
+        ],
+        xAxisLabel: '',
+        chartType: firstNumberColumn ? 'line' : 'table',
+        pivot: null,
+        template: true,
+        referenceLines: [],
+    };
+    return formEmptyState;
+}

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

@@ -1,5 +1,5 @@
 import { Client, QuillTenant } from '../models/Client';
-import { EventTracking } from '../QuillProvider';
+import { EventTracking } from '../models/Event';
 export declare const EMPTY_CLIENT: Client;
 export declare function fetchClient(publicKey: string, queryEndpoint: string, withCredentials: boolean | undefined, getToken: () => Promise<string>, eventTracking: EventTracking | null, queryHeaders?: HeadersInit, includeTenants?: boolean): Promise<Client & {
     allTenantTypes?: QuillTenant[];

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,qBAAQ,EACvB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,YAAY,CAAC,EAAE,WAAW,EAC1B,cAAc,UAAQ,GACrB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CA+DtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;;;GAuCA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,qBAAQ,EACvB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,aAAa,EAAE,aAAa,GAAG,IAAI,EACnC,YAAY,CAAC,EAAE,WAAW,EAC1B,cAAc,UAAQ,GACrB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CA+DtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;;;GAuCA"}

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

@@ -17,10 +17,6 @@ export declare function fieldTypeToDataTypeID(fieldType: string): number;
 export declare function convertFieldTypeToJSType(fieldType: string): string;
 export declare function convertFormatToJsType(column: Column): string;
 export declare function processColumnName(columnName: string): string;
-export declare function isStringType(fieldType: string): boolean;
-export declare function isDateType(fieldType: string): boolean;
-export declare function isNumberType(fieldType: string): boolean;
-export declare function isBoolType(fieldType: string): boolean;
 export declare const getYAxisFields: (report: QuillReportInternal, dashboardFilters: InternalDashboardFilter[]) => any[];
 export {};
 //# sourceMappingURL=columnProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAmJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0BD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CA0C/D;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAyBvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,cAAc,GACzB,QAAQ,mBAAmB,EAC3B,kBAAkB,uBAAuB,EAAE,UAqD5C,CAAC"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAmJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0BD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CA0C/D;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,GACzB,QAAQ,mBAAmB,EAC3B,kBAAkB,uBAAuB,EAAE,UAqD5C,CAAC"}

package/dist/cjs/utils/columnProcessing.js

@@ -7,10 +7,6 @@ exports.fieldTypeToDataTypeID = fieldTypeToDataTypeID;
 exports.convertFieldTypeToJSType = convertFieldTypeToJSType;
 exports.convertFormatToJsType = convertFormatToJsType;
 exports.processColumnName = processColumnName;
-exports.isStringType = isStringType;
-exports.isDateType = isDateType;
-exports.isNumberType = isNumberType;
-exports.isBoolType = isBoolType;
 const filterProcessing_1 = require("./filterProcessing");
 const textProcessing_1 = require("./textProcessing");
 function removeBigQuerySpecialChars(columnName) {
@@ -306,48 +302,6 @@ function convertFormatToJsType(column) {
 function processColumnName(columnName) {
     return removeBigQuerySpecialChars(columnName);
 }
-function isStringType(fieldType) {
-    return ['string', 'varchar', 'text', 'char', 'bpchar', 'citext'].includes(fieldType?.toLowerCase());
-}
-function isDateType(fieldType) {
-    return [
-        'date',
-        'datetime',
-        'time',
-        'timestamptz',
-        'timestamp',
-        'interval',
-    ].includes(fieldType?.toLowerCase());
-}
-function isNumberType(fieldType) {
-    return [
-        'int64',
-        'int32',
-        'int16',
-        'int8',
-        'int4',
-        'int2',
-        'float2',
-        'float4',
-        'float8',
-        'float16',
-        'numeric',
-        'number',
-        'smallint',
-        'bigint',
-        'tinyint',
-        'mediumint',
-        'integer',
-        'int',
-        'uint32',
-        'uint16',
-        'uint8',
-        'long',
-    ].includes(fieldType?.toLowerCase());
-}
-function isBoolType(fieldType) {
-    return ['bool', 'boolean'].includes(fieldType);
-}
 const getYAxisFields = (report, dashboardFilters) => {
     try {
         const curDateFilter = (0, filterProcessing_1.findAndProcessDateFilter)(dashboardFilters);

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

@@ -0,0 +1,5 @@
+export declare function isStringType(fieldType: string): boolean;
+export declare function isDateType(fieldType: string): boolean;
+export declare function isNumberType(fieldType: string): boolean;
+export declare function isBoolType(fieldType: string): boolean;
+//# sourceMappingURL=columnType.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"columnType.d.ts","sourceRoot":"","sources":["../../../src/utils/columnType.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAyBvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAErD"}

package/dist/cjs/utils/columnType.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isStringType = isStringType;
+exports.isDateType = isDateType;
+exports.isNumberType = isNumberType;
+exports.isBoolType = isBoolType;
+function isStringType(fieldType) {
+    return ['string', 'varchar', 'text', 'char', 'bpchar', 'citext'].includes(fieldType?.toLowerCase());
+}
+function isDateType(fieldType) {
+    return [
+        'date',
+        'datetime',
+        'time',
+        'timestamptz',
+        'timestamp',
+        'interval',
+    ].includes(fieldType?.toLowerCase());
+}
+function isNumberType(fieldType) {
+    return [
+        'int64',
+        'int32',
+        'int16',
+        'int8',
+        'int4',
+        'int2',
+        'float2',
+        'float4',
+        'float8',
+        'float16',
+        'numeric',
+        'number',
+        'smallint',
+        'bigint',
+        'tinyint',
+        'mediumint',
+        'integer',
+        'int',
+        'uint32',
+        'uint16',
+        'uint8',
+        'long',
+    ].includes(fieldType?.toLowerCase());
+}
+function isBoolType(fieldType) {
+    return ['bool', 'boolean'].includes(fieldType);
+}

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

@@ -1,8 +1,8 @@
 import { QuillReportInternal } from '../models/Report';
 import { QuillProviderClient } from '../models/Client';
-import { AdditionalProcessing } from './tableProcessing';
 import { CustomField } from '../models/Schema';
-import { EventTracking } from '../QuillProvider';
+import { EventTracking } from '../models/Event';
+import { AdditionalProcessing } from '../models/Pagination';
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
  * the dashboard item so that we aren't exposing unnecessary details to the

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EACL,oBAAoB,EAErB,MAAM,mBAAmB,CAAC;AAO3B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAsBjD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,cAAc,EACd,OAAO,GACR,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,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;CACzB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqM/B;AAwMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Cd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAavD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AASvD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAsB5D;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,EACZ,cAAc,EACd,OAAO,GACR,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IACpC,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,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;CACzB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAqM/B;AAwMD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Cd"}

package/dist/cjs/utils/dashboard.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanDashboardItem = cleanDashboardItem;
 exports.getDashboard = getDashboard;
-const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
+const pivotConstructor_1 = require("./pivotConstructor");
 const textProcessing_1 = require("./textProcessing");
 const dataFetcher_1 = require("./dataFetcher");
 const dates_1 = require("./dates");
-const pivotConstructor_1 = require("./pivotConstructor");
+const pivotConstructor_2 = require("./pivotConstructor");
 const tableProcessing_1 = require("./tableProcessing");
 const columnProcessing_1 = require("./columnProcessing");
 const defaultDashboardItem = {
@@ -310,7 +310,7 @@ async function getPivotTable(report, dashboardFilters, dashboardName, getToken,
                 });
                 report.distinctStrings = unique?.[pivot.columnField] ?? [];
             }
-            const pivotTable = await (0, pivotConstructor_1.generatePivotWithSQL)({
+            const pivotTable = await (0, pivotConstructor_2.generatePivotWithSQL)({
                 pivot,
                 report,
                 client,
@@ -341,7 +341,7 @@ async function getPivotTable(report, dashboardFilters, dashboardName, getToken,
         }
     }
     return pivot && data.rows
-        ? (0, PivotModal_1.generatePivotTable)({
+        ? (0, pivotConstructor_1.generatePivotTable)({
             pivot,
             report,
             client,
@@ -366,7 +366,7 @@ function extractPivotedYAxis(pivotTable, itemInfo, config = undefined) {
         return itemInfo?.yAxisFields ?? [];
     const yAxisFields = config ? config.yAxisFields : itemInfo?.yAxisFields;
     return yAxisFields && yAxisFields.length > 0
-        ? (0, PivotModal_1.generatePivotTableYAxis)(pivot, pivotTable.columns, yAxisFields[0])
+        ? (0, pivotConstructor_1.generatePivotTableYAxis)(pivot, pivotTable.columns, yAxisFields[0])
         : yAxisFields;
     // if (fields.length == 1) {
     //   const sampleField = fields[0];

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

@@ -1 +1 @@
-{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,GAAI,MAAM,WAAW,uBAsC1D,CAAC;AAEF,eAAO,MAAM,+BAA+B,GAAI,MAAM,WAAW,uBA4EhE,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,MAAM,WAAW,EAAE,YAAY,OAAO,WAmBpE,CAAC;AAGF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EACH,cAAc,EAAE,GAChB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,EAAE,QAaR"}
+{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,GAAI,MAAM,WAAW,uBAsC1D,CAAC;AAEF,eAAO,MAAM,+BAA+B,GAAI,MAAM,WAAW,uBA4EhE,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,MAAM,WAAW,EAAE,YAAY,OAAO,WAmBpE,CAAC;AAGF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EACH,cAAc,EAAE,GAChB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,EAAE,QAaR"}

package/dist/cjs/utils/dataProcessing.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSumOfFields = exports.getPointToPointPercentageChange = exports.getSimplePercentageChange = exports.Calculation = void 0;
 exports.parseValueFromBigQueryDates = parseValueFromBigQueryDates;
-const PivotModal_1 = require("../internals/ReportBuilder/PivotModal");
 const dates_1 = require("./dates");
+const dates_2 = require("./dates");
 const columnProcessing_1 = require("./columnProcessing");
 var Calculation;
 (function (Calculation) {
@@ -94,23 +94,23 @@ const getPointToPointPercentageChange = (data) => {
                 }
                 return Math.min(acc, 0);
             }, new Date('3022-01-01').getTime()));
-            const dateBucket = (0, dates_1.getDateBucketFromRange)({
+            const dateBucket = (0, dates_2.getDateBucketFromRange)({
                 start: minDate,
                 end: maxDate,
             });
-            const minDateBucket = (0, PivotModal_1.getDateString)(minDate.toISOString(), undefined, dateBucket);
-            const maxDateBucket = (0, PivotModal_1.getDateString)(maxDate.toISOString(), undefined, dateBucket);
+            const minDateBucket = (0, dates_1.getDateString)(minDate.toISOString(), undefined, dateBucket);
+            const maxDateBucket = (0, dates_1.getDateString)(maxDate.toISOString(), undefined, dateBucket);
             const minDateRows = data.rows.filter((row) => {
                 const rowValue = row[dateField];
                 if (rowValue) {
-                    return ((0, PivotModal_1.getDateString)(rowValue, undefined, dateBucket) === minDateBucket);
+                    return ((0, dates_1.getDateString)(rowValue, undefined, dateBucket) === minDateBucket);
                 }
                 return false;
             });
             const maxDateRows = data.rows.filter((row) => {
                 const rowValue = row[dateField];
                 if (rowValue) {
-                    return ((0, PivotModal_1.getDateString)(rowValue, undefined, dateBucket) === maxDateBucket);
+                    return ((0, dates_1.getDateString)(rowValue, undefined, dateBucket) === maxDateBucket);
                 }
                 return false;
             });
@@ -152,7 +152,7 @@ function parseValueFromBigQueryDates(rows, columns) {
         return;
     columns = columns.map((column) => (0, columnProcessing_1.convertPostgresColumn)(column));
     columns.forEach((column) => {
-        if ((0, PivotModal_1.isDateField)(column.fieldType)) {
+        if ((0, dates_1.isDateField)(column.fieldType)) {
             rows.forEach((row) => {
                 if (row[column.field] && typeof row[column.field] === 'object') {
                     row[column.field] = row[column.field].value;

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

@@ -14,10 +14,15 @@ export declare function getComparisonInterval(comparisonRange: {
 export declare function getDateBucketFromRange(dateRange: {
     start: Date;
     end: Date;
-}): "year" | "month" | "week" | "day";
+}): "week" | "year" | "month" | "day";
 export declare function parseQueryDateRangeByDatabaseType(minRange: any, maxRange: any, databaseType: string): {
     start: Date;
     end: Date;
 };
 export declare function getDateFormatFromBucket(dateBucket: string): string;
+export declare function getDateString(value: string, dateRange?: {
+    start: Date;
+    end: Date;
+}, dateBucket?: string, databaseType?: string): string;
+export declare function isDateField(fieldType: string): fieldType is "MMM_dd" | "MMM_yyyy" | "MMM_dd_yyyy" | "hh_ap_pm" | "MMM_dd_hh:mm_ap_pm" | "date" | "datetime" | "timestamptz" | "timestamp";
 //# sourceMappingURL=dates.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,GAAG,EACb,YAAY,EAAE,MAAM;;;EAUrB;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,UAoBzD"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,GAAG,EACb,YAAY,EAAE,MAAM;;;EAUrB;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,UAoBzD;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,EACtC,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,UAiDtB;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,8IAY5C"}

package/dist/cjs/utils/dates.js

@@ -6,8 +6,11 @@ exports.getComparisonInterval = getComparisonInterval;
 exports.getDateBucketFromRange = getDateBucketFromRange;
 exports.parseQueryDateRangeByDatabaseType = parseQueryDateRangeByDatabaseType;
 exports.getDateFormatFromBucket = getDateFormatFromBucket;
+exports.getDateString = getDateString;
+exports.isDateField = isDateField;
 const date_fns_1 = require("date-fns");
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
+const valueFormatter_1 = require("./valueFormatter");
 /**
  * Converts the comparison range label to match the date filter range if the
  * comparison range is dynamic (ie. "Previous Period" -> "Previous 6 months").
@@ -104,3 +107,64 @@ function getDateFormatFromBucket(dateBucket) {
     }
     return format;
 }
+function getDateString(value, dateRange, dateBucket, databaseType) {
+    let format;
+    if (dateBucket) {
+        switch (dateBucket) {
+            case 'day':
+                format = 'MMM_dd';
+                break;
+            case 'week':
+                format = 'MMM_dd-MMM_dd';
+                break;
+            case 'month':
+                format = 'MMM_yyyy';
+                break;
+            case 'year':
+                format = 'yyyy';
+                break;
+            default:
+                format = 'MMM_yyyy';
+                break;
+        }
+    }
+    else {
+        if (!dateRange) {
+            format = 'MMM_yyyy';
+        }
+        else {
+            const dayDifference = (0, date_fns_1.differenceInDays)(new Date(dateRange.end), new Date(dateRange.start));
+            if (dayDifference < 14) {
+                format = 'MMM_dd_yyyy';
+            }
+            else if (dayDifference < 60) {
+                format = 'MMM_dd-MMM_dd';
+            }
+            else if (dayDifference < 365 * 3) {
+                format = 'MMM_yyyy';
+            }
+            else {
+                format = 'yyyy';
+            }
+        }
+    }
+    return (0, valueFormatter_1.valueFormatter)({
+        value,
+        field: 'date',
+        // @ts-ignore
+        fields: [{ field: 'date', format }],
+        dateRange,
+        databaseType,
+    });
+}
+function isDateField(fieldType) {
+    return (fieldType === 'date' ||
+        fieldType === 'datetime' ||
+        fieldType === 'timestamp' ||
+        fieldType === 'timestamptz' ||
+        fieldType === 'MMM_yyyy' ||
+        fieldType === 'MMM_dd' ||
+        fieldType === 'MMM_dd_yyyy' ||
+        fieldType === 'MMM_dd_hh:mm_ap_pm' ||
+        fieldType === 'hh_ap_pm');
+}

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

@@ -1,9 +1,8 @@
-import { FieldType, InternalFilter, InternalDashboardDateFilter as DashboardDateFilter, Filter, InternalDashboardFilter } from '../models/Filter';
+import { FieldType, InternalFilter, InternalDashboardDateFilter as DashboardDateFilter, Filter, InternalDashboardFilter, FilterTreeNode } from '../models/Filter';
 import { QuillReport } from '../models/Report';
-import { FilterTreeNode } from './astFilterProcessing';
 import { ReportBuilderState } from '../models/ReportBuilder';
 import { QuillProviderClient } from '../models/Client';
-import { EventTracking } from '../QuillProvider';
+import { EventTracking } from '../models/Event';
 export declare function findAndProcessDateFilter(filters: any[]): any;
 export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value: any | undefined, comparison: any | undefined, dashboardName: string): any;
@@ -12,15 +11,6 @@ export declare const getType: (t: string) => FieldType;
  * Returns a sentence to describe a Filter
  */
 export declare function filterSentence(filter: InternalFilter): string;
-/**
- * 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;
 /**
  * This function uses the baseAst and forms a SQL query using the a filters array
  */

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,2BAA2B,IAAI,mBAAmB,EAClD,MAAM,EAEN,uBAAuB,EAExB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAqFtB;AAGD,eAAO,MAAM,OAAO,GAAI,GAAG,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,cAAc,EAAE,EACzB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4C/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,uBAAuB,EAAE,EAClC,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAgDP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED,eAAO,MAAM,uBAAuB,GAClC,QAAQ,mBAAmB,EAC3B,SAAS,WAAW,EAAE,EACtB,eAAe,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAkDpD,CAAC"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,2BAA2B,IAAI,mBAAmB,EAClD,MAAM,EAEN,uBAAuB,EAEvB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAK7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAqFtB;AAGD,eAAO,MAAM,OAAO,GAAI,GAAG,MAAM,cA0DhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,cAAc,EAAE,EACzB,MAAM,EAAE,mBAAmB,EAC3B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,aAAa,EAAE,aAAa,GAAG,IAAI,GAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4C/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,uBAAuB,EAAE,EAClC,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CAgDP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED,eAAO,MAAM,uBAAuB,GAClC,QAAQ,mBAAmB,EAC3B,SAAS,WAAW,EAAE,EACtB,eAAe,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAkDpD,CAAC"}

package/dist/cjs/utils/filterProcessing.js

@@ -5,8 +5,6 @@ exports.findAndProcessDateFilter = findAndProcessDateFilter;
 exports.processFilterFromBackend = processFilterFromBackend;
 exports.updateFilter = updateFilter;
 exports.filterSentence = filterSentence;
-exports.generateFilterStack = generateFilterStack;
-exports.filterStackToFilterTree = filterStackToFilterTree;
 exports.buildQueryFromFilters = buildQueryFromFilters;
 exports.applyCustomFilterToDashDateFilter = applyCustomFilterToDashDateFilter;
 exports.mergeCustomFilters = mergeCustomFilters;
@@ -230,83 +228,11 @@ function filterSentence(filter) {
     }
     return `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(filter.field)} ${filter.operator}${filter.operator === 'is' || filter.operator === 'is not' ? ' one of' : ''} ${value}`;
 }
-/**
- * Function that flattens a tree of filters into an array
- */
-function generateFilterStack(filterTree) {
-    if (!filterTree) {
-        return [];
-    }
-    const tree = filterTree;
-    let filterStack = [];
-    /**
-     * Function that takes in a FilterTree and flattens it into an array using in order traversal
-     */
-    function traverseTree(node) {
-        if (!node) {
-            return;
-        }
-        if (node.leaf) {
-            filterStack.push(node);
-        }
-        else {
-            traverseTree(node.leftNode);
-            filterStack.push(node);
-            traverseTree(node.rightNode);
-        }
-    }
-    traverseTree(tree);
-    // Remove null (invalid) filters from filter stack
-    filterStack = filterStack.filter((filter) => {
-        return ((!filter.leaf &&
-            filter.rightNode &&
-            (!filter.rightNode.leaf || filter.rightNode.value)) ||
-            (filter.leaf && filter.value));
-    });
-    return filterStack;
-}
-/**
- * Given an array of Filters (presumed to be in in-order state), generate
- * the corresponding Filter tree. Essentially the reverse of what traverseTree does
- */
-function filterStackToFilterTree(stack) {
-    function buildTree(i) {
-        const newNode = {
-            leaf: false,
-            operator: null,
-            leftNode: null,
-            rightNode: null,
-        };
-        if (i >= stack.length) {
-            return null;
-        }
-        else if (stack[i].leaf) {
-            if (i < stack.length - 1) {
-                // more nodes later
-                newNode.operator = stack[i + 1].operator;
-                newNode.leftNode = {
-                    leaf: true,
-                    leftNode: null,
-                    rightNode: null,
-                    operator: null,
-                    value: stack[i].value,
-                };
-                newNode.rightNode = buildTree(i + 2);
-            }
-            else {
-                newNode.leaf = true;
-                newNode.value = stack[i].value;
-            }
-        }
-        return newNode;
-    }
-    return buildTree(0);
-}
 /**
  * This function uses the baseAst and forms a SQL query using the a filters array
  */
 async function buildQueryFromFilters(reportBuilderState, filters, client, getToken, eventTracking) {
-    const subTree = filterStackToFilterTree(filters);
+    const subTree = (0, reportBuilder_1.filterStackToFilterTree)(filters);
     let whereNode = null;
     if (subTree) {
         whereNode = (0, astFilterProcessing_1.filterTreeToAst)(subTree, client.databaseType?.toLowerCase() || 'postgresql');

package/dist/cjs/utils/merge.js

@@ -5,7 +5,7 @@ exports.dateAdder = dateAdder;
 exports.mergeComparisonPivotColumns = mergeComparisonPivotColumns;
 exports.mergeComparisonPivotRows = mergeComparisonPivotRows;
 const date_fns_1 = require("date-fns");
-const columnProcessing_1 = require("./columnProcessing");
+const columnType_1 = require("./columnType");
 const date_fns_tz_1 = require("date-fns-tz");
 // FIXME: Update all of this as part of restoring date comparisons
 function mergeComparisonRange(resp) {
@@ -89,7 +89,7 @@ function merge2DPivotRows(pivot, rows, compRows, columnFieldValues, databaseType
     if (!pivot || !pivot.columnField) {
         return [];
     }
-    if ((0, columnProcessing_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
+    if ((0, columnType_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
         return merge2DStringPivotRows(pivot, rows, compRows, columnFieldValues);
     }
     return merge2DDatePivotRows(pivot, rows, compRows, columnFieldValues, databaseType, dateBucket, comparisonInterval);
@@ -142,7 +142,7 @@ function merge2DDatePivotRows(pivot, rows, compRows, columnFieldValues, database
     });
 }
 function merge1DPivotRows(pivot, rows, compRows, databaseType, dateBucket, comparisonInterval) {
-    if ((0, columnProcessing_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
+    if ((0, columnType_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
         return merge1DStringPivotRows(pivot, rows, compRows);
     }
     return merge1DDatePivotRows(pivot, rows, compRows, databaseType, dateBucket, comparisonInterval);