@quillsql/react 2.12.30 → 2.12.31

package/dist/esm/test-utils/generators.js

@@ -0,0 +1,37 @@
+function createRandomDate() {
+    const start = new Date(2020, 0, 1);
+    const end = new Date();
+    return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
+}
+function createRandomString() {
+    return Math.random().toString(36).substring(7);
+}
+function createRandomNumber() {
+    return Math.floor(Math.random() * 1000);
+}
+export function createRows(columns, rowCount) {
+    const rows = [];
+    for (let i = 0; i < rowCount; i++) {
+        rows.push(columns.reduce((row, column) => {
+            if (column.format === 'MMM_dd_yyyy') {
+                row[column.field] = createRandomDate().toDateString();
+            }
+            else if (column.format === 'whole_number') {
+                row[column.field] = createRandomNumber().toString();
+            }
+            else {
+                row[column.field] = createRandomString();
+            }
+            return row;
+        }, {}));
+    }
+    return rows;
+}
+export function createComparisonColumnsFromColumns(columns) {
+    const comparisons = columns.map((column) => ({
+        ...column,
+        field: `comparison_${column.field}`,
+        label: `comparison ${column.label}`,
+    }));
+    return [...columns, ...comparisons];
+}

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

@@ -1 +1 @@
-{"version":3,"file":"astFilterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astFilterProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,MAAM,EAOP,MAAM,kBAAkB,CAAC;AAqyI1B,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,cAAc,GAAG,IAAI,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,QACrB,GAAG,MACJ,MAAM,KACT,cAAc,GAAG,IAuGnB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,QAAS,GAAG,MAAM,MAAM,KAAG,MAAM,GAAG,IAoV3D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,eAAgB,cAAc,MAAM,MAAM,QAuBrE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,MAAM,MAAM,KAAG,GA4mHxD,CAAC"}
+{"version":3,"file":"astFilterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astFilterProcessing.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,MAAM,EAOP,MAAM,kBAAkB,CAAC;AAozI1B,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;IAChC,SAAS,EAAE,cAAc,GAAG,IAAI,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,QACrB,GAAG,MACJ,MAAM,KACT,cAAc,GAAG,IAuGnB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,QAAS,GAAG,MAAM,MAAM,KAAG,MAAM,GAAG,IA+V3D,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,eAAgB,cAAc,MAAM,MAAM,QAuBrE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,MAAM,MAAM,KAAG,GA2nHxD,CAAC"}

package/dist/esm/utils/astFilterProcessing.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-case-declarations */
 /* eslint-disable no-fallthrough */
