@quillsql/react 2.16.63 → 2.16.65

package/dist/index.cjs

@@ -22972,6 +22972,7 @@ var fetchReportBuilderDataFromState = async ({
   customFields,
   skipUniqueValues,
   skipRowCount,
+  rowCountOnly,
   processing,
   dashboardName,
   getToken,
@@ -23048,7 +23049,7 @@ var fetchReportBuilderDataFromState = async ({
       processing ?? { page: DEFAULT_PAGINATION },
       customFields,
       skipRowCount,
-      void 0,
+      rowCountOnly,
       curReport?.id ? String(curReport.id).trim() : void 0,
       draftSessionId ? String(draftSessionId).trim() : void 0
     );
@@ -61220,22 +61221,18 @@ function normalizePivotChartForAxisControls(chart, reportId) {
     yAxisFields
   };
 }
-function buildPivotColumnPivotTableFormattingColumns(chart) {
-  if (!Array.isArray(chart.columns) || chart.columns.length === 0) {
-    return null;
-  }
-  const columnField = String(chart.pivot?.columnField ?? "").trim();
-  const aggregations = getPivotAggregations(chart);
-  if (!columnField || aggregations.length === 0) {
-    return null;
-  }
+function buildPivotColumnPivotTableFormattingColumns(pivot, chart) {
+  if (!pivot) return null;
+  const reportForControls = chart ? { ...chart, pivot } : { pivot };
+  const aggregations = getPivotAggregations(reportForControls);
+  if (aggregations.length === 0) return null;
   const hasMultipleAggregations = aggregations.length > 1;
-  const rowField = String(chart.pivot?.rowField ?? "").trim();
+  const rowField = String(pivot.rowField ?? "").trim();
   const tableColumns = [];
   const selectedColumnIds = [];
   if (rowField) {
-    const rowSource = chart.columns.find(
-      (c) => String(c.field ?? "").trim() === rowField
+    const rowSource = chart?.columns?.find(
+      (column) => String(column.field ?? "").trim() === rowField
     );
     const rowTable = String(
       rowSource?.table ?? ""
@@ -61243,8 +61240,8 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     tableColumns.push({
       field: rowField,
       label: String(
-        rowSource?.label ?? chart.xAxisLabel ?? chart.xAxisField ?? rowField
-      ).trim() || rowField
+        rowSource?.label ?? chart?.xAxisLabel ?? chart?.xAxisField ?? toTitleCaseLabel(rowField)
+      ).trim() || toTitleCaseLabel(rowField)
     });
     const rowId = encodeColumnOptionValue(rowTable || void 0, rowField);
     if (rowId) {
@@ -61259,14 +61256,14 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     if (!fieldKey) continue;
     tableColumns.push({
       field: fieldKey,
-      label: buildAggregationLabel(aggregation, chart)
+      label: buildAggregationLabel(aggregation, reportForControls)
     });
     const id = encodeColumnOptionValue(void 0, fieldKey);
     if (id) {
       selectedColumnIds.push(id);
     }
   }
-  return { tableColumns, selectedColumnIds };
+  return { tableColumns, selectedColumnIds, aggregations };
 }
 function mergePivotColumnSeriesLabelWithUserEdit(normalizedLabel, userRowLabel, pivotSeriesField) {
   const user = String(userRowLabel ?? "").trim();
@@ -63046,7 +63043,9 @@ async function loadViaReportBuilderState({
   report,
   draftSessionId,
   pagination,
-  paginationSort
+  paginationSort,
+  rowsOnly,
+  rowCountOnly
 }) {
   const baseReport = {
     ...EMPTY_INTERNAL_REPORT,
@@ -63066,6 +63065,8 @@ async function loadViaReportBuilderState({
     // Unique values are fetched separately via `filterUniqueValuesQuery` so chart/table
     // refresh queries are not blocked on `report-builder-unique-values`.
     skipUniqueValues: true,
+    skipRowCount: rowsOnly,
+    rowCountOnly,
     previousRelevant: previousRelevantWhenSkippingInlineUniqueFetch(report),
     processing: pagination ? {
       page: {
@@ -63129,6 +63130,9 @@ async function loadViaReportBuilderState({
     report: {
       ...baseReport,
       ...reportBuilderInfo.report,
+      // A rows-only response intentionally has no count; retain the previous
+      // value until the independent count query completes.
+      rowCount: rowsOnly ? baseReport.rowCount : reportBuilderInfo.report.rowCount,
       reportBuilderState: normalizedReportBuilderState,
       pivot: reportBuilderState.pivot,
       pivotRows: refreshedPivotData?.rows ?? compatibleReportPivotRows ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRows : []) ?? [],
@@ -63158,7 +63162,8 @@ async function loadReportForUseForm({
   customFields,
   dashboardName,
   useInMemoryEngines,
-  draftSessionId
+  draftSessionId,
+  rowsOnly = false
 }) {
   const effectivePivot = pivot ?? initialReportBuilderState?.pivot ?? void 0;
   const hasPivot = Boolean(effectivePivot);
@@ -63255,7 +63260,9 @@ async function loadReportForUseForm({
     schema,
     customFields,
     dashboardName,
-    draftSessionId
+    report: baseReport,
+    draftSessionId,
+    rowsOnly
   });
 }
 function generateDraftSessionId() {
@@ -63263,8 +63270,8 @@ function generateDraftSessionId() {
 }
 function useReport(reportIdArg, options = {}) {
   const propReportId = String(reportIdArg ?? "").trim();
-  const [createdReportId, setCreatedReportId] = (0, import_react61.useState)(null);
-  const effectiveReportId = propReportId || createdReportId || "";
+  const [createdReportBootstrap, setCreatedReportBootstrap] = (0, import_react61.useState)(null);
+  const effectiveReportId = propReportId || createdReportBootstrap?.reportId || "";
   const { eventTracking } = (0, import_react61.useContext)(EventTrackingContext);
   const [draftSessionId, setDraftSessionId] = (0, import_react61.useState)(generateDraftSessionId);
   const useInMemoryEngines = options.useInMemoryEngines ?? false;
@@ -63481,13 +63488,57 @@ function useReport(reportIdArg, options = {}) {
   const dashboardNameForNewReport = (0, import_react61.useMemo)(() => {
     return [clientDefaultDashboardName, destinationDashboardName].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   }, [clientDefaultDashboardName, destinationDashboardName]);
+  const { mutate: createReport } = (0, import_react_query2.useMutation)({
+    mutationKey: ["useReport", "create-report", draftSessionId],
+    mutationFn: async ({
+      reportBuilderState,
+      tables
+    }) => {
+      if (!client) {
+        throw new Error("Missing client for create-report");
+      }
+      const fallbackName = tables[0]?.name ? snakeAndCamelCaseToTitleCase(tables[0].name) : "New report";
+      const resp = await saveReport({
+        report: {
+          ...EMPTY_INTERNAL_REPORT,
+          name: fallbackName,
+          chartType: "table",
+          dashboardName: "quill-draft-reports",
+          reportBuilderState
+        },
+        client,
+        getToken,
+        eventTracking,
+        tenants,
+        draftSessionId: draftSessionId || void 0
+      });
+      const reportId = String(resp?.id ?? resp?._id ?? "").trim();
+      if (!reportId) {
+        throw new Error("create-report returned no report id");
+      }
+      return {
+        reportId,
+        reportBuilderState,
+        report: {
+          ...EMPTY_INTERNAL_REPORT,
+          ...resp,
+          id: reportId,
+          name: String(resp?.name ?? "").trim() || fallbackName,
+          dashboardName: String(resp?.dashboardName ?? "").trim() || "quill-draft-reports",
+          chartType: resp?.chartType ?? "table",
+          pivot: null,
+          reportBuilderState
+        }
+      };
+    }
+  });
   const filterStackRef = (0, import_react61.useRef)(filterStack);
   filterStackRef.current = filterStack;
   const resolvedGroupRowsBy = decodePivotGroupOptionValue(groupRowsBy);
   const resolvedGroupColumnsBy = decodePivotGroupOptionValue(groupColumnsBy);
   (0, import_react61.useEffect)(() => {
     if (propReportId) {
-      setCreatedReportId(null);
+      setCreatedReportBootstrap(null);
     }
   }, [propReportId]);
   (0, import_react61.useEffect)(() => {
@@ -63567,7 +63618,7 @@ function useReport(reportIdArg, options = {}) {
   (0, import_react61.useEffect)(() => {
     if (reportOverride) return;
     if (propReportId) return;
-    if (createdReportId) return;
+    if (createdReportBootstrap) return;
     if (!client) return;
     if (!String(dashboardNameForNewReport ?? "").trim()) {
       return;
@@ -63598,59 +63649,34 @@ function useReport(reportIdArg, options = {}) {
       );
     }
     if (bootstrapColumns.length === 0) return;
-    let cancelled = false;
-    (async () => {
-      try {
-        const fkMapForMerge = getSchemaForeignKeyMapping(
-          schemaForReportBuilderState
-        );
-        const tables = mergeReportBuilderTables(
-          ids.map((name2) => ({ name: name2 })),
-          bootstrapColumns.map((col) => String(col.table ?? "").trim()).filter(Boolean),
-          fkMapForMerge
-        );
-        const reportBuilderState = {
-          tables,
-          columns: bootstrapColumns,
-          filterStack: [],
-          sort: [],
-          limit: null,
-          pivot: null
-        };
-        const resp = await saveReport({
-          report: {
-            ...EMPTY_INTERNAL_REPORT,
-            name: tables[0]?.name ? snakeAndCamelCaseToTitleCase(tables[0].name) : "New report",
-            chartType: "table",
-            dashboardName: "quill-draft-reports",
-            reportBuilderState
-          },
-          client,
-          getToken,
-          eventTracking,
-          tenants,
-          draftSessionId: draftSessionId || void 0
-        });
-        if (cancelled) return;
-        const id = String(resp?.id ?? resp?._id ?? "").trim();
-        if (id) setCreatedReportId(id);
-      } catch {
-      }
-    })();
-    return () => {
-      cancelled = true;
+    const fkMapForMerge = getSchemaForeignKeyMapping(
+      schemaForReportBuilderState
+    );
+    const tables = mergeReportBuilderTables(
+      ids.map((name2) => ({ name: name2 })),
+      bootstrapColumns.map((col) => String(col.table ?? "").trim()).filter(Boolean),
+      fkMapForMerge
+    );
+    const reportBuilderState = {
+      tables,
+      columns: bootstrapColumns,
+      filterStack: [],
+      sort: [],
+      limit: null,
+      pivot: null
     };
+    createReport(
+      { reportBuilderState, tables },
+      { onSuccess: setCreatedReportBootstrap }
+    );
   }, [
     reportOverride,
     propReportId,
-    createdReportId,
+    createdReportBootstrap,
     client,
+    createReport,
     schemaDatasourceIdsKey,
     dashboardNameForNewReport,
-    draftSessionId,
-    getToken,
-    eventTracking,
-    tenants,
     schemaForReportBuilderState,
     queryColumnsBootstrapKey
   ]);
@@ -64096,7 +64122,7 @@ function useReport(reportIdArg, options = {}) {
           }
         });
         return { uniqueValuesByColumn: normalizedUniqueValuesByColumn };
-      } catch (error) {
+      } catch {
         return { uniqueValuesByColumn: {} };
       }
     }),
@@ -64525,19 +64551,27 @@ function useReport(reportIdArg, options = {}) {
     setExpandReportBuilderColumnsForFlatTable(false);
     prevPivotStateForColumnExpansionRef.current = null;
   }, [propReportId, reportOverride]);
+  const createdBootstrapForInitialLoad = !propReportId && createdReportBootstrap?.reportId === effectiveReportId ? createdReportBootstrap : null;
+  const initialReportBuilderStateForLoad = initialReportBuilderState ?? createdBootstrapForInitialLoad?.reportBuilderState ?? null;
+  const initialBaseReportForLoad = createdBootstrapForInitialLoad?.report ?? null;
+  const isCreatedReportBootstrapLoad = Boolean(
+    createdBootstrapForInitialLoad && initialReportBuilderStateForLoad
+  );
   const initialLoadQuery = (0, import_react_query2.useQuery)({
     queryKey: createUseFormInitialLoadQueryKey({
       reportId: effectiveReportId,
       draftSessionId,
       useInMemoryEngines,
-      hasInitialReportBuilderState: Boolean(initialReportBuilderState),
+      hasInitialReportBuilderState: Boolean(
+        initialReportBuilderStateForLoad
+      ),
       reloadKeyHash,
       tenantHash,
       flagHash,
       clientHash
     }),
     queryFn: createUseFormQueryFn(async () => {
-      const allowReportTaskBootstrap = !initialReportBuilderState && bootstrapReportTaskUsedForReportIdRef.current !== effectiveReportId;
+      const allowReportTaskBootstrap = !initialReportBuilderStateForLoad && bootstrapReportTaskUsedForReportIdRef.current !== effectiveReportId;
       const loadTargetId = String(effectiveReportId ?? "").trim();
       const sourceReportIdentity = String(
         sourceReport?.id ?? sourceReport?._id ?? ""
@@ -64549,7 +64583,8 @@ function useReport(reportIdArg, options = {}) {
       }
       const loadResult = await loadReportForUseForm({
         reportId: effectiveReportId,
-        initialReportBuilderState,
+        initialReportBuilderState: initialReportBuilderStateForLoad,
+        baseReport: initialBaseReportForLoad,
         allowReportTaskBootstrap,
         client,
         getToken,
@@ -64560,7 +64595,8 @@ function useReport(reportIdArg, options = {}) {
         customFields: customFieldsRef.current,
         dashboardName: resolvedSourceDashboardName,
         useInMemoryEngines,
-        draftSessionId: draftSessionId || void 0
+        draftSessionId: draftSessionId || void 0,
+        rowsOnly: isCreatedReportBootstrapLoad
       });
       return loadResult;
     }),
@@ -65181,6 +65217,7 @@ function useReport(reportIdArg, options = {}) {
     () => stableSerializeForQueryKey(effectiveReportBuilderState),
     [effectiveReportBuilderState]
   );
+  const createdBootstrapStateMatchesEffectiveState = isCreatedReportBootstrapLoad && stableSerializeForQueryKey(initialReportBuilderStateForLoad) === effectiveReportBuilderStateHash;
   const prevPaginationResetStateHashRef = (0, import_react61.useRef)(null);
   (0, import_react61.useEffect)(() => {
     const prevHash = prevPaginationResetStateHashRef.current;
@@ -65287,12 +65324,61 @@ function useReport(reportIdArg, options = {}) {
     enabled: tableRefreshQueryEnabled,
     retry: false
   });
+  const createdBootstrapRowCountQuery = (0, import_react_query2.useQuery)({
+    queryKey: [
+      "useReport",
+      "created-bootstrap-row-count",
+      effectiveReportId,
+      stableSerializeForQueryKey(initialReportBuilderStateForLoad),
+      tenantHash,
+      clientHash
+    ],
+    queryFn: createUseFormQueryFn(async () => {
+      if (!createdBootstrapForInitialLoad || !initialReportBuilderStateForLoad || !client) {
+        return { report: null, error: "Missing bootstrap count prerequisites" };
+      }
+      return loadViaReportBuilderState({
+        reportId: effectiveReportId,
+        reportBuilderState: initialReportBuilderStateForLoad,
+        client,
+        getToken,
+        tenants,
+        schema: schemaForReportBuilderState,
+        customFields: schemaData.customFields,
+        dashboardName: resolvedSourceDashboardName,
+        report: createdBootstrapForInitialLoad.report,
+        draftSessionId: draftSessionId || void 0,
+        rowCountOnly: true
+      });
+    }),
+    enabled: createdBootstrapStateMatchesEffectiveState && Boolean(client) && !reportOverride,
+    retry: false
+  });
   (0, import_react61.useEffect)(() => {
     if (!tableRefreshQueryEnabled) return;
     const report = tableRefreshQuery.data?.report;
     if (tableRefreshQuery.data?.error || !report) return;
     setSourceReport(report);
   }, [effectiveReportId, tableRefreshQuery.data, tableRefreshQueryEnabled]);
+  (0, import_react61.useEffect)(() => {
+    if (!createdBootstrapStateMatchesEffectiveState) return;
+    const countReport = createdBootstrapRowCountQuery.data?.report;
+    if (createdBootstrapRowCountQuery.data?.error || !countReport) return;
+    setSourceReport((currentReport) => {
+      if (!currentReport || currentReport.id !== effectiveReportId) {
+        return currentReport;
+      }
+      if (currentReport.rowCount === countReport.rowCount) {
+        return currentReport;
+      }
+      return { ...currentReport, rowCount: countReport.rowCount };
+    });
+  }, [
+    createdBootstrapRowCountQuery.data,
+    createdBootstrapStateMatchesEffectiveState,
+    effectiveReportId,
+    sourceReport?.id
+  ]);
   const chartTypes = (0, import_react61.useMemo)(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
@@ -65961,7 +66047,8 @@ function useReport(reportIdArg, options = {}) {
           pageIndex: pagination.pageIndex,
           pageSize: pagination.pageSize
         },
-        paginationSort: tablePaginationSort
+        paginationSort: tablePaginationSort,
+        rowsOnly: true
       });
     }),
     enabled: tablePageQueryEnabled,
@@ -66602,8 +66689,10 @@ function useReport(reportIdArg, options = {}) {
       }
     };
   }, [chart, filterOptions, filtersForQueryBuilder]);
-  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(
-    chart && chart.pivot && Array.isArray(chart.columns) && chart.columns.length > 0
+  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
+  const pivotTableColumnControls = (0, import_react61.useMemo)(
+    () => isPivotTableChart ? buildPivotColumnPivotTableFormattingColumns(pivotState, chart) : null,
+    [chart, isPivotTableChart, pivotState]
   );
   const chartAxes = (0, import_react61.useMemo)(() => {
     const yAxisItems = resolvedYAxisFields.map(
@@ -66903,24 +66992,19 @@ function useReport(reportIdArg, options = {}) {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
   } = (0, import_react61.useMemo)(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      const pivotTableColumns = aggregationSlotColumns ? aggregationSlotColumns.tableColumns : chart.columns.map((c) => ({
-        field: String(c.field ?? "").trim(),
-        label: String(c.label ?? c.field ?? "").trim() || String(c.field ?? "")
-      }));
-      const selectedPivotIds = aggregationSlotColumns ? aggregationSlotColumns.selectedColumnIds : chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
       return getAllColumnOptions({
         schemaColumnOptions,
-        tableColumns: pivotTableColumns,
-        selectedColumnIds: selectedPivotIds
+        tableColumns: pivotTableColumnControls.tableColumns,
+        selectedColumnIds: pivotTableColumnControls.selectedColumnIds
       });
     }
+    if (isPivotTableChart) {
+      return {
+        columnsOptions: [],
+        hasTableDrivenColumnOrder: true
+      };
+    }
     return getAllColumnOptions({
       schemaColumnOptions,
       tableColumns: table.columns,
@@ -66933,6 +67017,7 @@ function useReport(reportIdArg, options = {}) {
     chart?.xAxisLabel,
     columns,
     isPivotTableChart,
+    pivotTableColumnControls,
     schemaColumnOptions,
     table.columns
   ]);
@@ -66954,17 +67039,11 @@ function useReport(reportIdArg, options = {}) {
     [tableDerivedColumnOrder]
   );
   const activeTableColumnIds = (0, import_react61.useMemo)(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      if (aggregationSlotColumns) {
-        return aggregationSlotColumns.selectedColumnIds;
-      }
-      return chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
+      return pivotTableColumnControls.selectedColumnIds;
+    }
+    if (isPivotTableChart) {
+      return [];
     }
     const currentColumns = (columns ?? []).filter(Boolean);
     if (!hasTableDrivenColumnOrder) {
@@ -66989,6 +67068,7 @@ function useReport(reportIdArg, options = {}) {
     columns,
     hasTableDrivenColumnOrder,
     isPivotTableChart,
+    pivotTableColumnControls,
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
@@ -67043,12 +67123,12 @@ function useReport(reportIdArg, options = {}) {
       });
     }
     const columnPivotMeasureFormatByAggregationField = /* @__PURE__ */ new Map();
-    if (isPivotTableChart && chart?.pivot) {
-      const slotFormatting = buildPivotColumnPivotTableFormattingColumns(chart);
+    if (pivotTableColumnControls && chart) {
+      const slotFormatting = pivotTableColumnControls;
       if (slotFormatting) {
-        const aggregations = getPivotAggregations(chart);
+        const aggregations = slotFormatting.aggregations;
         const hasMultiple = aggregations.length > 1;
-        const rowField = String(chart.pivot.rowField ?? "").trim();
+        const rowField = String(pivotState?.rowField ?? "").trim();
         const firstValueColumnFormat = String(
           (chart.columns ?? []).find(
             (c) => String(c.field ?? "").trim() !== rowField
@@ -67128,6 +67208,8 @@ function useReport(reportIdArg, options = {}) {
     columnOptionById,
     displayColumnById,
     isPivotTableChart,
+    pivotState,
+    pivotTableColumnControls,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
     sourceReport?.columns,
@@ -67199,8 +67281,8 @@ function useReport(reportIdArg, options = {}) {
   ]);
   const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching);
   const filterUniqueValuesLoading = filterUniqueValuesEnabled && (filterUniqueValuesQuery.isPending || filterUniqueValuesQuery.isFetching);
-  const chartLoading = initialLoadInProgress || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
-  const tableLoading = initialLoadInProgress || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const tableLoading = initialLoadInProgress || pendingPivotRefresh || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const loading = chartLoading || tableLoading;
   const buildSetReportColumnsFromIds = (nextColumnIds, settingsById) => {
     const normalizedNextIds = nextColumnIds.map((columnId) => String(columnId ?? "").trim()).filter(Boolean);
@@ -67477,11 +67559,12 @@ function useReport(reportIdArg, options = {}) {
     const isClearingRowGrouping = effectiveNextState.groupRowsBy !== void 0 && String(effectiveNextState.groupRowsBy ?? "").trim().length === 0;
     const queuePromoteColumnToRow = isClearingRowGrouping && !sourceReport;
     const shouldRefreshExpandedTableData = useInMemoryEngines && (hasRowGroupSelection || hasColumnGroupSelection || hasAggregationSelection) || !useInMemoryEngines && !nextPivot && effectiveNextState.sort !== void 0;
-    const dispatchTouchesPivot = touchesPivotState || isDatasourceUpdate;
+    const hasReportIdentity = Boolean(effectiveReportId);
+    const dispatchTouchesPivot = touchesPivotState || hasReportIdentity && isDatasourceUpdate;
     dispatchFormRuntime({
       type: "APPLY_SET_REPORT",
       touchesPivotState: dispatchTouchesPivot,
-      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate || addedRequestedDisplayColumns.length > 0,
+      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || hasReportIdentity && (isDatasourceUpdate || addedRequestedDisplayColumns.length > 0),
       queuePromoteColumnToRow,
       updater: (prev) => {
         const next = {
@@ -67553,13 +67636,25 @@ function useReport(reportIdArg, options = {}) {
           const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
           const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
-          if (addedDisplayColumns.length > 0) {
+          const hasPivotSelection = Boolean(
+            decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
+          ) || next.aggregationState.some(isAppliedAggregation);
+          const requestedDisplayTableNames = new Set(
+            normalizedDisplayColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
+          );
+          const selectedDatasourceTableNames = new Set(
+            (next.schemaDatasourceIds ?? []).map((tableName) => String(tableName ?? "").trim()).filter(Boolean)
+          );
+          const replacesDatasourceTableScope = !hasPivotSelection && requestedDisplayTableNames.size > 0 && selectedDatasourceTableNames.size > 0 && [...requestedDisplayTableNames].every(
+            (tableName) => !selectedDatasourceTableNames.has(tableName)
+          );
+          if (replacesDatasourceTableScope) {
+            next.queryColumns = normalizedDisplayColumns;
+            next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(
               next.queryColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
             );
-            const hasPivotSelection = Boolean(
-              decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
-            ) || next.aggregationState.some(isAppliedAggregation);
             const queryColumnsToInclude = addedDisplayColumns.filter(
               (column) => {
                 const tableName = String(column.table ?? "").trim();

package/dist/index.js

@@ -22969,6 +22969,7 @@ var fetchReportBuilderDataFromState = async ({
   customFields,
   skipUniqueValues,
   skipRowCount,
+  rowCountOnly,
   processing,
   dashboardName,
   getToken,
@@ -23045,7 +23046,7 @@ var fetchReportBuilderDataFromState = async ({
       processing ?? { page: DEFAULT_PAGINATION },
       customFields,
       skipRowCount,
-      void 0,
+      rowCountOnly,
       curReport?.id ? String(curReport.id).trim() : void 0,
       draftSessionId ? String(draftSessionId).trim() : void 0
     );
@@ -58821,7 +58822,7 @@ import {
   useRef as useRef24,
   useState as useState41
 } from "react";
-import { keepPreviousData, useQuery } from "@tanstack/react-query";
+import { keepPreviousData, useMutation, useQuery } from "@tanstack/react-query";
 init_util();
 init_columnType();
 init_columnProcessing();
@@ -61432,22 +61433,18 @@ function normalizePivotChartForAxisControls(chart, reportId) {
     yAxisFields
   };
 }
-function buildPivotColumnPivotTableFormattingColumns(chart) {
-  if (!Array.isArray(chart.columns) || chart.columns.length === 0) {
-    return null;
-  }
-  const columnField = String(chart.pivot?.columnField ?? "").trim();
-  const aggregations = getPivotAggregations(chart);
-  if (!columnField || aggregations.length === 0) {
-    return null;
-  }
+function buildPivotColumnPivotTableFormattingColumns(pivot, chart) {
+  if (!pivot) return null;
+  const reportForControls = chart ? { ...chart, pivot } : { pivot };
+  const aggregations = getPivotAggregations(reportForControls);
+  if (aggregations.length === 0) return null;
   const hasMultipleAggregations = aggregations.length > 1;
-  const rowField = String(chart.pivot?.rowField ?? "").trim();
+  const rowField = String(pivot.rowField ?? "").trim();
   const tableColumns = [];
   const selectedColumnIds = [];
   if (rowField) {
-    const rowSource = chart.columns.find(
-      (c) => String(c.field ?? "").trim() === rowField
+    const rowSource = chart?.columns?.find(
+      (column) => String(column.field ?? "").trim() === rowField
     );
     const rowTable = String(
       rowSource?.table ?? ""
@@ -61455,8 +61452,8 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     tableColumns.push({
       field: rowField,
       label: String(
-        rowSource?.label ?? chart.xAxisLabel ?? chart.xAxisField ?? rowField
-      ).trim() || rowField
+        rowSource?.label ?? chart?.xAxisLabel ?? chart?.xAxisField ?? toTitleCaseLabel(rowField)
+      ).trim() || toTitleCaseLabel(rowField)
     });
     const rowId = encodeColumnOptionValue(rowTable || void 0, rowField);
     if (rowId) {
@@ -61471,14 +61468,14 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     if (!fieldKey) continue;
     tableColumns.push({
       field: fieldKey,
-      label: buildAggregationLabel(aggregation, chart)
+      label: buildAggregationLabel(aggregation, reportForControls)
     });
     const id = encodeColumnOptionValue(void 0, fieldKey);
     if (id) {
       selectedColumnIds.push(id);
     }
   }
-  return { tableColumns, selectedColumnIds };
+  return { tableColumns, selectedColumnIds, aggregations };
 }
 function mergePivotColumnSeriesLabelWithUserEdit(normalizedLabel, userRowLabel, pivotSeriesField) {
   const user = String(userRowLabel ?? "").trim();
@@ -63258,7 +63255,9 @@ async function loadViaReportBuilderState({
   report,
   draftSessionId,
   pagination,
-  paginationSort
+  paginationSort,
+  rowsOnly,
+  rowCountOnly
 }) {
   const baseReport = {
     ...EMPTY_INTERNAL_REPORT,
@@ -63278,6 +63277,8 @@ async function loadViaReportBuilderState({
     // Unique values are fetched separately via `filterUniqueValuesQuery` so chart/table
     // refresh queries are not blocked on `report-builder-unique-values`.
     skipUniqueValues: true,
+    skipRowCount: rowsOnly,
+    rowCountOnly,
     previousRelevant: previousRelevantWhenSkippingInlineUniqueFetch(report),
     processing: pagination ? {
       page: {
@@ -63341,6 +63342,9 @@ async function loadViaReportBuilderState({
     report: {
       ...baseReport,
       ...reportBuilderInfo.report,
+      // A rows-only response intentionally has no count; retain the previous
+      // value until the independent count query completes.
+      rowCount: rowsOnly ? baseReport.rowCount : reportBuilderInfo.report.rowCount,
       reportBuilderState: normalizedReportBuilderState,
       pivot: reportBuilderState.pivot,
       pivotRows: refreshedPivotData?.rows ?? compatibleReportPivotRows ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRows : []) ?? [],
@@ -63370,7 +63374,8 @@ async function loadReportForUseForm({
   customFields,
   dashboardName,
   useInMemoryEngines,
-  draftSessionId
+  draftSessionId,
+  rowsOnly = false
 }) {
   const effectivePivot = pivot ?? initialReportBuilderState?.pivot ?? void 0;
   const hasPivot = Boolean(effectivePivot);
@@ -63467,7 +63472,9 @@ async function loadReportForUseForm({
     schema,
     customFields,
     dashboardName,
-    draftSessionId
+    report: baseReport,
+    draftSessionId,
+    rowsOnly
   });
 }
 function generateDraftSessionId() {
@@ -63475,8 +63482,8 @@ function generateDraftSessionId() {
 }
 function useReport(reportIdArg, options = {}) {
   const propReportId = String(reportIdArg ?? "").trim();
-  const [createdReportId, setCreatedReportId] = useState41(null);
-  const effectiveReportId = propReportId || createdReportId || "";
+  const [createdReportBootstrap, setCreatedReportBootstrap] = useState41(null);
+  const effectiveReportId = propReportId || createdReportBootstrap?.reportId || "";
   const { eventTracking } = useContext36(EventTrackingContext);
   const [draftSessionId, setDraftSessionId] = useState41(generateDraftSessionId);
   const useInMemoryEngines = options.useInMemoryEngines ?? false;
@@ -63693,13 +63700,57 @@ function useReport(reportIdArg, options = {}) {
   const dashboardNameForNewReport = useMemo32(() => {
     return [clientDefaultDashboardName, destinationDashboardName].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   }, [clientDefaultDashboardName, destinationDashboardName]);
+  const { mutate: createReport } = useMutation({
+    mutationKey: ["useReport", "create-report", draftSessionId],
+    mutationFn: async ({
+      reportBuilderState,
+      tables
+    }) => {
+      if (!client) {
+        throw new Error("Missing client for create-report");
+      }
+      const fallbackName = tables[0]?.name ? snakeAndCamelCaseToTitleCase(tables[0].name) : "New report";
+      const resp = await saveReport({
+        report: {
+          ...EMPTY_INTERNAL_REPORT,
+          name: fallbackName,
+          chartType: "table",
+          dashboardName: "quill-draft-reports",
+          reportBuilderState
+        },
+        client,
+        getToken,
+        eventTracking,
+        tenants,
+        draftSessionId: draftSessionId || void 0
+      });
+      const reportId = String(resp?.id ?? resp?._id ?? "").trim();
+      if (!reportId) {
+        throw new Error("create-report returned no report id");
+      }
+      return {
+        reportId,
+        reportBuilderState,
+        report: {
+          ...EMPTY_INTERNAL_REPORT,
+          ...resp,
+          id: reportId,
+          name: String(resp?.name ?? "").trim() || fallbackName,
+          dashboardName: String(resp?.dashboardName ?? "").trim() || "quill-draft-reports",
+          chartType: resp?.chartType ?? "table",
+          pivot: null,
+          reportBuilderState
+        }
+      };
+    }
+  });
   const filterStackRef = useRef24(filterStack);
   filterStackRef.current = filterStack;
   const resolvedGroupRowsBy = decodePivotGroupOptionValue(groupRowsBy);
   const resolvedGroupColumnsBy = decodePivotGroupOptionValue(groupColumnsBy);
   useEffect31(() => {
     if (propReportId) {
-      setCreatedReportId(null);
+      setCreatedReportBootstrap(null);
     }
   }, [propReportId]);
   useEffect31(() => {
@@ -63779,7 +63830,7 @@ function useReport(reportIdArg, options = {}) {
   useEffect31(() => {
     if (reportOverride) return;
     if (propReportId) return;
-    if (createdReportId) return;
+    if (createdReportBootstrap) return;
     if (!client) return;
     if (!String(dashboardNameForNewReport ?? "").trim()) {
       return;
@@ -63810,59 +63861,34 @@ function useReport(reportIdArg, options = {}) {
       );
     }
     if (bootstrapColumns.length === 0) return;
-    let cancelled = false;
-    (async () => {
-      try {
-        const fkMapForMerge = getSchemaForeignKeyMapping(
-          schemaForReportBuilderState
-        );
-        const tables = mergeReportBuilderTables(
-          ids.map((name2) => ({ name: name2 })),
-          bootstrapColumns.map((col) => String(col.table ?? "").trim()).filter(Boolean),
-          fkMapForMerge
-        );
-        const reportBuilderState = {
-          tables,
-          columns: bootstrapColumns,
-          filterStack: [],
-          sort: [],
-          limit: null,
-          pivot: null
-        };
-        const resp = await saveReport({
-          report: {
-            ...EMPTY_INTERNAL_REPORT,
-            name: tables[0]?.name ? snakeAndCamelCaseToTitleCase(tables[0].name) : "New report",
-            chartType: "table",
-            dashboardName: "quill-draft-reports",
-            reportBuilderState
-          },
-          client,
-          getToken,
-          eventTracking,
-          tenants,
-          draftSessionId: draftSessionId || void 0
-        });
-        if (cancelled) return;
-        const id = String(resp?.id ?? resp?._id ?? "").trim();
-        if (id) setCreatedReportId(id);
-      } catch {
-      }
-    })();
-    return () => {
-      cancelled = true;
+    const fkMapForMerge = getSchemaForeignKeyMapping(
+      schemaForReportBuilderState
+    );
+    const tables = mergeReportBuilderTables(
+      ids.map((name2) => ({ name: name2 })),
+      bootstrapColumns.map((col) => String(col.table ?? "").trim()).filter(Boolean),
+      fkMapForMerge
+    );
+    const reportBuilderState = {
+      tables,
+      columns: bootstrapColumns,
+      filterStack: [],
+      sort: [],
+      limit: null,
+      pivot: null
     };
+    createReport(
+      { reportBuilderState, tables },
+      { onSuccess: setCreatedReportBootstrap }
+    );
   }, [
     reportOverride,
     propReportId,
-    createdReportId,
+    createdReportBootstrap,
     client,
+    createReport,
     schemaDatasourceIdsKey,
     dashboardNameForNewReport,
-    draftSessionId,
-    getToken,
-    eventTracking,
-    tenants,
     schemaForReportBuilderState,
     queryColumnsBootstrapKey
   ]);
@@ -64308,7 +64334,7 @@ function useReport(reportIdArg, options = {}) {
           }
         });
         return { uniqueValuesByColumn: normalizedUniqueValuesByColumn };
-      } catch (error) {
+      } catch {
         return { uniqueValuesByColumn: {} };
       }
     }),
@@ -64737,19 +64763,27 @@ function useReport(reportIdArg, options = {}) {
     setExpandReportBuilderColumnsForFlatTable(false);
     prevPivotStateForColumnExpansionRef.current = null;
   }, [propReportId, reportOverride]);
+  const createdBootstrapForInitialLoad = !propReportId && createdReportBootstrap?.reportId === effectiveReportId ? createdReportBootstrap : null;
+  const initialReportBuilderStateForLoad = initialReportBuilderState ?? createdBootstrapForInitialLoad?.reportBuilderState ?? null;
+  const initialBaseReportForLoad = createdBootstrapForInitialLoad?.report ?? null;
+  const isCreatedReportBootstrapLoad = Boolean(
+    createdBootstrapForInitialLoad && initialReportBuilderStateForLoad
+  );
   const initialLoadQuery = useQuery({
     queryKey: createUseFormInitialLoadQueryKey({
       reportId: effectiveReportId,
       draftSessionId,
       useInMemoryEngines,
-      hasInitialReportBuilderState: Boolean(initialReportBuilderState),
+      hasInitialReportBuilderState: Boolean(
+        initialReportBuilderStateForLoad
+      ),
       reloadKeyHash,
       tenantHash,
       flagHash,
       clientHash
     }),
     queryFn: createUseFormQueryFn(async () => {
-      const allowReportTaskBootstrap = !initialReportBuilderState && bootstrapReportTaskUsedForReportIdRef.current !== effectiveReportId;
+      const allowReportTaskBootstrap = !initialReportBuilderStateForLoad && bootstrapReportTaskUsedForReportIdRef.current !== effectiveReportId;
       const loadTargetId = String(effectiveReportId ?? "").trim();
       const sourceReportIdentity = String(
         sourceReport?.id ?? sourceReport?._id ?? ""
@@ -64761,7 +64795,8 @@ function useReport(reportIdArg, options = {}) {
       }
       const loadResult = await loadReportForUseForm({
         reportId: effectiveReportId,
-        initialReportBuilderState,
+        initialReportBuilderState: initialReportBuilderStateForLoad,
+        baseReport: initialBaseReportForLoad,
         allowReportTaskBootstrap,
         client,
         getToken,
@@ -64772,7 +64807,8 @@ function useReport(reportIdArg, options = {}) {
         customFields: customFieldsRef.current,
         dashboardName: resolvedSourceDashboardName,
         useInMemoryEngines,
-        draftSessionId: draftSessionId || void 0
+        draftSessionId: draftSessionId || void 0,
+        rowsOnly: isCreatedReportBootstrapLoad
       });
       return loadResult;
     }),
@@ -65393,6 +65429,7 @@ function useReport(reportIdArg, options = {}) {
     () => stableSerializeForQueryKey(effectiveReportBuilderState),
     [effectiveReportBuilderState]
   );
+  const createdBootstrapStateMatchesEffectiveState = isCreatedReportBootstrapLoad && stableSerializeForQueryKey(initialReportBuilderStateForLoad) === effectiveReportBuilderStateHash;
   const prevPaginationResetStateHashRef = useRef24(null);
   useEffect31(() => {
     const prevHash = prevPaginationResetStateHashRef.current;
@@ -65499,12 +65536,61 @@ function useReport(reportIdArg, options = {}) {
     enabled: tableRefreshQueryEnabled,
     retry: false
   });
+  const createdBootstrapRowCountQuery = useQuery({
+    queryKey: [
+      "useReport",
+      "created-bootstrap-row-count",
+      effectiveReportId,
+      stableSerializeForQueryKey(initialReportBuilderStateForLoad),
+      tenantHash,
+      clientHash
+    ],
+    queryFn: createUseFormQueryFn(async () => {
+      if (!createdBootstrapForInitialLoad || !initialReportBuilderStateForLoad || !client) {
+        return { report: null, error: "Missing bootstrap count prerequisites" };
+      }
+      return loadViaReportBuilderState({
+        reportId: effectiveReportId,
+        reportBuilderState: initialReportBuilderStateForLoad,
+        client,
+        getToken,
+        tenants,
+        schema: schemaForReportBuilderState,
+        customFields: schemaData.customFields,
+        dashboardName: resolvedSourceDashboardName,
+        report: createdBootstrapForInitialLoad.report,
+        draftSessionId: draftSessionId || void 0,
+        rowCountOnly: true
+      });
+    }),
+    enabled: createdBootstrapStateMatchesEffectiveState && Boolean(client) && !reportOverride,
+    retry: false
+  });
   useEffect31(() => {
     if (!tableRefreshQueryEnabled) return;
     const report = tableRefreshQuery.data?.report;
     if (tableRefreshQuery.data?.error || !report) return;
     setSourceReport(report);
   }, [effectiveReportId, tableRefreshQuery.data, tableRefreshQueryEnabled]);
+  useEffect31(() => {
+    if (!createdBootstrapStateMatchesEffectiveState) return;
+    const countReport = createdBootstrapRowCountQuery.data?.report;
+    if (createdBootstrapRowCountQuery.data?.error || !countReport) return;
+    setSourceReport((currentReport) => {
+      if (!currentReport || currentReport.id !== effectiveReportId) {
+        return currentReport;
+      }
+      if (currentReport.rowCount === countReport.rowCount) {
+        return currentReport;
+      }
+      return { ...currentReport, rowCount: countReport.rowCount };
+    });
+  }, [
+    createdBootstrapRowCountQuery.data,
+    createdBootstrapStateMatchesEffectiveState,
+    effectiveReportId,
+    sourceReport?.id
+  ]);
   const chartTypes = useMemo32(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
@@ -66173,7 +66259,8 @@ function useReport(reportIdArg, options = {}) {
           pageIndex: pagination.pageIndex,
           pageSize: pagination.pageSize
         },
-        paginationSort: tablePaginationSort
+        paginationSort: tablePaginationSort,
+        rowsOnly: true
       });
     }),
     enabled: tablePageQueryEnabled,
@@ -66814,8 +66901,10 @@ function useReport(reportIdArg, options = {}) {
       }
     };
   }, [chart, filterOptions, filtersForQueryBuilder]);
-  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(
-    chart && chart.pivot && Array.isArray(chart.columns) && chart.columns.length > 0
+  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
+  const pivotTableColumnControls = useMemo32(
+    () => isPivotTableChart ? buildPivotColumnPivotTableFormattingColumns(pivotState, chart) : null,
+    [chart, isPivotTableChart, pivotState]
   );
   const chartAxes = useMemo32(() => {
     const yAxisItems = resolvedYAxisFields.map(
@@ -67115,24 +67204,19 @@ function useReport(reportIdArg, options = {}) {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
   } = useMemo32(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      const pivotTableColumns = aggregationSlotColumns ? aggregationSlotColumns.tableColumns : chart.columns.map((c) => ({
-        field: String(c.field ?? "").trim(),
-        label: String(c.label ?? c.field ?? "").trim() || String(c.field ?? "")
-      }));
-      const selectedPivotIds = aggregationSlotColumns ? aggregationSlotColumns.selectedColumnIds : chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
       return getAllColumnOptions({
         schemaColumnOptions,
-        tableColumns: pivotTableColumns,
-        selectedColumnIds: selectedPivotIds
+        tableColumns: pivotTableColumnControls.tableColumns,
+        selectedColumnIds: pivotTableColumnControls.selectedColumnIds
       });
     }
+    if (isPivotTableChart) {
+      return {
+        columnsOptions: [],
+        hasTableDrivenColumnOrder: true
+      };
+    }
     return getAllColumnOptions({
       schemaColumnOptions,
       tableColumns: table.columns,
@@ -67145,6 +67229,7 @@ function useReport(reportIdArg, options = {}) {
     chart?.xAxisLabel,
     columns,
     isPivotTableChart,
+    pivotTableColumnControls,
     schemaColumnOptions,
     table.columns
   ]);
@@ -67166,17 +67251,11 @@ function useReport(reportIdArg, options = {}) {
     [tableDerivedColumnOrder]
   );
   const activeTableColumnIds = useMemo32(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      if (aggregationSlotColumns) {
-        return aggregationSlotColumns.selectedColumnIds;
-      }
-      return chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
+      return pivotTableColumnControls.selectedColumnIds;
+    }
+    if (isPivotTableChart) {
+      return [];
     }
     const currentColumns = (columns ?? []).filter(Boolean);
     if (!hasTableDrivenColumnOrder) {
@@ -67201,6 +67280,7 @@ function useReport(reportIdArg, options = {}) {
     columns,
     hasTableDrivenColumnOrder,
     isPivotTableChart,
+    pivotTableColumnControls,
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
@@ -67255,12 +67335,12 @@ function useReport(reportIdArg, options = {}) {
       });
     }
     const columnPivotMeasureFormatByAggregationField = /* @__PURE__ */ new Map();
-    if (isPivotTableChart && chart?.pivot) {
-      const slotFormatting = buildPivotColumnPivotTableFormattingColumns(chart);
+    if (pivotTableColumnControls && chart) {
+      const slotFormatting = pivotTableColumnControls;
       if (slotFormatting) {
-        const aggregations = getPivotAggregations(chart);
+        const aggregations = slotFormatting.aggregations;
         const hasMultiple = aggregations.length > 1;
-        const rowField = String(chart.pivot.rowField ?? "").trim();
+        const rowField = String(pivotState?.rowField ?? "").trim();
         const firstValueColumnFormat = String(
           (chart.columns ?? []).find(
             (c) => String(c.field ?? "").trim() !== rowField
@@ -67340,6 +67420,8 @@ function useReport(reportIdArg, options = {}) {
     columnOptionById,
     displayColumnById,
     isPivotTableChart,
+    pivotState,
+    pivotTableColumnControls,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
     sourceReport?.columns,
@@ -67411,8 +67493,8 @@ function useReport(reportIdArg, options = {}) {
   ]);
   const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching);
   const filterUniqueValuesLoading = filterUniqueValuesEnabled && (filterUniqueValuesQuery.isPending || filterUniqueValuesQuery.isFetching);
-  const chartLoading = initialLoadInProgress || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
-  const tableLoading = initialLoadInProgress || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const tableLoading = initialLoadInProgress || pendingPivotRefresh || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const loading = chartLoading || tableLoading;
   const buildSetReportColumnsFromIds = (nextColumnIds, settingsById) => {
     const normalizedNextIds = nextColumnIds.map((columnId) => String(columnId ?? "").trim()).filter(Boolean);
@@ -67689,11 +67771,12 @@ function useReport(reportIdArg, options = {}) {
     const isClearingRowGrouping = effectiveNextState.groupRowsBy !== void 0 && String(effectiveNextState.groupRowsBy ?? "").trim().length === 0;
     const queuePromoteColumnToRow = isClearingRowGrouping && !sourceReport;
     const shouldRefreshExpandedTableData = useInMemoryEngines && (hasRowGroupSelection || hasColumnGroupSelection || hasAggregationSelection) || !useInMemoryEngines && !nextPivot && effectiveNextState.sort !== void 0;
-    const dispatchTouchesPivot = touchesPivotState || isDatasourceUpdate;
+    const hasReportIdentity = Boolean(effectiveReportId);
+    const dispatchTouchesPivot = touchesPivotState || hasReportIdentity && isDatasourceUpdate;
     dispatchFormRuntime({
       type: "APPLY_SET_REPORT",
       touchesPivotState: dispatchTouchesPivot,
-      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate || addedRequestedDisplayColumns.length > 0,
+      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || hasReportIdentity && (isDatasourceUpdate || addedRequestedDisplayColumns.length > 0),
       queuePromoteColumnToRow,
       updater: (prev) => {
         const next = {
@@ -67765,13 +67848,25 @@ function useReport(reportIdArg, options = {}) {
           const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
           const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
-          if (addedDisplayColumns.length > 0) {
+          const hasPivotSelection = Boolean(
+            decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
+          ) || next.aggregationState.some(isAppliedAggregation);
+          const requestedDisplayTableNames = new Set(
+            normalizedDisplayColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
+          );
+          const selectedDatasourceTableNames = new Set(
+            (next.schemaDatasourceIds ?? []).map((tableName) => String(tableName ?? "").trim()).filter(Boolean)
+          );
+          const replacesDatasourceTableScope = !hasPivotSelection && requestedDisplayTableNames.size > 0 && selectedDatasourceTableNames.size > 0 && [...requestedDisplayTableNames].every(
+            (tableName) => !selectedDatasourceTableNames.has(tableName)
+          );
+          if (replacesDatasourceTableScope) {
+            next.queryColumns = normalizedDisplayColumns;
+            next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(
               next.queryColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
             );
-            const hasPivotSelection = Boolean(
-              decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
-            ) || next.aggregationState.some(isAppliedAggregation);
             const queryColumnsToInclude = addedDisplayColumns.filter(
               (column) => {
                 const tableName = String(column.table ?? "").trim();

package/package.json

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