@quillsql/react 2.13.44 → 2.13.46

package/dist/cjs/components/Dashboard/DashboardSectionContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardSectionContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardSectionContainer.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EAChD,KAAK,EACL,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAenB"}
+{"version":3,"file":"DashboardSectionContainer.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DashboardSectionContainer.tsx"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,EAChD,KAAK,EACL,QAAQ,EACR,GAAG,KAAK,EACT,EAAE,GAAG,GAAG,GAAG,CAAC,OAAO,CAcnB"}

package/dist/cjs/components/Dashboard/DashboardSectionContainer.js

@@ -7,7 +7,6 @@ function DashboardSectionContainer({ style, children, ...props }) {
             width: '100%',
             display: 'flex',
             flexDirection: 'column',
-            gap: 40,
             ...style,
         }, ...props, children: children }));
 }

package/dist/cjs/components/Dashboard/DataLoader.d.ts

@@ -14,12 +14,13 @@ export type DataLoaderChildProps = {
     rowCount?: number;
     rowCountIsLoading?: boolean;
 };
-export default function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, reportMode, }: {
+export default function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, dashboardName, propogateChanges, }: {
     item: QuillReportInternal;
     filters: DashboardFilter[];
     userFilters?: InternalFilter[];
     additionalProcessing: AdditionalProcessing;
-    reportMode?: boolean;
+    dashboardName?: string;
+    propogateChanges?: boolean;
     children: ({ isLoading, error, onPageChange, onSortChange, data, }: DataLoaderChildProps) => JSX.Element;
 }): JSX.Element;
 type ColorMapType = {
@@ -40,14 +41,15 @@ export type ChartDataLoaderChildProps = {
     rowCount?: number;
     rowCountIsLoading?: boolean;
 };
-export declare const ChartDataLoader: ({ item, children, dateBucket, additionalProcessing, filters, userFilters, reportMode, }: {
+export declare const ChartDataLoader: ({ item, children, dateBucket, additionalProcessing, filters, userFilters, dashboardName, propogateChanges, }: {
     item: QuillReportInternal;
     dateBucket?: string;
     mapColorsToFields?: (_report: QuillReport, _theme: QuillTheme) => ColorMapType;
     additionalProcessing: AdditionalProcessing;
     filters: DashboardFilter[];
     userFilters?: InternalFilter[];
-    reportMode?: boolean;
+    dashboardName?: string;
+    propogateChanges?: boolean;
     children: ({ isLoading, error, data, dateBucket, rowCount, rowCountIsLoading, }: ChartDataLoaderChildProps) => JSX.Element;
 }) => JSX.Element;
 export {};

package/dist/cjs/components/Dashboard/DataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA2BtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAyKF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EACX,oBAAoB,EAAE,2BAA2B,EACjD,UAAkB,GACnB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CA6Xd;AAED,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe,4FAQzB;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;IAClB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,iBAAiB,GAClB,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;CAC9C,KAAG,GAAG,CAAC,OAoLP,CAAC"}
+{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAajD,OAAO,EACL,oBAAoB,EAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA4BtE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AA+KF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EACX,oBAAoB,EAAE,2BAA2B,EACjD,aAAa,EACb,gBAAgB,GACjB,EAAE;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CA8Vd;AAED,KAAK,YAAY,GAAG;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe,iHASzB;IACD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,CAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;IAClB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,iBAAiB,GAClB,EAAE,yBAAyB,KAAK,GAAG,CAAC,OAAO,CAAC;CAC9C,KAAG,GAAG,CAAC,OAiLP,CAAC"}

package/dist/cjs/components/Dashboard/DataLoader.js

@@ -14,6 +14,7 @@ const tableProcessing_1 = require("../../utils/tableProcessing");
 // import { didFiltersChange } from '../../Chart';
 const merge_1 = require("../../utils/merge");
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
+const useDashboard_1 = require("../../hooks/useDashboard");
 const constructReportFromItem = (item) => {
     return {
         ...report_1.EMPTY_INTERNAL_REPORT,
@@ -36,13 +37,13 @@ const constructReportFromItem = (item) => {
 };
 function filterValuesEquivalent(filters1, filters2) {
     if (filters1.length !== filters2.length) {
-        // Find the odd filters out and return false ONLY if they have a selected value
+        // Find the odd filters out and return false ONLY if they have a selected value or are a date filter
         const filters1Labels = filters1.map((f) => f.label);
         const filters2Labels = filters2.map((f) => f.label);
-        const oddFilters = filters1Labels.filter((label) => !filters2Labels.includes(label));
+        const oddFilters = filters1Labels.length > filters2Labels.length ? filters1Labels.filter((label) => !filters2Labels.includes(label)) : filters2Labels.filter((label) => !filters1Labels.includes(label));
         for (const filter of oddFilters) {
-            const filter1 = filters1.find((f) => f.label === filter);
-            if (filter1?.selectedValue) {
+            const filter1 = filters1Labels.length > filters2Labels.length ? filters1.find((f) => f.label === filter) : filters2.find((f) => f.label === filter);
+            if (filter1?.selectedValue || filter1?.startDate || filter1?.endDate) {
                 return false;
             }
         }
@@ -142,33 +143,33 @@ function tenantsEquivalent(tenants1, tenants2) {
 function customFieldsEquivalent(customFields1, customFields2) {
     return (0, fast_deep_equal_1.default)(customFields1, customFields2);
 }
-function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, reportMode = false, }) {
+function DataLoader({ item, children, filters, userFilters, additionalProcessing: defaultAdditionalProcessing, dashboardName, propogateChanges, }) {
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
-    const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
+    const { dashboardReports: dashboard, addReport, updateReport } = (0, useDashboard_1.useDashboardReports)(dashboardName);
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
     const { reports, reportsDispatch, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
     const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
-    const contextFilters = () => {
-        return reportMode
-            ? Object.values(reportFilters[item.id] ?? {}).map((f) => f.filter)
-            : Object.values(dashboardFilters[item.dashboardName] ?? {}).map((f) => f.filter);
-    };
+    const contextFilters = (0, react_1.useMemo)(() => {
+        return dashboardName
+            ? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
+            : Object.values(reportFilters[item.id] ?? {}).map((f) => f.filter);
+    }, [dashboardFilters, reportFilters, dashboardName, item.id]);
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
     const [loading, setLoading] = (0, react_1.useState)(true);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [previousPage, setPreviousPage] = (0, react_1.useState)(0);
     const [additionalProcessing, setAdditionalProcessing] = (0, react_1.useState)(defaultAdditionalProcessing);
     const chartReport = (0, react_1.useMemo)(() => {
-        const report = (reportMode ? reports : dashboard)[item.id];
+        const report = (dashboardName ? dashboard : reports)[item.id];
         if (report) {
-            return (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(report), contextFilters());
+            return (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(report), contextFilters);
         }
         else {
             return constructReportFromItem(item);
         }
     }, [
-        (reportMode ? reports : dashboard)[item.id],
+        (dashboardName ? dashboard : reports)[item.id],
         reportFilters,
         dashboardFilters,
     ]);
@@ -198,16 +199,12 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
             const rowCount = await (0, report_1.fetchReportRowCount)(item.id, client, tenants, flags, true, filters.concat(userFilters ?? []), processing, schemaData.customFields, rowCountAbortController.current.signal);
             rowCountAbortController.current = null;
             if (rowCount) {
-                if (reportMode) {
-                    reportsDispatch({
-                        type: 'UPDATE_REPORT',
-                        id: item.id,
-                        data: { rowCount },
-                    });
+                if (dashboardName) {
+                    updateReport({ id: item.id, rowCount });
                 }
                 else {
-                    dispatch({
-                        type: 'UPDATE_DASHBOARD_ITEM',
+                    reportsDispatch({
+                        type: 'UPDATE_REPORT',
                         id: item.id,
                         data: { rowCount },
                     });
@@ -243,7 +240,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         }
     };
     const onSortChange = (sort) => {
-        const report = (reportMode ? reports : dashboard)[item.id];
+        const report = (dashboardName ? dashboard : reports)[item.id];
         if ((0, paginationProcessing_1.shouldSortInMemory)(additionalProcessing.page ?? paginationProcessing_1.DEFAULT_PAGINATION, report?.rowCount)) {
             return;
         }
@@ -268,9 +265,9 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                 updateTableRowsAbortController.current?.abort();
                 updateTableRowsAbortController.current = new AbortController();
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const pivotQuery = (reportMode ? reports : dashboard)[item.id]
+                const pivotQuery = (dashboardName ? dashboard : reports)[item.id]
                     ?.pivotQuery;
-                const comparisonPivotQuery = (reportMode ? reports : dashboard)[item.id]
+                const comparisonPivotQuery = (dashboardName ? dashboard : reports)[item.id]
                     ?.comparisonPivotQuery;
                 const paginatedRows = await (0, tableProcessing_1.fetchResultsByReport)({
                     reportId: item.id,
@@ -292,54 +289,27 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                 }
                 const isPivotPagination = !!(item.pivot && pivotQuery);
                 const prevRows = isPivotPagination
-                    ? (reportMode ? reports : dashboard)[item.id]?.pivotRows
-                    : (reportMode ? reports : dashboard)[item.id]?.rows;
+                    ? (dashboardName ? dashboard : reports)[item.id]?.pivotRows
+                    : (dashboardName ? dashboard : reports)[item.id]?.rows;
                 let updatedRows = [...(prevRows ?? []), ...paginatedRows.rows];
                 if (resetRows) {
                     updatedRows = paginatedRows.rows;
                 }
-                if (reportMode) {
-                    if (isPivotPagination) {
-                        reportsDispatch({
-                            type: 'UPDATE_REPORT',
-                            id: item.id,
-                            data: {
-                                pivotRows: updatedRows,
-                                loadingRows: false,
-                                filtersApplied: userFilters,
-                            },
-                        });
-                    }
-                    else {
-                        reportsDispatch({
-                            type: 'UPDATE_REPORT',
-                            id: item.id,
-                            data: {
-                                rows: updatedRows,
-                                loadingRows: false,
-                                filtersApplied: userFilters,
-                            },
-                        });
-                    }
+                if (dashboardName) {
+                    updateReport({
+                        id: item.id,
+                        [isPivotPagination ? 'pivotRows' : 'rows']: updatedRows,
+                        loadingRows: false,
+                        filtersApplied: userFilters,
+                    });
                 }
                 else {
                     if (isPivotPagination) {
-                        dispatch({
-                            type: 'UPDATE_DASHBOARD_ITEM',
-                            id: item.id,
-                            data: {
-                                pivotRows: updatedRows,
-                                loadingRows: false,
-                                filtersApplied: userFilters,
-                            },
-                        });
-                    }
-                    else {
-                        dispatch({
-                            type: 'UPDATE_DASHBOARD_ITEM',
+                        reportsDispatch({
+                            type: 'UPDATE_REPORT',
                             id: item.id,
                             data: {
-                                rows: updatedRows,
+                                [isPivotPagination ? 'pivotRows' : 'rows']: updatedRows,
                                 loadingRows: false,
                                 filtersApplied: userFilters,
                             },
@@ -372,7 +342,32 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         rowsAbortController.current?.abort();
         rowsAbortController.current = new AbortController();
         try {
-            if (reportMode) {
+            if (dashboardName) {
+                const { report: fetchedReport, error } = await (0, report_1.fetchReport)({
+                    reportId: item.id,
+                    client,
+                    tenants,
+                    flags,
+                    useReportTask: true,
+                    filters: filters.concat(userFilters ?? []),
+                    additionalProcessing: processing,
+                    customFields: schemaData.customFields,
+                    rowsOnly: true,
+                    rowCountOnly: false,
+                    abortSignal: rowsAbortController.current.signal,
+                });
+                addReport({
+                    ...fetchedReport,
+                    id: item.id,
+                    triggerReload: false,
+                    rowCount: fetchedReport.pivot ? fetchedReport.rowCount : 0,
+                    filtersApplied: userFilters,
+                    loadingRows: false,
+                    // rowCount 0 indicates it's still loading if row length is nonzero
+                });
+                setError(error);
+            }
+            else {
                 try {
                     await fetchIndividualReport({
                         reportId: item.id,
@@ -383,6 +378,7 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                         additionalProcessing: processing,
                         reportAbortController: rowsAbortController.current,
                         customFields: schemaData.customFields,
+                        propogateChanges,
                     });
                     rowsAbortController.current = null;
                     setError(undefined);
@@ -391,33 +387,6 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
                     setError(e.message ?? 'Error fetching report');
                 }
             }
-            else {
-                const { report: fetchedReport, error } = await (0, report_1.fetchReport)({
-                    reportId: item.id,
-                    client,
-                    tenants,
-                    flags,
-                    useReportTask: true,
-                    filters: filters.concat(userFilters ?? []),
-                    additionalProcessing: processing,
-                    customFields: schemaData.customFields,
-                    rowsOnly: true,
-                    rowCountOnly: false,
-                    abortSignal: rowsAbortController.current.signal,
-                });
-                dispatch({
-                    type: 'ADD_DASHBOARD_ITEM',
-                    id: item.id,
-                    data: {
-                        ...fetchedReport,
-                        triggerReload: false,
-                        rowCount: fetchedReport.pivot ? fetchedReport.rowCount : 0,
-                        filtersApplied: userFilters,
-                        loadingRows: false,
-                    }, // rowCount 0 indicates it's still loading if row length is nonzero
-                });
-                setError(error);
-            }
             if (!item.pivot) {
                 fetchRowCount(processing);
             }
@@ -440,11 +409,11 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
     // we should be fetching this data directly when mutating filters/tenants rather than using a magical effect
     (0, react_1.useEffect)(() => {
         if (schemaData.isSchemaLoading ||
-            (filterValuesEquivalent(previousFilters.current ?? contextFilters(), filters) &&
+            (filterValuesEquivalent(previousFilters.current ?? contextFilters, filters) &&
                 userFilterValuesEquivalent(previousUserFilters.current ?? [], userFilters ?? []) &&
                 tenantsEquivalent(previousTenants.current ?? [], tenants ?? []) &&
                 customFieldsEquivalent(previousCustomFields.current, schemaData.customFields) &&
-                ((reportMode ? reports : dashboard)[item.id]?.rows?.length || rowsAbortController.current))) {
+                ((dashboardName ? dashboard : reports)[item.id]?.rows?.length || rowsAbortController.current))) {
             if (!rowsAbortController.current && !schemaData.isSchemaLoading)
                 setLoading(false);
             return;
@@ -464,14 +433,14 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
         schemaData.isSchemaLoading,
     ]);
     (0, react_1.useEffect)(() => {
-        const tempReport = (reportMode ? reports : dashboard)[item.id];
+        const tempReport = (dashboardName ? dashboard : reports)[item.id];
         if (tempReport?.triggerReload) {
             fetchReportHelper(additionalProcessing);
         }
         else if (tempReport?.error) {
             setError(tempReport.error);
         }
-    }, [(reportMode ? reports : dashboard)[item.id]?.triggerReload, (reportMode ? reports : dashboard)[item.id]?.error]);
+    }, [(dashboardName ? dashboard : reports)[item.id]?.triggerReload, (dashboardName ? dashboard : reports)[item.id]?.error]);
     return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: children({
             isLoading: loading,
             error,
@@ -484,17 +453,17 @@ function DataLoader({ item, children, filters, userFilters, additionalProcessing
 }
 // The same data-loader pattern as above, but with special logic for charts
 // At some point these may be able to get merged into one function.
-const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, filters, userFilters, reportMode = false, }) => {
-    const [dashboard, dispatch] = (0, react_1.useContext)(Context_1.DashboardContext);
+const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, filters, userFilters, dashboardName, propogateChanges, }) => {
+    const { dashboardReports: dashboard, addReport } = (0, useDashboard_1.useDashboardReports)(dashboardName);
     const { dashboardFilters } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
     const { reports, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
     const { reportFilters } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
-    const contextFilters = () => {
-        return reportMode
-            ? Object.values(reportFilters[item.id] ?? {}).map((f) => f.filter)
-            : Object.values(dashboardFilters[item.dashboardName] ?? {}).map((f) => f.filter);
-    };
+    const contextFilters = (0, react_1.useMemo)(() => {
+        return dashboardName
+            ? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
+            : Object.values(reportFilters[item.id] ?? {}).map((f) => f.filter);
+    }, [dashboardFilters, reportFilters, dashboardName, item.id]);
     const [loading, setLoading] = (0, react_1.useState)(true);
     const [error, setError] = (0, react_1.useState)(undefined);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
@@ -507,13 +476,13 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
     const fetchReportAbortController = (0, react_1.useRef)(null);
     const rowsRequestId = (0, react_1.useRef)(0);
     const chartReport = (0, react_1.useMemo)(() => {
-        const report = reportMode ? reports[item.id] : dashboard[item.id];
+        const report = dashboardName ? dashboard[item.id] : reports[item.id];
         if (!report) {
             return constructReportFromItem(item);
         }
-        return (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(report), contextFilters());
+        return (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(report), contextFilters);
     }, [
-        (reportMode ? reports : dashboard)[item.id],
+        (dashboardName ? dashboard : reports)[item.id],
         reportFilters,
         dashboardFilters,
     ]);
@@ -531,7 +500,32 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
         fetchReportAbortController.current?.abort();
         fetchReportAbortController.current = new AbortController();
         try {
-            if (reportMode) {
+            if (dashboardName) {
+                const { report, error } = await (0, report_1.fetchReport)({
+                    reportId: item.id,
+                    client,
+                    tenants,
+                    flags,
+                    useReportTask,
+                    filters: filters.concat(userFilters ?? []),
+                    additionalProcessing: {
+                        ...additionalProcessing,
+                        ...{ page: paginationProcessing_1.DEFAULT_PAGINATION },
+                    },
+                    dateBucket,
+                    customFields: schemaData.customFields,
+                    abortSignal: fetchReportAbortController.current.signal,
+                });
+                addReport({
+                    ...report,
+                    id: item.id,
+                    triggerReload: false,
+                    filtersApplied: userFilters,
+                    loadingRows: false,
+                });
+                setError(error);
+            }
+            else {
                 try {
                     await fetchIndividualReport({
                         reportId: item.id,
@@ -546,6 +540,7 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
                         dateBucket,
                         reportAbortController: fetchReportAbortController.current,
                         customFields: schemaData.customFields,
+                        propogateChanges,
                     });
                     setError(undefined);
                 }
@@ -553,34 +548,6 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
                     setError(e.message ?? 'Error fetching report');
                 }
             }
-            else {
-                const { report, error } = await (0, report_1.fetchReport)({
-                    reportId: item.id,
-                    client,
-                    tenants,
-                    flags,
-                    useReportTask,
-                    filters: filters.concat(userFilters ?? []),
-                    additionalProcessing: {
-                        ...additionalProcessing,
-                        ...{ page: paginationProcessing_1.DEFAULT_PAGINATION },
-                    },
-                    dateBucket,
-                    customFields: schemaData.customFields,
-                    abortSignal: fetchReportAbortController.current.signal,
-                });
-                dispatch({
-                    type: 'ADD_DASHBOARD_ITEM',
-                    id: item.id,
-                    data: {
-                        ...report,
-                        triggerReload: false,
-                        filtersApplied: userFilters,
-                        loadingRows: false,
-                    },
-                });
-                setError(error);
-            }
         }
         catch (e) {
             if (e instanceof Error && e.name === 'AbortError') {
@@ -600,12 +567,14 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
             return;
         }
         if (schemaData.isSchemaLoading ||
-            (filterValuesEquivalent(previousFilters.current ?? contextFilters(), filters) &&
+            (filterValuesEquivalent(
+            // previousFilters.current ?? contextFilters,
+            previousFilters.current ?? [], filters) &&
                 userFilterValuesEquivalent(previousUserFilters.current ?? [], userFilters ?? []) &&
                 tenantsEquivalent(tenants ?? [], previousTenants.current ?? []) &&
                 previousDateBucket.current === dateBucket &&
                 customFieldsEquivalent(previousCustomFields.current, schemaData.customFields) &&
-                ((reportMode ? reports : dashboard)[item.id]?.rows?.length || fetchReportAbortController.current))) {
+                ((dashboardName ? dashboard : reports)[item.id]?.rows?.length || fetchReportAbortController.current))) {
             if (!fetchReportAbortController.current && !schemaData.isSchemaLoading)
                 setLoading(false);
             return;
@@ -626,14 +595,14 @@ const ChartDataLoader = ({ item, children, dateBucket, additionalProcessing, fil
         schemaData.isSchemaLoading,
     ]);
     (0, react_1.useEffect)(() => {
-        const tempReport = (reportMode ? reports : dashboard)[item.id];
+        const tempReport = (dashboardName ? dashboard : reports)[item.id];
         if (tempReport && tempReport.triggerReload) {
             fetchReportHelper();
         }
         else if (tempReport?.error) {
             setError(tempReport.error);
         }
-    }, [(reportMode ? reports : dashboard)[item.id]?.triggerReload, (reportMode ? reports : dashboard)[item.id]?.error]);
+    }, [(dashboardName ? dashboard : reports)[item.id]?.triggerReload, (dashboardName ? dashboard : reports)[item.id]?.error]);
     return children({
         isLoading: !chartReport || loading,
         data: chartReport,

package/dist/cjs/components/QuillTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,2CA8e1B"}
+{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,2CAsf1B"}