@quillsql/react 2.13.7 → 2.13.9

package/dist/esm/hooks/useAskQuill.d.ts

@@ -1,11 +1,11 @@
 import { Pivot } from '../models/Pivot';
 import { FilterTreeNode as FilterTree } from '../utils/astFilterProcessing';
-import { FieldTypes } from '../models/Filter';
+import { FieldType } from '../models/Filter';
 interface Column {
     label: string;
     field: string;
     format: string;
-    fieldType: FieldTypes;
+    fieldType: FieldType;
 }
 export declare const useAskQuill: () => {
     data: {

package/dist/esm/hooks/useAskQuill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAskQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAskQuill.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAEL,cAAc,IAAI,UAAU,EAE7B,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,UAAU,MAAM;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,UAAU,CAAC;CACvB;AA6BD,eAAO,MAAM,WAAW;UAChB;QACJ,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;QACpB,cAAc,EAAE,MAAM,EAAE,CAAC;QACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;QAC5B,gBAAgB,EAAE,MAAM,EAAE,CAAC;QAC3B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;KAE/B;aACQ,OAAO;WACT,MAAM,GAAG,SAAS;iBACZ,MAAM,KAAK,QAAQ,GAAG,GAAG,SAAS,CAAC;2BACzB,KAAK,KAAK,IAAI;qCACJ,UAAU,KAAK,IAAI;CA0MrD,CAAC"}
+{"version":3,"file":"useAskQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAskQuill.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAEL,cAAc,IAAI,UAAU,EAE7B,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,UAAU,MAAM;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;CACtB;AA6BD,eAAO,MAAM,WAAW,QAAO;IAC7B,IAAI,EAAE;QACJ,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;QACpB,cAAc,EAAE,MAAM,EAAE,CAAC;QACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;QAC5B,gBAAgB,EAAE,MAAM,EAAE,CAAC;QAC3B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;KAE/B,CAAC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;IACjD,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACtC,kBAAkB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;CA0MtD,CAAC"}

package/dist/esm/hooks/useAskQuill.js

@@ -4,25 +4,25 @@ import { fetchAndProcessASTFromPrompt } from '../utils/astProcessing';
 import { fetchReportBuilderDataFromAST, } from '../utils/report';
 import { astToFilterTree, filterTreeToAst, } from '../utils/astFilterProcessing';
 import { getPossiblePivotFieldOptions } from '../utils/pivotProcessing';
-import { FieldTypes } from '../models/Filter';
+import { FieldType } from '../models/Filter';
 function convertColumnInternalToAskQuillColumn(columns) {
     return columns.map((column) => {
-        let convertedFieldType = FieldTypes.String;
-        if (column.jsType === FieldTypes.Date) {
-            convertedFieldType = FieldTypes.Date;
+        let convertedFieldType = FieldType.String;
+        if (column.jsType === FieldType.Date) {
+            convertedFieldType = FieldType.Date;
         }
-        else if (column.jsType === FieldTypes.Number) {
-            convertedFieldType = FieldTypes.Number;
+        else if (column.jsType === FieldType.Number) {
+            convertedFieldType = FieldType.Number;
         }
-        else if (column.jsType === FieldTypes.String) {
-            convertedFieldType = FieldTypes.String;
+        else if (column.jsType === FieldType.String) {
+            convertedFieldType = FieldType.String;
         }
-        else if (column.jsType === FieldTypes.Boolean ||
+        else if (column.jsType === FieldType.Boolean ||
             column.jsType === 'bool') {
-            convertedFieldType = FieldTypes.Boolean;
+            convertedFieldType = FieldType.Boolean;
         }
-        else if (column.jsType === FieldTypes.Null) {
-            convertedFieldType = FieldTypes.Null;
+        else if (column.jsType === FieldType.Null) {
+            convertedFieldType = FieldType.Null;
         }
         return {
             label: column.label,

package/dist/esm/hooks/useAstToFilterTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAstToFilterTree.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAstToFilterTree.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAmB,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD;;;;;;GAMG;AACH,QAAA,MAAM,kBAAkB,QACjB,GAAG,UACA,mBAAmB;gBACZ,cAAc,GAAG,IAAI;iBAAe,cAAc,EAAE;CAoBpE,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"useAstToFilterTree.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAstToFilterTree.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAmB,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD;;;;;;GAMG;AACH,QAAA,MAAM,kBAAkB,QACjB,GAAG,UACA,mBAAmB,KAC1B;IAAE,UAAU,EAAE,cAAc,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,cAAc,EAAE,CAAA;CAoBpE,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/esm/hooks/useDashboard.d.ts

@@ -1,10 +1,10 @@
 import { QuillReport, QuillReportInternal } from '../models/Report';
-import { DashboardFilter } from '../models/Filter';
+import { DashboardFilter, InternalFilter } from '../models/Filter';
 import { DashboardConfig } from '../models/Dashboard';
 export declare const useReports: () => {
     reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
 };
-export declare const useDashboard: (dashboardName: string | null) => {
+export declare const useDashboard: (dashboardName: string | null, customFilters?: InternalFilter[]) => {
     data: DashboardConfig | null;
     dashboardFilters: DashboardFilter[] | null;
     isLoading: boolean | undefined;
@@ -13,10 +13,10 @@ export declare const useDashboard: (dashboardName: string | null) => {
         report: QuillReport | {
             id: string;
         };
-        action: 'upsert' | 'delete';
+        action: "upsert" | "delete";
     }, overrideFilters?: {
         filters: DashboardFilter[];
-        editedFilterLabel: string;
+        editedFilterLabel?: string;
     }) => Promise<void>;
 };
 export declare const useDashboards: () => {
@@ -29,12 +29,13 @@ export declare const useDashboards: () => {
     createDashboard: ({ name, filters, dateFilter, }: {
         name: string;
         filters: DashboardFilter[];
-        dateFilter?: DashboardFilter | undefined;
+        dateFilter?: DashboardFilter;
     }) => Promise<void>;
-    updateDashboard: (name: string, { newName, filters, dateFilter, }: {
+    updateDashboard: (name: string, { newName, filters, dateFilter, customFilters, }: {
         newName: string;
         filters: DashboardFilter[];
-        dateFilter?: DashboardFilter | undefined;
+        dateFilter?: DashboardFilter;
+        customFilters?: InternalFilter[];
     }) => Promise<void>;
     deleteDashboard: (name: string) => Promise<void>;
 };

package/dist/esm/hooks/useDashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAMpE,OAAO,EAAE,eAAe,EAAuB,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,eAAO,MAAM,UAAU;gDAYC,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,MAAM,GAAG,IAAI;;;;2CAqJT,MAAM;qCAjI1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAA;KAAE;CA8I9E,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;cAsBhB,MAAM;iBACH,eAAe,EAAE;;;4BAiDpB,MAAM;iBAMD,MAAM;iBACN,eAAe,EAAE;;;4BAiFO,MAAM;CA8B5C,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAMpE,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,eAAO,MAAM,UAAU;uCAYR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CAwLc,MAAM;qCA9J1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;CAwKJ,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;sDAuBrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BA+CO,MAAM,oDAMT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;KAClC;4BA2FkC,MAAM;CA8B5C,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -1,7 +1,7 @@
 import { useContext, useMemo } from 'react';
 import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, } from '../Context';
 import { COMPARISON_RANGE, PRIMARY_RANGE, } from '../DateRangePicker/dateRangePickerUtils';
-import { DashboardFilterType } from '../models/Filter';
+import { DashboardFilterType, } from '../models/Filter';
 export const useReports = () => {
     const [dashboard, dispatch] = useContext(DashboardContext);
     const reloadReport = (id) => {
@@ -22,14 +22,15 @@ export const useReports = () => {
         reloadFilteredReports,
     };
 };
-export const useDashboard = (dashboardName) => {
-    const { dashboardConfig, loadDashboard } = useContext(DashboardConfigContext);
+export const useDashboard = (dashboardName, customFilters) => {
+    const { dashboardConfig, isLoading: isDashboardsLoading, loadDashboard, } = useContext(DashboardConfigContext);
     const { dashboardFilters, loadFiltersForDashboard } = useContext(DashboardFiltersContext);
     //TODO: handle error states
     // const [error, setError] = useState<any>(null);
     const [, isClientLoading] = useContext(ClientContext);
     const loading = useMemo(() => !dashboardName ||
         isClientLoading ||
+        isDashboardsLoading ||
         dashboardConfig[dashboardName]?.loading ||
         (dashboardConfig[dashboardName] &&
             !dashboardConfig[dashboardName]?.config.sections), [isClientLoading, dashboardConfig, dashboardName]);
@@ -57,31 +58,44 @@ export const useDashboard = (dashboardName) => {
                     ]
                     : []),
                 ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
-            ], overrideFilters.editedFilterLabel);
+            ], overrideFilters.editedFilterLabel, customFilters);
             return;
         }
         const dashboard = await loadDashboard(overrideDashboardName ?? dashboardName, fetchFromServer, reportAction);
         if (!fetchFromServer &&
-            Object.keys(dashboardFilters[dashboardName] ?? {}).length) {
+            Object.keys(dashboardFilters[dashboardName] ?? {}).length &&
+            // there exists no non date filter that has undefined options
+            Object.values(dashboardFilters[dashboardName] ?? {}).every((filter) => filter.filter.filterType === DashboardFilterType.Date ||
+                filter.filter.options)) {
             return;
         }
-        const comparisonRangeStart = dashboard?.dateFilter?.comparisonRange?.startDate ??
-            COMPARISON_RANGE[dashboard?.dateFilter?.defaultComparisonRange ??
-                'NO_COMPARISON']({
-                start: PRIMARY_RANGE[dashboard?.dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS']?.start,
-                end: PRIMARY_RANGE[dashboard?.dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS']?.end,
-            })?.start;
-        const comparisonRangeEnd = dashboard?.dateFilter?.comparisonRange?.endDate ??
-            COMPARISON_RANGE[dashboard?.dateFilter?.defaultComparisonRange ??
-                'NO_COMPARISON']({
-                start: PRIMARY_RANGE[dashboard?.dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS']?.start,
-                end: PRIMARY_RANGE[dashboard?.dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS']?.end,
-            })?.end;
+        const getComparisonRange = (dateFilter, rangeType) => {
+            const range = dateFilter?.presetRanges?.find((range) => range.value === dateFilter?.primaryRange?.value) ?? PRIMARY_RANGE[dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS'];
+            return (dateFilter?.comparisonRange?.[rangeType] ??
+                COMPARISON_RANGE[dateFilter?.defaultComparisonRange ??
+                    'NO_COMPARISON']({
+                    startDate: !range.startDate || range.startDate instanceof Date
+                        ? range.startDate
+                        : new Date(range.startDate), // when range.startDate is a string
+                    endDate: !range.endDate || range.endDate instanceof Date
+                        ? range.endDate
+                        : new Date(range.endDate), // when range.endDate is a string
+                })?.[rangeType]);
+        };
+        const comparisonRangeStart = getComparisonRange(dashboard?.dateFilter, 'startDate');
+        const comparisonRangeEnd = getComparisonRange(dashboard?.dateFilter, 'endDate');
+        const range = dashboard?.dateFilter?.presetRanges?.find((range) => range.value === dashboard?.dateFilter?.primaryRange?.value) ??
+            PRIMARY_RANGE[dashboard?.dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS'] ??
+            PRIMARY_RANGE['LAST_30_DAYS'];
         const dateFilter = dashboard?.dateFilter
             ? {
                 ...dashboard?.dateFilter,
-                startDate: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS'].start,
-                endDate: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS'].end,
+                startDate: !range.startDate || range.startDate instanceof Date
+                    ? range.startDate
+                    : new Date(range.startDate), // when range.startDate is a string
+                endDate: !range.endDate || range.endDate instanceof Date
+                    ? range.endDate
+                    : new Date(range.endDate), // when range.endDate is a string
                 filterType: DashboardFilterType.Date,
                 dateField: [
                     ...new Map(Object.values(dashboard?.sections ?? {})
@@ -107,10 +121,7 @@ export const useDashboard = (dashboardName) => {
             }
             : undefined;
         // Append dateFilter to the filters unless it's undefined
-        loadFiltersForDashboard(dashboardName, [
-            ...(dateFilter ? [dateFilter] : []),
-            ...(dashboard?.filters ?? []),
-        ]);
+        loadFiltersForDashboard(dashboardName, [...(dateFilter ? [dateFilter] : []), ...(dashboard?.filters ?? [])], undefined, customFilters);
     };
     function isDashboardFilterLoading(filterName) {
         if (!dashboardName)
@@ -130,7 +141,7 @@ export const useDashboard = (dashboardName) => {
     };
 };
 export const useDashboards = () => {
-    const { dashboardConfig, dashboardConfigDispatch } = useContext(DashboardConfigContext);
+    const { dashboardConfig, isLoading: isDashboardsLoading, dashboardConfigDispatch, } = useContext(DashboardConfigContext);
     const { loadFiltersForDashboard, dispatch: dashboardFiltersDispatch } = useContext(DashboardFiltersContext);
     const [client, isLoading] = useContext(ClientContext);
     const dashboards = useMemo(() => {
@@ -186,7 +197,7 @@ export const useDashboards = () => {
             console.error(e);
         }
     };
-    const updateDashboard = async (name, { newName, filters, dateFilter, }) => {
+    const updateDashboard = async (name, { newName, filters, dateFilter, customFilters, }) => {
         if (!client)
             return;
         const dashboard = dashboardConfig[name]?.config;
@@ -224,6 +235,9 @@ export const useDashboards = () => {
                     ...updated.data.dashboard,
                 },
             });
+            const range = updated.data.dashboard.presetRanges?.find((range) => range.value === updated.data.dashboard.primaryRange?.value) ??
+                PRIMARY_RANGE[updated.data.dashboard.primaryRange?.value ?? 'LAST_30_DAYS'] ??
+                PRIMARY_RANGE['LAST_30_DAYS'];
             const updatedDateFilter = updated.data.dashboard.dateFilter
                 ? {
                     ...updated.data.dashboard.dateFilter,
@@ -239,16 +253,18 @@ export const useDashboards = () => {
                             return [key, report.dateField];
                         })).values(),
                     ],
-                    startDate: PRIMARY_RANGE[updated.data.dashboard.dateFilter.primaryRange?.value ??
-                        'LAST_30_DAYS'].start,
-                    endDate: PRIMARY_RANGE[updated.data.dashboard.dateFilter.primaryRange?.value ??
-                        'LAST_30_DAYS'].end,
+                    startDate: !range.startDate || range.startDate instanceof Date
+                        ? range.startDate
+                        : new Date(range.startDate), // when range.startDate is a string
+                    endDate: !range.endDate || range.endDate instanceof Date
+                        ? range.endDate
+                        : new Date(range.endDate), // when range.endDate is a string
                 }
                 : undefined;
             loadFiltersForDashboard(updated.data.dashboard.name, [
                 ...(updatedDateFilter ? [updatedDateFilter] : []),
                 ...(updated.data.dashboard.filters ?? []),
-            ]);
+            ], undefined, customFilters);
         }
         catch (e) {
             console.error(e);
@@ -278,8 +294,8 @@ export const useDashboards = () => {
         });
     };
     return {
-        dashboards: isLoading ? null : dashboards,
-        isLoading,
+        dashboards: isLoading || isDashboardsLoading ? null : dashboards,
+        isLoading: isLoading || isDashboardsLoading,
         createDashboard,
         updateDashboard,
         deleteDashboard,

package/dist/esm/hooks/useExport.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="react" />
 import { QuillReport } from '../models/Report';
 export declare const useExport: (reportId?: string, { CustomDocumentComponent, maximumRowsPerPage, sectionField, }?: {
-    CustomDocumentComponent?: ((props: QuillPDFProps) => JSX.Element) | undefined;
-    maximumRowsPerPage?: number | undefined;
-    sectionField?: string | undefined;
+    CustomDocumentComponent?: (props: QuillPDFProps) => JSX.Element;
+    maximumRowsPerPage?: number;
+    sectionField?: string;
 }) => {
     downloadCSV: () => void;
     downloadPDF: () => void;

package/dist/esm/hooks/useExport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":";AASA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAwD/C,eAAO,MAAM,SAAS,cACT,MAAM;uCAOmB,aAAa,KAAK,WAAW;;;;;;;;;;;;;;;CAuMlE,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAyD/C,eAAO,MAAM,SAAS,cACT,MAAM,mEAMd;IACD,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,GAAG,CAAC,OAAO,CAAC;IAChE,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;;;;;;;;;;;;CAoMF,CAAC;AAEF,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}

package/dist/esm/hooks/useExport.js

@@ -11,6 +11,7 @@ import { ChartDisplay } from '../Chart';
 import { fetchReport } from '../utils/report';
 import jsPDF from 'jspdf';
 import { quillFormat } from '../utils/valueFormatter';
+import { mergeComparisonRange } from '../utils/merge';
 async function getExportData(client, dashboardFilters, reportId) {
     const minimalFilters = Object.values(dashboardFilters).length
         ? Object.values(dashboardFilters).map((filter) => {
@@ -58,7 +59,7 @@ sectionField, } = {}) => {
         if (!dashboardName || !dashboardFilters[dashboardName]) {
             return [];
         }
-        // @ts-ignore
+        //FIXME: Pretty sure this won't work with multiple dashboards
         return Object.values(dashboardFilters[dashboardName]).map((dashboardFilter) => {
             return dashboardFilter.filter;
         });
@@ -197,13 +198,16 @@ sectionField, } = {}) => {
 };
 function QuillCustomDocumentComponent({ report }) {
     // const [theme] = useContext(ThemeContext);
+    const chartReport = useMemo(() => {
+        return mergeComparisonRange(report);
+    }, [report]);
     return (_jsxs("div", { style: { display: 'flex', flexDirection: 'column', margin: '2rem' }, children: [_jsx("div", { style: { display: 'flex', flexDirection: 'row', alignItems: 'center' }, children: _jsx("h2", { style: {
                         fontSize: 18,
                         fontWeight: '600',
                         textAlign: 'left',
                         paddingLeft: 10,
                         // color: theme?.primaryTextColor,
-                    }, children: report.name }) }), _jsxs("div", { style: { paddingLeft: 20, paddingRight: 20 }, children: [report.chartType !== 'table' && (_jsx(ChartDisplay, { overrideTheme: defaultQuillTheme, config: report, containerStyle: {
+                    }, children: report.name }) }), _jsxs("div", { style: { paddingLeft: 20, paddingRight: 20 }, children: [report.chartType !== 'table' && (_jsx(ChartDisplay, { overrideTheme: defaultQuillTheme, config: chartReport, containerStyle: {
                             display: 'flex',
                             height: 400,
                         }, loading: false, isAnimationActive: false })), _jsx("div", { style: {

package/dist/esm/hooks/useInternalState.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
-declare const useInternalState: <T>(defaultValueProp: T, valueProp: T) => [T, import("react").Dispatch<import("react").SetStateAction<T>>];
+declare const useInternalState: <T>(defaultValueProp: T, valueProp: T) => [T, React.Dispatch<React.SetStateAction<T>>];
 export default useInternalState;
 //# sourceMappingURL=useInternalState.d.ts.map

package/dist/esm/hooks/useInternalState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useInternalState.d.ts","sourceRoot":"","sources":["../../../src/hooks/useInternalState.tsx"],"names":[],"mappings":";AAEA,QAAA,MAAM,gBAAgB,4GAWrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"useInternalState.d.ts","sourceRoot":"","sources":["../../../src/hooks/useInternalState.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,gBAAgB,GAAI,CAAC,oBAAqB,CAAC,aAAa,CAAC,KAUjC,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CACxE,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/esm/hooks/useOnClickOutside.d.ts

@@ -1,3 +1,5 @@
-declare const useOnClickOutside: (ref: React.RefObject<HTMLDivElement>, handler: (event: any) => void, listening?: boolean) => void;
+declare const useOnClickOutside: (ref: React.RefObject<HTMLDivElement>, handler: {
+    (event: any): void;
+}, listening?: boolean) => void;
 export default useOnClickOutside;
 //# sourceMappingURL=useOnClickOutside.d.ts.map

package/dist/esm/hooks/useOnClickOutside.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOnClickOutside.d.ts","sourceRoot":"","sources":["../../../src/hooks/useOnClickOutside.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,iBAAiB,QAChB,MAAM,SAAS,CAAC,cAAc,CAAC,mBACjB,GAAG,KAAG,IAAI,cACjB,OAAO,SAqBpB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"useOnClickOutside.d.ts","sourceRoot":"","sources":["../../../src/hooks/useOnClickOutside.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,iBAAiB,QAChB,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,WAC3B;IAAE,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAA;CAAE,cACnB,OAAO,SAqBpB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/esm/hooks/useQuill.d.ts

@@ -1,11 +1,5 @@
 import { QuillReport } from '../models/Report';
 import { Calculation } from '../utils/dataProcessing';
-interface Column {
-    _id: string;
-    label: string;
-    field: string;
-    format: string;
-}
 export interface Field {
     name: string;
     tableID: number;
@@ -26,12 +20,4 @@ export declare const useQuill: (reportId?: string, pagination?: {
     setSort: (field: string, direction: string) => void;
     calculate: ((calcType: Calculation) => number | undefined) | (() => undefined);
 };
-export declare const usePivot: (reportId?: string) => {
-    data: {
-        rows: any[];
-        columns: Column[];
-    } | undefined;
-    error: string | undefined;
-};
-export {};
 //# sourceMappingURL=useQuill.d.ts.map

package/dist/esm/hooks/useQuill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAGjC,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,cACR,MAAM,eACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE;UAEtD,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,SAAS;sBACP,MAAM,KAAK,IAAI;qBAChB,MAAM,aAAa,MAAM,KAAK,IAAI;2BAEnC,WAAW,KAAK,MAAM,GAAG,SAAS,WACvC,SAAS;CAmLrB,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;WAC7C,MAAM,GAAG,SAAS;CAoD1B,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAIjC,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,QAAQ,cACR,MAAM,eACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,KAC3D;IACD,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,SAAS,EACL,CAAC,CAAC,QAAQ,EAAE,WAAW,KAAK,MAAM,GAAG,SAAS,CAAC,GAC/C,CAAC,MAAM,SAAS,CAAC,CAAC;CA8LvB,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -1,10 +1,10 @@
 import { useContext, useEffect, useMemo, useState } from 'react';
 import { ClientContext, DashboardContext, DashboardFiltersContext, SchemaDataContext, } from '../Context';
-import { mergeComparisonRange } from '../utils/merge';
 import { convertInternalReportToReport, fetchReport } from '../utils/report';
 import { shouldFetchMore } from '../utils/paginationProcessing';
 import { fetchResultsByReport, } from '../utils/tableProcessing';
 import { getPointToPointPercentageChange, getSimplePercentageChange, getSumOfFields, } from '../utils/dataProcessing';
+import { mergeComparisonRange } from '../utils/merge';
 export const useQuill = (reportId, pagination) => {
     const [dashboard, dispatch] = useContext(DashboardContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
@@ -22,6 +22,11 @@ export const useQuill = (reportId, pagination) => {
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(undefined);
     const [previousPage, setPreviousPage] = useState(0);
+    const processedReport = useMemo(() => {
+        return reportId && dashboard[reportId]
+            ? convertInternalReportToReport(mergeComparisonRange(dashboard[reportId]))
+            : undefined;
+    }, [reportId, reportId && dashboard[reportId]]);
     const [calculate, setCalculate] = useState(() => emptyCalculate);
     function emptyCalculate() {
         return undefined;
@@ -106,12 +111,7 @@ export const useQuill = (reportId, pagination) => {
             return;
         }
         if (dashboard && dashboard[curReportId]) {
-            // @ts-ignore
-            if (dashboard[curReportId].compareRows) {
-                mergeComparisonRange(dashboard[curReportId]);
-            }
-            // @ts-ignore
-            setData(convertInternalReportToReport(dashboard[curReportId]));
+            setData(convertInternalReportToReport(mergeComparisonRange(dashboard[curReportId])));
             setLoading(false);
             return;
         }
@@ -126,7 +126,7 @@ export const useQuill = (reportId, pagination) => {
                 triggerReload: false,
             },
         });
-        setData(convertInternalReportToReport(report));
+        setData(convertInternalReportToReport(mergeComparisonRange(report)));
         setError(error);
         setLoading(false);
     };
@@ -140,49 +140,12 @@ export const useQuill = (reportId, pagination) => {
     useEffect(() => {
         setCalculate(() => calculateFunction);
     }, [data]);
-    return { data, loading, error, fetchMore, setSort, calculate };
-};
-export const usePivot = (reportId) => {
-    const [dashboard] = useContext(DashboardContext);
-    const [data, setData] = useState(undefined);
-    const [error, setError] = useState(undefined);
-    useEffect(() => {
-        if (!reportId ||
-            !dashboard ||
-            // @ts-ignore
-            !dashboard[reportId] ||
-            // @ts-ignore
-            !dashboard[reportId].pivotColumns ||
-            // @ts-ignore
-            !dashboard[reportId].pivotRows) {
-            setError('No data found');
-            return;
-        }
-        setData({
-            // @ts-ignore
-            rows: dashboard[reportId].pivotRows,
-            // @ts-ignore
-            columns: dashboard[reportId].pivotColumns
-                .map((col, index) => {
-                if (index === 0) {
-                    return {
-                        ...col,
-                        format: 'string',
-                    };
-                }
-                return {
-                    ...col,
-                    // @ts-ignore
-                    format: dashboard[reportId].yAxisFields[0].format,
-                };
-            })
-                .filter(
-            // @ts-ignore
-            (col) => 
-            // @ts-ignore
-            dashboard[reportId].chartType !== 'table' ||
-                !col.field.startsWith('comparison_')),
-        });
-    }, [dashboard, reportId]);
-    return { data, error };
+    return {
+        data: processedReport ?? data,
+        loading,
+        error,
+        fetchMore,
+        setSort,
+        calculate,
+    };
 };

package/dist/esm/hooks/useSelectOnKeyDown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSelectOnKeyDown.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSelectOnKeyDown.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,kBAAkB,0BACC,MAAM,KAAK,IAAI,gBACxB,MAAM,EAAE,aACX,OAAO,iCACa,OAAO,KAAK,IAAI,UACvC,MAAM,qCAGV,mBAAmB,CAAC,cAAc,GAAG,iBAAiB,CAAC,KAAK,IAAI,CAqErE,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"useSelectOnKeyDown.d.ts","sourceRoot":"","sources":["../../../src/hooks/useSelectOnKeyDown.tsx"],"names":[],"mappings":"AAEA,QAAA,MAAM,kBAAkB,kBACP,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,gBACxB,MAAM,EAAE,aACX,OAAO,qBACC,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,UACvC,MAAM,KACb,CACD,MAAM,GAAG,IAAI,GAAG,SAAS,EACzB,CAAC,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,GAAG,iBAAiB,CAAC,KAAK,IAAI,CAqErE,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/esm/index.d.ts

@@ -15,7 +15,7 @@ export { default as ChartEditor } from './ChartEditor';
 export type { ChartEditorProps } from './ChartEditor';
 export { quillFormat as format } from './utils/valueFormatter';
 export { useDashboard, useReports, useDashboards } from './hooks/useDashboard';
-export { useQuill, usePivot } from './hooks/useQuill';
+export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
 export { useMemoizedRows } from './hooks/useFormat';
 export { useAskQuill } from './hooks/useAskQuill';
@@ -28,4 +28,5 @@ export type { TableComponentProps } from './components/QuillTable';
 export type { DateRangePickerComponentProps, DateRangePickerOption, DateRange, } from './DateRangePicker/QuillDateRangePicker';
 export type { DashboardSectionComponentProps } from './components/Dashboard/DashboardSection';
 export { Calculation } from './utils/dataProcessing';
+export { StringOperator, NullOperator, DateOperator, NumberOperator, FilterType, } from './models/Filter';
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,MAAM,wCAAwC,CAAC;AAChD,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChF,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,mBAAmB,EACnB,WAAW,GACZ,MAAM,2BAA2B,CAAC;AACnC,YAAY,EACV,0BAA0B,EAC1B,6BAA6B,EAC7B,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,+BAA+B,CAAC;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EACV,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,MAAM,wCAAwC,CAAC;AAChD,YAAY,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,UAAU,GACX,MAAM,iBAAiB,CAAC"}

package/dist/esm/index.js

@@ -8,7 +8,7 @@ export { default as ReportBuilder } from './ReportBuilder';
 export { default as ChartEditor } from './ChartEditor';
 export { quillFormat as format } from './utils/valueFormatter';
 export { useDashboard, useReports, useDashboards } from './hooks/useDashboard';
-export { useQuill, usePivot } from './hooks/useQuill';
+export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
 export { useMemoizedRows } from './hooks/useFormat';
 export { useAskQuill } from './hooks/useAskQuill';
@@ -16,3 +16,4 @@ export { useVirtualTables } from './hooks/useVirtualTables';
 export { downloadCSV } from './utils/csv';
 export { ThemeContext } from './Context';
 export { Calculation } from './utils/dataProcessing';
+export { StringOperator, NullOperator, DateOperator, NumberOperator, FilterType, } from './models/Filter';

package/dist/esm/internals/ReportBuilder/PivotForm.d.ts

@@ -7,6 +7,8 @@ interface PivotFormProps {
     setPivotColumnField: any;
     pivotValueField: any;
     setPivotValueField: any;
+    pivotValueField2: any;
+    setPivotValueField2: any;
     pivotAggregation: any;
     setPivotAggregation: any;
     columns: ColumnInternal[];
@@ -24,7 +26,8 @@ interface PivotFormProps {
         children: ReactNode;
     }) => JSX.Element;
     isLoading?: boolean;
+    pivotHint?: string;
 }
-export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, columns, uniqueValues, uniqueValuesIsLoading, onDelete, SecondaryButtonComponent, SelectComponent, PivotColumnContainer, isLoading, }: PivotFormProps): import("react/jsx-runtime").JSX.Element;
+export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotValueField2, setPivotValueField2, pivotAggregation, setPivotAggregation, columns, uniqueValues, uniqueValuesIsLoading, onDelete, SecondaryButtonComponent, SelectComponent, PivotColumnContainer, isLoading, pivotHint, }: PivotFormProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=PivotForm.d.ts.map

package/dist/esm/internals/ReportBuilder/PivotForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotForm.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotForm.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAuB,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAU,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAM9D,UAAU,cAAc;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,OAAO,EACP,YAAY,EACZ,qBAAqB,EACrB,QAAQ,EACR,wBAA+C,EAC/C,eAA+C,EAC/C,oBAAgD,EAChD,SAAS,GACV,EAAE,cAAc,2CAuHhB"}
+{"version":3,"file":"PivotForm.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotForm.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAmC,MAAM,OAAO,CAAC;AAG1E,OAAO,EAAU,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAO9D,UAAU,cAAc;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,OAAO,EACP,YAAY,EACZ,qBAAqB,EACrB,QAAQ,EACR,wBAA+C,EAC/C,eAA+C,EAC/C,oBAAgD,EAChD,SAAS,EACT,SAAS,GACV,EAAE,cAAc,2CAoKhB"}