@quillsql/react 2.14.1 → 2.14.2

package/dist/cjs/Chart.js

@@ -172,7 +172,7 @@ function isEquivalent(filters1, filters2) {
 }
 function Chart({ colors, reportId, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter = false, hideFilters = false, mapColorsToFields, LoadingComponent = ChartSkeleton_1.QuillLoadingSkeleton, SelectComponent = QuillSelect_1.QuillSelectComponent, MultiSelectComponent = QuillMultiSelectWithCombo_1.QuillMultiSelectComponentWithCombo, DateRangePickerComponent = QuillDateRangePicker_1.QuillDateRangePicker, FilterContainerComponent = UiComponents_1.QuillFilterContainerComponent, TableComponent = TableComponent_1.default, MetricComponent = MetricComponent_1.default, filters, onClickChartElement, dateBucket, propagateChanges, }) {
     const [schemaData] = (0, react_1.useContext)(Context_1.SchemaDataContext);
-    const { reload } = (0, useReport_1.useReport)(reportId);
+    const { reload } = (0, useReport_1.useReportInternal)(reportId);
     const { reports, reportsDispatch, fetchIndividualReport } = (0, react_1.useContext)(Context_1.ReportsContext);
     const { reportFiltersDispatch, reportFilters, customReportFiltersDispatch, customReportFilters, } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const { isLoading: isDashboardsLoading } = (0, react_1.useContext)(Context_1.DashboardConfigContext);

package/dist/cjs/Context.d.ts

@@ -85,6 +85,9 @@ export declare const DashboardConfigContext: React.Context<{
 type ReportState = {
     [id: string]: QuillReportInternal;
 };
+type ReportLoadingState = {
+    [id: string]: boolean;
+};
 type ReportAction = {
     type: 'ADD_REPORT';
     id: string;
@@ -99,6 +102,11 @@ type ReportAction = {
 } | {
     type: 'CLEAR_REPORTS';
 };
+type ReportLoadingStateAction = {
+    type: 'SET_REPORT_LOADING';
+    id: string;
+    data: boolean;
+};
 export declare const ReportsContext: React.Context<{
     reports: ReportState;
     reportsDispatch: React.Dispatch<ReportAction>;
@@ -116,6 +124,8 @@ export declare const ReportsContext: React.Context<{
         } | null;
         propagateChanges?: boolean;
     }) => Promise<void>;
+    reportsLoadingState: ReportLoadingState;
+    reportsLoadingStateDispatch: React.Dispatch<ReportLoadingStateAction>;
 }>;
 type ReportFiltersState = {
     [id: string]: {

package/dist/cjs/Context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/Context.js

@@ -193,10 +193,20 @@ const reportsReducer = (state = {}, action) => {
             return state;
     }
 };
+const reportsLoadingStateReducer = (state = {}, action) => {
+    switch (action.type) {
+        case 'SET_REPORT_LOADING':
+            return { ...state, [action.id]: action.data };
+        default:
+            return state;
+    }
+};
 exports.ReportsContext = (0, react_1.createContext)({
     reports: {},
     reportsDispatch: dummySetter,
     fetchIndividualReport: async () => { },
+    reportsLoadingState: {},
+    reportsLoadingStateDispatch: dummySetter,
 });
 const customReportFiltersReducer = (state, action) => {
     switch (action.type) {
@@ -377,6 +387,7 @@ const ContextProvider = ({ children, initialTheme, publicKey, queryEndpoint, que
     const [reportFilters, reportFiltersDispatch] = (0, react_1.useReducer)(reportFiltersReducer, {});
     const reportFilterOptionsAbortControllers = (0, react_1.useRef)({});
     const [reports, reportsDispatch] = (0, react_1.useReducer)(reportsReducer, {});
+    const [reportsLoadingState, reportsLoadingStateDispatch] = (0, react_1.useReducer)(reportsLoadingStateReducer, {});
     const reportsAbortControllers = (0, react_1.useRef)({});
     const fetchSchemaAbortController = (0, react_1.useRef)(null);
     const fetchSchemaProcessId = (0, react_1.useRef)(0);
@@ -750,17 +761,17 @@ const ContextProvider = ({ children, initialTheme, publicKey, queryEndpoint, que
                     },
                 });
                 // Should we be updating the filters for all attached reports when the dashboard filters change?
-                reportFiltersDispatch({
-                    type: 'UPDATE_REPORT_FILTER',
-                    id: filter.label,
-                    data: {
-                        filter: {
-                            ...filter,
-                            options: filterOptions,
-                        },
-                        loading: false,
-                    },
-                });
+                // reportFiltersDispatch({
+                //   type: 'UPDATE_REPORT_FILTER',
+                //   id: filter.label, // should be a reportId
+                //   data: {
+                //     filter: {
+                //       ...filter,
+                //       options: filterOptions,
+                //     },
+                //     loading: false,
+                //   },
+                // });
                 return null;
             }
             catch (error) {
@@ -1268,6 +1279,8 @@ const ContextProvider = ({ children, initialTheme, publicKey, queryEndpoint, que
                                             reports,
                                             reportsDispatch,
                                             fetchIndividualReport,
+                                            reportsLoadingState,
+                                            reportsLoadingStateDispatch,
                                         }, children: (0, jsx_runtime_1.jsx)(exports.TenantContext.Provider, { value: {
                                                 tenants: populatedClient?.currentTenants ?? tenants,
                                                 flags: populatedClient?.currentFlags ?? flags,

package/dist/cjs/StaticChart.d.ts

@@ -1,9 +1,7 @@
-import { QuillReport } from './models/Report';
 export interface StaticChartProps {
-    report: QuillReport;
-    loading: boolean;
+    reportId: string;
     onClickChartElement?: (data: any) => void;
     containerStyle?: React.CSSProperties;
 }
-export default function StaticChart({ report, loading, onClickChartElement, containerStyle, }: StaticChartProps): import("react/jsx-runtime").JSX.Element;
+export default function StaticChart({ reportId, onClickChartElement, containerStyle, }: StaticChartProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=StaticChart.d.ts.map

package/dist/cjs/StaticChart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StaticChart.d.ts","sourceRoot":"","sources":["../../src/StaticChart.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,OAAO,EACP,mBAAmB,EACnB,cAAc,GACf,EAAE,gBAAgB,2CAUlB"}
+{"version":3,"file":"StaticChart.d.ts","sourceRoot":"","sources":["../../src/StaticChart.tsx"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,QAAQ,EACR,mBAAmB,EACnB,cAAc,GACf,EAAE,gBAAgB,2CAWlB"}

package/dist/cjs/StaticChart.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = StaticChart;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const Chart_1 = require("./Chart");
-function StaticChart({ report, loading, onClickChartElement, containerStyle, }) {
-    return ((0, jsx_runtime_1.jsx)(Chart_1.ChartDisplay, { reportId: report.id, config: report, onClickChartElement: onClickChartElement, loading: loading, containerStyle: containerStyle }));
+const useDashboard_1 = require("./hooks/useDashboard");
+function StaticChart({ reportId, onClickChartElement, containerStyle, }) {
+    const { report, loading } = (0, useDashboard_1.useDashboardReport)(reportId);
+    return ((0, jsx_runtime_1.jsx)(Chart_1.ChartDisplay, { reportId: reportId, config: report ?? undefined, onClickChartElement: onClickChartElement, loading: loading, containerStyle: containerStyle }));
 }

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

@@ -63,7 +63,7 @@ export declare const useDashboards: () => {
     }) => Promise<void>;
     deleteDashboard: (name: string) => Promise<void>;
 };
-export declare const useDashboard: (dashboardName: string, fetchDataWithHook?: boolean) => {
+export declare const useDashboard: (dashboardName: string) => {
     isLoading: boolean;
     sections: {
         name: string;
@@ -78,4 +78,8 @@ export declare const useDashboard: (dashboardName: string, fetchDataWithHook?: b
         };
     } | Filter>) => void;
 };
+export declare const useDashboardReport: (reportId: string) => {
+    report: QuillReport | null;
+    loading: boolean;
+};
 //# sourceMappingURL=useDashboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAGL,uBAAuB,EAGvB,MAAM,EACN,cAAc,EAGd,eAAe,EAGhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKtD,eAAO,MAAM,oBAAoB,kBAChB,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,uBAAuB,EAAE,CAAC;QACnC,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,uBAAuB,EAAE,CAAC;QACnC,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,uBAAuB,CAAC;KACtC;4BAqDO,MAAM,gEAOT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,UAAU,CAAC,EAAE,uBAAuB,CAAC;QACrC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB;4BAyOkC,MAAM;CAwB5C,CAAC;AAGF,eAAO,MAAM,YAAY,kBACR,MAAM,kCAEpB;IACD,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,EAAE,CAAA;KAAE,EAAE,CAAC;IACrD,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,YAAY,EAAE,CACZ,OAAO,EAAE,KAAK,CACV;QACE,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG;YAAE,SAAS,CAAC,EAAE,IAAI,CAAC;YAAC,OAAO,CAAC,EAAE,IAAI,CAAA;SAAE,CAAC;KACjE,GACD,MAAM,CACT,KACE,IAAI,CAAC;CAmOX,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAGL,uBAAuB,EAGvB,MAAM,EACN,cAAc,EAGd,eAAe,EAGhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKtD,eAAO,MAAM,oBAAoB,kBAChB,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,uBAAuB,EAAE,CAAC;QACnC,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,uBAAuB,EAAE,CAAC;QACnC,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,uBAAuB,CAAC;KACtC;4BAqDO,MAAM,gEAOT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,UAAU,CAAC,EAAE,uBAAuB,CAAC;QACrC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB;4BAyOkC,MAAM;CAwB5C,CAAC;AAGF,eAAO,MAAM,YAAY,kBACR,MAAM,KAEpB;IACD,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,EAAE,CAAA;KAAE,EAAE,CAAC;IACrD,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,YAAY,EAAE,CACZ,OAAO,EAAE,KAAK,CACV;QACE,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG;YAAE,SAAS,CAAC,EAAE,IAAI,CAAC;YAAC,OAAO,CAAC,EAAE,IAAI,CAAA;SAAE,CAAC;KACjE,GACD,MAAM,CACT,KACE,IAAI,CAAC;CAmOX,CAAC;AAGF,eAAO,MAAM,kBAAkB,aACnB,MAAM,KACf;IACD,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;CAQlB,CAAC"}

package/dist/cjs/hooks/useDashboard.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useDashboard = exports.useDashboards = exports.useAllReports = exports.useDashboardReports = exports.useDashboardInternal = void 0;
+exports.useDashboardReport = exports.useDashboard = exports.useDashboards = exports.useAllReports = exports.useDashboardReports = exports.useDashboardInternal = void 0;
 const react_1 = require("react");
 const Context_1 = require("../Context");
 const dateRangePickerUtils_1 = require("../DateRangePicker/dateRangePickerUtils");
@@ -509,12 +509,12 @@ const useDashboards = () => {
 };
 exports.useDashboards = useDashboards;
 // Dev facing
-const useDashboard = (dashboardName, fetchDataWithHook = true) => {
+const useDashboard = (dashboardName) => {
     const { data, dashboardFilters, reload, isLoading } = (0, exports.useDashboardInternal)(dashboardName);
     const { customFilterDispatch } = (0, react_1.useContext)(Context_1.DashboardFiltersContext);
+    const { reportsDispatch, reportsLoadingStateDispatch } = (0, react_1.useContext)(Context_1.ReportsContext);
     const initialLoad = (0, react_1.useRef)(true);
     const fetchedInitialReports = (0, react_1.useRef)(false);
-    const [isFetching, setIsFetching] = (0, react_1.useState)(false);
     const [client] = (0, react_1.useContext)(Context_1.ClientContext);
     const { tenants, flags } = (0, react_1.useContext)(Context_1.TenantContext);
     const { getToken } = (0, react_1.useContext)(Context_1.FetchContext);
@@ -535,20 +535,19 @@ const useDashboard = (dashboardName, fetchDataWithHook = true) => {
                 .filter((v) => v !== undefined),
         }));
     }, [data?.sections, allReportsById]);
-    const [sectionReports, setSectionReports] = (0, react_1.useState)({});
     const sections = (0, react_1.useMemo)(() => {
         return dashboardSections.map((section) => ({
             ...section,
-            reports: section.reports.map((report) => sectionReports[report.id] ?? report),
+            reports: section.reports,
         }));
-    }, [dashboardSections, sectionReports]);
+    }, [dashboardSections]);
     const filters = (0, react_1.useMemo)(() => {
         if (!dashboardFilters)
             return [];
         return dashboardFilters.map(Filter_1.convertInternalDashboardFilterToDashboardFilter);
     }, [dashboardFilters]);
     (0, react_1.useEffect)(() => {
-        if (!fetchedInitialReports.current && data && fetchDataWithHook) {
+        if (!fetchedInitialReports.current && data) {
             fetchedInitialReports.current = true;
             fetchReports([], dashboardFilters ?? []);
         }
@@ -643,16 +642,18 @@ const useDashboard = (dashboardName, fetchDataWithHook = true) => {
         const customFilters = filters.filter(isFilter);
         const newCustomFilters = applyCustomFilters(customFilters);
         const newDashboardFilters = applyDashboardFilters(dashboardFilters);
-        if (fetchDataWithHook) {
-            fetchReports(newCustomFilters, newDashboardFilters);
-        }
+        fetchReports(newCustomFilters, newDashboardFilters);
     };
     const fetchReports = async (customFilters, dashboardFilters) => {
         if (!client)
             return;
-        setIsFetching(true);
         const allReportIds = sections.flatMap((section) => section.reports.map((report) => report.id));
-        const newReports = (await Promise.all(allReportIds.map(async (reportId) => {
+        await Promise.all(allReportIds.map(async (reportId) => {
+            reportsLoadingStateDispatch({
+                type: 'SET_REPORT_LOADING',
+                id: reportId,
+                data: true,
+            });
             const { report, error } = await (0, report_1.fetchReport)({
                 reportId,
                 client,
@@ -665,20 +666,34 @@ const useDashboard = (dashboardName, fetchDataWithHook = true) => {
                 console.error(error);
                 return null;
             }
-            return (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(report), dashboardFilters);
-        }))).filter((r) => r !== null);
-        const newSectionReports = newReports.reduce((acc, report) => {
-            acc[report.id] = report;
-            return acc;
-        }, {});
-        setSectionReports(newSectionReports);
-        setIsFetching(false);
+            const convertedReport = (0, report_1.convertInternalReportToReport)((0, merge_1.mergeComparisonRange)(report), dashboardFilters);
+            reportsDispatch({
+                type: 'UPDATE_REPORT',
+                id: reportId,
+                data: convertedReport,
+            });
+            reportsLoadingStateDispatch({
+                type: 'SET_REPORT_LOADING',
+                id: reportId,
+                data: false,
+            });
+            return convertedReport;
+        }));
     };
     return {
-        isLoading: !!isLoading || isFetching,
+        isLoading: !!isLoading,
         sections,
         filters,
         applyFilters,
     };
 };
 exports.useDashboard = useDashboard;
+// useDashboard accompanying hook
+const useDashboardReport = (reportId) => {
+    const { reports, reportsLoadingState } = (0, react_1.useContext)(Context_1.ReportsContext);
+    return {
+        report: reportsLoadingState[reportId] ? null : (reports[reportId] ?? null),
+        loading: !!reportsLoadingState[reportId],
+    };
+};
+exports.useDashboardReport = useDashboardReport;

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

@@ -3,7 +3,7 @@ import { InternalDashboardFilter, InternalFilter } from '../models/Filter';
 export declare const useReports: () => {
     reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
 };
-export declare const useReport: (reportId: string) => {
+export declare const useReportInternal: (reportId: string) => {
     reload: (overrideFilters: {
         filters: InternalDashboardFilter[];
         editedFilterLabel?: string;

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

@@ -1 +1 @@
-{"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,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3E,eAAO,MAAM,UAAU;uCAIR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAmBtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,cAAc,EAAE,cACpB,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,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3E,eAAO,MAAM,UAAU;uCAIR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAmBtD,CAAC;AAIF,eAAO,MAAM,iBAAiB,aAAc,MAAM;8BAI7B;QACf,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,cAAc,EAAE,cACpB,OAAO,GAAG,UAAU,GAAG,WAAW;CA4BhD,CAAC"}

package/dist/cjs/hooks/useReport.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useReport = exports.useReports = void 0;
+exports.useReportInternal = exports.useReports = void 0;
 const react_1 = require("react");
 const Context_1 = require("../Context");
 const useDashboard_1 = require("./useDashboard");
@@ -27,7 +27,7 @@ const useReports = () => {
 exports.useReports = useReports;
 // Exposes context operations with the "Report" scope
 // Not meant to be customer facing
-const useReport = (reportId) => {
+const useReportInternal = (reportId) => {
     const { loadFiltersForReport } = (0, react_1.useContext)(Context_1.ReportFiltersContext);
     const { allReportsById } = (0, useDashboard_1.useAllReports)();
     const reload = async (overrideFilters, customFilters = [], initiator = 'Chart') => {
@@ -47,4 +47,4 @@ const useReport = (reportId) => {
     };
     return { reload };
 };
-exports.useReport = useReport;
+exports.useReportInternal = useReportInternal;

package/dist/cjs/index.d.ts

@@ -16,7 +16,7 @@ export type { ChartEditorProps } from './ChartEditor';
 export { default as StaticChart } from './StaticChart';
 export type { StaticChartProps } from './StaticChart';
 export { quillFormat as format } from './utils/valueFormatter';
-import { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports } from './hooks/useDashboard';
+import { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, useDashboardReport } from './hooks/useDashboard';
 export { useReports } from './hooks/useReport';
 export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
@@ -33,5 +33,5 @@ export type { DashboardSectionComponentProps } from './components/Dashboard/Dash
 export { Calculation } from './utils/dataProcessing';
 export { StringOperator, NullOperator, DateOperator, NumberOperator, FilterType, DashboardFilterType, type Filter, type InternalFilter, type InternalDashboardDateFilter, type QuillCustomInterval, type QuillCustomRelativeInterval, } from './models/Filter';
 export { ALL_TENANTS, SINGLE_TENANT } from './utils/constants';
-export { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, };
+export { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, useDashboardReport, };
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/cjs/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useAllReports = exports.useDashboardReports = exports.useDashboards = exports.useDashboardInternal = exports.useDashboard = exports.SINGLE_TENANT = exports.ALL_TENANTS = exports.DashboardFilterType = exports.FilterType = exports.NumberOperator = exports.DateOperator = exports.NullOperator = exports.StringOperator = exports.Calculation = exports.ThemeContext = exports.downloadCSV = exports.useVirtualTables = exports.useAskQuill = exports.useMemoizedRows = exports.useExport = exports.useQuill = exports.useReports = exports.format = exports.StaticChart = exports.ChartEditor = exports.ReportBuilder = exports.SchemaListComponent = exports.SQLEditor = exports.Table = exports.Chart = exports.QuillProvider = exports.Dashboard = void 0;
+exports.useDashboardReport = exports.useAllReports = exports.useDashboardReports = exports.useDashboards = exports.useDashboardInternal = exports.useDashboard = exports.SINGLE_TENANT = exports.ALL_TENANTS = exports.DashboardFilterType = exports.FilterType = exports.NumberOperator = exports.DateOperator = exports.NullOperator = exports.StringOperator = exports.Calculation = exports.ThemeContext = exports.downloadCSV = exports.useVirtualTables = exports.useAskQuill = exports.useMemoizedRows = exports.useExport = exports.useQuill = exports.useReports = exports.format = exports.StaticChart = exports.ChartEditor = exports.ReportBuilder = exports.SchemaListComponent = exports.SQLEditor = exports.Table = exports.Chart = exports.QuillProvider = exports.Dashboard = void 0;
 // src/index.ts
 var Dashboard_1 = require("./Dashboard");
 Object.defineProperty(exports, "Dashboard", { enumerable: true, get: function () { return __importDefault(Dashboard_1).default; } });
@@ -30,6 +30,7 @@ Object.defineProperty(exports, "useDashboardInternal", { enumerable: true, get:
 Object.defineProperty(exports, "useDashboards", { enumerable: true, get: function () { return useDashboard_1.useDashboards; } });
 Object.defineProperty(exports, "useDashboardReports", { enumerable: true, get: function () { return useDashboard_1.useDashboardReports; } });
 Object.defineProperty(exports, "useAllReports", { enumerable: true, get: function () { return useDashboard_1.useAllReports; } });
+Object.defineProperty(exports, "useDashboardReport", { enumerable: true, get: function () { return useDashboard_1.useDashboardReport; } });
 var useReport_1 = require("./hooks/useReport");
 Object.defineProperty(exports, "useReports", { enumerable: true, get: function () { return useReport_1.useReports; } });
 var useQuill_1 = require("./hooks/useQuill");

package/dist/esm/Chart.js

@@ -22,7 +22,7 @@ import QuillMetricComponent from './components/Dashboard/MetricComponent';
 import DataLoader, { ChartDataLoader, } from './components/Dashboard/DataLoader';
 import QuillTableComponent from './components/Dashboard/TableComponent';
 import { COMPARISON_RANGE, convertPresetOptionsToSelectableList, defaultOptionsV2, getRangeFromPresetOptions, } from './DateRangePicker/dateRangePickerUtils';
-import { useReport } from './hooks/useReport';
+import { useReportInternal } from './hooks/useReport';
 import equal from 'fast-deep-equal';
 import { QuillMultiSelectComponentWithCombo } from './components/QuillMultiSelectWithCombo';
 import { USMap, WorldMap } from './components/Chart/MapChart';
@@ -131,7 +131,7 @@ export function isEquivalent(filters1, filters2) {
 }
 export default function Chart({ colors, reportId, className, containerStyle, isAnimationActive, hideXAxis, hideYAxis, hideCartesianGrid, hideHorizontalCartesianGrid = false, hideVerticalCartesianGrid = true, hideSubsequentXAxisTicks = false, cartesianGridLineStyle = 'solid', cartesianGridLineColor, comparisonLineStyle, hideDateRangeFilter = false, hideFilters = false, mapColorsToFields, LoadingComponent = QuillLoadingSkeleton, SelectComponent = QuillSelectComponent, MultiSelectComponent = QuillMultiSelectComponentWithCombo, DateRangePickerComponent = QuillDateRangePicker, FilterContainerComponent = QuillFilterContainerComponent, TableComponent = QuillTableComponent, MetricComponent = QuillMetricComponent, filters, onClickChartElement, dateBucket, propagateChanges, }) {
     const [schemaData] = useContext(SchemaDataContext);
-    const { reload } = useReport(reportId);
+    const { reload } = useReportInternal(reportId);
     const { reports, reportsDispatch, fetchIndividualReport } = useContext(ReportsContext);
     const { reportFiltersDispatch, reportFilters, customReportFiltersDispatch, customReportFilters, } = useContext(ReportFiltersContext);
     const { isLoading: isDashboardsLoading } = useContext(DashboardConfigContext);

package/dist/esm/Context.d.ts

@@ -85,6 +85,9 @@ export declare const DashboardConfigContext: React.Context<{
 type ReportState = {
     [id: string]: QuillReportInternal;
 };
+type ReportLoadingState = {
+    [id: string]: boolean;
+};
 type ReportAction = {
     type: 'ADD_REPORT';
     id: string;
@@ -99,6 +102,11 @@ type ReportAction = {
 } | {
     type: 'CLEAR_REPORTS';
 };
+type ReportLoadingStateAction = {
+    type: 'SET_REPORT_LOADING';
+    id: string;
+    data: boolean;
+};
 export declare const ReportsContext: React.Context<{
     reports: ReportState;
     reportsDispatch: React.Dispatch<ReportAction>;
@@ -116,6 +124,8 @@ export declare const ReportsContext: React.Context<{
         } | null;
         propagateChanges?: boolean;
     }) => Promise<void>;
+    reportsLoadingState: ReportLoadingState;
+    reportsLoadingStateDispatch: React.Dispatch<ReportLoadingStateAction>;
 }>;
 type ReportFiltersState = {
     [id: string]: {

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

@@ -1 +1 @@
-{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/Context.tsx"],"names":[],"mappings":"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"}

package/dist/esm/Context.js

@@ -187,10 +187,20 @@ const reportsReducer = (state = {}, action) => {
             return state;
     }
 };
+const reportsLoadingStateReducer = (state = {}, action) => {
+    switch (action.type) {
+        case 'SET_REPORT_LOADING':
+            return { ...state, [action.id]: action.data };
+        default:
+            return state;
+    }
+};
 export const ReportsContext = createContext({
     reports: {},
     reportsDispatch: dummySetter,
     fetchIndividualReport: async () => { },
+    reportsLoadingState: {},
+    reportsLoadingStateDispatch: dummySetter,
 });
 const customReportFiltersReducer = (state, action) => {
     switch (action.type) {
@@ -371,6 +381,7 @@ export const ContextProvider = ({ children, initialTheme, publicKey, queryEndpoi
     const [reportFilters, reportFiltersDispatch] = useReducer(reportFiltersReducer, {});
     const reportFilterOptionsAbortControllers = useRef({});
     const [reports, reportsDispatch] = useReducer(reportsReducer, {});
+    const [reportsLoadingState, reportsLoadingStateDispatch] = useReducer(reportsLoadingStateReducer, {});
     const reportsAbortControllers = useRef({});
     const fetchSchemaAbortController = useRef(null);
     const fetchSchemaProcessId = useRef(0);
@@ -744,17 +755,17 @@ export const ContextProvider = ({ children, initialTheme, publicKey, queryEndpoi
                     },
                 });
                 // Should we be updating the filters for all attached reports when the dashboard filters change?
-                reportFiltersDispatch({
-                    type: 'UPDATE_REPORT_FILTER',
-                    id: filter.label,
-                    data: {
-                        filter: {
-                            ...filter,
-                            options: filterOptions,
-                        },
-                        loading: false,
-                    },
-                });
+                // reportFiltersDispatch({
+                //   type: 'UPDATE_REPORT_FILTER',
+                //   id: filter.label, // should be a reportId
+                //   data: {
+                //     filter: {
+                //       ...filter,
+                //       options: filterOptions,
+                //     },
+                //     loading: false,
+                //   },
+                // });
                 return null;
             }
             catch (error) {
@@ -1262,6 +1273,8 @@ export const ContextProvider = ({ children, initialTheme, publicKey, queryEndpoi
                                             reports,
                                             reportsDispatch,
                                             fetchIndividualReport,
+                                            reportsLoadingState,
+                                            reportsLoadingStateDispatch,
                                         }, children: _jsx(TenantContext.Provider, { value: {
                                                 tenants: populatedClient?.currentTenants ?? tenants,
                                                 flags: populatedClient?.currentFlags ?? flags,

package/dist/esm/StaticChart.d.ts

@@ -1,9 +1,7 @@
-import { QuillReport } from './models/Report';
 export interface StaticChartProps {
-    report: QuillReport;
-    loading: boolean;
+    reportId: string;
     onClickChartElement?: (data: any) => void;
     containerStyle?: React.CSSProperties;
 }
-export default function StaticChart({ report, loading, onClickChartElement, containerStyle, }: StaticChartProps): import("react/jsx-runtime").JSX.Element;
+export default function StaticChart({ reportId, onClickChartElement, containerStyle, }: StaticChartProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=StaticChart.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"StaticChart.d.ts","sourceRoot":"","sources":["../../src/StaticChart.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,OAAO,EACP,mBAAmB,EACnB,cAAc,GACf,EAAE,gBAAgB,2CAUlB"}
+{"version":3,"file":"StaticChart.d.ts","sourceRoot":"","sources":["../../src/StaticChart.tsx"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,QAAQ,EACR,mBAAmB,EACnB,cAAc,GACf,EAAE,gBAAgB,2CAWlB"}

package/dist/esm/StaticChart.js

@@ -1,5 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ChartDisplay } from './Chart';
-export default function StaticChart({ report, loading, onClickChartElement, containerStyle, }) {
-    return (_jsx(ChartDisplay, { reportId: report.id, config: report, onClickChartElement: onClickChartElement, loading: loading, containerStyle: containerStyle }));
+import { useDashboardReport } from './hooks/useDashboard';
+export default function StaticChart({ reportId, onClickChartElement, containerStyle, }) {
+    const { report, loading } = useDashboardReport(reportId);
+    return (_jsx(ChartDisplay, { reportId: reportId, config: report ?? undefined, onClickChartElement: onClickChartElement, loading: loading, containerStyle: containerStyle }));
 }

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

@@ -63,7 +63,7 @@ export declare const useDashboards: () => {
     }) => Promise<void>;
     deleteDashboard: (name: string) => Promise<void>;
 };
-export declare const useDashboard: (dashboardName: string, fetchDataWithHook?: boolean) => {
+export declare const useDashboard: (dashboardName: string) => {
     isLoading: boolean;
     sections: {
         name: string;
@@ -78,4 +78,8 @@ export declare const useDashboard: (dashboardName: string, fetchDataWithHook?: b
         };
     } | Filter>) => void;
 };
+export declare const useDashboardReport: (reportId: string) => {
+    report: QuillReport | null;
+    loading: boolean;
+};
 //# sourceMappingURL=useDashboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAGL,uBAAuB,EAGvB,MAAM,EACN,cAAc,EAGd,eAAe,EAGhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKtD,eAAO,MAAM,oBAAoB,kBAChB,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,uBAAuB,EAAE,CAAC;QACnC,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,uBAAuB,EAAE,CAAC;QACnC,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,uBAAuB,CAAC;KACtC;4BAqDO,MAAM,gEAOT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,UAAU,CAAC,EAAE,uBAAuB,CAAC;QACrC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB;4BAyOkC,MAAM;CAwB5C,CAAC;AAGF,eAAO,MAAM,YAAY,kBACR,MAAM,kCAEpB;IACD,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,EAAE,CAAA;KAAE,EAAE,CAAC;IACrD,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,YAAY,EAAE,CACZ,OAAO,EAAE,KAAK,CACV;QACE,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG;YAAE,SAAS,CAAC,EAAE,IAAI,CAAC;YAAC,OAAO,CAAC,EAAE,IAAI,CAAA;SAAE,CAAC;KACjE,GACD,MAAM,CACT,KACE,IAAI,CAAC;CAmOX,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAGL,uBAAuB,EAGvB,MAAM,EACN,cAAc,EAGd,eAAe,EAGhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAKtD,eAAO,MAAM,oBAAoB,kBAChB,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,uBAAuB,EAAE,CAAC;QACnC,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,uBAAuB,EAAE,CAAC;QACnC,eAAe,EAAE,MAAM,EAAE,CAAC;QAC1B,UAAU,CAAC,EAAE,uBAAuB,CAAC;KACtC;4BAqDO,MAAM,gEAOT;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,UAAU,CAAC,EAAE,uBAAuB,CAAC;QACrC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;QACjC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;KACvB;4BAyOkC,MAAM;CAwB5C,CAAC;AAGF,eAAO,MAAM,YAAY,kBACR,MAAM,KAEpB;IACD,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,WAAW,EAAE,CAAA;KAAE,EAAE,CAAC;IACrD,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,YAAY,EAAE,CACZ,OAAO,EAAE,KAAK,CACV;QACE,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG;YAAE,SAAS,CAAC,EAAE,IAAI,CAAC;YAAC,OAAO,CAAC,EAAE,IAAI,CAAA;SAAE,CAAC;KACjE,GACD,MAAM,CACT,KACE,IAAI,CAAC;CAmOX,CAAC;AAGF,eAAO,MAAM,kBAAkB,aACnB,MAAM,KACf;IACD,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;CAQlB,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -1,4 +1,4 @@
-import { useContext, useEffect, useMemo, useRef, useState } from 'react';
+import { useContext, useEffect, useMemo, useRef } from 'react';
 import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, FetchContext, ReportFiltersContext, ReportsContext, TenantContext, } from '../Context';
 import { convertPresetOptionsToSelectableList, PRIMARY_RANGE, } from '../DateRangePicker/dateRangePickerUtils';
 import { convertCustomFilter, InternalDashboardFilterType, StringFilterType, convertInternalDashboardFilterToDashboardFilter, } from '../models/Filter';
@@ -502,12 +502,12 @@ export const useDashboards = () => {
     };
 };
 // Dev facing
-export const useDashboard = (dashboardName, fetchDataWithHook = true) => {
+export const useDashboard = (dashboardName) => {
     const { data, dashboardFilters, reload, isLoading } = useDashboardInternal(dashboardName);
     const { customFilterDispatch } = useContext(DashboardFiltersContext);
+    const { reportsDispatch, reportsLoadingStateDispatch } = useContext(ReportsContext);
     const initialLoad = useRef(true);
     const fetchedInitialReports = useRef(false);
-    const [isFetching, setIsFetching] = useState(false);
     const [client] = useContext(ClientContext);
     const { tenants, flags } = useContext(TenantContext);
     const { getToken } = useContext(FetchContext);
@@ -528,20 +528,19 @@ export const useDashboard = (dashboardName, fetchDataWithHook = true) => {
                 .filter((v) => v !== undefined),
         }));
     }, [data?.sections, allReportsById]);
-    const [sectionReports, setSectionReports] = useState({});
     const sections = useMemo(() => {
         return dashboardSections.map((section) => ({
             ...section,
-            reports: section.reports.map((report) => sectionReports[report.id] ?? report),
+            reports: section.reports,
         }));
-    }, [dashboardSections, sectionReports]);
+    }, [dashboardSections]);
     const filters = useMemo(() => {
         if (!dashboardFilters)
             return [];
         return dashboardFilters.map(convertInternalDashboardFilterToDashboardFilter);
     }, [dashboardFilters]);
     useEffect(() => {
-        if (!fetchedInitialReports.current && data && fetchDataWithHook) {
+        if (!fetchedInitialReports.current && data) {
             fetchedInitialReports.current = true;
             fetchReports([], dashboardFilters ?? []);
         }
@@ -636,16 +635,18 @@ export const useDashboard = (dashboardName, fetchDataWithHook = true) => {
         const customFilters = filters.filter(isFilter);
         const newCustomFilters = applyCustomFilters(customFilters);
         const newDashboardFilters = applyDashboardFilters(dashboardFilters);
-        if (fetchDataWithHook) {
-            fetchReports(newCustomFilters, newDashboardFilters);
-        }
+        fetchReports(newCustomFilters, newDashboardFilters);
     };
     const fetchReports = async (customFilters, dashboardFilters) => {
         if (!client)
             return;
-        setIsFetching(true);
         const allReportIds = sections.flatMap((section) => section.reports.map((report) => report.id));
-        const newReports = (await Promise.all(allReportIds.map(async (reportId) => {
+        await Promise.all(allReportIds.map(async (reportId) => {
+            reportsLoadingStateDispatch({
+                type: 'SET_REPORT_LOADING',
+                id: reportId,
+                data: true,
+            });
             const { report, error } = await fetchReport({
                 reportId,
                 client,
@@ -658,19 +659,32 @@ export const useDashboard = (dashboardName, fetchDataWithHook = true) => {
                 console.error(error);
                 return null;
             }
-            return convertInternalReportToReport(mergeComparisonRange(report), dashboardFilters);
-        }))).filter((r) => r !== null);
-        const newSectionReports = newReports.reduce((acc, report) => {
-            acc[report.id] = report;
-            return acc;
-        }, {});
-        setSectionReports(newSectionReports);
-        setIsFetching(false);
+            const convertedReport = convertInternalReportToReport(mergeComparisonRange(report), dashboardFilters);
+            reportsDispatch({
+                type: 'UPDATE_REPORT',
+                id: reportId,
+                data: convertedReport,
+            });
+            reportsLoadingStateDispatch({
+                type: 'SET_REPORT_LOADING',
+                id: reportId,
+                data: false,
+            });
+            return convertedReport;
+        }));
     };
     return {
-        isLoading: !!isLoading || isFetching,
+        isLoading: !!isLoading,
         sections,
         filters,
         applyFilters,
     };
 };
+// useDashboard accompanying hook
+export const useDashboardReport = (reportId) => {
+    const { reports, reportsLoadingState } = useContext(ReportsContext);
+    return {
+        report: reportsLoadingState[reportId] ? null : (reports[reportId] ?? null),
+        loading: !!reportsLoadingState[reportId],
+    };
+};

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

@@ -3,7 +3,7 @@ import { InternalDashboardFilter, InternalFilter } from '../models/Filter';
 export declare const useReports: () => {
     reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
 };
-export declare const useReport: (reportId: string) => {
+export declare const useReportInternal: (reportId: string) => {
     reload: (overrideFilters: {
         filters: InternalDashboardFilter[];
         editedFilterLabel?: string;

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

@@ -1 +1 @@
-{"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,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3E,eAAO,MAAM,UAAU;uCAIR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAmBtD,CAAC;AAIF,eAAO,MAAM,SAAS,aAAc,MAAM;8BAIrB;QACf,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,cAAc,EAAE,cACpB,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,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3E,eAAO,MAAM,UAAU;uCAIR,CAAC,MAAM,EAAE,mBAAmB,KAAK,OAAO;CAmBtD,CAAC;AAIF,eAAO,MAAM,iBAAiB,aAAc,MAAM;8BAI7B;QACf,OAAO,EAAE,uBAAuB,EAAE,CAAC;QACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,kBACc,cAAc,EAAE,cACpB,OAAO,GAAG,UAAU,GAAG,WAAW;CA4BhD,CAAC"}

package/dist/esm/hooks/useReport.js

@@ -23,7 +23,7 @@ export const useReports = () => {
 };
 // Exposes context operations with the "Report" scope
 // Not meant to be customer facing
-export const useReport = (reportId) => {
+export const useReportInternal = (reportId) => {
     const { loadFiltersForReport } = useContext(ReportFiltersContext);
     const { allReportsById } = useAllReports();
     const reload = async (overrideFilters, customFilters = [], initiator = 'Chart') => {

package/dist/esm/index.d.ts

@@ -16,7 +16,7 @@ export type { ChartEditorProps } from './ChartEditor';
 export { default as StaticChart } from './StaticChart';
 export type { StaticChartProps } from './StaticChart';
 export { quillFormat as format } from './utils/valueFormatter';
-import { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports } from './hooks/useDashboard';
+import { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, useDashboardReport } from './hooks/useDashboard';
 export { useReports } from './hooks/useReport';
 export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
@@ -33,5 +33,5 @@ export type { DashboardSectionComponentProps } from './components/Dashboard/Dash
 export { Calculation } from './utils/dataProcessing';
 export { StringOperator, NullOperator, DateOperator, NumberOperator, FilterType, DashboardFilterType, type Filter, type InternalFilter, type InternalDashboardDateFilter, type QuillCustomInterval, type QuillCustomRelativeInterval, } from './models/Filter';
 export { ALL_TENANTS, SINGLE_TENANT } from './utils/constants';
-export { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, };
+export { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, useDashboardReport, };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.js

@@ -8,7 +8,7 @@ export { default as ReportBuilder } from './ReportBuilder';
 export { default as ChartEditor } from './ChartEditor';
 export { default as StaticChart } from './StaticChart';
 export { quillFormat as format } from './utils/valueFormatter';
-import { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, } from './hooks/useDashboard';
+import { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, useDashboardReport, } from './hooks/useDashboard';
 export { useReports } from './hooks/useReport';
 export { useQuill } from './hooks/useQuill';
 export { useExport } from './hooks/useExport';
@@ -20,4 +20,4 @@ export { ThemeContext } from './Context';
 export { Calculation } from './utils/dataProcessing';
 export { StringOperator, NullOperator, DateOperator, NumberOperator, FilterType, DashboardFilterType, } from './models/Filter';
 export { ALL_TENANTS, SINGLE_TENANT } from './utils/constants';
-export { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, };
+export { useDashboard, useDashboardInternal, useDashboards, useDashboardReports, useAllReports, useDashboardReport, };

package/package.json

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