-import { DateOperator, FieldTypes, FilterNames, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
+import { BoolOperator, DateOperator, FieldTypes, FilterNames, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
 import { format, isValid, parse, subDays, subHours, subMonths, subWeeks, subYears, } from 'date-fns';
 // Map SQL string operators to corresponding StringOperator enums
 const stringOperatorMap = {
@@ -33,10 +33,15 @@ const numberOperatorMap = {
     [NumberOperator.GreaterThanOrEqualTo]: ['>='],
     [NumberOperator.LessThanOrEqualTo]: ['<='],
 };
+// Map SQL boolean operators to corresponding BooleanOperator enums
+const boolOperatorMap = {
+    [BoolOperator.EqualTo]: ['=', 'IS'],
+    [BoolOperator.NotEqualTo]: ['<>', '!=', 'IS NOT'],
+};
 // Map SQL null operators to corresponding NullOperator enums
 const nullOperatorMap = {
-    [NullOperator.IsNull]: ['IS'],
-    [NullOperator.IsNotNull]: ['IS NOT'],
+    [NullOperator.IsNull]: ['IS', '='],
+    [NullOperator.IsNotNull]: ['IS NOT', '!=', '<>'],
 };
 // Combine all individual operator maps into a single map for easy lookup
 const operatorMap = {
@@ -44,6 +49,7 @@ const operatorMap = {
     ...dateOperatorMap,
     ...numberOperatorMap,
     ...nullOperatorMap,
+    ...boolOperatorMap,
 };
 /**
  * Helper function to reverse map SQL operators back to Filter Operators based on field type
@@ -58,6 +64,8 @@ const reverseOperatorMap = (operator, fieldType) => {
             return (Object.keys(numberOperatorMap).find((key) => numberOperatorMap[key].includes(operator)) ?? null);
         case FieldTypes.Null:
             return (Object.keys(nullOperatorMap).find((key) => nullOperatorMap[key].includes(operator)) ?? null);
+        case FieldTypes.Boolean:
+            return (Object.keys(boolOperatorMap).find((key) => boolOperatorMap[key].includes(operator)) ?? null);
         default:
             return null;
     }
@@ -112,6 +120,8 @@ function mapOperatorToFilterName(operator, fieldType) {
             return FilterNames.NumericFilter;
         case FieldTypes.Null:
             return FilterNames.NullFilter;
+        case FieldTypes.Boolean:
+            return FilterNames.BooleanFilter;
         default:
             console.error(`Could not determine filter name: {operator: ${operator}, fieldType: ${fieldType}}`);
             return null;
@@ -4322,6 +4332,9 @@ export const astToFilter = (ast, db) => {
                 fieldType = FieldTypes.String;
             }
             break;
+        case 'bool':
+            fieldType = FieldTypes.Boolean;
+            break;
         default:
             fieldType = FieldTypes.String;
     }
@@ -4490,6 +4503,14 @@ export const astToFilter = (ast, db) => {
                     value: value.value,
                 };
             }
+        case FilterNames.BooleanFilter:
+            return {
+                field: field,
+                name: filterName,
+                type: FieldTypes.Boolean,
+                operator: mappedOperator,
+                value: Boolean(right.value),
+            };
     }
     return null;
 };
@@ -8043,6 +8064,20 @@ export const filterToAst = (filter, db) => {
                 left: { type: 'column_ref', table: null, column: field },
                 right: { type: 'null', value: null },
             };
+        case FieldTypes.Boolean:
+            return {
+                type: 'binary_expr',
+                operator: mappedOperator,
+                left: {
+                    type: 'column_ref',
+                    table: null,
+                    column: field,
+                },
+                right: {
+                    type: 'bool',
+                    value: value,
+                },
+            };
         default:
             return null;
     }

package/dist/esm/utils/astFilterProcessing.uspec.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-import { DateOperator, FieldTypes, FilterNames, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
+import { BoolOperator, DateOperator, FieldTypes, FilterNames, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
 import { astToFilter, filterToAst } from './astFilterProcessing';
 import { format, subDays, subMonths, subYears } from 'date-fns';
 import * as fs from 'fs';
@@ -20,7 +20,7 @@ describe('Filter to AST - String', () => {
             value: ['value 1', 'value 2'],
         };
         const ast = filterToAst(filter, 'mysql');
-        const sql = "SELECT * FROM t WHERE field IN ('value 1', 'value 2')";
+        const sql = "SELECT * FROM t WHERE LOWER(field) IN (LOWER('value 1'), LOWER('value 2'))";
         const expectedAst = parseSelectSQL(sql).where;
         expect(ast).toEqual(expectedAst);
     });
@@ -33,7 +33,7 @@ describe('Filter to AST - String', () => {
             value: ['value 1', 'value 2'],
         };
         const ast = filterToAst(filter, 'mysql');
-        const sql = "SELECT * FROM t WHERE field NOT IN ('value 1', 'value 2')";
+        const sql = "SELECT * FROM t WHERE LOWER(field) NOT IN (LOWER('value 1'), LOWER('value 2'))";
         const expectedAst = parseSelectSQL(sql).where;
         expect(ast).toEqual(expectedAst);
     });
@@ -261,7 +261,7 @@ describe('Filter to AST - String', () => {
 });
 describe('AST to Filter - String', () => {
     it('should convert AST to Filter for string field - Is', () => {
-        const sql = "SELECT * FROM t WHERE field IN ('value 1', 'value 2')";
+        const sql = "SELECT * FROM t WHERE LOWER(field) IN (LOWER('value 1'), LOWER('value 2'))";
         const ast = parseSelectSQL(sql);
         const filter = astToFilter(ast.where, 'mysql');
         const expectedFilter = {
@@ -274,7 +274,7 @@ describe('AST to Filter - String', () => {
         expect(filter).toEqual(expectedFilter);
     });
     it('should convert AST to Filter for string field - IsNot', () => {
-        const sql = "SELECT * FROM t WHERE field NOT IN ('value 1', 'value 2')";
+        const sql = "SELECT * FROM t WHERE LOWER(field) NOT IN (LOWER('value 1'), LOWER('value 2'))";
         const ast = parseSelectSQL(sql);
         const filter = astToFilter(ast.where, 'mysql');
         const expectedFilter = {
@@ -2727,3 +2727,151 @@ describe('AST to Filter - Date (Date Comparison Operators)', () => {
         expect(filter).toEqual(expectedFilter);
     });
 });
+describe('Filter to AST - Bool', () => {
+    it('should convert Filter to AST for boolean field - IsTrue', () => {
+        const filter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.EqualTo,
+            value: true,
+        };
+        const ast = filterToAst(filter, 'mysql');
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something = TRUE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const expectedAst = parseSelectSQL(sql).where;
+        expect(ast).toEqual(expectedAst);
+    });
+    it('should convert Filter to AST for boolean field - IsFalse', () => {
+        const filter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.EqualTo,
+            value: false,
+        };
+        const ast = filterToAst(filter, 'mysql');
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something = FALSE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const expectedAst = parseSelectSQL(sql).where;
+        expect(ast).toEqual(expectedAst);
+    });
+    it('should convert Filter to AST for boolean field - IsNotTrue', () => {
+        const filter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.NotEqualTo,
+            value: true,
+        };
+        const ast = filterToAst(filter, 'mysql');
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something <> TRUE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const expectedAst = parseSelectSQL(sql).where;
+        expect(ast).toEqual(expectedAst);
+    });
+    it('should convert Filter to AST for boolean field - IsNotFalse', () => {
+        const filter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.NotEqualTo,
+            value: false,
+        };
+        const ast = filterToAst(filter, 'mysql');
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something <> FALSE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const expectedAst = parseSelectSQL(sql).where;
+        expect(ast).toEqual(expectedAst);
+    });
+});
+describe('AST to Filter - Bool', () => {
+    it('should convert AST to Filter for boolean field - IsTrue', () => {
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something = TRUE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const ast = parseSelectSQL(sql);
+        const filter = astToFilter(ast.where, 'postgresql');
+        const expectedFilter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.EqualTo,
+            value: true,
+        };
+        expect(filter).toEqual(expectedFilter);
+    });
+    it('should convert AST to Filter for boolean field - IsFalse', () => {
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something = FALSE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const ast = parseSelectSQL(sql);
+        const filter = astToFilter(ast.where, 'postgresql');
+        const expectedFilter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.EqualTo,
+            value: false,
+        };
+        expect(filter).toEqual(expectedFilter);
+    });
+    it('should convert AST to Filter for boolean field - IsNotTrue', () => {
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something <> TRUE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const ast = parseSelectSQL(sql);
+        const filter = astToFilter(ast.where, 'postgresql');
+        const expectedFilter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.NotEqualTo,
+            value: true,
+        };
+        expect(filter).toEqual(expectedFilter);
+    });
+    it('should convert AST to Filter for boolean field - IsNotFalse', () => {
+        const sql = `
+        SELECT * FROM transactions
+        WHERE is_something <> FALSE
+      `
+            .replace(/\s+/g, ' ')
+            .trim();
+        const ast = parseSelectSQL(sql);
+        const filter = astToFilter(ast.where, 'postgresql');
+        const expectedFilter = {
+            field: 'is_something',
+            name: FilterNames.BooleanFilter,
+            type: FieldTypes.Boolean,
+            operator: BoolOperator.NotEqualTo,
+            value: false,
+        };
+        expect(filter).toEqual(expectedFilter);
+    });
+});

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

@@ -1,5 +1,6 @@
 import { ColumnInfo } from '../components/ReportBuilder/schema';
 import { Column, ColumnInternal } from '../models/Columns';
+import { QuillReportInternal } from '../models/Report';
 export declare function convertPostgresColumn(field: {
     name: string;
     dataTypeID: number;
@@ -8,4 +9,5 @@ export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo
 export declare function convertFieldTypeToJSType(fieldType: string): string;
 export declare function convertFormatToJsType(column: Column): string;
 export declare function processColumnName(columnName: string): string;
+export declare const getYAxisFields: (report: QuillReportInternal) => any[];
 //# sourceMappingURL=columnProcessing.d.ts.map

package/dist/esm/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;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAM3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D"}
+{"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,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,WAAY,mBAAmB,UAsDzD,CAAC"}

package/dist/esm/utils/columnProcessing.js

@@ -1,3 +1,4 @@
+import { findAndProcessDateFilter } from './filterProcessing';
 function removeBigQuerySpecialChars(columnName) {
     return columnName.replaceAll('quill_forward_slash', '/');
 }
@@ -206,3 +207,54 @@ export function convertFormatToJsType(column) {
 export function processColumnName(columnName) {
     return removeBigQuerySpecialChars(columnName);
 }
+export const getYAxisFields = (report) => {
+    try {
+        const curDateFilter = findAndProcessDateFilter(Object.values(report.filtersApplied));
+        if (report.pivot && report.pivotColumns && report.pivot.columnField) {
+            return (report.pivotColumns
+                .slice(1)
+                .map((column) => {
+                // @ts-ignore
+                return { ...column, format: report.yAxisFields[0].format };
+            }) ?? []);
+        }
+        else if (report.pivot && report.pivotColumns) {
+            return (report.pivotColumns
+                .slice(1)
+                .map((column) => {
+                return {
+                    ...column,
+                    // @ts-ignore
+                    label: report?.yAxisFields[0].label,
+                    // @ts-ignore
+                    format: report?.yAxisFields[0].format,
+                };
+            }) ?? []);
+        }
+        else {
+            if (curDateFilter?.comparison &&
+                curDateFilter.comparisonRange.value !== 'NO_COMPARISON') {
+                const comparisonYAxisFields = report.yAxisFields?.map((field) => {
+                    return {
+                        ...field,
+                        field: `comparison_${field.field}`,
+                        label: `comparison ${field.label ?? field.field}`,
+                    };
+                });
+                if (report.pivotColumns) {
+                    return report.pivotColumns;
+                }
+                else if (comparisonYAxisFields || report.yAxisFields) {
+                    const yAxisFields = report.yAxisFields ?? [];
+                    const compYAxisFields = comparisonYAxisFields ?? [];
+                    return [...yAxisFields, ...compYAxisFields];
+                }
+                return [];
+            }
+            return report.pivotColumns ?? report.yAxisFields ?? [];
+        }
+    }
+    catch (e) {
+        return report.yAxisFields;
+    }
+};

package/dist/esm/utils/columnProcessing.uspec.d.ts

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

package/dist/esm/utils/columnProcessing.uspec.d.ts.map

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

package/dist/esm/utils/columnProcessing.uspec.js

@@ -0,0 +1,65 @@
+import { DEFAULT_COMPARISON_DATE_FILTER, TWO_D_PIVOT, GENERIC_REPORT_INTERNAL, ONE_D_PIVOT, } from '../test-utils/constants';
+import { createRows } from '../test-utils/generators';
+import { getYAxisFields } from './columnProcessing';
+describe('columnProcessing', () => {
+    describe('getYAxisFields', () => {
+        it('should return an array of fields for generic reports', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'id', format: 'whole_number', label: 'ID' },
+            ]);
+        });
+        it('should return an array of fields for comparison reports', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                compareRows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                filtersApplied: [DEFAULT_COMPARISON_DATE_FILTER],
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'id', format: 'whole_number', label: 'ID' },
+                {
+                    field: 'comparison_id',
+                    format: 'whole_number',
+                    label: 'comparison ID',
+                },
+            ]);
+        });
+        it('should return the proper fields for a 2d pivot report', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                pivotColumns: TWO_D_PIVOT.pivotColumns,
+                pivotRows: TWO_D_PIVOT.pivotRows,
+                pivot: TWO_D_PIVOT.pivot,
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'Food', format: 'whole_number', label: 'Food' },
+                { field: 'Fuel', format: 'whole_number', label: 'Fuel' },
+                { field: 'Other', format: 'whole_number', label: 'Other' },
+            ]);
+        });
+        it('should return the proper fields for a 1d pivot report', () => {
+            const internalReport = {
+                ...GENERIC_REPORT_INTERNAL,
+                rows: createRows(GENERIC_REPORT_INTERNAL.columns, 10),
+                pivotColumns: ONE_D_PIVOT.pivotColumns,
+                pivotRows: ONE_D_PIVOT.pivotRows,
+                pivot: ONE_D_PIVOT.pivot,
+                yAxisFields: [
+                    { field: 'amount', format: 'whole_number', label: 'Amount' },
+                ],
+            };
+            const result = getYAxisFields(internalReport);
+            expect(result).toEqual([
+                { field: 'amount', format: 'whole_number', label: 'Amount' },
+            ]);
+        });
+    });
+});

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

@@ -1,4 +1,4 @@
-import { QuillReportInternal } from '../Dashboard';
+import { QuillReportInternal } from '../models/Report';
 /**
  * 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/esm/utils/dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAgC5E;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAgD9B;AA0KD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+BpE;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAyC9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}

package/dist/esm/utils/dashboard.js

@@ -1,4 +1,3 @@
-import { valueFormatter } from './valueFormatter';
 import { generatePivotTable, generatePivotTableYAxis, } from '../internals/ReportBuilder/PivotModal';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { getData } from './dataFetcher';
@@ -14,15 +13,14 @@ const defaultDashboardItem = {
     chartType: '',
     dateField: null,
     pivot: null,
-    primaryAggregation: '',
-    comparisonAggregation: '',
-    aggregationPercentChange: undefined,
     yAxisFields: [],
     xAxisLabel: '',
     xAxisField: '',
     xAxisFormat: 'string',
     order: -1,
     filtersApplied: {},
+    queryString: '',
+    rowCount: 0,
 };
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
@@ -41,7 +39,6 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
             name: item.name,
         };
     const pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
-    const { primaryAggregation, comparisonAggregation, aggregationPercentChange, } = getAggragations(pivotTable, item);
     return {
         id: item._id,
         name: item.name,
@@ -56,9 +53,6 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: item.pivot,
-        primaryAggregation,
-        comparisonAggregation,
-        aggregationPercentChange,
         yAxisFields: pivotTable
             ? extractPivotedYAxis(pivotTable, item)
             : item.yAxisFields,
@@ -70,42 +64,9 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         rowCount: parseInt(item.rowCount),
         sort: item.sort,
         itemQuery: item.itemQuery,
+        queryString: item.queryString,
     };
 }
-/**
- * Extracts the aggregations from the item, if any.
- */
-function getAggragations(pivotTable, item) {
-    const yAxisFields = extractPivotedYAxis(pivotTable, item);
-    const rows = extractPivotedData(pivotTable, item);
-    // extract the aggragation for the primary range.
-    const mainKey = yAxisFields[0]?.field ?? item.pivot?.valueField;
-    const primary = mainKey
-        ? rows.reduce((sum, row) => sum + parseFloat(row[mainKey]), 0)
-        : 0;
-    // extract the aggragation for the comparison range, if applicable.
-    const compKey = yAxisFields[1]?.field ?? item.pivot?.valueField;
-    const comparison = compKey
-        ? rows.reduce((sum, row) => sum + parseFloat(row[compKey]), 0)
-        : 0;
-    return {
-        primaryAggregation: formatAggragation(item, primary),
-        comparisonAggregation: formatAggragation(item, comparison),
-        aggregationPercentChange: Number(primary - comparison),
-    };
-}
-/**
- * Applies a valueFormatter to the given value based on the format in the item.
- */
-function formatAggragation(item, value) {
-    if (!value)
-        return undefined;
-    return valueFormatter({
-        value,
-        field: item.pivot?.valueField,
-        fields: item.yAxisFields,
-    });
-}
 /**
  * Extract and transform the data from itemInfo.
  */
@@ -161,20 +122,6 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             : undefined)
         : undefined;
 }
-/**
- * Returns the data list based on whether the table is pivoted and if there is
- * a config value passed into this component.
- */
-function extractPivotedData(pivotTable, item, config = undefined) {
-    if (pivotTable)
-        return pivotTable.rows;
-    if (config) {
-        if (config.bucketedRows.length > 0)
-            return config.bucketedRows;
-        return config.rows;
-    }
-    return item.rows;
-}
 /**
  * Extracts the yAxis from the pivot table, if one exists.
  */

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

@@ -1,8 +1,10 @@
-import { QuillReportInternal } from '../Dashboard';
+import { QuillReportInternal } from '../models/Report';
 export declare enum Calculation {
     PointToPointPercentageChange = "POINT_TO_POINT_PERCENTAGE_CHANGE",
-    SimplePercentageChange = "SIMPLE_PERCENTAGE_CHANGE"
+    SimplePercentageChange = "SIMPLE_PERCENTAGE_CHANGE",
+    Sum = "SUM"
 }
 export declare const getSimplePercentageChange: (data: QuillReportInternal) => number | undefined;
 export declare const getPointToPointPercentageChange: (data: QuillReportInternal) => number | undefined;
+export declare const getSumOfFields: (data: QuillReportInternal) => number;
 //# sourceMappingURL=dataProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAInD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;CACpD;AAyBD,eAAO,MAAM,yBAAyB,SAAU,mBAAmB,uBAsClE,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,mBAAmB,uBAkFxE,CAAC"}
+{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAIvD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,SAAU,mBAAmB,uBAsClE,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,mBAAmB,uBAkFxE,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,mBAAmB,WAavD,CAAC"}

package/dist/esm/utils/dataProcessing.js

@@ -4,6 +4,7 @@ export var Calculation;
 (function (Calculation) {
     Calculation["PointToPointPercentageChange"] = "POINT_TO_POINT_PERCENTAGE_CHANGE";
     Calculation["SimplePercentageChange"] = "SIMPLE_PERCENTAGE_CHANGE";
+    Calculation["Sum"] = "SUM";
 })(Calculation || (Calculation = {}));
 const getSumOfField = (rows, field) => {
     if (rows[0] && rows[0][field]) {
@@ -120,3 +121,18 @@ export const getPointToPointPercentageChange = (data) => {
         }
     }
 };
+export const getSumOfFields = (data) => {
+    if (data.pivot && data.pivotRows && data.pivotColumns) {
+        const pivotRows = data.pivotRows;
+        const fields = data.pivotColumns.map((field) => {
+            return field.field;
+        });
+        return getSumOfFieldsAndRows(pivotRows, fields);
+    }
+    else {
+        const yAxisFields = data.yAxisFields.map((field) => {
+            return field.field;
+        });
+        return getSumOfFieldsAndRows(data.rows, yAxisFields);
+    }
+};

package/dist/esm/utils/dataProcessing.uspec.js

@@ -10,6 +10,7 @@ const defaultReport = {
     order: 0,
     queryString: 'dummy',
     compareRows: [{ amount: '20' }, { amount: '20' }],
+    rowCount: 0,
     pivot: null,
     rows: [
         { amount: '40', created_at: '2024-06-01' },

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

@@ -14,6 +14,7 @@ export declare function getComparisonInterval(comparisonRange: {
 export declare function getDateBucketFromRange(dateRange: {
     start: Date;
     end: Date;
-}): "month" | "week" | "year" | "day";
+}): "year" | "month" | "week" | "day";
 export declare function parseDateByDatabaseType(date: any, databaseType: string): Date;
+export declare function getDateFormatFromBucket(dateBucket: string): string;
 //# sourceMappingURL=dates.d.ts.map