@quillsql/react 2.12.52 → 2.13.0

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

@@ -1,14 +1,22 @@
-import { QuillReportInternal } from '../models/Report';
-import { DashboardStringFilter } from '../models/Filter';
+import { QuillReport, QuillReportInternal } from '../models/Report';
+import { DashboardFilter } from '../models/Filter';
 export declare const useReports: () => {
     reloadFilteredReports: (predicate: (report: QuillReportInternal) => boolean) => void;
 };
 export declare const useDashboard: (dashboardName: string) => {
     data: import("../models/Dashboard").DashboardConfig | null | undefined;
-    dashboardFilters: DashboardStringFilter[] | null;
+    dashboardFilters: DashboardFilter[] | null;
     isLoading: boolean | undefined;
-    isDashboardFiltersLoading: boolean;
+    isDashboardFilterLoading: (filterName: string) => boolean | undefined;
     error: any;
-    reload: (overrideDashboardName?: string, fetchFromServer?: boolean) => Promise<void>;
+    reload: (overrideDashboardName?: string, fetchFromServer?: boolean, reportAction?: {
+        report: QuillReport | {
+            id: string;
+        };
+        action: 'upsert' | 'delete';
+    }, overrideFilters?: {
+        filters: DashboardFilter[];
+        editedFilterLabel: string;
+    }) => Promise<void>;
 };
 //# 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":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,eAAO,MAAM,UAAU;gDAYC,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;;;qCAyBtB,MAAM;CA6EjC,CAAC"}
+{"version":3,"file":"useDashboard.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDashboard.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOpE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,eAAO,MAAM,UAAU;gDAYC,mBAAmB,KAAK,OAAO;CAYtD,CAAC;AAEF,eAAO,MAAM,YAAY,kBAAmB,MAAM;;;;2CAiQF,MAAM;;qCA3O1B,MAAM,4CAEf;QACb,MAAM,EAAE,WAAW,GAAG;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;KAC7B,oBACiB;QAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAA;KAAE;CAqP9E,CAAC"}

package/dist/esm/hooks/useDashboard.js

