@quillsql/react 2.13.46 → 2.13.48

package/dist/esm/hooks/useDashboard.js

@@ -1,5 +1,5 @@
 import { useContext, useMemo } from 'react';
-import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, ReportsContext, } from '../Context';
+import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, ReportFiltersContext, ReportsContext, } from '../Context';
 import { PRIMARY_RANGE } from '../DateRangePicker/dateRangePickerUtils';
 import { DashboardFilterType, } from '../models/Filter';
 import { createDefaultDateFilter } from '../utils/filterProcessing';
@@ -48,9 +48,10 @@ export const useDashboard = (dashboardName, customFilters) => {
                     : []),
                 ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
             ], overrideFilters.editedFilterLabel, customFilters);
-            return;
+            if (!overrideFilters.refetchReports)
+                return;
         }
-        const dashboard = await loadDashboard(overrideDashboardName ?? dashboardName, fetchFromServer, reportAction);
+        const updatedDashboard = await loadDashboard(overrideDashboardName ?? dashboardName, fetchFromServer, reportAction);
         if (!fetchFromServer &&
             Object.keys(dashboardFilters[dashboardName] ?? {}).length &&
             // there exists no non date filter that has undefined options
@@ -58,11 +59,13 @@ export const useDashboard = (dashboardName, customFilters) => {
                 filter.filter.options)) {
             return;
         }
-        const dateFilter = dashboard?.dateFilter
-            ? createDefaultDateFilter(dashboard?.dateFilter, Object.values(dashboard?.sections ?? {}).flat(), dashboardName)
+        if (overrideFilters)
+            return;
+        const dateFilter = updatedDashboard?.dateFilter
+            ? createDefaultDateFilter(updatedDashboard.dateFilter, Object.values(dashboard?.sections ?? {}).flat(), dashboardName)
             : undefined;
         // Append dateFilter to the filters unless it's undefined
-        loadFiltersForDashboard(dashboardName, [...(dateFilter ? [dateFilter] : []), ...(dashboard?.filters ?? [])], undefined, customFilters);
+        loadFiltersForDashboard(dashboardName, [...(dateFilter ? [dateFilter] : []), ...(updatedDashboard?.filters ?? [])], undefined, customFilters);
     };
     const setSectionOrder = async (sectionOrder) => {
         if (!client || !dashboardName)
@@ -70,7 +73,7 @@ export const useDashboard = (dashboardName, customFilters) => {
         if (dashboardConfig[dashboardName]) {
             const newSections = sectionOrder.reduce((acc, section) => {
                 acc[section.section] = section.reportOrder.map((id, index) => {
-                    return dashboard?.[dashboardName]?.[id] ? { ...dashboard[dashboardName][id], order: index } : null;
+                    return dashboard?.[dashboardName]?.[id] ? { ...dashboard[dashboardName][id], id: id, order: index } : null;
                 }).filter((r) => r);
                 return acc;
             }, {});
@@ -153,6 +156,8 @@ export const useDashboardReports = (dashboardName) => {
     const updateReport = (data) => {
         if (!dashboardName)
             throw new Error('No dashboard name provided for updateReport');
+        if (!data.id)
+            throw new Error('No report id provided for updateReport');
         dispatch({
             type: 'UPDATE_DASHBOARD_ITEM',
             id: data.id,
@@ -200,15 +205,17 @@ export const useAllReports = () => {
             reportMap[report.id] = report;
         });
         return reportMap;
-    }, [reports]);
+    }, [reports, dashboard]);
     return {
         allReportsById,
     };
 };
 export const useDashboards = () => {
-    const [, dashboardDispatch] = useContext(DashboardContext);
+    const [dashboardReports, dashboardDispatch] = useContext(DashboardContext);
     const { dashboardConfig, isLoading: isDashboardsLoading, dashboardConfigDispatch, } = useContext(DashboardConfigContext);
-    const { loadFiltersForDashboard, dispatch: dashboardFiltersDispatch } = useContext(DashboardFiltersContext);
+    const { dashboardFilters, loadFiltersForDashboard, dispatch: dashboardFiltersDispatch } = useContext(DashboardFiltersContext);
+    const { reportsDispatch } = useContext(ReportsContext);
+    const { reportFiltersDispatch } = useContext(ReportFiltersContext);
     const [client, isLoading] = useContext(ClientContext);
     const dashboards = useMemo(() => {
         return Object.values(dashboardConfig).map((dashboard) => {
@@ -220,7 +227,7 @@ export const useDashboards = () => {
                 createdAt: dashboard.config.createdAt,
                 sectionOrder: dashboard.config.sectionOrder,
             };
-        });
+        }).sort((a, b) => (a.createdAt?.getTime() ?? 0) - (b.createdAt?.getTime() ?? 0));
     }, [dashboardConfig]);
     const createDashboard = async ({ name, filters, dateFilter, dashboardOwners, }) => {
         if (!client)
@@ -275,7 +282,7 @@ export const useDashboards = () => {
             console.error(e);
         }
     };
