@quillsql/react 2.13.39 → 2.13.41

package/dist/cjs/hooks/useReport.js

@@ -29,14 +29,8 @@ exports.useReports = useReports;
 // Not meant to be customer facing
 const useReport = (reportId) => {
     const { loadFiltersForReport } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
-    const { reports, reportsDispatch } = (0, react_1.useContext)(Context_1.ReportsContext);
+    const { reports } = (0, react_1.useContext)(Context_1.ReportsContext);
     const reload = async (overrideFilters, customFilters = [], initiator = 'Chart') => {
-        // Set loading member on the report to true
-        reportsDispatch({
-            type: 'UPDATE_REPORT',
-            id: reportId,
-            data: { loadingRows: true },
-        });
         // Pull the date filter out of the override filters, process it, and append it to the filters
         const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
         loadFiltersForReport(reportId, initiator, [

package/dist/cjs/hooks/useVirtualTables.d.ts

@@ -7,12 +7,16 @@ export declare const useVirtualTables: () => {
     };
     reloadAll: (client: any, caller?: string) => Promise<{
         schema: Table[];
-        customFields: any;
+        customFields: {
+            [tableName: string]: import("../models/Schema").CustomField[];
+        } | null;
         isSchemaLoading: boolean;
     }>;
     refreshSome: (client: any, tables: Table[]) => Promise<{
         schema: Table[];
-        customFields: any;
+        customFields: {
+            [tableName: string]: import("../models/Schema").CustomField[];
+        } | null;
         isSchemaLoading: boolean;
     }>;
 };

package/dist/cjs/hooks/useVirtualTables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useVirtualTables.d.ts","sourceRoot":"","sources":["../../../src/hooks/useVirtualTables.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,eAAO,MAAM,gBAAgB;;;;;;wBAMS,GAAG,WAAW,MAAM;;;;;0BAiDf,GAAG,UAAU,KAAK,EAAE;;;;;CA6D9D,CAAC"}
+{"version":3,"file":"useVirtualTables.d.ts","sourceRoot":"","sources":["../../../src/hooks/useVirtualTables.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,eAAO,MAAM,gBAAgB;;;;;;wBAOS,GAAG,WAAW,MAAM;;;;;;;0BAyDf,GAAG,UAAU,KAAK,EAAE;;;;;;;CA6D9D,CAAC"}

package/dist/cjs/hooks/useVirtualTables.js

@@ -6,6 +6,7 @@ const Context_1 = require("../Context");
 const schema_1 = require("../utils/schema");
 const useVirtualTables = () => {
     const [schemaData, setSchemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
+    const { tenants } = (0, react_1.useContext)(Context_1.TenantContext);
     const [loadingTables, setLoadingTables] = (0, react_1.useState)({});
     const handleReload = async (client, caller) => {
         setSchemaData({ ...schemaData, isSchemaLoading: true });
@@ -14,11 +15,12 @@ const useVirtualTables = () => {
             acc[table._id] = true;
             return acc;
         }, {}));
-        const { schemaData: schema, customFieldsByTable } = await (0, schema_1.getSchemaInfo)(client, caller);
+        const { schemaData: schema, customFieldsByTable, schemaWithCustomFields, } = await (0, schema_1.getSchemaInfo)({ client, caller, tenants });
         setSchemaData({
             schema,
             customFields: customFieldsByTable,
             isSchemaLoading: false,
+            schemaWithCustomFields,
         });
         setLoadingTables({});
         return {
@@ -28,7 +30,7 @@ const useVirtualTables = () => {
         };
     };
     const handleReloadSome = async (client, tableIds, caller) => {
-        const { schemaData: schema, customFieldsByTable } = await (0, schema_1.getSchemaInfo)(client, caller, tableIds);
+        const { schemaData: schema, customFieldsByTable, schemaWithCustomFields, } = await (0, schema_1.getSchemaInfo)({ client, caller, tenants, tableIds });
         // Only replace the tables that were reloaded
         setSchemaData({
             schema: schemaData.schema.map((table) => {
@@ -39,6 +41,7 @@ const useVirtualTables = () => {
             }, {}),
             customFields: customFieldsByTable,
             isSchemaLoading: false,
+            schemaWithCustomFields,
         });
         return {
             schema,

package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map

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

package/dist/cjs/internals/ReportBuilder/PivotModal.js

@@ -72,8 +72,8 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
             }
             let newUniqueValues = uniqueValues;
             if (fetchDistinct || !uniqueValues) {
-                const { filteredColumns: smallStringColumns, exceededColumns } = await (0, tableProcessing_1.getCountsByColumns)(stringColumns, query || '', client, tenants, schemaData.customFields ?? [], dashboardName);
-                newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(smallStringColumns, query || '', data.rows || [], client, tenants, schemaData.customFields ?? [], undefined, dashboardName);
+                const { filteredColumns: smallStringColumns, exceededColumns } = await (0, tableProcessing_1.getCountsByColumns)(stringColumns, query || '', client, tenants, schemaData.customFields ?? {}, dashboardName);
+                newUniqueValues = await (0, tableProcessing_1.getUniqueValuesByColumns)(smallStringColumns, query || '', data.rows || [], client, tenants, schemaData.customFields ?? {}, undefined, dashboardName);
                 exceededColumns?.forEach((column) => {
                     if (newUniqueValues) {
                         newUniqueValues[column.field] = { EXCEEDS_LIMIT: true };
@@ -104,7 +104,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
             if (dateColumns.length === 0) {
                 return;
             }
-            const dateRangeByColumn = await (0, tableProcessing_1.getQueryDateRangeByColumns)(dateColumns, query || '', client, tenants, schemaData.customFields ?? [], dashboardName);
+            const dateRangeByColumn = await (0, tableProcessing_1.getQueryDateRangeByColumns)(dateColumns, query || '', client, tenants, schemaData.customFields ?? {}, dashboardName);
             setDateRanges(dateRangeByColumn || {});
         }
     };
@@ -365,7 +365,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
             !columnsToShow[pivotColumnField]) {
             errors.push('Error in column field: undefined type');
         }
-        if (errors.length === 0 && pivotAggregations?.every((p) => p.valueField && p.aggregationType)) {
+        if (errors.length === 0 && pivotAggregations?.every((p) => p.aggregationType && (p.valueField || p.aggregationType === 'count'))) {
             const pivot = {
                 rowField: pivotRowField,
                 rowFieldType: columnTypes[pivotRowField ?? ''],
@@ -586,7 +586,6 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         columns,
     ]);
     const pivotFieldChange = async (field, value) => {
-        console.log();
         if (typeof value !== 'string' && (!value?.length || !value?.every((p) => p?.aggregationType))) {
             return;
         }
@@ -832,7 +831,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                                                                         'count',
                                                                         'max',
                                                                         'min',
-                                                                        ...(pivotRowField ? ['percentage'] : []),
+                                                                        'percentage'
                                                                     ].map((option) => {
                                                                         return { label: option, value: option };
                                                                     }),
@@ -872,7 +871,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                                                     setIsOpen(false);
                                                     setPopUpTitle('Add pivot');
                                                 }, label: "Cancel" }), (0, jsx_runtime_1.jsx)(ButtonComponent, { id: "custom-button", onClick: onCommitPivot, label: 'Save', disabled: !(pivotAggregations?.length > 0) ||
-                                                    pivotAggregations.some((agg) => !agg.aggregationType || !agg.valueField) })] })] })) : ((0, jsx_runtime_1.jsx)("div", { style: {
+                                                    pivotAggregations.some((agg) => !agg.aggregationType || (!agg.valueField && agg.aggregationType !== 'count')) })] })] })) : ((0, jsx_runtime_1.jsx)("div", { style: {
                                     display: 'flex',
                                     flexDirection: 'column',
                                     fontFamily: theme?.fontFamily,

package/dist/cjs/models/Filter.d.ts

@@ -49,7 +49,7 @@ export declare enum FieldType {
     Null = "null",
     Boolean = "boolean"
 }
-export declare enum FilterType {
+export declare enum InternalFilterType {
     StringFilter = "string-filter",
     DateFilter = "date-filter",
     DateCustomFilter = "date-custom-filter",
@@ -61,13 +61,20 @@ export declare enum FilterType {
 }
 export type Operator = StringOperator | DateOperator | NumberOperator | NullOperator | BoolOperator;
 export interface BaseFilter {
-    filterType: FilterType;
+    filterType: InternalFilterType;
     fieldType: FieldType;
     operator: Operator;
     field: string;
     value: any;
     table?: string;
 }
+export declare enum FilterType {
+    String = "string",
+    Date = "date",
+    Numeric = "numeric",
+    Boolean = "boolean",
+    Null = "null"
+}
 export interface Filter {
     filterType: FilterType;
     operator?: StringOperator | DateOperator | NumberOperator | NullOperator | BoolOperator;
@@ -75,29 +82,29 @@ export interface Filter {
         startDate: string;
         endDate: string;
     } | {
-        value: number;
+        value?: number;
         unit: TimeUnit;
     } | null;
-    field: string;
-    table: string;
+    field?: string;
+    table?: string;
 }
 export interface StringFilter extends BaseFilter {
-    filterType: FilterType.StringFilter;
+    filterType: InternalFilterType.StringFilter;
     fieldType: FieldType.String;
     value: string;
 }
 export interface StringInFilter extends BaseFilter {
-    filterType: FilterType.StringInFilter;
+    filterType: InternalFilterType.StringInFilter;
     fieldType: FieldType.String;
     value: string[];
 }
 export interface NumericFilter extends BaseFilter {
-    filterType: FilterType.NumericFilter;
+    filterType: InternalFilterType.NumericFilter;
     fieldType: FieldType.Number;
     value: number;
 }
 export interface DateFilter extends BaseFilter {
-    filterType: FilterType.DateFilter;
+    filterType: InternalFilterType.DateFilter;
     fieldType: FieldType.Date;
     value: {
         value: number;
@@ -105,7 +112,7 @@ export interface DateFilter extends BaseFilter {
     };
 }
 export interface DateCustomFilter extends BaseFilter {
-    filterType: FilterType.DateCustomFilter;
+    filterType: InternalFilterType.DateCustomFilter;
     fieldType: FieldType.Date;
     value: {
         startDate: string;
@@ -113,17 +120,17 @@ export interface DateCustomFilter extends BaseFilter {
     };
 }
 export interface DateComparisonFilter extends BaseFilter {
-    filterType: FilterType.DateComparisonFilter;
+    filterType: InternalFilterType.DateComparisonFilter;
     fieldType: FieldType.Date;
     value: string;
 }
 export interface BooleanFilter extends BaseFilter {
-    filterType: FilterType.BooleanFilter;
+    filterType: InternalFilterType.BooleanFilter;
     fieldType: FieldType.Boolean;
     value: boolean;
 }
 export interface NullFilter extends BaseFilter {
-    filterType: FilterType.NullFilter;
+    filterType: InternalFilterType.NullFilter;
     fieldType: FieldType.Null;
     value: null;
 }

package/dist/cjs/models/Filter.d.ts.map

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

package/dist/cjs/models/Filter.js

@@ -1,7 +1,7 @@
 "use strict";
 // import * as Constants from '../utils/filterConstants';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertCustomFilter = exports.DashboardFilterType = exports.FilterType = exports.FieldType = exports.TimeUnit = exports.BoolOperator = exports.NullOperator = exports.NumberOperator = exports.DateOperator = exports.StringOperator = void 0;
+exports.convertCustomFilter = exports.DashboardFilterType = exports.FilterType = exports.InternalFilterType = exports.FieldType = exports.TimeUnit = exports.BoolOperator = exports.NullOperator = exports.NumberOperator = exports.DateOperator = exports.StringOperator = void 0;
 /* eslint-disable no-unused-vars */
 const IS_EXACTLY = 'is exactly';
 const IS_NOT_EXACTLY = 'is not exactly';
@@ -88,16 +88,24 @@ var FieldType;
     FieldType["Null"] = "null";
     FieldType["Boolean"] = "boolean";
 })(FieldType || (exports.FieldType = FieldType = {}));
+var InternalFilterType;
+(function (InternalFilterType) {
+    InternalFilterType["StringFilter"] = "string-filter";
+    InternalFilterType["DateFilter"] = "date-filter";
+    InternalFilterType["DateCustomFilter"] = "date-custom-filter";
+    InternalFilterType["DateComparisonFilter"] = "date-comparison-filter";
+    InternalFilterType["NumericFilter"] = "numeric-filter";
+    InternalFilterType["NullFilter"] = "null-filter";
+    InternalFilterType["StringInFilter"] = "string-in-filter";
+    InternalFilterType["BooleanFilter"] = "boolean-filter";
+})(InternalFilterType || (exports.InternalFilterType = InternalFilterType = {}));
 var FilterType;
 (function (FilterType) {
-    FilterType["StringFilter"] = "string-filter";
-    FilterType["DateFilter"] = "date-filter";
-    FilterType["DateCustomFilter"] = "date-custom-filter";
-    FilterType["DateComparisonFilter"] = "date-comparison-filter";
-    FilterType["NumericFilter"] = "numeric-filter";
-    FilterType["NullFilter"] = "null-filter";
-    FilterType["StringInFilter"] = "string-in-filter";
-    FilterType["BooleanFilter"] = "boolean-filter";
+    FilterType["String"] = "string";
+    FilterType["Date"] = "date";
+    FilterType["Numeric"] = "numeric";
+    FilterType["Boolean"] = "boolean";
+    FilterType["Null"] = "null";
 })(FilterType || (exports.FilterType = FilterType = {}));
 /** Dashboard filters are filters that persist with the dashboard */
 var DashboardFilterType;
@@ -111,43 +119,59 @@ var StringFilterType;
     StringFilterType["Multiselect"] = "multiselect";
 })(StringFilterType || (StringFilterType = {}));
 const convertCustomFilter = (filter) => {
+    let field;
+    let filterType;
+    let fieldType;
+    let operator;
+    let value;
+    let table;
     switch (filter.filterType) {
-        case FilterType.StringFilter:
-            if (typeof filter.value !== 'string') {
-                throw new Error(`Invalid value for StringFilter, expected string, got ${filter.value}`);
+        case FilterType.String:
+            if (!filter.field) {
+                throw new Error('Field is required for StringFilter');
             }
-            if (filter.operator === undefined) {
-                filter.operator = StringOperator.IsExactly;
+            if (typeof filter.value === 'string') {
+                filterType = InternalFilterType.StringFilter;
+                fieldType = FieldType.String;
+                operator = filter.operator;
+                field = filter.field;
+                table = filter.table;
+                value = filter.value;
             }
-            if (!(filter.operator in StringOperator) &&
-                !Object.values(StringOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for StringFilter, expected StringOperator, got ${filter.operator}`);
+            else if (Array.isArray(filter.value) &&
+                filter.value.every((v) => typeof v === 'string')) {
+                filterType = InternalFilterType.StringInFilter;
+                fieldType = FieldType.String;
+                operator = filter.operator;
+                field = filter.field;
+                table = filter.table;
+                value = filter.value;
             }
-            return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.String,
-            };
-        case FilterType.StringInFilter:
-            if (!Array.isArray(filter.value)) {
-                throw new Error(`Invalid value for StringInFilter, expected string[], got ${filter.value}`);
+            else {
+                throw new Error(`Invalid value for StringFilter, expected string, or string array, got ${filter.value}`);
             }
             if (filter.operator === undefined) {
                 filter.operator = StringOperator.IsExactly;
             }
             if (!(filter.operator in StringOperator) &&
                 !Object.values(StringOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for StringInFilter, expected StringOperator, got ${filter.operator}`);
+                throw new Error(`Invalid operator for StringFilter, expected StringOperator, got ${filter.operator}`);
             }
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.String,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.NumericFilter:
+        case FilterType.Numeric:
             if (typeof filter.value !== 'number') {
                 throw new Error(`Invalid value for NumericFilter, expected number, got ${filter.value}`);
             }
+            else if (!filter.field) {
+                throw new Error('Field is required for NumericFilter');
+            }
             if (filter.operator === undefined) {
                 filter.operator = NumberOperator.EqualTo;
             }
@@ -155,15 +179,27 @@ const convertCustomFilter = (filter) => {
                 !Object.values(NumberOperator).includes(filter.operator)) {
                 throw new Error(`Invalid operator for NumericFilter, expected NumberOperator, got ${filter.operator}`);
             }
+            filterType = InternalFilterType.NumericFilter;
+            fieldType = FieldType.Number;
+            operator = filter.operator;
+            field = filter.field;
+            value = filter.value;
+            table = filter.table;
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Number,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.NullFilter:
+        case FilterType.Null:
             if (filter.value !== null) {
                 throw new Error(`Invalid value for NullFilter, expected null, got ${filter.value}`);
             }
+            else if (!filter.field) {
+                throw new Error('Field is required for NullFilter');
+            }
             if (filter.operator === undefined) {
                 filter.operator = NullOperator.IsNotNull;
             }
@@ -171,15 +207,27 @@ const convertCustomFilter = (filter) => {
                 !Object.values(NullOperator).includes(filter.operator)) {
                 throw new Error(`Invalid operator for NullFilter, expected NullOperator, got ${filter.operator}`);
             }
+            filterType = InternalFilterType.NullFilter;
+            fieldType = FieldType.Null;
+            operator = filter.operator;
+            field = filter.field;
+            value = null;
+            table = filter.table;
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Null,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.BooleanFilter:
+        case FilterType.Boolean:
             if (typeof filter.value !== 'boolean') {
                 throw new Error(`Invalid value for BooleanFilter, expected boolean, got ${filter.value}`);
             }
+            else if (!filter.field) {
+                throw new Error('Field is required for BooleanFilter');
+            }
             if (filter.operator === undefined) {
                 filter.operator = BoolOperator.EqualTo;
             }
@@ -187,62 +235,88 @@ const convertCustomFilter = (filter) => {
                 !Object.values(BoolOperator).includes(filter.operator)) {
                 throw new Error(`Invalid operator for BooleanFilter, expected BoolOperator, got ${filter.operator}`);
             }
+            filterType = InternalFilterType.BooleanFilter;
+            fieldType = FieldType.Boolean;
+            operator = filter.operator;
+            field = filter.field;
+            value = null;
+            table = filter.table;
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Boolean,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.DateFilter:
-            if (typeof filter.value !== 'object' ||
-                filter.value === null ||
-                !('value' in filter.value) ||
-                typeof filter.value.value !== 'number' ||
-                typeof filter.value.unit !== 'string') {
-                throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, got ${filter.value}`);
-            }
-            if (filter.operator === undefined) {
-                filter.operator = DateOperator.EqualTo;
+        case FilterType.Date:
+            if (typeof filter.value === 'object' &&
+                filter.value &&
+                'value' in filter.value &&
+                filter.value.unit) {
+                if ((filter.value.value && typeof filter.value.value !== 'number') ||
+                    typeof filter.value.unit !== 'string') {
+                    throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, got ${filter.value}`);
+                }
+                if (!filter.value.value) {
+                    filter.value.value = 1;
+                }
+                if (filter.operator === undefined) {
+                    filter.operator = DateOperator.EqualTo;
+                }
+                if (!(filter.operator in DateOperator) &&
+                    !Object.values(DateOperator).includes(filter.operator)) {
+                    throw new Error(`Invalid operator for DateFilter, expected DateOperator, got ${filter.operator}`);
+                }
+                filterType = InternalFilterType.DateFilter;
+                fieldType = FieldType.Date;
+                operator = filter.operator;
+                value = filter.value;
+                field = filter.field || '';
+                table = filter.table;
             }
-            if (!(filter.operator in DateOperator) &&
-                !Object.values(DateOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for DateFilter, expected DateOperator, got ${filter.operator}`);
+            else if (typeof filter.value === 'object' &&
+                filter.value &&
+                'startDate' in filter.value &&
+                filter.value.startDate &&
+                'endDate' in filter.value &&
+                filter.value.endDate) {
+                if (typeof filter.value.startDate !== 'string' ||
+                    typeof filter.value.endDate !== 'string') {
+                    throw new Error(`Invalid value for DateCustomFilter, expected { startDate: string, endDate: string }, got ${filter.value}`);
+                }
+                filterType = InternalFilterType.DateCustomFilter;
+                fieldType = FieldType.Date;
+                operator = DateOperator.Custom;
+                value = filter.value;
+                field = filter.field || '';
+                table = filter.table;
             }
-            return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Date,
-            };
-        case FilterType.DateCustomFilter:
-            if (typeof filter.value !== 'object' ||
-                filter.value === null ||
-                !('startDate' in filter.value) ||
-                !('endDate' in filter.value) ||
-                typeof filter.value.startDate !== 'string' ||
-                typeof filter.value.endDate !== 'string') {
-                throw new Error(`Invalid value for DateCustomFilter, expected { startDate: string, endDate: string }, got ${filter.value}`);
-            }
-            // Right now we're silently ignoring the operator, may want to generate error instead?
-            filter.operator = DateOperator.Custom;
-            return {
-                ...filter,
-                operator: DateOperator.Custom,
-                fieldType: FieldType.Date,
-            };
-        case FilterType.DateComparisonFilter:
-            if (typeof filter.value !== 'string') {
-                throw new Error(`Invalid value for DateComparisonFilter, expected string, got ${filter.value}`);
-            }
-            if (filter.operator === undefined) {
-                filter.operator = DateOperator.EqualTo;
+            else if (typeof filter.value === 'string') {
+                if (filter.operator === undefined) {
+                    filter.operator = DateOperator.EqualTo;
+                }
+                if (!(filter.operator in DateOperator) &&
+                    !Object.values(DateOperator).includes(filter.operator)) {
+                    throw new Error(`Invalid operator for DateComparisonFilter, expected DateOperator, got ${filter.operator}`);
+                }
+                filterType = InternalFilterType.DateComparisonFilter;
+                fieldType = FieldType.Date;
+                operator = filter.operator;
+                value = filter.value;
+                field = filter.field || '';
+                table = filter.table;
             }
-            if (!(filter.operator in DateOperator) &&
-                !Object.values(DateOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for DateComparisonFilter, expected DateOperator, got ${filter.operator}`);
+            else {
+                throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, { startDate: string, endDate: string}, or string, got ${filter.value}`);
             }
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Date,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
     }
 };

package/dist/cjs/models/Report.d.ts

@@ -86,6 +86,17 @@ export interface QuillReport {
             field: string;
         };
     };
+    referenceLines?: {
+        label: string;
+        query: [number, number] | string;
+    }[];
+    /** Resolved reference line y values */
+    referenceLineYValues?: {
+        label: string;
+        query: [number, number];
+    }[];
+    includeCustomFields?: boolean;
+    columnsWithCustomFields?: Column[];
 }
 export interface QuillReportInternal extends QuillReport {
     /** The pivot row info. */
@@ -122,7 +133,7 @@ export interface QuillReportInternal extends QuillReport {
     adminError?: string;
     /** An internal flag to force a report to trigger a reload from the backend */
     triggerReload?: boolean;
-    /** An internal flag to force a report to trigger a reload from the backend */
+    /** columns as ColumnInternal */
     columnInternal: ColumnInternal[];
     /** Represents if the report is currently loading rows */
     loadingRows?: boolean;