@@ -1,6 +1,8 @@
-import { useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { ClientContext, DashboardConfigContext, DashboardContext, } from '../Context';
-import { getDashboard, getDashboardFilters as getFilters, } from '../utils/dashboard';
+import { useContext, useMemo, useState } from 'react';
+import { ClientContext, DashboardConfigContext, DashboardContext, DashboardFiltersContext, } from '../Context';
+import { getDashboard } from '../utils/dashboard';
+import { COMPARISON_RANGE, PRIMARY_RANGE, } from '../DateRangePicker/dateRangePickerUtils';
+import equal from 'fast-deep-equal';
 export const useReports = () => {
     const [dashboard, dispatch] = useContext(DashboardContext);
     const reloadReport = (id) => {
@@ -23,109 +25,192 @@ export const useReports = () => {
 };
 export const useDashboard = (dashboardName) => {
     const [dashboardConfig, dashboardConfigContext] = useContext(DashboardConfigContext);
-    // if (dashboardName === undefined || dashboardName === null) {
-    //   throw new Error('useDashboard requires a dashboard name parameter');
-    // }
+    const { dashboardFilters, loadFiltersForDashboard } = useContext(DashboardFiltersContext);
+    const [dashboard] = useContext(DashboardContext);
     const [isLoading, setIsLoading] = useState(true);
     const [error, setError] = useState(null);
     const [client, isClientLoading] = useContext(ClientContext);
-    const [dashboardFilters, setDashboardFilters] = useState(null);
-    const [dashboardFiltersLoading, setDashboardFiltersLoading] = useState(true);
     const loading = useMemo(() => isLoading ||
         isClientLoading ||
         (dashboardConfig[dashboardName] &&
             !dashboardConfig[dashboardName]?.sections), [isLoading, isClientLoading, dashboardConfig, dashboardName]);
-    const handleReload = async (overrideDashboardName, fetchFromServer = false) => {
-        await Promise.allSettled([
-            getDashboardFilters(overrideDashboardName ?? dashboardName),
-            getDashboards(overrideDashboardName ?? dashboardName, fetchFromServer),
+    const handleReload = async (overrideDashboardName, fetchFromServer = false, reportAction, overrideFilters) => {
+        if (!fetchFromServer && isLoading)
+            return;
+        if (overrideFilters) {
+            // Pull the date filter out of the override filters, process it, and append it to the filters
+            const dateFilter = overrideFilters.filters.find((f) => f.filterType === 'date_range');
+            loadFiltersForDashboard(dashboardName, [
+                ...(dateFilter
+                    ? [
+                        {
+                            ...dateFilter,
+                            dateField: [
+                                ...new Map(Object.values(dashboardConfig[overrideDashboardName ?? dashboardName]
+                                    ?.sections ?? {})
+                                    .flat()
+                                    .map((report) => {
+                                    const key = JSON.stringify(report.dateField);
+                                    return [key, report.dateField];
+                                })).values(),
+                            ],
+                        },
+                    ]
+                    : []),
+                ...(overrideFilters.filters.filter((f) => f.filterType !== 'date_range') ?? []),
+            ], overrideFilters.editedFilterLabel);
+            return;
+        }
+        const dashboard = await getDashboards(overrideDashboardName ?? dashboardName, fetchFromServer, reportAction);
+        if (!fetchFromServer &&
+            Object.keys(dashboardFilters[dashboardName] ?? {}).length)
+            return;
+        const dateFilter = dashboard?.dateFilter
+            ? {
+                ...dashboard?.dateFilter,
+                startDate: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS']?.start,
+                endDate: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ?? 'LAST_30_DAYS']?.end,
+                filterType: 'date_range',
+                dateField: [
+                    ...new Map(Object.values(dashboard?.sections ?? {})
+                        .flat()
+                        .map((report) => {
+                        const key = JSON.stringify(report.dateField);
+                        return [key, report.dateField];
+                    })).values(),
+                ],
+                preset: dashboard?.dateFilter.primaryRange,
+                dashboardName: overrideDashboardName ?? dashboardName,
+                comparisonRange: dashboard?.dateFilter.comparison
+                    ? {
+                        startDate: dashboard?.dateFilter.comparsionRange?.startDate ??
+                            COMPARISON_RANGE[dashboard?.dateFilter
+                                .defaultComparisonRange ??
+                                'NO_COMPARISON']({
+                                start: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.start,
+                                end: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.end,
+                            })?.start,
+                        endDate: dashboard?.dateFilter.comparsionRange?.endDate ??
+                            COMPARISON_RANGE[dashboard?.dateFilter
+                                .defaultComparisonRange ??
+                                'NO_COMPARISON']({
+                                start: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.start,
+                                end: PRIMARY_RANGE[dashboard?.dateFilter.primaryRange?.value ??
+                                    'LAST_30_DAYS']?.end,
+                            })?.end,
+                        value: dashboard?.dateFilter.comparsionRange?.value ??
+                            dashboard.dateFilter?.defaultComparisonRange,
+                    }
+                    : undefined,
+            }
+            : undefined;
+        // Append dateFilter to the filters unless it's undefined
+        loadFiltersForDashboard(dashboardName, [
+            ...(dateFilter ? [dateFilter] : []),
+            ...(dashboard?.filters ?? []),
         ]);
     };
-    async function getDashboards(dashboardName, fetchFromServer = false) {
-        if (!fetchFromServer && dashboardConfig) {
+    async function getDashboards(dashboardName, fetchFromServer = false, reportAction) {
+        const curDashboardConfig = dashboardConfig[dashboardName];
+        if (!fetchFromServer && curDashboardConfig?.sections) {
+            if (reportAction?.action === 'delete') {
+                dashboardConfigContext({
+                    type: 'UPDATE_DASHBOARD',
+                    id: dashboardName,
+                    data: {
+                        ...curDashboardConfig,
+                        sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
+                            sectionKey,
+                            reports.filter((report) => report.id !== reportAction.report.id),
+                        ])),
+                    },
+                });
+            }
+            else if (reportAction?.action === 'upsert') {
+                const containsReport = Object.values(curDashboardConfig?.sections ?? {})
+                    .flat()
+                    .some((report) => (report.id ?? report._id) === reportAction?.report.id);
+                dashboardConfigContext({
+                    type: 'UPDATE_DASHBOARD',
+                    id: dashboardName,
+                    data: {
+                        ...curDashboardConfig,
+                        sections: Object.fromEntries(Object.entries(curDashboardConfig?.sections ?? {}).map(([sectionKey, reports]) => [
+                            sectionKey,
+                            containsReport
+                                ? reports.map((report) => {
+                                    return {
+                                        report,
+                                        ...(reportAction?.report.id === report.id
+                                            ? reportAction?.report
+                                            : dashboard[report.id]),
+                                        _id: report.id,
+                                        id: report.id,
+                                    };
+                                })
+                                : [
+                                    ...(reports ?? []),
+                                    {
+                                        report: reportAction?.report,
+                                        ...dashboard[reportAction?.report.id],
+                                        id: reportAction?.report.id,
+                                        _id: reportAction?.report.id,
+                                    },
+                                ],
+                        ])),
+                    },
+                });
+            }
             setIsLoading(false);
-            return;
+            return curDashboardConfig;
         }
-        const curDashboardConfig = dashboardConfig[dashboardName];
         if (!fetchFromServer &&
             curDashboardConfig &&
             curDashboardConfig.newQueries) {
             setIsLoading(false);
-            return;
+            return curDashboardConfig;
         }
-        setIsLoading(true);
-        if (!client || !client.publicKey || !client.customerId) {
-            return;
+        if (!client || !client.publicKey || !client.organizationId) {
+            return curDashboardConfig;
         }
         if (dashboardName === null || dashboardName === undefined)
-            return;
+            return curDashboardConfig;
         try {
+            setIsLoading(true);
             const resp = await getDashboard(dashboardName, client);
-            dashboardConfigContext({
-                type: 'ADD_DASHBOARD',
-                id: dashboardName,
-                data: { ...resp },
-            });
-            setIsLoading(false);
+            // if dashboard has changed
+            if (!equal(resp, curDashboardConfig)) {
+                dashboardConfigContext({
+                    type: 'ADD_DASHBOARD',
+                    id: dashboardName,
+                    data: { ...resp },
+                });
+            }
             setError(null);
+            return resp;
         }
         catch (error) {
-            setError(null);
-            setIsLoading(false);
             setError(error);
             console.error('Error fetching data:', error);
         }
-    }
-    async function getDashboardFilters(dashboardName) {
-        setDashboardFiltersLoading(true);
-        if (!client || !client.publicKey || !client.customerId) {
-            return;
-        }
-        if (dashboardName === null || dashboardName === undefined)
-            return;
-        try {
-            const resp = await getFilters(dashboardName, client);
-            setDashboardFilters(resp);
-        }
-        catch (error) {
-            console.error('Error fetching data:', error);
-        }
         finally {
-            setDashboardFiltersLoading(false);
+            setIsLoading(false);
         }
     }
-    useEffectAwaitingLoad(() => {
-        getDashboards(dashboardName, true);
-    }, [dashboardName, client], isClientLoading);
+    function isDashboardFilterLoading(filterName) {
+        return dashboardFilters[dashboardName]?.[filterName]?.loading;
+    }
     return {
         data: loading ? null : dashboardConfig[dashboardName],
-        dashboardFilters: dashboardFilters,
+        dashboardFilters: dashboardFilters[dashboardName] !== undefined
+            ? Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter)
+            : null,
         isLoading: loading,
-        isDashboardFiltersLoading: dashboardFiltersLoading,
+        isDashboardFilterLoading,
         error,
         reload: handleReload,
     };
 };
-function useEffectAwaitingLoad(effectCallback, dependencies, isLoading) {
-    const latestEffectRef = useRef(null);
-    useEffect(() => {
-        let isEffectCanceled = false;
-        const waitForLoading = async () => {
-            while (isLoading) {
-                await new Promise((resolve) => setTimeout(resolve, 16)); // Wait for 16ms (roughly one frame at 60fps)
-                if (isEffectCanceled)
-                    return;
-            }
-        };
-        const effectPromise = waitForLoading().then(() => {
-            if (!isEffectCanceled) {
-                effectCallback();
-            }
-        });
-        latestEffectRef.current = effectPromise;
-        return () => {
-            isEffectCanceled = true;
-            latestEffectRef.current = null;
-        };
-    }, [...dependencies, isLoading]);
-}

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

@@ -1 +1 @@
-{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AA8DA,eAAO,MAAM,SAAS,cAAe,MAAM;;;;CA6C1C,CAAC"}
+{"version":3,"file":"useExport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useExport.tsx"],"names":[],"mappings":"AA8DA,eAAO,MAAM,SAAS,cAAe,MAAM;;;;CA2D1C,CAAC"}

package/dist/esm/hooks/useExport.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { downloadCSV } from '../utils/csv';
-import { useContext, useLayoutEffect, useRef, useState } from 'react';
+import { useContext, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { getData } from '../utils/dataFetcher';
 import { ClientContext, DashboardFiltersContext, ThemeContext, } from '../Context';
 import ReactDOM from 'react-dom';
@@ -23,7 +23,7 @@ async function getExportData(client, dashboardFilters, reportId) {
     const hostedBody = {
         metadata: {
             dashboardItemId: reportId,
-            orgId: client.customerId || '*',
+            orgId: client.organizationId || '*',
             clientId: client.publicKey,
             task: 'item',
             databaseType: client?.databaseType,
@@ -44,6 +44,12 @@ async function getExportData(client, dashboardFilters, reportId) {
 }
 export const useExport = (reportId) => {
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const specificDashboardFilters = useMemo(() => {
+        //FIXME: Pretty sure this won't work with multiple dashboards
+        Object.values(dashboardFilters).map((dashboardFilter) => {
+            return dashboardFilter.filter;
+        });
+    }, [dashboardFilters]);
     const [theme] = useContext(ThemeContext);
     const [client] = useContext(ClientContext);
     const [isLoading, setIsLoading] = useState(false);
@@ -56,7 +62,7 @@ export const useExport = (reportId) => {
                 return;
             }
             setIsLoading(true);
-            const resp = await getExportData(client, dashboardFilters, reportId);
+            const resp = await getExportData(client, specificDashboardFilters, reportId);
             downloadCSV({
                 rows: resp.rows,
                 fields: resp.columns,
@@ -69,7 +75,7 @@ export const useExport = (reportId) => {
                 return;
             }
             setIsLoading(true);
-            const resp = await getExportData(client, dashboardFilters, reportId);
+            const resp = await getExportData(client, specificDashboardFilters, reportId);
             const iframe = document.createElement('iframe');
             document.body.appendChild(iframe);
             if (iframe && iframe.contentDocument && theme) {

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

@@ -1 +1 @@
-{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAEjC,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,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;UAEtD,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,SAAS;sBACP,MAAM,KAAK,IAAI;qBAChB,MAAM,aAAa,MAAM,KAAK,IAAI;2BAEnC,WAAW,KAAK,MAAM,GAAG,SAAS,WACvC,SAAS;CAyLrB,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;WAC7C,MAAM,GAAG,SAAS;CAoD1B,CAAC"}
+{"version":3,"file":"useQuill.d.ts","sourceRoot":"","sources":["../../../src/hooks/useQuill.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,WAAW,EAIZ,MAAM,yBAAyB,CAAC;AAGjC,UAAU,MAAM;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,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;UAEtD,WAAW,GAAG,IAAI;aACf,OAAO;WACT,MAAM,GAAG,SAAS;sBACP,MAAM,KAAK,IAAI;qBAChB,MAAM,aAAa,MAAM,KAAK,IAAI;2BAEnC,WAAW,KAAK,MAAM,GAAG,SAAS,WACvC,SAAS;CAmLrB,CAAC;AAEF,eAAO,MAAM,QAAQ,cACR,MAAM;UAEX;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS;WAC7C,MAAM,GAAG,SAAS;CAoD1B,CAAC"}

package/dist/esm/hooks/useQuill.js

@@ -1,13 +1,21 @@
-import { useContext, useEffect, useState } from 'react';
+import { useContext, useEffect, useMemo, useState } from 'react';
 import { ClientContext, DashboardContext, DashboardFiltersContext, SchemaDataContext, } from '../Context';
 import { mergeComparisonRange } from '../utils/merge';
 import { convertInternalReportToReport, fetchReport } from '../utils/report';
 import { shouldFetchMore } from '../utils/paginationProcessing';
-import { fetchTableByReport, } from '../utils/tableProcessing';
+import { fetchResultsByReport, } from '../utils/tableProcessing';
 import { getPointToPointPercentageChange, getSimplePercentageChange, getSumOfFields, } from '../utils/dataProcessing';
 export const useQuill = (reportId, pagination) => {
     const [dashboard, dispatch] = useContext(DashboardContext);
     const { dashboardFilters } = useContext(DashboardFiltersContext);
+    const specificDashboardFilters = useMemo(() => {
+        if (!reportId)
+            return [];
+        const dashboardName = dashboard[reportId]?.dashboardName;
+        if (!dashboardName)
+            return [];
+        return Object.values(dashboardFilters[dashboardName] ?? {}).map((f) => f.filter);
+    }, [dashboardFilters, reportId, dashboard]);
     const [schemaData] = useContext(SchemaDataContext);
     const [client] = useContext(ClientContext);
     const [data, setData] = useState(null);
@@ -73,13 +81,8 @@ export const useQuill = (reportId, pagination) => {
         if (!loading && reportId && data) {
             setLoading(true);
             try {
-                const specificDashboardFilter = dashboardFilters.filter((f) => f &&
-                    reportId &&
-                    dashboard[reportId] &&
-                    // @ts-ignore
-                    dashboard[reportId].dashboardName === f.dashboardName);
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const paginatedRows = await fetchTableByReport(reportId, client, updatedProcessing, specificDashboardFilter, schemaData.customFields);
+                const paginatedRows = await fetchResultsByReport(reportId, client, updatedProcessing, specificDashboardFilters, schemaData.customFields);
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
                 }
@@ -108,23 +111,18 @@ export const useQuill = (reportId, pagination) => {
                 mergeComparisonRange(dashboard[curReportId]);
             }
             // @ts-ignore
-            setData({ ...dashboard[curReportId] });
+            setData(convertInternalReportToReport(dashboard[curReportId]));
             setLoading(false);
             return;
         }
-        const specificDashboardFilter = dashboardFilters.filter((f) => f &&
-            reportId &&
-            dashboard[curReportId] &&
-            // @ts-ignore
-            dashboard[curReportId].dashboardName === f.dashboardName);
         setLoading(true);
-        const { report, error } = await fetchReport(curReportId, client, useReportTask, specificDashboardFilter, additionalProcessing, undefined, schemaData.customFields);
+        const { report, error } = await fetchReport(curReportId, client, useReportTask, specificDashboardFilters, additionalProcessing, undefined, schemaData.customFields);
         dispatch({
             type: 'ADD_DASHBOARD_ITEM',
             id: reportId,
             data: {
                 ...report,
-                filtersApplied: specificDashboardFilter,
+                filtersApplied: specificDashboardFilters,
                 triggerReload: false,
             },
         });
@@ -134,7 +132,9 @@ export const useQuill = (reportId, pagination) => {
     };
     useEffect(() => {
         if (reportId) {
-            fetchReportHelper(reportId, pagination ? true : false, pagination);
+            fetchReportHelper(reportId, pagination ? true : false, {
+                page: pagination,
+            });
         }
     }, [reportId, dashboard]);
     useEffect(() => {

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

@@ -1,8 +1,17 @@
+import { Table } from '../models/Tables';
 export declare const useVirtualTables: () => {
-    data: import("../models/Tables").Table[];
+    data: Table[];
     isLoading: boolean;
-    reload: (client: any, caller?: string) => Promise<{
-        schema: import("../models/Tables").Table[];
+    loadingTables: {
+        [key: string]: boolean;
+    };
+    reloadAll: (client: any, caller?: string) => Promise<{
+        schema: Table[];
+        customFields: any;
+        isSchemaLoading: boolean;
+    }>;
+    refreshSome: (client: any, tables: Table[]) => Promise<{
+        schema: Table[];
         customFields: any;
         isSchemaLoading: boolean;
     }>;

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

@@ -1 +1 @@
-{"version":3,"file":"useVirtualTables.d.ts","sourceRoot":"","sources":["../../../src/hooks/useVirtualTables.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB;;;qBAGS,GAAG,WAAW,MAAM;;;;;CAqBzD,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;;;;;;wBAMS,GAAG,WAAW,MAAM;;;;;0BAiDf,GAAG,UAAU,KAAK,EAAE;;;;;CAqF9D,CAAC"}

package/dist/esm/hooks/useVirtualTables.js

@@ -1,25 +1,129 @@
-import { useContext } from 'react';
+import { useContext, useState } from 'react';
 import { SchemaDataContext } from '../Context';
 import { getSchemaInfoWithCustomFields } from '../utils/schema';
 export const useVirtualTables = () => {
     const [schemaData, setSchemaData] = useContext(SchemaDataContext);
+    const [loadingTables, setLoadingTables] = useState({});
     const handleReload = async (client, caller) => {
         setSchemaData({ ...schemaData, isSchemaLoading: true });
+        // For each table in schemData.schema, set loadingTables[table] to true
+        setLoadingTables(schemaData.schema.reduce((acc, table) => {
+            acc[table._id] = true;
+            return acc;
+        }, {}));
         const { schemaData: schema, customFieldsByTable } = await getSchemaInfoWithCustomFields(client, caller);
         setSchemaData({
             schema,
             customFields: customFieldsByTable,
             isSchemaLoading: false,
         });
+        setLoadingTables({});
         return {
             schema,
             customFields: customFieldsByTable,
             isSchemaLoading: false,
         };
     };
+    const handleReloadSome = async (client, tableIds, caller) => {
+        const { schemaData: schema, customFieldsByTable } = await getSchemaInfoWithCustomFields(client, caller, tableIds);
+        // Only replace the tables that were reloaded
+        setSchemaData({
+            schema: schemaData.schema.map((table) => {
+                if (tableIds.includes(table._id)) {
+                    return schema.find((newTable) => newTable._id === table._id) || table;
+                }
+                return table;
+            }, {}),
+            customFields: customFieldsByTable,
+            isSchemaLoading: false,
+        });
+        return {
+            schema,
+            customFields: customFieldsByTable,
+            isSchemaLoading: false,
+        };
+    };
+    const handleRefreshSome = async (client, tables) => {
+        if (!client.clientId)
+            return schemaData;
+        // For each table in tableIds, set loadingTables[table] to true
+        setLoadingTables({
+            ...loadingTables,
+            ...tables.reduce((acc, table) => {
+                acc[table._id] = true;
+                return acc;
+            }, {}),
+        });
+        try {
+            const promises = tables.map(async (table) => {
+                return await fetch(`${client.queryEndpoint}?update-view`, {
+                    method: 'POST',
+                    headers: {
+                        ...client.queryHeaders,
+                        'Content-Type': 'application/json',
+                    },
+                    credentials: client.withCredentials ? 'include' : 'omit',
+                    body: JSON.stringify({
+                        metadata: {
+                            preQueries: [table.viewQuery.replace(/;/, '')],
+                            clientId: client.clientId,
+                            publicKey: client.publicKey,
+                            task: 'update-view',
+                            name: table.name,
+                            id: table._id,
+                            runQueryConfig: { getColumns: true },
+                        },
+                    }),
+                })
+                    .then((res) => res.json())
+                    .then(async (res) => {
+                    if (res.status === 'success') {
+                        return await fetch(client.queryEndpoint, {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json',
+                                ...client.queryHeaders,
+                            },
+                            body: JSON.stringify({
+                                metadata: {
+                                    preQueries: [table.viewQuery.replace(/;/, '')],
+                                    name: table.name,
+                                    customFieldInfo: table.customFieldInfo,
+                                    task: 'view',
+                                    id: table._id,
+                                    clientId: client.clientId,
+                                    runQueryConfig: { getColumns: true },
+                                    databaseType: client.databaseType,
+                                    useNewNodeSql: true,
+                                },
+                            }),
+                            credentials: client.withCredentials ? 'include' : 'omit', // If withCredentials is true, set to 'include'. Otherwise, set to 'omit'.
+                        });
+                    }
+                });
+            });
+            await Promise.all(promises);
+            return await handleReloadSome(client, tables.map((table) => table._id));
+        }
+        catch (e) {
+            console.error(e);
+            throw e;
+        }
+        finally {
+            setLoadingTables((prevLoadingTables) => {
+                const newLoadingTables = { ...prevLoadingTables };
+                tables.forEach((table) => {
+                    delete newLoadingTables[table._id];
+                });
+                return newLoadingTables;
+            });
+        }
+    };
     return {
         data: schemaData.schema,
         isLoading: schemaData.isSchemaLoading,
-        reload: handleReload,
+        loadingTables,
+        reloadAll: handleReload,
+        refreshSome: handleRefreshSome,
     };
 };

package/dist/esm/internals/ReportBuilder/PivotForm.d.ts

@@ -11,6 +11,7 @@ interface PivotFormProps {
     setPivotAggregation: any;
     columns: ColumnInternal[];
     uniqueValues?: any;
+    uniqueValuesIsLoading?: boolean;
     onDelete?: any;
     SecondaryButtonComponent?: (props: {
         onClick: () => void;
@@ -22,7 +23,8 @@ interface PivotFormProps {
     PivotColumnContainer?: (props: {
         children: ReactNode;
     }) => JSX.Element;
+    isLoading?: boolean;
 }
-export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, columns, uniqueValues, onDelete, SecondaryButtonComponent, SelectComponent, PivotColumnContainer, }: PivotFormProps): import("react/jsx-runtime").JSX.Element;
+export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, columns, uniqueValues, uniqueValuesIsLoading, onDelete, SecondaryButtonComponent, SelectComponent, PivotColumnContainer, isLoading, }: PivotFormProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=PivotForm.d.ts.map

package/dist/esm/internals/ReportBuilder/PivotForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotForm.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotForm.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAuB,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAU,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAM9D,UAAU,cAAc;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;CACxE;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,wBAA+C,EAC/C,eAA+C,EAC/C,oBAAgD,GACjD,EAAE,cAAc,2CA4GhB"}
+{"version":3,"file":"PivotForm.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotForm.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAuB,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAU,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAM9D,UAAU,cAAc;IACtB,aAAa,EAAE,GAAG,CAAC;IACnB,gBAAgB,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,mBAAmB,EAAE,GAAG,CAAC;IACzB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QACjC,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,IAAI,CAAC,EAAE,SAAS,CAAC;KAClB,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IACvE,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAChC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,OAAO,EACP,YAAY,EACZ,qBAAqB,EACrB,QAAQ,EACR,wBAA+C,EAC/C,eAA+C,EAC/C,oBAAgD,EAChD,SAAS,GACV,EAAE,cAAc,2CAuHhB"}