@quillsql/react 2.16.95 → 2.16.96

package/dist/index.cjs

@@ -65618,8 +65618,7 @@ async function fetchReportBuilderStateByReportId({
     if (!state || typeof state !== "object") {
       return null;
     }
-    const parsedState = state;
-    return parsedState;
+    return state;
   } catch (error) {
     if (error instanceof Error && error.name === "AbortError") {
       throw error;
@@ -65658,10 +65657,11 @@ function applyFetchedReportBuilderState(result, fetchedReportBuilderState) {
   }).filter(
     (table) => Boolean(table)
   );
+  const keptExistingRules = existingRules.rules.length > 0;
   const mergedState = {
     tables: mergedTables,
     columns: existingColumns.length > 0 ? existingColumns : fetchedColumns,
-    rules: existingRules.rules.length > 0 ? existingRules : fetchedRules,
+    rules: keptExistingRules ? existingRules : fetchedRules,
     pivot: existingState?.pivot ?? fetchedReportBuilderState.pivot ?? null,
     sort: existingSort.length > 0 ? existingSort : fetchedSort,
     limit: existingState?.limit ?? fetchedReportBuilderState.limit ?? null
@@ -67899,6 +67899,24 @@ function useReport(reportIdArg, options = {}) {
     initialDataUpdatedAt: () => findCachedDashboardReportQuery(queryClient, effectiveReportId)?.state.dataUpdatedAt,
     staleTime: DASHBOARD_REPORT_STALE_TIME_MS
   });
+  const reportBuilderStateQuery = (0, import_react_query3.useQuery)({
+    queryKey: ["useReport", "report-builder-state", effectiveReportId],
+    queryFn: createUseFormQueryFn((signal) => {
+      if (!client) {
+        return Promise.resolve(null);
+      }
+      return fetchReportBuilderStateByReportId({
+        reportId: effectiveReportId,
+        client,
+        getToken,
+        draftSessionId: draftSessionId || void 0,
+        tenants,
+        abortSignal: signal
+      });
+    }),
+    enabled: Boolean(effectiveReportId) && Boolean(client) && !reportOverride,
+    staleTime: 0
+  });
   const reportNameQueryReportId = String(effectiveReportId ?? "").trim();
   const reportNameQuery = (0, import_react_query3.useQuery)({
     queryKey: createUseFormReportNameQueryKey({
@@ -67929,10 +67947,21 @@ function useReport(reportIdArg, options = {}) {
   const displayReportName = formReportName !== void 0 ? formReportName : resolvedReportName;
   (0, import_react63.useEffect)(() => {
     if (reportOverride) return;
-    const report = initialLoadQuery.data?.report ?? null;
+    const report = applyFetchedReportBuilderState(
+      initialLoadQuery.data ?? { report: null },
+      reportBuilderStateQuery.data ?? null
+    ).report ?? null;
     initializeSchemaScopeForReport(report);
     setSourceReport(report);
-  }, [initialLoadQuery.data, reportOverride, effectiveReportId]);
+  }, [
+    initialLoadQuery.data,
+    initialLoadQuery.fetchStatus,
+    initialLoadQuery.isFetching,
+    initialLoadQuery.isPending,
+    reportBuilderStateQuery.data,
+    reportOverride,
+    effectiveReportId
+  ]);
   (0, import_react63.useEffect)(() => {
     if (!sourceReport) {
       return;
@@ -70712,7 +70741,7 @@ function useReport(reportIdArg, options = {}) {
     isPivotTableChart,
     tableColumnItems
   ]);
-  const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching);
+  const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching || reportBuilderStateQuery.isPending || reportBuilderStateQuery.isFetching);
   const filterUniqueValuesLoading = filterUniqueValuesEnabled && (filterUniqueValuesQuery.isPending || filterUniqueValuesQuery.isFetching);
   const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const awaitingPivotDetailRows = Boolean(nextPivot || sourceReport?.pivot) && !reportOverride && Boolean(sourceReport) && sourceReportMatchesEffectiveReportId && (!Array.isArray(sourceReport?.rows) || sourceReport.rows.length === 0) && pivotTableDataRefreshQuery.status !== "error";
@@ -71540,7 +71569,9 @@ function useReport(reportIdArg, options = {}) {
   };
   const saveChanges = (0, import_react63.useCallback)(
     async (overrides) => {
-      if (!client || !sourceReport || !effectiveReportBuilderState) return;
+      if (!client || !sourceReport || !effectiveReportBuilderState) {
+        return;
+      }
       const sourceRest = {
         ...sourceReport
       };
@@ -72646,10 +72677,9 @@ function useReportFilterDraft(args) {
     );
     return stringField?.name ?? fields[0]?.name ?? "";
   }, []);
-  const getDefaultValue = (0, import_react66.useCallback)(
-    (rule) => defaultFilterRuleValueForOperator(rule?.operator),
-    []
-  );
+  const getDefaultValue = (0, import_react66.useCallback)((rule) => {
+    return defaultFilterRuleValueForOperator(rule?.operator);
+  }, []);
   const filterDraftQueryBuilderProps = (0, import_react66.useMemo)(
     () => ({
       ...queryBuilderProps,

package/dist/index.js

@@ -65826,8 +65826,7 @@ async function fetchReportBuilderStateByReportId({
     if (!state || typeof state !== "object") {
       return null;
     }
-    const parsedState = state;
-    return parsedState;
+    return state;
   } catch (error) {
     if (error instanceof Error && error.name === "AbortError") {
       throw error;
@@ -65866,10 +65865,11 @@ function applyFetchedReportBuilderState(result, fetchedReportBuilderState) {
   }).filter(
     (table) => Boolean(table)
   );
+  const keptExistingRules = existingRules.rules.length > 0;
   const mergedState = {
     tables: mergedTables,
     columns: existingColumns.length > 0 ? existingColumns : fetchedColumns,
-    rules: existingRules.rules.length > 0 ? existingRules : fetchedRules,
+    rules: keptExistingRules ? existingRules : fetchedRules,
     pivot: existingState?.pivot ?? fetchedReportBuilderState.pivot ?? null,
     sort: existingSort.length > 0 ? existingSort : fetchedSort,
     limit: existingState?.limit ?? fetchedReportBuilderState.limit ?? null
@@ -68107,6 +68107,24 @@ function useReport(reportIdArg, options = {}) {
     initialDataUpdatedAt: () => findCachedDashboardReportQuery(queryClient, effectiveReportId)?.state.dataUpdatedAt,
     staleTime: DASHBOARD_REPORT_STALE_TIME_MS
   });
+  const reportBuilderStateQuery = useQuery({
+    queryKey: ["useReport", "report-builder-state", effectiveReportId],
+    queryFn: createUseFormQueryFn((signal) => {
+      if (!client) {
+        return Promise.resolve(null);
+      }
+      return fetchReportBuilderStateByReportId({
+        reportId: effectiveReportId,
+        client,
+        getToken,
+        draftSessionId: draftSessionId || void 0,
+        tenants,
+        abortSignal: signal
+      });
+    }),
+    enabled: Boolean(effectiveReportId) && Boolean(client) && !reportOverride,
+    staleTime: 0
+  });
   const reportNameQueryReportId = String(effectiveReportId ?? "").trim();
   const reportNameQuery = useQuery({
     queryKey: createUseFormReportNameQueryKey({
@@ -68137,10 +68155,21 @@ function useReport(reportIdArg, options = {}) {
   const displayReportName = formReportName !== void 0 ? formReportName : resolvedReportName;
   useEffect33(() => {
     if (reportOverride) return;
-    const report = initialLoadQuery.data?.report ?? null;
+    const report = applyFetchedReportBuilderState(
+      initialLoadQuery.data ?? { report: null },
+      reportBuilderStateQuery.data ?? null
+    ).report ?? null;
     initializeSchemaScopeForReport(report);
     setSourceReport(report);
-  }, [initialLoadQuery.data, reportOverride, effectiveReportId]);
+  }, [
+    initialLoadQuery.data,
+    initialLoadQuery.fetchStatus,
+    initialLoadQuery.isFetching,
+    initialLoadQuery.isPending,
+    reportBuilderStateQuery.data,
+    reportOverride,
+    effectiveReportId
+  ]);
   useEffect33(() => {
     if (!sourceReport) {
       return;
@@ -70920,7 +70949,7 @@ function useReport(reportIdArg, options = {}) {
     isPivotTableChart,
     tableColumnItems
   ]);
-  const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching);
+  const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching || reportBuilderStateQuery.isPending || reportBuilderStateQuery.isFetching);
   const filterUniqueValuesLoading = filterUniqueValuesEnabled && (filterUniqueValuesQuery.isPending || filterUniqueValuesQuery.isFetching);
   const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const awaitingPivotDetailRows = Boolean(nextPivot || sourceReport?.pivot) && !reportOverride && Boolean(sourceReport) && sourceReportMatchesEffectiveReportId && (!Array.isArray(sourceReport?.rows) || sourceReport.rows.length === 0) && pivotTableDataRefreshQuery.status !== "error";
@@ -71748,7 +71777,9 @@ function useReport(reportIdArg, options = {}) {
   };
   const saveChanges = useCallback5(
     async (overrides) => {
-      if (!client || !sourceReport || !effectiveReportBuilderState) return;
+      if (!client || !sourceReport || !effectiveReportBuilderState) {
+        return;
+      }
       const sourceRest = {
         ...sourceReport
       };
@@ -72854,10 +72885,9 @@ function useReportFilterDraft(args) {
     );
     return stringField?.name ?? fields[0]?.name ?? "";
   }, []);
-  const getDefaultValue = useCallback6(
-    (rule) => defaultFilterRuleValueForOperator(rule?.operator),
-    []
-  );
+  const getDefaultValue = useCallback6((rule) => {
+    return defaultFilterRuleValueForOperator(rule?.operator);
+  }, []);
   const filterDraftQueryBuilderProps = useMemo35(
     () => ({
       ...queryBuilderProps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.16.95",
+  "version": "2.16.96",
   "type": "module",
   "exports": {
     ".": {