@quillsql/react 2.13.47 → 2.13.49

package/dist/cjs/hooks/useDashboard.js

@@ -13,14 +13,15 @@ const useDashboard = (dashboardName, customFilters) => {
     //TODO: handle error states
     // const [error, setError] = useState<any>(null);
     const [client, isClientLoading] = (0, react_1.useContext)(Context_1.ClientContext);
+    const { quillFetchWithToken } = (0, react_1.useContext)(Context_1.FetchContext);
     const loading = (0, react_1.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 = (0, react_1.useMemo)(() => {
         return dashboardName && dashboardFilters[dashboardName] !== undefined
             ? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
@@ -51,9 +52,10 @@ 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
@@ -61,20 +63,32 @@ const useDashboard = (dashboardName, customFilters) => {
                 filter.filter.options)) {
             return;
         }
-        const dateFilter = dashboard?.dateFilter
-            ? (0, filterProcessing_1.createDefaultDateFilter)(dashboard?.dateFilter, Object.values(dashboard?.sections ?? {}).flat(), dashboardName)
+        if (overrideFilters)
+            return;
+        const dateFilter = updatedDashboard?.dateFilter
+            ? (0, filterProcessing_1.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({
@@ -99,15 +113,11 @@ 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',
@@ -157,6 +167,8 @@ 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,
@@ -205,19 +217,23 @@ const useAllReports = () => {
             reportMap[report.id] = report;
         });
         return reportMap;
-    }, [reports]);
+    }, [reports, dashboard]);
     return {
         allReportsById,
     };
 };
 exports.useAllReports = useAllReports;
 const useDashboards = () => {
-    const [, dashboardDispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
+    const [dashboardReports, dashboardDispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
     const { dashboardConfig, isLoading: isDashboardsLoading, dashboardConfigDispatch, } = (0, react_1.useContext)(Context_1.DashboardConfigContext);
-    const { loadFiltersForDashboard, dispatch: dashboardFiltersDispatch } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
+    const { dashboardFilters, loadFiltersForDashboard, dispatch: dashboardFiltersDispatch, } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
+    const { reportsDispatch } = (0, react_1.useContext)(Context_1.ReportsContext);
+    const { reportFiltersDispatch } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const [client, isLoading] = (0, react_1.useContext)(Context_1.ClientContext);
+    const { quillFetchWithToken } = (0, react_1.useContext)(Context_1.FetchContext);
     const dashboards = (0, react_1.useMemo)(() => {
-        return Object.values(dashboardConfig).map((dashboard) => {
+        return Object.values(dashboardConfig)
+            .map((dashboard) => {
             return {
                 name: dashboard.config.name,
                 id: dashboard.config.dashboardId,
@@ -226,7 +242,8 @@ 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)
@@ -258,30 +275,28 @@ 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)) {
@@ -292,6 +307,7 @@ const useDashboards = () => {
             type: 'DELETE_DASHBOARD',
             id: name,
         });
+        const oldFilters = dashboardFilters[name];
         dashboardFiltersDispatch({
             type: 'DELETE_DASHBOARD_FILTERS',
             dashboardName: name,
@@ -304,19 +320,13 @@ 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,
@@ -324,6 +334,29 @@ 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,
@@ -334,20 +367,60 @@ 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) ??
-                dateRangePickerUtils_1.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 = (0, dateRangePickerUtils_1.convertPresetOptionsToSelectableList)(updated.data.dashboard.dateFilter?.presetOptions ?? [], updated.data.dashboard.dateFilter?.defaultPresetRanges ?? []).find((option) => option.value ===
+                updated.data.dashboard.dateFilter?.primaryRange?.value) ??
+                dateRangePickerUtils_1.PRIMARY_RANGE[updated.data.dashboard.dateFilter?.primaryRange?.value ??
+                    'LAST_30_DAYS'] ??
                 dateRangePickerUtils_1.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: Filter_1.DashboardFilterType.Date,
@@ -368,10 +441,35 @@ 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 === Filter_1.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);
@@ -380,21 +478,14 @@ 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/cjs/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/cjs/hooks/useExport.js

@@ -15,40 +15,41 @@ const react_dom_1 = require("react-dom");
 const report_1 = require("../utils/report");
 const jspdf_1 = __importDefault(require("jspdf"));
 const valueFormatter_1 = require("../utils/valueFormatter");
-async function getExportData(client, dashboardFilters, reportId, tenants, flags, customFields) {
+const useDashboard_1 = require("./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 (0, dataFetcher_1.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 (0, dataFetcher_1.getData)(client, 'itempost', 'same-origin', hostedBody, cloudBody);
+        getToken,
+    });
+    const resp = await (0, dataFetcher_1.parseFetchResponse)(client, 'item', fetchResp, getToken);
     const cleanedReport = await (0, dashboard_1.cleanDashboardItem)({
         item: resp,
         dashboardFilters,
         client,
         customFields,
+        getToken,
     });
     if (cleanedReport.chartType === 'table' && cleanedReport.pivot) {
         cleanedReport.columns = cleanedReport.yAxisFields;
@@ -58,11 +59,14 @@ async function getExportData(client, dashboardFilters, reportId, tenants, flags,
 const useExport = (reportId, { CustomDocumentComponent = QuillCustomDocumentComponent, maximumRowsPerPage = 20, 
 // if sectionKeyField is passed, then we will group by that field
 sectionField, } = {}) => {
-    const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
+    const { dashboardFilters, dashboardCustomFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const { reports } = (0, react_1.useContext)(Context_1.ReportsContext);
-    const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
+    const { reportFilters, customReportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
+    const { allReportsById } = (0, useDashboard_1.useAllReports)();
+    const dashboardReport = allReportsById[reportId ?? ''];
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
     const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
+    const { getToken } = (0, react_1.useContext)(Context_1.FetchContext);
     const specificDashboardFilters = (0, react_1.useMemo)(() => {
         if (!reportId) {
             return [];
@@ -99,8 +103,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);
             (0, csv_1.downloadCSV)({
                 rows: resp.pivot && resp.pivotRows ? resp.pivotRows : resp.rows,
                 fields: resp.pivot && resp.pivotColumns ? resp.pivotColumns : resp.columns,
@@ -113,15 +121,21 @@ sectionField, } = {}) => {
             const filters = specificReportFilters.length > 0
                 ? specificReportFilters
                 : specificDashboardFilters;
-            const { report: fetchedReport } = await (0, report_1.fetchReport)({
+            const { report: fetchedReport, error } = await (0, report_1.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/cjs/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/cjs/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/cjs/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"}

package/dist/cjs/hooks/useQuill.js

@@ -12,8 +12,12 @@ const useDashboard_1 = require("./useDashboard");
 const useQuill = (reportId, pagination) => {
     const { reports, reportsDispatch, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
     const { allReportsById } = (0, useDashboard_1.useAllReports)();
-    const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
-    const { reportFilters, reportFiltersDispatch } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
+    const { getToken } = (0, react_1.useContext)(Context_1.FetchContext);
+    const dashboardReport = (0, react_1.useMemo)(() => {
+        return allReportsById[reportId ?? ''];
+    }, [allReportsById[reportId ?? '']]);
+    const { dashboardFilters, dashboardCustomFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
+    const { reportFilters, customReportFilters, reportFiltersDispatch } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const specificReportFilters = (0, react_1.useMemo)(() => {
         if (!reportId)
             return null;
@@ -26,14 +30,10 @@ const useQuill = (reportId, pagination) => {
     const [error, setError] = (0, react_1.useState)(undefined);
     const [previousPage, setPreviousPage] = (0, react_1.useState)(0);
     const processedReport = (0, react_1.useMemo)(() => {
-        return reportId && (allReportsById[reportId])
+        return reportId && allReportsById[reportId]
             ? (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(allReportsById[reportId]), specificReportFilters ?? [], 'useQuill')
             : undefined;
-    }, [
-        reportId,
-        reportId && allReportsById[reportId],
-        specificReportFilters,
-    ]);
+    }, [reportId, reportId && allReportsById[reportId], specificReportFilters]);
     const [additionalProcessing, setAdditionProcessing] = (0, react_1.useState)(pagination
         ? {
             page: pagination,
@@ -97,6 +97,7 @@ const useQuill = (reportId, pagination) => {
                     processing: updatedProcessing,
                     filters: reportFilters[reportId],
                     customFields: schemaData.customFields,
+                    getToken,
                 });
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
@@ -149,7 +150,9 @@ const useQuill = (reportId, pagination) => {
                 initiator: 'useQuill',
                 fetchRows: true,
                 dashboardFilters: specificReportFilters || [],
-                customFilters: [],
+                customFilters: customReportFilters[curReportId] ??
+                    dashboardCustomFilters[dashboardReport?.dashboardName ?? ''] ??
+                    [],
                 additionalProcessing,
                 customFields: schemaData.customFields,
             });
@@ -187,15 +190,22 @@ const useQuill = (reportId, pagination) => {
             });
         }
     }, [isClientLoading, reportId, specificReportFilters]);
+    const resetFilters = () => {
+        if (reportId) {
+            reportFiltersDispatch({
+                type: 'CLEAR_REPORT_FILTERS',
+                id: reportId,
+            });
+        }
+    };
     return {
         data: processedReport ?? null,
-        loading: !reportId ||
-            allReportsById[reportId]?.loadingRows ||
-            loading,
+        loading: !reportId || allReportsById[reportId]?.loadingRows || loading,
         error,
         fetchMore,
         setSort,
         calculate: calculateFunction,
+        resetFilters,
     };
 };
 exports.useQuill = useQuill;

package/dist/cjs/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/cjs/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":"AAEA,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/cjs/hooks/useReport.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useReport = exports.useReports = void 0;
 const react_1 = require("react");
 const Context_1 = require("../Context");
-const Filter_1 = require("../models/Filter");
 const useDashboard_1 = require("./useDashboard");
 const useReports = () => {
     const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.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',
@@ -44,7 +43,7 @@ const useReport = (reportId) => {
                 ]
                 : []),
             ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
-        ], overrideFilters.editedFilterLabel, customFilters.map(Filter_1.convertCustomFilter));
+        ], overrideFilters.editedFilterLabel, customFilters);
     };
     return { reload };
 };

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

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