@quillsql/react 2.13.47 → 2.13.49

package/dist/esm/hooks/useAskQuill.js

@@ -1,5 +1,5 @@
 import { useContext, useEffect, useState } from 'react';
-import { ClientContext, SchemaDataContext, TenantContext } from '../Context';
+import { ClientContext, FetchContext, SchemaDataContext, TenantContext, } from '../Context';
 import { fetchAndProcessASTFromPrompt } from '../utils/astProcessing';
 import { fetchReportBuilderDataFromAST, } from '../utils/report';
 import { astToFilterTree, filterTreeToAst, } from '../utils/astFilterProcessing';
@@ -36,6 +36,7 @@ export const useAskQuill = (dashboardName) => {
     const [client] = useContext(ClientContext);
     const [schemaData] = useContext(SchemaDataContext);
     const { tenants } = useContext(TenantContext);
+    const { getToken } = useContext(FetchContext);
     const [astInfo, setAstInfo] = useState(undefined);
     const [data, setData] = useState({
         rows: [],
@@ -65,13 +66,13 @@ export const useAskQuill = (dashboardName) => {
         let curFilterTree = null;
         setLoading(true);
         try {
-            setLoading(true);
             astInfo = await fetchAndProcessASTFromPrompt({
                 aiPrompt: query,
                 schema: schemaData.schema,
                 client,
                 dashboardName,
                 tenants,
+                getToken,
             });
             if (astInfo.error) {
                 throw new Error(astInfo.error);
@@ -83,6 +84,7 @@ export const useAskQuill = (dashboardName) => {
                 tenants,
                 pivot: astInfo.pivot,
                 dashboardName,
+                getToken,
             });
             if (!reportBuilderInfo) {
                 throw new Error('Error fetching report');
@@ -132,6 +134,7 @@ export const useAskQuill = (dashboardName) => {
                 tenants,
                 pivot: newPivot,
                 dashboardName,
+                getToken,
             });
             setLoading(false);
             if (!reportBuilderInfo) {
@@ -175,6 +178,7 @@ export const useAskQuill = (dashboardName) => {
                 tenants,
                 pivot: data.pivot || undefined,
                 dashboardName,
+                getToken,
             });
             setLoading(false);
         }

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

@@ -14,6 +14,7 @@ export declare const useDashboard: (dashboardName: string | null, customFilters?
     }, overrideFilters?: {
         filters: DashboardFilter[];
         editedFilterLabel?: string;
+        refetchReports?: boolean;
     }) => Promise<void>;
     setSectionOrder: (sectionOrder: {
         section: string;
@@ -53,13 +54,12 @@ export declare const useDashboards: () => {
         dashboardOwners: string[];
         dateFilter?: DashboardFilter;
     }) => Promise<void>;
-    updateDashboard: (name: string, { newName, filters, dateFilter, customFilters, tenantKeys, sectionOrder, }: {
+    updateDashboard: (name: string, { newName, filters, dateFilter, customFilters, tenantKeys, }: {
         newName: string;
         filters: DashboardFilter[];
         dateFilter?: DashboardFilter;
         customFilters?: InternalFilter[];
         tenantKeys?: string[];
-        sectionOrder: string[];
     }) => 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":"AAQA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EACL,eAAe,EAEf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CAyLc,MAAM;qCAvJ1B,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;oCA2E0C;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAC,EAAE;CAkFtG,CAAC;AAEF,eAAO,MAAM,mBAAmB,mBAAoB,MAAM;;;;yBAK5B,OAAO,CAAC,mBAAmB,CAAC;sBAe/B,mBAAmB;CAmB7C,CAAC;AAEF,eAAO,MAAM,aAAa;;;;CAkBzB,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;;;;;;;;;uEA4BrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BAuDO,MAAM,8EAQT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;QACtB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB;4BAkHkC,MAAM;CA+B5C,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAEL,eAAe,EAGf,cAAc,EAEf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,eAAO,MAAM,YAAY,kBACR,MAAM,GAAG,IAAI,kBACZ,cAAc,EAAE;;;;2CA0Mc,MAAM;qCAtK1B,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;QAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B;oCAmFa;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE;CAwF3E,CAAC;AAEF,eAAO,MAAM,mBAAmB,mBAAoB,MAAM;;;;yBAK5B,OAAO,CAAC,mBAAmB,CAAC;sBAiB/B,mBAAmB;CAoB7C,CAAC;AAEF,eAAO,MAAM,aAAa;;;;CAqBzB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;uEAsCrB;QACD,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,eAAe,CAAC;KAC9B;4BAqDO,MAAM,gEAOT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,UAAU,CAAC,EAAE,eAAe,CAAC;QAC7B,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB;4BAkOkC,MAAM;CAwB5C,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -1,6 +1,6 @@
 import { useContext, useMemo } from 'react';
-import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, ReportsContext, } from '../Context';
-import { PRIMARY_RANGE } from '../DateRangePicker/dateRangePickerUtils';
+import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, FetchContext, ReportFiltersContext, ReportsContext, } from '../Context';
+import { convertPresetOptionsToSelectableList, PRIMARY_RANGE, } from '../DateRangePicker/dateRangePickerUtils';
 import { DashboardFilterType, } from '../models/Filter';
 import { createDefaultDateFilter } from '../utils/filterProcessing';
 export const useDashboard = (dashboardName, customFilters) => {
@@ -10,14 +10,15 @@ export const useDashboard = (dashboardName, customFilters) => {
     //TODO: handle error states
     // const [error, setError] = useState<any>(null);
     const [client, isClientLoading] = useContext(ClientContext);
+    const { quillFetchWithToken } = useContext(FetchContext);
     const loading = useMemo(() => {
-        return !dashboardName ||
+        return (!dashboardName ||
             isClientLoading ||
             isDashboardsLoading ||
             dashboardConfig[dashboardName]?.loading ||
             (dashboardConfig[dashboardName] &&
-                !dashboardConfig[dashboardName]?.config.sections);
-    }, [isClientLoading, dashboardConfig, dashboardName]);
+                !dashboardConfig[dashboardName]?.config.sections));
+    }, [isClientLoading, dashboardConfig, dashboardName, isDashboardsLoading]);
     const populatedDashboardFilters = useMemo(() => {
         return dashboardName && dashboardFilters[dashboardName] !== undefined
             ? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
@@ -48,9 +49,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,20 +60,32 @@ 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?.map((filter) => ({
+                ...filter,
+                query: undefined,
+            })) ?? []),
+        ], undefined, customFilters);
     };
     const setSectionOrder = async (sectionOrder) => {
         if (!client || !dashboardName)
             return;
         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;
-                }).filter((r) => r);
+                acc[section.section] = section.reportOrder
+                    .map((id, index) => {
+                    return dashboard?.[dashboardName]?.[id]
+                        ? { ...dashboard[dashboardName][id], id: id, order: index }
+                        : null;
+                })
+                    .filter((r) => r);
                 return acc;
             }, {});
             dashboardConfigDispatch({
@@ -96,15 +110,11 @@ export const useDashboard = (dashboardName, customFilters) => {
                 sectionOrder,
             };
             try {
-                const response = await fetch(client.queryEndpoint, {
-                    method: 'POST',
-                    headers: {
-                        ...client.queryHeaders,
-                        'Content-Type': 'application/json',
-                    },
-                    body: JSON.stringify({ metadata: body }),
-                    credentials: client.withCredentials ? 'include' : 'omit',
-                }).then((res) => res.json());
+                const response = await quillFetchWithToken({
+                    client,
+                    task: 'set-section-order',
+                    metadata: body,
+                });
                 Object.entries(response?.data?.newIds ?? {}).forEach(([section, newId]) => {
                     dashboardConfigDispatch({
                         type: 'UPDATE_DASHBOARD',
@@ -153,6 +163,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,18 +212,22 @@ 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 { quillFetchWithToken } = useContext(FetchContext);
     const dashboards = useMemo(() => {
-        return Object.values(dashboardConfig).map((dashboard) => {
+        return Object.values(dashboardConfig)
+            .map((dashboard) => {
             return {
                 name: dashboard.config.name,
                 id: dashboard.config.dashboardId,
@@ -220,7 +236,8 @@ 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)
@@ -252,30 +269,28 @@ export const useDashboards = () => {
             tenantKeys: dashboardOwners,
         };
         try {
-            const response = await fetch(client.queryEndpoint, {
-                method: 'POST',
-                headers: {
-                    ...client.queryHeaders,
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ metadata: body }),
-                credentials: client.withCredentials ? 'include' : 'omit',
+            const updated = await quillFetchWithToken({
+                client,
+                task: 'edit-dashboard',
+                metadata: body,
             });
-            const updated = await response.json();
             dashboardConfigDispatch({
                 type: 'UPDATE_DASHBOARD',
                 id: name,
-                data: { config: {
+                data: {
+                    config: {
                         ...updated.data.dashboard,
-                        createdAt: new Date(updated.data.dashboard.createdAt)
-                    }, loading: false },
+                        createdAt: new Date(updated.data.dashboard.createdAt),
+                    },
+                    loading: false,
+                },
             });
         }
         catch (e) {
             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 +301,7 @@ export const useDashboards = () => {
             type: 'DELETE_DASHBOARD',
             id: name,
         });
+        const oldFilters = dashboardFilters[name];
         dashboardFiltersDispatch({
             type: 'DELETE_DASHBOARD_FILTERS',
             dashboardName: name,
@@ -298,19 +314,13 @@ export const useDashboards = () => {
             task: 'edit-dashboard',
             clientId: client.clientId,
             tenantKeys,
-            sectionOrder,
         };
         try {
-            const response = await fetch(client.queryEndpoint, {
-                method: 'POST',
-                headers: {
-                    ...client.queryHeaders,
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ metadata: body }),
-                credentials: client.withCredentials ? 'include' : 'omit',
+            const updated = await quillFetchWithToken({
+                client,
+                task: 'edit-dashboard',
+                metadata: body,
             });
-            const updated = await response.json();
             dashboardConfigDispatch({
                 type: 'UPDATE_DASHBOARD',
                 id: updated.data.dashboard.name,
@@ -318,6 +328,29 @@ export const useDashboards = () => {
                     config: {
                         ...dashboard,
                         ...updated.data.dashboard,
+                        dateFilter: updated.data.dashboard.dateFilter
+                            ? {
+                                ...updated.data.dashboard.dateFilter,
+                                presetOptions: updated.data.dashboard.dateFilter.presetOptions?.map((preset) => ({
+                                    ...preset,
+                                    loopStart: preset.loopStart
+                                        ? new Date(preset.loopStart)
+                                        : undefined,
+                                    loopEnd: preset.loopEnd
+                                        ? new Date(preset.loopEnd)
+                                        : undefined,
+                                })),
+                                defaultPresetRanges: updated.data.dashboard.dateFilter.defaultPresetRanges?.map((preset) => ({
+                                    ...preset,
+                                    loopStart: preset.loopStart
+                                        ? new Date(preset.loopStart)
+                                        : undefined,
+                                    loopEnd: preset.loopEnd
+                                        ? new Date(preset.loopEnd)
+                                        : undefined,
+                                })),
+                            }
+                            : undefined,
                         createdAt: new Date(updated.data.dashboard.createdAt),
                     },
                     loading: false,
@@ -328,20 +361,60 @@ 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,
+                });
             });
-            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'] ??
+            if (dashboardFilters[name])
+                dashboardFiltersDispatch({
+                    type: 'ADD_DASHBOARD_FILTERS',
+                    dashboardName: newName,
+                    data: dashboardFilters[name],
+                });
+            const range = convertPresetOptionsToSelectableList(updated.data.dashboard.dateFilter?.presetOptions ?? [], updated.data.dashboard.dateFilter?.defaultPresetRanges ?? []).find((option) => option.value ===
+                updated.data.dashboard.dateFilter?.primaryRange?.value) ??
+                PRIMARY_RANGE[updated.data.dashboard.dateFilter?.primaryRange?.value ??
+                    'LAST_30_DAYS'] ??
                 PRIMARY_RANGE['LAST_30_DAYS'];
             const updatedDateFilter = updated.data.dashboard.dateFilter
                 ? {
                     ...updated.data.dashboard.dateFilter,
+                    presetOptions: updated.data.dashboard.dateFilter.presetOptions?.map((preset) => ({
+                        ...preset,
+                        loopStart: preset.loopStart
+                            ? new Date(preset.loopStart)
+                            : undefined,
+                        loopEnd: preset.loopEnd ? new Date(preset.loopEnd) : undefined,
+                    })),
+                    defaultPresetRanges: updated.data.dashboard.dateFilter.defaultPresetRanges?.map((preset) => ({
+                        ...preset,
+                        loopStart: preset.loopStart
+                            ? new Date(preset.loopStart)
+                            : undefined,
+                        loopEnd: preset.loopEnd
+                            ? new Date(preset.loopEnd)
+                            : undefined,
+                    })),
                     dashboardName: updated.data.dashboard.name,
                     preset: updated.data.dashboard.dateFilter.primaryRange,
                     filterType: DashboardFilterType.Date,
@@ -362,10 +435,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);
@@ -374,21 +472,14 @@ export const useDashboards = () => {
     const deleteDashboard = async (name) => {
         if (!client)
             return;
-        await fetch(client.queryEndpoint, {
-            method: 'POST',
-            headers: {
-                ...client.queryHeaders,
-                'Content-Type': 'application/json',
+        await quillFetchWithToken({
+            client,
+            task: 'delete-dashboard',
+            metadata: {
+                clientId: client.clientId,
+                databaseType: client.databaseType,
+                name,
             },
-            body: JSON.stringify({
-                metadata: {
-                    task: 'delete-dashboard',
-                    clientId: client.clientId,
-                    databaseType: client.databaseType,
-                    name,
-                },
-            }),
-            credentials: client.withCredentials ? 'include' : 'omit',
         });
         dashboardConfigDispatch({
             type: 'DELETE_DASHBOARD',

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":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAiE/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;CAiRvB,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

@@ -1,48 +1,49 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { downloadCSV } from '../utils/csv';
 import { useContext, useMemo, useState } from 'react';
-import { getData } from '../utils/dataFetcher';
-import { ClientContext, DashboardFiltersContext, ReportFiltersContext, ReportsContext, SchemaDataContext, TenantContext, } from '../Context';
+import { parseFetchResponse, quillFetch } from '../utils/dataFetcher';
+import { ClientContext, DashboardFiltersContext, FetchContext, ReportFiltersContext, ReportsContext, SchemaDataContext, TenantContext, } from '../Context';
 import { cleanDashboardItem } from '../utils/dashboard';
 import { createRoot } from 'react-dom/client';
 import { flushSync } from 'react-dom';
 import { fetchReport } from '../utils/report';
 import jsPDF from 'jspdf';
 import { quillFormat } from '../utils/valueFormatter';
-async function getExportData(client, dashboardFilters, reportId, tenants, flags, customFields) {
+import { useAllReports } from './useDashboard';
+async function getExportData(client, dashboardFilters, reportId, getToken, tenants, flags, customFields) {
     const minimalFilters = Object.values(dashboardFilters).length
         ? Object.values(dashboardFilters).map((filter) => {
             const newFilter = { ...filter };
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
                 delete newFilter['selectedValue'];
+                delete newFilter['presetOptions'];
             }
             delete newFilter['options'];
             return newFilter;
         })
         : [];
-    const hostedBody = {
+    const fetchResp = await quillFetch({
+        client,
+        task: 'item',
         metadata: {
             dashboardItemId: reportId,
             clientId: client.publicKey,
-            task: 'item',
             databaseType: client?.databaseType,
             filters: minimalFilters,
             useNewNodeSql: true,
             tenants,
             flags,
         },
-    };
-    const cloudBody = {
-        id: reportId,
-        useNewNodeSql: true,
-    };
-    const resp = await getData(client, 'itempost', 'same-origin', hostedBody, cloudBody);
+        getToken,
+    });
+    const resp = await parseFetchResponse(client, 'item', fetchResp, getToken);
     const cleanedReport = await cleanDashboardItem({
         item: resp,
         dashboardFilters,
         client,
         customFields,
+        getToken,
     });
     if (cleanedReport.chartType === 'table' && cleanedReport.pivot) {
         cleanedReport.columns = cleanedReport.yAxisFields;
@@ -52,11 +53,14 @@ 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 { getToken } = useContext(FetchContext);
     const specificDashboardFilters = useMemo(() => {
         if (!reportId) {
             return [];
@@ -93,8 +97,12 @@ 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, getToken, tenants, flags, schemaData?.customFields);
             downloadCSV({
                 rows: resp.pivot && resp.pivotRows ? resp.pivotRows : resp.rows,
                 fields: resp.pivot && resp.pivotColumns ? resp.pivotColumns : resp.columns,
@@ -107,15 +115,21 @@ sectionField, } = {}) => {
             const filters = specificReportFilters.length > 0
                 ? specificReportFilters
                 : specificDashboardFilters;
-            const { report: fetchedReport } = await fetchReport({
+            const { report: fetchedReport, error } = await fetchReport({
                 reportId,
                 client,
                 tenants,
                 flags,
                 useReportTask: true,
-                filters,
+                filters: filters.concat((customReportFilters[reportId] ??
+                    dashboardCustomFilters[dashboardReport?.dashboardName ?? ''])),
                 customFields: schemaData?.customFields,
+                getToken,
             });
+            if (error) {
+                console.error(error);
+                return;
+            }
             const report = fetchedReport;
             if (report.pivot && report.pivotRows && report.pivotColumns) {
                 report.rows = report.pivotRows;

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,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,WAC3B;IAAE,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAA;CAAE,cACnB,OAAO,SAqBpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAAa,WAAW,KAAG,MAoBzD,CAAC;AAmBF,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,eAAO,MAAM,kBAAkB,YAAa,WAAW,KAAG,MAoBzD,CAAC;AAqBF,eAAe,iBAAiB,CAAC"}

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":"AAiBA,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"}