-    const updateDashboard = async (name, { newName, filters, dateFilter, customFilters, tenantKeys, sectionOrder, }) => {
+    const updateDashboard = async (name, { newName, filters, dateFilter, customFilters, tenantKeys, }) => {
         if (!client)
             return;
         if (tenantKeys?.some((key) => !key)) {
@@ -286,6 +293,7 @@ export const useDashboards = () => {
             type: 'DELETE_DASHBOARD',
             id: name,
         });
+        const oldFilters = dashboardFilters[name];
         dashboardFiltersDispatch({
             type: 'DELETE_DASHBOARD_FILTERS',
             dashboardName: name,
@@ -298,10 +306,9 @@ export const useDashboards = () => {
             task: 'edit-dashboard',
             clientId: client.clientId,
             tenantKeys,
-            sectionOrder,
         };
         try {
-            const response = await fetch(client.queryEndpoint, {
+            const updated = await fetch(client.queryEndpoint, {
                 method: 'POST',
                 headers: {
                     ...client.queryHeaders,
@@ -309,8 +316,7 @@ export const useDashboards = () => {
                 },
                 body: JSON.stringify({ metadata: body }),
                 credentials: client.withCredentials ? 'include' : 'omit',
-            });
-            const updated = await response.json();
+            }).then((res) => res.json());
             dashboardConfigDispatch({
                 type: 'UPDATE_DASHBOARD',
                 id: updated.data.dashboard.name,
@@ -328,14 +334,36 @@ export const useDashboards = () => {
                 .flat()
                 .forEach((report) => {
                 dashboardDispatch({
-                    type: 'UPDATE_DASHBOARD_ITEM',
+                    type: 'ADD_DASHBOARD_ITEM',
                     id: report._id,
-                    dashboard: name,
+                    dashboard: newName,
                     data: {
+                        ...dashboardReports[report._id],
+                        id: report._id,
                         filterMap: report.filterMap,
-                    },
+                        dashboardName: newName,
+                        rows: undefined,
+                    }
+                });
+                dashboardDispatch({
+                    type: 'REMOVE_DASHBOARD_ITEM',
+                    id: report._id,
+                });
+                reportsDispatch({
+                    type: 'DELETE_REPORT',
+                    id: report._id
+                });
+                reportFiltersDispatch({
+                    type: 'CLEAR_REPORT_FILTERS',
+                    id: report._id,
                 });
             });
+            if (dashboardFilters[name])
+                dashboardFiltersDispatch({
+                    type: 'ADD_DASHBOARD_FILTERS',
+                    dashboardName: newName,
+                    data: dashboardFilters[name],
+                });
             const range = updated.data.dashboard.dateFilter?.presetRanges?.find((range) => range.value === updated.data.dashboard.dateFilter?.primaryRange?.value) ??
                 PRIMARY_RANGE[updated.data.dashboard.dateFilter?.primaryRange?.value ?? 'LAST_30_DAYS'] ??
                 PRIMARY_RANGE['LAST_30_DAYS'];
@@ -362,10 +390,35 @@ export const useDashboards = () => {
                         : new Date(range.endDate), // when range.endDate is a string
                 }
                 : undefined;
-            loadFiltersForDashboard(updated.data.dashboard.name, [
+            const newFilters = [
                 ...(updatedDateFilter ? [updatedDateFilter] : []),
-                ...(updated.data.dashboard.filters ?? []),
-            ], undefined, customFilters);
+                ...(updated.data.dashboard.filters.map((f) => ({
+                    ...f,
+                    selectedValue: oldFilters?.[f.label]?.filter?.selectedValue,
+                    values: oldFilters?.[f.label]?.filter?.values,
+                    operator: oldFilters?.[f.label]?.filter?.operator,
+                })) ?? []),
+            ].map((f) => {
+                if (f.filterType === DashboardFilterType.Date) {
+                    return {
+                        ...f,
+                        startDate: dashboardFilters[name]?.[f.label]?.filter?.startDate,
+                        endDate: dashboardFilters[name]?.[f.label]?.filter?.endDate,
+                        preset: dashboardFilters[name]?.[f.label]?.filter?.preset,
+                    };
+                }
+                else {
+                    return {
+                        ...f,
+                        selectedValue: dashboardFilters[name]?.[f.label]?.filter?.selectedValue,
+                    };
+                }
+            });
+            dashboardFiltersDispatch({
+                type: 'DELETE_DASHBOARD_FILTERS',
+                dashboardName: name,
+            });
+            loadFiltersForDashboard(updated.data.dashboard.name, newFilters, undefined, customFilters);
         }
         catch (e) {
             console.error(e);

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

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAoE/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,KACA;IACD,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;CAwPvB,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":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsE/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,KACA;IACD,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,YAAY,EAAE,OAAO,CAAC;CA8PvB,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

@@ -9,6 +9,7 @@ import { flushSync } from 'react-dom';
 import { fetchReport } from '../utils/report';
 import jsPDF from 'jspdf';
 import { quillFormat } from '../utils/valueFormatter';
+import { useAllReports } from './useDashboard';
 async function getExportData(client, dashboardFilters, reportId, tenants, flags, customFields) {
     const minimalFilters = Object.values(dashboardFilters).length
         ? Object.values(dashboardFilters).map((filter) => {
@@ -16,6 +17,7 @@ async function getExportData(client, dashboardFilters, reportId, tenants, flags,
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
                 delete newFilter['selectedValue'];
+                delete newFilter['presetOptions'];
             }
             delete newFilter['options'];
             return newFilter;
@@ -52,9 +54,11 @@ async function getExportData(client, dashboardFilters, reportId, tenants, flags,
 export const useExport = (reportId, { CustomDocumentComponent = QuillCustomDocumentComponent, maximumRowsPerPage = 20, 
 // if sectionKeyField is passed, then we will group by that field
 sectionField, } = {}) => {
-    const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const { dashboardFilters, dashboardCustomFilters } = useContext(DashboardFiltersContext);
     const { reports } = useContext(ReportsContext);
-    const { reportFilters } = useContext(ReportFiltersContext);
+    const { reportFilters, customReportFilters } = useContext(ReportFiltersContext);
+    const { allReportsById } = useAllReports();
+    const dashboardReport = allReportsById[reportId ?? ''];
     const [schemaData] = useContext(SchemaDataContext);
     const { tenants, flags } = useContext(TenantContext);
     const specificDashboardFilters = useMemo(() => {
@@ -93,8 +97,8 @@ sectionField, } = {}) => {
             }
             setIsCSVLoading(true);
             const resp = await getExportData(client, specificReportFilters.length > 0
-                ? specificReportFilters
-                : specificDashboardFilters, reportId, tenants, flags, schemaData?.customFields);
+                ? specificReportFilters.concat(customReportFilters[reportId] ?? dashboardCustomFilters[dashboardReport?.dashboardName ?? ''] ?? [])
+                : specificDashboardFilters.concat(customReportFilters[reportId] ?? dashboardCustomFilters[dashboardReport?.dashboardName ?? ''] ?? []), reportId, tenants, flags, schemaData?.customFields);
             downloadCSV({
                 rows: resp.pivot && resp.pivotRows ? resp.pivotRows : resp.rows,
                 fields: resp.pivot && resp.pivotColumns ? resp.pivotColumns : resp.columns,
@@ -113,7 +117,7 @@ sectionField, } = {}) => {
                 tenants,
                 flags,
                 useReportTask: true,
-                filters,
+                filters: filters.concat((customReportFilters[reportId] ?? dashboardCustomFilters[dashboardReport?.dashboardName ?? ''])),
                 customFields: schemaData?.customFields,
             });
             const report = fetchedReport;

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

@@ -19,5 +19,6 @@ export declare const useQuill: (reportId?: string, pagination?: {
     fetchMore: (page: number) => void;
     setSort: (field: string, direction: string) => void;
     calculate: ((calcType: Calculation) => number | undefined) | (() => undefined);
+    resetFilters: () => void;
 };
 //# 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":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAKjC,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;CAwNvB,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAKjC,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;IACtB,YAAY,EAAE,MAAM,IAAI,CAAC;CAqO1B,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -9,8 +9,11 @@ import { useAllReports } from './useDashboard';
 export const useQuill = (reportId, pagination) => {
     const { reports, reportsDispatch, fetchIndividualReport } = useContext(ReportsContext);
     const { allReportsById } = useAllReports();
-    const { dashboardFilters } = useContext(DashboardFiltersContext);
-    const { reportFilters, reportFiltersDispatch } = useContext(ReportFiltersContext);
+    const dashboardReport = useMemo(() => {
+        return allReportsById[reportId ?? ''];
+    }, [allReportsById[reportId ?? '']]);
+    const { dashboardFilters, dashboardCustomFilters } = useContext(DashboardFiltersContext);
+    const { reportFilters, customReportFilters, reportFiltersDispatch } = useContext(ReportFiltersContext);
     const specificReportFilters = useMemo(() => {
         if (!reportId)
             return null;
@@ -146,7 +149,7 @@ export const useQuill = (reportId, pagination) => {
                 initiator: 'useQuill',
                 fetchRows: true,
                 dashboardFilters: specificReportFilters || [],
-                customFilters: [],
+                customFilters: customReportFilters[curReportId] ?? dashboardCustomFilters[dashboardReport?.dashboardName ?? ''] ?? [],
                 additionalProcessing,
                 customFields: schemaData.customFields,
             });
@@ -184,6 +187,14 @@ export const useQuill = (reportId, pagination) => {
             });
         }
     }, [isClientLoading, reportId, specificReportFilters]);
+    const resetFilters = () => {
+        if (reportId) {
+            reportFiltersDispatch({
+                type: 'CLEAR_REPORT_FILTERS',
+                id: reportId,
+            });
+        }
+    };
     return {
         data: processedReport ?? null,
         loading: !reportId ||
@@ -193,5 +204,6 @@ export const useQuill = (reportId, pagination) => {
         fetchMore,
         setSort,
         calculate: calculateFunction,
+        resetFilters,
     };
 };

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

@@ -1,5 +1,5 @@
 import { QuillReportInternal } from '../models/Report';
-import { DashboardFilter, Filter } from '../models/Filter';
+import { DashboardFilter, InternalFilter } from '../models/Filter';
 export declare const useReports: () => {
     reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
 };
@@ -7,6 +7,6 @@ export declare const useReport: (reportId: string) => {
     reload: (overrideFilters: {
         filters: DashboardFilter[];
         editedFilterLabel?: string;
-    }, customFilters?: Filter[], initiator?: "Chart" | "useQuill" | "useExport") => Promise<void>;
+    }, customFilters?: InternalFilter[], initiator?: "Chart" | "useQuill" | "useExport") => Promise<void>;
 };
 //# sourceMappingURL=useReport.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useReport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useReport.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAuB,eAAe,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAGhF,eAAO,MAAM,UAAU;uCAIR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAmBtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,MAAM,EAAE,cACZ,OAAO,GAAG,UAAU,GAAG,WAAW;CA4BhD,CAAC"}
+{"version":3,"file":"useReport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useReport.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGnE,eAAO,MAAM,UAAU;uCAIR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAmBtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,cAAc,EAAE,cACpB,OAAO,GAAG,UAAU,GAAG,WAAW;CA4BhD,CAAC"}

package/dist/esm/hooks/useReport.js

@@ -1,12 +1,11 @@
 import { useContext } from 'react';
 import { DashboardContext, ReportFiltersContext, } from '../Context';
-import { convertCustomFilter } from '../models/Filter';
 import { useAllReports } from './useDashboard';
 export const useReports = () => {
     const [dashboard, dispatch] = useContext(DashboardContext);
     const reloadFilteredReports = (predicate) => {
-        for (const dashboardName in Object.keys(dashboard)) {
-            for (const id in Object.keys(dashboard[dashboardName])) {
+        for (const dashboardName of Object.keys(dashboard)) {
+            for (const id of Object.keys(dashboard[dashboardName])) {
                 if (predicate(dashboard[dashboardName][id])) {
                     dispatch({
                         type: 'UPDATE_DASHBOARD_ITEM',
@@ -40,7 +39,7 @@ export const useReport = (reportId) => {
                 ]
                 : []),
             ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
-        ], overrideFilters.editedFilterLabel, customFilters.map(convertCustomFilter));
+        ], overrideFilters.editedFilterLabel, customFilters);
     };
     return { reload };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAqDtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;;;GAyCA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAoDtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;CAClB;;;GAyCA"}

package/dist/esm/utils/client.js

@@ -42,7 +42,6 @@ export async function fetchClient(publicKey, queryEndpoint, withCredentials = fa
         console.error('ERROR:', error);
         throw error;
     }
-    console.log('RESULT: ', result);
     return {
         ...result,
         allTenantTypes: result?.allTenantTypes?.map((tenant) => ({

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

@@ -1,5 +1,6 @@
 import { Pagination } from '../models/Pagination';
 export declare const DEFAULT_PAGINATION: Pagination;
+export declare const DEFAULT_TABLE_PAGINATION: Pagination;
 export declare function shouldFetchMore(pagination: Pagination, page: number, maxPage: number, currentRowCount?: number): boolean;
 export declare function shouldSortInMemory(pagination: Pagination, rowCount?: number): boolean;
 //# sourceMappingURL=paginationProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"paginationProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/paginationProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,MAAM,WAkBzB;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK3E"}
+{"version":3,"file":"paginationProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/paginationProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,UAItC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,MAAM,WAkBzB;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK3E"}

package/dist/esm/utils/paginationProcessing.js

@@ -3,6 +3,11 @@ export const DEFAULT_PAGINATION = {
     rowsPerPage: 10,
     rowsPerRequest: 600,
 };
+export const DEFAULT_TABLE_PAGINATION = {
+    page: 0,
+    rowsPerPage: 10,
+    rowsPerRequest: 50,
+};
 export function shouldFetchMore(pagination, page, maxPage, currentRowCount) {
     if (!pagination ||
         (currentRowCount && currentRowCount >= pagination.rowsPerPage * (page + 1))) {

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,EACvB,MAAM,GACP,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CAyWrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,EACvB,MAAM,GACP,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CA2WrB;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,sBAYnD"}

package/dist/esm/utils/pivotConstructor.js

@@ -146,7 +146,9 @@ export async function generatePivotWithSQL({ pivot, report, client, dateBucket,
         label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
         format: field.name === pivot.rowField
             ? 'string'
-            : pivot.aggregations?.[index]?.aggregationType === 'percentage'
+            // This scary equation is calculating which aggregation a column is associated with. 
+            // Eg you have 7 columns and 2 aggregations, you can assume column 0 is the row field, 1-3 is aggregation 0, and 4-6 is aggregation 1.
+            : pivot.aggregations?.[Math.floor((index - 1) / Math.floor((responseFields.length - 1) / (pivot.aggregations?.length ?? 1)))]?.aggregationType === 'percentage'
                 ? 'percent'
                 : 'whole_number',
         fieldType: field.fieldType,

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAoB1B,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,sBAAsB,+EAQhC;IACD,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,CAAC;IACd,YAAY,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,CAAC;IACjD,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,aAAa,EAAE,MAAM,CAAC;CACvB,KAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CA0BtC,CAAC;AAEF,eAAO,MAAM,6BAA6B,sGASvC;IACD,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB,KAAG,OAAO,CAAC,oBAAoB,CA+C/B,CAAC;AAEF,eAAO,MAAM,4BAA4B,2GAStC;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,CAAC;IAClD,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,KAAG,OAAO,CAAC,mBAAmB,CA4B9B,CAAC;AAEF,eAAO,MAAM,wBAAwB,mIAWlC;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB,KAAG,OAAO,CAAC;IACV,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,kBAAkB,CAAC,EAAE,oBAAoB,CAAC;IAC1C,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAoDA,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,gBACC;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,kBAChC,MAAM,KACrB,OAAO,CAAC;IACT,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACvC,CAsDA,CAAC;AAmFF,eAAO,MAAM,0BAA0B,YAC5B,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,gBACC;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;CAAE,kBAChC,MAAM,KACrB,OAAO,CAAC;IACT,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,SAAS,EAAE;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE,CAAA;KAAE,CAAC;CAC7D,GAAG,IAAI,CAkBP,CAAC;AA4DF,eAAO,MAAM,gBAAgB,WACnB,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,UACL,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,kBACF,MAAM,KACrB,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAsBA,CAAC;AAIF,eAAO,MAAM,mBAAmB,0KAe7B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,CAAC;IACd,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACpD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,KAAG,OAAO,CAAC;IACV,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B,CAqIA,CAAC;AAEF,eAAO,MAAM,oBAAoB,sKAc9B;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EACH;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,CAAC;IACd,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,KAAG,OAAO,CAAC;IACV,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CA+FA,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,aAAa,CAAC,MAAM,UACjB,mBAAmB,WAEvB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACnB,SAAS,eACA,oBAAoB,iBAClB,GAAG,aACP,OAAO,iBACH,OAAO,kBACN,MAAM,KACrB,OAAO,CAAC;IACT,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B,CAuEA,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/tableProcessing.js

@@ -447,6 +447,7 @@ export const fetchResultsByReport = async ({ reportId, client, tenants, processi
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
                 delete newFilter['selectedValue'];
+                delete newFilter['presetOptions'];
             }
             delete newFilter['options'];
             return newFilter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.13.46",
+  "version": "2.13.48",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",