@quillsql/react 2.16.94 → 2.16.95

package/dist/index.js

@@ -15180,7 +15180,7 @@ var init_dates = __esm({
     init_inMemoryPivotEngine();
     init_valueFormatter();
     DATE_BUCKET_AXIS_FORMATS = {
-      day: "MMM_dd_yyyy",
+      day: "MMM_dd",
       week: "MMM_dd-MMM_dd",
       month: "MMM_yyyy",
       year: "yyyy"
@@ -17184,6 +17184,79 @@ var init_paginationProcessing = __esm({
   }
 });
 
+// src/utils/dashboardProfiler.ts
+function profilingEnabled() {
+  if (typeof process !== "undefined" && process.env?.QUILL_DASHBOARD_PROFILE === "true") {
+    return true;
+  }
+  if (typeof window === "undefined") return false;
+  return Boolean(window.__QUILL_DASHBOARD_PROFILE__);
+}
+function profileStore() {
+  if (typeof window !== "undefined") {
+    const profileWindow = window;
+    profileWindow.__QUILL_DASHBOARD_TRACE__ ??= [];
+    return profileWindow.__QUILL_DASHBOARD_TRACE__;
+  }
+  const globalStore = globalThis;
+  globalStore.__QUILL_DASHBOARD_TRACE__ ??= [];
+  return globalStore.__QUILL_DASHBOARD_TRACE__;
+}
+function queryKeyFamily(queryKey) {
+  const head = String(queryKey[0] ?? "");
+  const next = String(queryKey[1] ?? "");
+  if (head === "quill" && next === "dashboard-report") {
+    return "quill/dashboard-report";
+  }
+  if (head === "useReport") {
+    return `useReport/${next || "unknown"}`;
+  }
+  return head || "other";
+}
+function summarizeEngineRequest(input) {
+  const metadata = input.metadata ?? {};
+  return {
+    task: input.task ?? null,
+    shareRequest: Boolean(input.shareRequest),
+    reuseExisting: input.reuseExisting ?? null,
+    settled: input.settled ?? null,
+    reportId: metadata.reportId ?? null,
+    metadataKeys: Object.keys(metadata).sort(),
+    dashboardName: metadata.dashboardName ?? null,
+    dashboardItemId: metadata.dashboardItemId ?? null,
+    useNewNodeSql: metadata.useNewNodeSql ?? null,
+    dateBucket: metadata.dateBucket ?? null,
+    hasPivot: Boolean(metadata.pivot),
+    hasReportBuilderState: Boolean(metadata.reportBuilderState),
+    additionalProcessing: metadata.additionalProcessing ?? null,
+    filterCount: Array.isArray(metadata.filters) ? metadata.filters.length : null
+  };
+}
+function profileDashboard(event, data) {
+  if (!profilingEnabled()) return;
+  const entry = {
+    at: Math.round(performance.now() * 10) / 10,
+    event,
+    data
+  };
+  profileStore().push(entry);
+  if (typeof window !== "undefined") {
+    const profileWindow = window;
+    profileWindow.__QUILL_DASHBOARD_PROFILE__ = true;
+    profileWindow.__QUILL_DUMP_DASHBOARD_PROFILE__ = () => profileWindow.__QUILL_DASHBOARD_TRACE__ ?? [];
+  }
+  if (typeof process !== "undefined" && process.env?.QUILL_DASHBOARD_PROFILE_CONSOLE === "true" && CONSOLE_EVENT_PATTERN.test(event)) {
+    console.log(`[quill-profile] ${event}`, data ?? {});
+  }
+}
+var CONSOLE_EVENT_PATTERN;
+var init_dashboardProfiler = __esm({
+  "src/utils/dashboardProfiler.ts"() {
+    "use strict";
+    CONSOLE_EVENT_PATTERN = /cache|initial-load|use-report-loading|network|unique-values|table-refresh|pivot|shared-request|engine-fetch|generate-pivot/;
+  }
+});
+
 // src/utils/pivotConstructor.ts
 function normalizeLegacyPivotSortFieldValue(sortField) {
   if (sortField === void 0) {
@@ -17296,6 +17369,22 @@ async function generatePivotWithSQL({
     rowLimit: pivot.rowLimit,
     dateBucket: resolvedDateBucket
   };
+  profileDashboard(
+    "generate-pivot-sql",
+    summarizeEngineRequest({
+      task: "pivot-template",
+      shareRequest: false,
+      metadata: {
+        reportId: report?.id,
+        dashboardName,
+        dateBucket: resolvedDateBucket,
+        additionalProcessing,
+        pivot: pivotConfig,
+        reportBuilderState,
+        filters: dashboardFilters
+      }
+    })
+  );
   const resp = await quillFetch({
     client,
     task: "pivot-template",
@@ -17668,6 +17757,7 @@ var init_pivotConstructor = __esm({
     init_columnType();
     init_dataFetcher();
     init_dataProcessing();
+    init_dashboardProfiler();
     init_dates();
     init_textProcessing();
     init_valueFormatter();
@@ -20090,6 +20180,20 @@ async function getOrFetchSharedRequest({
 }) {
   if (signal?.aborted) throw createAbortError(signal);
   let entry = entries.get(key);
+  const reuseExisting = Boolean(entry);
+  profileDashboard("shared-request", {
+    ...summarizeEngineRequest({
+      task: void 0,
+      shareRequest: true,
+      reuseExisting,
+      settled: entry?.settled,
+      metadata: { reportId }
+    }),
+    reportId: reportId ?? null,
+    reuseExisting,
+    settled: entry?.settled ?? false,
+    keyLength: key.length
+  });
   if (!entry) {
     const controller = new AbortController();
     entry = {
@@ -20165,6 +20269,7 @@ var ORPHAN_GRACE_MS, COMPLETED_TTL_MS, entries;
 var init_reportRequestPool = __esm({
   "src/utils/reportRequestPool.ts"() {
     "use strict";
+    init_dashboardProfiler();
     ORPHAN_GRACE_MS = 100;
     COMPLETED_TTL_MS = 15e3;
     entries = /* @__PURE__ */ new Map();
@@ -20727,6 +20832,7 @@ var init_dataFetcher = __esm({
     init_dates();
     init_changelogNotify();
     init_reportRequestPool();
+    init_dashboardProfiler();
     quillFetch = async ({
       client,
       task,
@@ -20787,6 +20893,14 @@ var init_dataFetcher = __esm({
           return { error: "Failed to fetch data" };
         }
       };
+      profileDashboard(
+        "engine-fetch",
+        summarizeEngineRequest({
+          task,
+          shareRequest,
+          metadata
+        })
+      );
       if (!shareRequest) {
         return execute(abortSignal);
       }
@@ -21358,22 +21472,7 @@ init_dates();
 init_pivotConstructor();
 init_columnProcessing();
 init_paginationProcessing();
-
-// src/utils/dashboardProfiler.ts
-function profileDashboard(event, data) {
-  if (typeof window === "undefined") return;
-  const profileWindow = window;
-  if (!profileWindow.__QUILL_DASHBOARD_PROFILE__) return;
-  const entry = {
-    at: Math.round(performance.now() * 10) / 10,
-    event,
-    data
-  };
-  profileWindow.__QUILL_DASHBOARD_TRACE__ ??= [];
-  profileWindow.__QUILL_DASHBOARD_TRACE__.push(entry);
-}
-
-// src/utils/dashboard.ts
+init_dashboardProfiler();
 var defaultDashboardItem = {
   id: "",
   name: "",
@@ -22787,6 +22886,7 @@ init_tableProcessing();
 init_textProcessing();
 init_valueFormatter();
 init_astFilterProcessing();
+init_dashboardProfiler();
 init_reportBuilder();
 init_astProcessing();
 
@@ -26583,6 +26683,7 @@ function normalizePSTRanges(start, end) {
 
 // src/Context.tsx
 init_changelogNotify();
+init_dashboardProfiler();
 
 // src/reportStore.ts
 import { createContext, useContext, useSyncExternalStore } from "react";
@@ -32364,7 +32465,7 @@ function QuillTable({
     setSortColumn(sort?.field || "");
     setSortDirection(sort?.direction || "desc");
   }, [sort]);
-  const holdFullPageLoader = rows?.length === 0 && isLoading;
+  const holdFullPageLoader = Boolean(isLoading);
   const pageCountUnknown = manualPagination && pageCount === -1;
   const { activeRows, maxPage } = useMemo4(() => {
     const start = currentPage * rowsPerPage;
@@ -37291,6 +37392,7 @@ function getDashboardReportProcessing(report, serverPagination) {
 }
 
 // src/hooks/useDashboard.ts
+init_dashboardProfiler();
 var DEFAULT_DASHBOARD_REPORT_STALE_TIME_MS = 5 * 60 * 1e3;
 var useDashboardConfigInternal = (dashboardName) => {
   const { dashboardConfig, isLoading: dashboardsLoading } = useContext13(
@@ -38401,6 +38503,14 @@ var useDashboard = (dashboardName, config) => {
           additionalProcessing
         );
         const usePivotTask = !cacheEnabled && !!reportInfo.pivot;
+        profileDashboard("dashboard-report-cache-path", {
+          reportId,
+          cacheEnabled,
+          cacheCabCacheable: cacheCab.isCacheable(reportId),
+          usePivotTask,
+          forceCacheToRefresh,
+          hasPivot: Boolean(reportInfo.pivot)
+        });
         const allFilters = dashboardFilters2.concat(customFilters).concat(customReportFiltersArray);
         const applyInMemoryPivotIfNeeded = (report2) => {
           const pivotToApply = reportInfo.pivot ?? report2.pivot;
@@ -38634,7 +38744,9 @@ var useDashboard = (dashboardName, config) => {
                   pivotColumns: pivotData.columns,
                   pivotRowCount: pivotData.rowCount,
                   pivotQuery: pivotData.pivotQuery,
-                  comparisonPivotQuery: pivotData.comparisonPivotQuery
+                  comparisonPivotQuery: pivotData.comparisonPivotQuery,
+                  pivotResultRowField: pivotData.rowField,
+                  pivotResultSourceRowField: reportInfo.pivot?.rowField
                 },
                 error: void 0
               };
@@ -38664,6 +38776,26 @@ var useDashboard = (dashboardName, config) => {
             shareRequest: !forceCacheToRefresh
           });
         };
+        const existingState = queryClient.getQueryState(queryKey);
+        const existingData = queryClient.getQueryData(queryKey);
+        const dataUpdatedAt = existingState?.dataUpdatedAt ?? 0;
+        const ageMs = dataUpdatedAt ? Date.now() - dataUpdatedAt : null;
+        const isStale = dataUpdatedAt === 0 || Date.now() - dataUpdatedAt >= reportStaleTimeMs;
+        profileDashboard("dashboard-report-tanstack-cache", {
+          reportId,
+          keyFamily: "quill/dashboard-report",
+          cacheEnabled,
+          usePivotTask,
+          forceCacheToRefresh,
+          staleTimeMs: reportStaleTimeMs,
+          status: existingState?.status ?? "missing",
+          fetchStatus: existingState?.fetchStatus ?? "idle",
+          hasData: existingData !== void 0,
+          dataUpdatedAt,
+          ageMs,
+          isStale,
+          willReuseTanstack: !forceCacheToRefresh && existingData !== void 0 && !isStale
+        });
         const result = forceCacheToRefresh ? await fetchDashboardReport() : await queryClient.fetchQuery({
           queryKey,
           queryFn: fetchDashboardReport,
@@ -39066,6 +39198,7 @@ var useDashboardReport = (reportId, config) => {
 };
 
 // src/components/Dashboard/DataLoader.tsx
+init_dashboardProfiler();
 import { Fragment as Fragment5, jsx as jsx46 } from "react/jsx-runtime";
 var constructReportFromItem = (item) => {
   return {
@@ -41481,6 +41614,7 @@ function QuillTableDashboardComponent({
 
 // src/Chart.tsx
 init_valueFormatter();
+init_dashboardProfiler();
 import { Fragment as Fragment6, jsx as jsx50, jsxs as jsxs38 } from "react/jsx-runtime";
 function Chart({
   colors,
@@ -45472,6 +45606,7 @@ init_Filter();
 
 // src/StaticChart.tsx
 import { useEffect as useEffect20, useMemo as useMemo21 } from "react";
+init_dashboardProfiler();
 import { jsx as jsx60 } from "react/jsx-runtime";
 var CHART_TYPE_STYLES = {
   metric: { height: "100px", width: "200px" },
@@ -62120,6 +62255,24 @@ import {
   eachWeekOfInterval as eachWeekOfInterval2,
   eachYearOfInterval as eachYearOfInterval2
 } from "date-fns";
+var PIVOT_DATE_BUCKETS = /* @__PURE__ */ new Set([
+  "day",
+  "week",
+  "month",
+  "year"
+]);
+function inBucketDateBucketForField(rules, field) {
+  for (const entry of rules) {
+    if (!entry || typeof entry !== "object") continue;
+    const rule = entry;
+    if (rule.operator !== "inBucket" || rule.field !== field) continue;
+    const bucket = rule.value && typeof rule.value === "object" && !Array.isArray(rule.value) ? rule.value.bucket : void 0;
+    if (typeof bucket === "string" && PIVOT_DATE_BUCKETS.has(bucket)) {
+      return bucket;
+    }
+  }
+  return void 0;
+}
 function buildPivotDateBucketStarts(range, bucket) {
   const min2 = new Date(range.min);
   const max2 = new Date(range.max);
@@ -62439,6 +62592,7 @@ function resolveReportFromCacheCab({
 }
 
 // src/hooks/useForm.tsx
+init_dashboardProfiler();
 init_reportRequestPool();
 
 // src/hooks/useForm.queries.ts
@@ -62484,6 +62638,15 @@ function createUseFormInitialLoadQueryKey(input) {
     input.additionalSchemaHash
   ];
 }
+var DASHBOARD_REPORT_STALE_TIME_MS = 5 * 60 * 1e3;
+function findCachedDashboardReportQuery(queryClient, reportId) {
+  const id = String(reportId ?? "").trim();
+  if (!id) return void 0;
+  return queryClient.getQueryCache().findAll({ queryKey: ["quill", "dashboard-report", id] }).find((query) => {
+    const data = query.state.data;
+    return Boolean(data?.report) && !data?.error;
+  });
+}
 function shouldBootstrapUseFormInitialLoad(input) {
   return !input.hasInitialReportBuilderState && input.previouslyBootstrappedIdentity !== input.currentIdentity;
 }
@@ -63466,6 +63629,11 @@ function getPivotTableSlotReportColumn(reportColumns, aggregations, rowField, pi
   }
   return cols[aggIndex + 1];
 }
+function pivotRowKey(chart) {
+  return String(
+    chart?.pivotResultRowField ?? chart?.pivot?.rowField ?? ""
+  ).trim();
+}
 function isPivotTableDateBucketRowAxis(chart, xAxisField) {
   if (!chart?.pivot) return false;
   if (String(chart.chartType ?? "").toLowerCase() !== "table") return false;
@@ -63474,7 +63642,8 @@ function isPivotTableDateBucketRowAxis(chart, xAxisField) {
   }
   const rowField = String(chart.pivot.rowField ?? "").trim();
   const xf = String(xAxisField ?? "").trim();
-  if (!rowField || xf !== rowField) return false;
+  const rowKey = pivotRowKey(chart);
+  if (!rowField || xf !== rowField && xf !== rowKey) return false;
   return isDateType(String(chart.pivot.rowFieldType ?? ""));
 }
 var RESOLVABLE_X_AXIS_DATE_BUCKETS = /* @__PURE__ */ new Set([
@@ -63488,22 +63657,24 @@ function resolvePivotDateBucketXAxisFormat(chart, xAxisField) {
   const dateBucket = String(chart?.pivot?.dateBucket ?? "").trim().toLowerCase();
   if (!RESOLVABLE_X_AXIS_DATE_BUCKETS.has(dateBucket)) return null;
   const rowField = String(chart?.pivot?.rowField ?? "").trim();
-  if (!rowField || String(xAxisField ?? "").trim() !== rowField) return null;
+  const xf = String(xAxisField ?? "").trim();
+  const rowKey = pivotRowKey(chart);
+  if (!rowField || xf !== rowField && xf !== rowKey) return null;
   if (!isDateType(String(chart?.pivot?.rowFieldType ?? ""))) return null;
   return getDateFormatFromBucket(dateBucket);
 }
 function chartDetailRowsMissingPivotRowBucket(chart) {
   if (!chart?.pivot) return false;
-  const rowField = String(chart.pivot.rowField ?? "").trim();
-  if (!rowField) return false;
+  const rowKey = pivotRowKey(chart);
+  if (!rowKey) return false;
   const rows = chart.rows;
   if (!Array.isArray(rows) || rows.length === 0) return false;
   const first = rows.find(
     (r) => r && typeof r === "object" && Object.keys(r).length > 0
   );
   if (!first) return false;
-  if (!Object.prototype.hasOwnProperty.call(first, rowField)) return true;
-  const v = first[rowField];
+  if (!Object.prototype.hasOwnProperty.call(first, rowKey)) return true;
+  const v = first[rowKey];
   return v === void 0 || v === null;
 }
 function shouldUsePivotRowFieldAsXAxis(chartType, pivotRowField, rowColumnFormat) {
@@ -63539,7 +63710,7 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   } : chart;
   if (!config) return config;
   if (!config.pivot) return config;
-  const pivotRowFieldEarly = String(config.pivot?.rowField ?? "").trim();
+  const pivotRowFieldEarly = pivotRowKey(config);
   const rowColumn = (config.pivotColumns ?? config.columns ?? []).find(
     (col) => String(col.field ?? "").trim() === pivotRowFieldEarly
   );
@@ -63574,7 +63745,7 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
     return keys;
   })() : [];
   const pivotValueFields = pivotRowFields.filter(
-    (field) => field !== withResolvedXAxis.pivot?.rowField
+    (field) => field !== pivotRowKey(withResolvedXAxis) && field !== withResolvedXAxis.pivot?.rowField
   );
   const isAggregationOnlyPivot = !String(withResolvedXAxis.pivot?.rowField ?? "").trim() && !String(withResolvedXAxis.pivot?.columnField ?? "").trim();
   const yAxisFormatByField = new Map(
@@ -63695,7 +63866,7 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   const normalizedPivotColumns = pivotColumnFields.length > 0 ? pivotColumnFields.map((field) => {
     const knownColumn = knownColumnsByField.get(field);
     const yAxis = yAxisFields.find((axis) => axis.field === field);
-    const format9 = yAxis?.format ?? knownColumn?.format ?? (field === withResolvedXAxis.pivot?.rowField ? isMetricOrGauge ? "string" : withResolvedXAxis.xAxisFormat ?? "string" : yAxisFallbackFormat);
+    const format9 = yAxis?.format ?? knownColumn?.format ?? (field === pivotRowKey(withResolvedXAxis) || field === withResolvedXAxis.pivot?.rowField ? isMetricOrGauge ? "string" : withResolvedXAxis.xAxisFormat ?? "string" : yAxisFallbackFormat);
     return {
       field,
       label: yAxis?.label ?? knownColumn?.label ?? field,
@@ -63708,7 +63879,7 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
     const slotCol = getPivotTableSlotReportColumn(
       pivotTableSlotColumns,
       aggregations,
-      withResolvedXAxis.pivot?.rowField,
+      pivotRowKey(withResolvedXAxis) || withResolvedXAxis.pivot?.rowField,
       col.field
     );
     if (!slotCol) return col;
@@ -63730,9 +63901,7 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   const normalizedXAxisFormat = normalizedXAxisField === withResolvedXAxis.xAxisField ? withResolvedXAxis.xAxisFormat : yAxisFields.find((axis) => axis.field === normalizedXAxisField)?.format ?? pivotTableDisplayColumns.find(
     (column) => column.field === normalizedXAxisField
   )?.format ?? withResolvedXAxis.xAxisFormat;
-  const pivotDisplayRowField = String(
-    withResolvedXAxis.pivot?.rowField ?? ""
-  ).trim();
+  const pivotDisplayRowField = pivotRowKey(withResolvedXAxis);
   const pivotDisplayRowFieldType = String(
     withResolvedXAxis.pivot?.rowFieldType ?? ""
   ).trim();
@@ -66696,19 +66865,30 @@ function useReport(reportIdArg, options = {}) {
         )
       });
       const diagnostics = globalThis.__QUILL_CACHECAB_DIAGNOSTICS__;
+      const durationMs = performance.now() - startedAt;
+      const outcome = resolution.resolved ? "hit" : "fallback";
       if (Array.isArray(diagnostics)) {
         diagnostics.push({
           reportId: effectiveReportId,
           operation,
-          outcome: resolution.resolved ? "hit" : "fallback",
+          outcome,
           reason: resolution.resolved ? "complete" : resolution.reason,
           details: resolution.resolved ? void 0 : resolution.details,
           snapshotReason: snapshot?.reason ?? "cache_miss",
           forcedIncompleteSnapshot: Boolean(snapshot) && !snapshot?.complete && forceIncompleteCacheCabForParity,
           rowCount: snapshot?.rowCount ?? 0,
-          durationMs: performance.now() - startedAt
+          durationMs
         });
       }
+      profileDashboard("use-report-cachecab", {
+        reportId: effectiveReportId,
+        operation,
+        outcome,
+        reason: resolution.resolved ? "complete" : resolution.reason,
+        snapshotReason: snapshot?.reason ?? "cache_miss",
+        rowCount: snapshot?.rowCount ?? 0,
+        durationMs: Math.round(durationMs * 10) / 10
+      });
       return resolution.resolved ? resolution.report : null;
     },
     [
@@ -67282,9 +67462,15 @@ function useReport(reportIdArg, options = {}) {
             if (alias) localValues[alias] = values;
           }
           if (hasEveryColumn) {
+            profileDashboard("use-report-unique-values-cachecab-hit", {
+              reportId: effectiveReportId
+            });
             return { uniqueValuesByColumn: localValues };
           }
         }
+        profileDashboard("use-report-unique-values-network", {
+          reportId: effectiveReportId
+        });
         const tablesForUniqueValues = filterUniqueValuesRequest.reportBuilderState?.tables?.map(
           (table2) => String(table2?.name ?? "").trim()
         ) ?? filterUniqueValuesRequest.stringColumnsByTable.map((column) => String(column.table ?? "").trim()).filter(Boolean);
@@ -67803,6 +67989,29 @@ function useReport(reportIdArg, options = {}) {
   const initialLoadQuery = useQuery({
     queryKey: initialLoadQueryKey,
     queryFn: createUseFormQueryFn(async (signal) => {
+      const tanstackState = queryClient.getQueryState(initialLoadQueryKey);
+      const dashboardReportQueries = queryClient.getQueryCache().getAll().filter(
+        (query) => queryKeyFamily(query.queryKey) === "quill/dashboard-report"
+      );
+      const matchingDashboardReport = dashboardReportQueries.find(
+        (query) => String(query.queryKey[2] ?? "") === String(effectiveReportId)
+      );
+      profileDashboard("use-report-initial-load-queryfn", {
+        reportId: effectiveReportId,
+        reason: "TanStack ran this queryFn, so useReport/initial-load had no fresh cached data",
+        keyFamily: "useReport/initial-load",
+        status: tanstackState?.status ?? "missing",
+        hasData: tanstackState?.data !== void 0,
+        dataUpdatedAt: tanstackState?.dataUpdatedAt ?? 0,
+        staleTime: 0,
+        dashboardReportQueryCount: dashboardReportQueries.length,
+        matchingDashboardReport: matchingDashboardReport ? {
+          hasData: matchingDashboardReport.state.data !== void 0,
+          status: matchingDashboardReport.state.status,
+          staleTime: matchingDashboardReport.options?.staleTime ?? 0,
+          unusedByUseReport: true
+        } : null
+      });
       let cachedReportBuilderState = initialReportBuilderStateForLoad ?? void 0;
       if (!cachedReportBuilderState) {
         const snapshot = await cacheCab.getReportSnapshot(
@@ -67827,6 +68036,9 @@ function useReport(reportIdArg, options = {}) {
         operation: "initial"
       });
       if (cachedReport) {
+        profileDashboard("use-report-initial-load-served-from-cachecab", {
+          reportId: effectiveReportId
+        });
         return { report: cachedReport };
       }
       const allowReportTaskBootstrap = shouldBootstrapUseFormInitialLoad({
@@ -67841,6 +68053,12 @@ function useReport(reportIdArg, options = {}) {
       const formFiltersBelongToLoadTarget = Boolean(loadTargetId) && sourceReportIdentity === loadTargetId;
       const rulesForLoad = useInMemoryEngines || !formFiltersBelongToLoadTarget ? EMPTY_QUERY_FILTERS : queryFilters;
       const shareInitialRequest = sharedInitialRequestUsedForReportIdRef.current !== effectiveReportId;
+      profileDashboard("use-report-initial-load-network", {
+        reportId: effectiveReportId,
+        path: "loadReportForUseForm",
+        hasCachedReportBuilderState: Boolean(cachedReportBuilderState)
+      });
+      const networkStartedAt = performance.now();
       const loadResult = await loadReportForUseForm({
         reportId: effectiveReportId,
         initialReportBuilderState: initialReportBuilderStateForLoad,
@@ -67860,6 +68078,12 @@ function useReport(reportIdArg, options = {}) {
         rowsOnly: isCreatedReportBootstrapLoad,
         abortSignal: signal
       });
+      profileDashboard("use-report-initial-load-network-done", {
+        reportId: effectiveReportId,
+        durationMs: Math.round(performance.now() - networkStartedAt),
+        hasReport: Boolean(loadResult.report),
+        error: loadResult.error ?? null
+      });
       if (loadResult.report && !loadResult.error) {
         if (allowReportTaskBootstrap) {
           bootstrapReportTaskUsedForInitialLoadRef.current = initialLoadIdentityHash;
@@ -67871,7 +68095,17 @@ function useReport(reportIdArg, options = {}) {
       return loadResult;
     }),
     enabled: Boolean(effectiveReportId) && Boolean(client) && !reportOverride,
-    retry: false
+    retry: false,
+    initialData: () => {
+      const cached = findCachedDashboardReportQuery(
+        queryClient,
+        effectiveReportId
+      );
+      const data = cached?.state.data;
+      return data?.report ? { report: data.report, error: data.error } : void 0;
+    },
+    initialDataUpdatedAt: () => findCachedDashboardReportQuery(queryClient, effectiveReportId)?.state.dataUpdatedAt,
+    staleTime: DASHBOARD_REPORT_STALE_TIME_MS
   });
   const reportNameQueryReportId = String(effectiveReportId ?? "").trim();
   const reportNameQuery = useQuery({
@@ -67922,15 +68156,6 @@ function useReport(reportIdArg, options = {}) {
         const shouldPromoteColumnToRowFromPendingFlag = pendingPromoteColumnToRow && !String(prev.groupRowsBy ?? "").trim();
         const sourceReportBuilderTables = (sourceReport.reportBuilderState?.tables ?? []).filter((table2) => Boolean(String(table2?.name ?? "").trim()));
         const sourceReportBuilderTableNames = sourceReportBuilderTables.map((table2) => table2.name).filter((name2) => Boolean(name2));
-        const sourceQueryColumns = normalizeReportBuilderColumns(
-          sourceReport.reportBuilderState?.columns ?? (sourceReport.columns ?? []).map((column) => ({
-            field: column.field,
-            table: column.table ?? resolveColumnTableFromReportMetadata(
-              sourceReport,
-              column.field
-            )
-          }))
-        );
         const nextQueryFilters = prev.queryFilters.rules.length ? prev.queryFilters : rulesFromReport(sourceReport);
         const pivotAggregationsFromSource = Array.isArray(sourceReport.pivot?.aggregations) ? sourceReport.pivot.aggregations : sourceReport.pivot?.aggregationType ? [
           {
@@ -67997,6 +68222,9 @@ function useReport(reportIdArg, options = {}) {
           tables: tableScopeForDisplayColumns,
           schemaTables: schemaForReportBuilderState
         });
+        const sourceQueryColumns = normalizeReportBuilderColumns(
+          sourceReport.reportBuilderState?.columns?.length ? sourceReport.reportBuilderState.columns : sourceDisplayColumnsFromSchema
+        );
         const savedDisplayColumns = normalizeReportBuilderColumns(
           (sourceReport.columns ?? []).map((column) => ({
             ...column,
@@ -68510,13 +68738,12 @@ function useReport(reportIdArg, options = {}) {
       tables: effectiveReportBuilderState.tables,
       schemaTables: schemaForReportBuilderState
     });
-    const columnsToFetch = allColumnsBySelectedTable.length > 0 ? allColumnsBySelectedTable : effectiveReportBuilderState.columns;
-    if (columnsToFetch.length === 0) {
+    if (allColumnsBySelectedTable.length === 0) {
       return void 0;
     }
     return {
       ...effectiveReportBuilderState,
-      columns: columnsToFetch,
+      columns: allColumnsBySelectedTable,
       pivot: null,
       sort: [],
       limit: null
@@ -68559,6 +68786,29 @@ function useReport(reportIdArg, options = {}) {
     refreshDecision.shouldRefresh,
     queryFilters
   ]);
+  const shouldSkipRedundantPivotTableDataQuery = useMemo33(() => {
+    if (!sourceReport || !pivotState) {
+      return false;
+    }
+    if (tableRefreshVersion !== 0 || pivotRefreshVersion !== 0) {
+      return false;
+    }
+    if (!Array.isArray(sourceReport.rows) || sourceReport.rows.length === 0) {
+      return false;
+    }
+    if (refreshDecision.shouldRefresh) {
+      return false;
+    }
+    const sourceRules = sourceReport.reportBuilderState?.rules ?? EMPTY_QUERY_FILTERS;
+    return stableSerializeForQueryKey(queryFilters) === stableSerializeForQueryKey(sourceRules);
+  }, [
+    sourceReport,
+    pivotState,
+    tableRefreshVersion,
+    pivotRefreshVersion,
+    refreshDecision.shouldRefresh,
+    queryFilters
+  ]);
   const shouldForceTableRefreshFromFilters = !useInMemoryEngines && !pivotState;
   const immediateTableRefreshInput = useMemo33(
     () => ({
@@ -68607,8 +68857,14 @@ function useReport(reportIdArg, options = {}) {
         operation: "table"
       });
       if (cachedReport) {
+        profileDashboard("use-report-table-refresh-cachecab-hit", {
+          reportId: effectiveReportId
+        });
         return { report: cachedReport };
       }
+      profileDashboard("use-report-table-refresh-network", {
+        reportId: effectiveReportId
+      });
       return loadViaReportBuilderState({
         reportId: effectiveReportId,
         reportBuilderState: tableRefreshInput.reportBuilderState,
@@ -69222,7 +69478,8 @@ function useReport(reportIdArg, options = {}) {
     sourceReport
   ]);
   const pivotRefreshQueryEnabled = !reportOverride && pendingPivotRefresh && !shouldSkipPivotRefreshForUnchangedPivot && Boolean(sourceReport) && Boolean(client) && Boolean(effectiveReportBuilderState) && Boolean(nextPivot) && sourceReportMatchesEffectiveReportId;
-  const pivotTableDataRefreshQueryEnabled = !reportOverride && Boolean(sourceReport) && Boolean(client) && Boolean(nextPivot) && Boolean(pivotTableDataReportBuilderState) && !pendingPivotRefresh && sourceReportMatchesEffectiveReportId;
+  const initialLoadSettled = Boolean(reportOverride) || !effectiveReportId || Boolean(client) && !initialLoadQuery.isPending && !initialLoadQuery.isFetching;
+  const pivotTableDataRefreshQueryEnabled = !reportOverride && Boolean(sourceReport) && Boolean(client) && Boolean(nextPivot) && Boolean(pivotTableDataReportBuilderState) && !pendingPivotRefresh && sourceReportMatchesEffectiveReportId && initialLoadSettled && !shouldSkipRedundantPivotTableDataQuery;
   const pivotRefreshQuery = useQuery({
     queryKey: createUseFormPivotRefreshQueryKey({
       reportId: effectiveReportId,
@@ -69336,7 +69593,7 @@ function useReport(reportIdArg, options = {}) {
   const paginationRangeStart = pagination.pageIndex * pagination.pageSize;
   const paginationRangeEnd = paginationRangeStart + pagination.pageSize;
   const pageWithinBaseWindow = paginationRangeEnd <= baseWindowRowsLength || trustedSourceRowCount !== void 0 && trustedSourceRowCount <= baseWindowRowsLength;
-  const tablePageQueryEnabled = !pageWithinBaseWindow && !reportOverride && !useInMemoryEngines && Boolean(client) && Boolean(sourceReport) && Boolean(tablePageReportBuilderState) && sourceReportMatchesEffectiveReportId && !pendingPivotRefresh;
+  const tablePageQueryEnabled = !pageWithinBaseWindow && !reportOverride && !useInMemoryEngines && Boolean(client) && Boolean(sourceReport) && Boolean(tablePageReportBuilderState) && sourceReportMatchesEffectiveReportId && !pendingPivotRefresh && initialLoadSettled;
   const tablePageQuery = useQuery({
     queryKey: createUseFormTablePageQueryKey({
       reportId: effectiveReportId,
@@ -69508,21 +69765,17 @@ function useReport(reportIdArg, options = {}) {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
     const chartPivot = pendingPivotChangesDimensions ? sourceReport.pivot ?? null : nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
-    const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
-      ...chartPivot,
-      rowField: sourceReport.pivotResultRowField
-    } : chartPivot;
-    const rowCountForChart = chartPivotForDisplay ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
+    const rowCountForChart = chartPivot ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
     const referencedTablesForChart = effectiveReportBuilderState?.tables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;
-    const rowCountForChartResolved = chartPivotForDisplay ? Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
+    const rowCountForChartResolved = chartPivot ? Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
     const chartDataPayload = {
       ...sourceReport,
       rows: rowsForChart,
       rowCount: rowCountForChartResolved,
       chartType: chartType ?? sourceReport.chartType,
       reportBuilderState: effectiveReportBuilderState,
-      pivot: chartPivotForDisplay,
+      pivot: chartPivot,
       referencedTables: referencedTablesForChart && referencedTablesForChart.length > 0 ? referencedTablesForChart : sourceReport.referencedTables,
       pivotRows: pivotRowsForChart,
       pivotColumns: sourceReport.pivotColumns,
@@ -69623,7 +69876,7 @@ function useReport(reportIdArg, options = {}) {
   const xAxisOptions = useMemo33(() => {
     if (!chartAxesBaseChart) return chartAxisOptions;
     const pivot = chartAxesBaseChart.pivot;
-    const pivotRowField = String(pivot?.rowField ?? "").trim();
+    const pivotRowField = pivotRowKey(chartAxesBaseChart);
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
     if (pivot && pivotRowField) {
       if (["metric", "gauge"].includes(chartType2)) {
@@ -69744,9 +69997,7 @@ function useReport(reportIdArg, options = {}) {
   const resolvedXAxisField = useMemo33(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
-    const pivotRowField = String(
-      chartAxesBaseChart.pivot?.rowField ?? ""
-    ).trim();
+    const pivotRowField = pivotRowKey(chartAxesBaseChart);
     if (pivotRowField) {
       const rowColumn = (chartAxesBaseChart.pivotColumns ?? chartAxesBaseChart.columns ?? []).find((col) => String(col.field ?? "").trim() === pivotRowField);
       if (shouldUsePivotRowFieldAsXAxis(
@@ -69882,11 +70133,11 @@ function useReport(reportIdArg, options = {}) {
         columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
           columns: columns2 ?? baseChart.columns,
           yAxisFields: resolvedYAxisFieldsForDisplay,
-          pivotRowField: String(baseChart.pivot.rowField ?? ""),
+          pivotRowField: pivotRowKey(baseChart),
           xAxisLabel: resolvedXAxisLabel
         });
       } else {
-        const pivotRowField = String(baseChart.pivot.rowField ?? "").trim();
+        const pivotRowField = pivotRowKey(baseChart);
         const pivotLabelByField = new Map(
           (baseChart.pivotColumns ?? []).map((column) => [
             String(column.field ?? "").trim(),
@@ -69934,8 +70185,11 @@ function useReport(reportIdArg, options = {}) {
     const rowField = String(pivot?.rowField ?? "").trim();
     if (rowField && isDateType(String(pivot?.rowFieldType ?? ""))) {
       const field = pivot?.rowFieldTable ? `${pivot.rowFieldTable}.${rowField}` : rowField;
-      const bucket = dateBucket || pivot?.dateBucket || "month";
-      const labelsByRaw = /* @__PURE__ */ new Map();
+      const chartBucket = dateBucket || pivot?.dateBucket || "month";
+      const bucket = inBucketDateBucketForField(
+        filtersForQueryBuilder.rules ?? [],
+        field
+      ) ?? chartBucket;
       const cacheKey = `${String(effectiveReportId ?? "")}\0${field}\0${bucket}`;
       if (pivotDateFilterRangeCacheRef.current.key !== cacheKey) {
         pivotDateFilterRangeCacheRef.current = {
@@ -69951,7 +70205,6 @@ function useReport(reportIdArg, options = {}) {
         const key = String(raw);
         const timestamp = new Date(key).getTime();
         if (Number.isNaN(timestamp)) continue;
-        labelsByRaw.set(key, String(record[rowField] ?? key));
         const cachedMin = pivotDateFilterRangeCacheRef.current.min;
         const cachedMax = pivotDateFilterRangeCacheRef.current.max;
         if (cachedMin == null || timestamp < new Date(cachedMin).getTime()) {
@@ -69964,7 +70217,7 @@ function useReport(reportIdArg, options = {}) {
       const { min: min2, max: max2 } = pivotDateFilterRangeCacheRef.current;
       const options2 = min2 && max2 ? buildPivotDateBucketStarts({ min: min2, max: max2 }, bucket).map((value) => ({
         value,
-        label: labelsByRaw.get(value) ?? getDateString(value, void 0, bucket)
+        label: getDateString(value, void 0, bucket)
       })) : [];
       out.push({
         field,
@@ -69980,7 +70233,8 @@ function useReport(reportIdArg, options = {}) {
     chart?.rows,
     dateBucket,
     effectiveReportId,
-    filterValueOptionsByFieldName
+    filterValueOptionsByFieldName,
+    filtersForQueryBuilder.rules
   ]);
   const chartForUi = useMemo33(() => {
     if (!chart?.pivot) return chart;
@@ -69993,10 +70247,10 @@ function useReport(reportIdArg, options = {}) {
     };
     const selectedValue = (field, operator, options2) => {
       const rule = filtersForQueryBuilder.rules.find(
-        (entry) => typeof entry === "object" && entry !== null && "field" in entry && entry.field === field && entry.operator === operator
+        (entry) => typeof entry === "object" && entry !== null && "field" in entry && entry.field === field && (entry.operator === operator || operator === "inBucket" && entry.operator === "between")
       );
       if (!rule) return null;
-      const raw = operator === "inBucket" ? rule.value?.start : Array.isArray(rule.value) ? rule.value[0] : void 0;
+      const raw = operator === "inBucket" ? rule.operator === "between" && Array.isArray(rule.value) ? rule.value[0] : rule.value?.start : Array.isArray(rule.value) ? rule.value[0] : void 0;
       if (raw == null) return null;
       const value = String(raw);
       return options2.some((option) => option.value === value) ? value : null;
@@ -70252,9 +70506,7 @@ function useReport(reportIdArg, options = {}) {
       sourceReport,
       includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     });
-    const pivotRowFieldForTable = String(
-      sourceReport?.pivot?.rowField ?? ""
-    ).trim();
+    const pivotRowFieldForTable = pivotRowKey(sourceReport);
     const pivotRowTableUsesAxisFormat = chartAxisEdits.xAxisFormat !== void 0;
     const columns2 = String(chartType ?? "").toLowerCase() === "table" && sourceReport?.pivot && pivotRowFieldForTable && String(resolvedXAxisField ?? "").trim() === pivotRowFieldForTable ? mergedFromReport.map(
       (column) => column.field === pivotRowFieldForTable ? {
@@ -70266,7 +70518,7 @@ function useReport(reportIdArg, options = {}) {
     const pivotLabeledColumns = String(chartType ?? "").toLowerCase() === "table" && sourceReport?.pivot ? mergePivotTableDisplayColumnLabelsFromYAxis({
       columns: columns2,
       yAxisFields: resolvedYAxisFieldsForDisplay,
-      pivotRowField: String(sourceReport.pivot.rowField ?? ""),
+      pivotRowField: pivotRowKey(sourceReport),
       xAxisLabel: resolvedXAxisLabel
     }) ?? columns2 : columns2;
     const tableColumnsWithPivotDisplayLabels = pivotLabeledColumns.map(
@@ -70515,7 +70767,7 @@ function useReport(reportIdArg, options = {}) {
       if (slotFormatting) {
         const aggregations = slotFormatting.aggregations;
         const hasMultiple = aggregations.length > 1;
-        const rowField = String(pivotState?.rowField ?? "").trim();
+        const rowField = pivotRowKey(chart);
         const firstValueColumnFormat = String(
           (chart.columns ?? []).find(
             (c) => String(c.field ?? "").trim() !== rowField
@@ -70551,9 +70803,7 @@ function useReport(reportIdArg, options = {}) {
         }
       }
     }
-    const pivotRowFieldForSettings = String(
-      chart?.pivot?.rowField ?? ""
-    ).trim();
+    const pivotRowFieldForSettings = pivotRowKey(chart);
     const rowAxisLabel = String(resolvedXAxisLabel ?? "").trim();
     for (const columnId of activeTableColumnIds) {
       const option = columnOptionById.get(columnId);
@@ -70613,7 +70863,7 @@ function useReport(reportIdArg, options = {}) {
     tableColumnSettingsCoalesceRef.current = new Map(tableColumnSettingsById);
   }, [tableColumnSettingsById]);
   const tableColumnItems = useMemo33(() => {
-    const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
+    const pivotRowFieldForFormat = pivotRowKey(chart);
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     const items = activeTableColumnIds.map((columnId) => {
       const option = columnOptionById.get(columnId);
@@ -70652,7 +70902,7 @@ function useReport(reportIdArg, options = {}) {
     return new Map(tableColumnItems.map((item) => [item.id, item]));
   }, [tableColumnItems]);
   const tableColumnValues = useMemo33(() => {
-    const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
+    const pivotRowFieldForFormat = pivotRowKey(chart);
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     return tableColumnItems.map((item) => {
       const coerced = coerceTableColumnFormatToAxisValue(item.format);
@@ -70673,8 +70923,89 @@ function useReport(reportIdArg, options = {}) {
   const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching);
   const filterUniqueValuesLoading = filterUniqueValuesEnabled && (filterUniqueValuesQuery.isPending || filterUniqueValuesQuery.isFetching);
   const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
-  const tableLoading = initialLoadInProgress || pendingPivotRefresh || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const awaitingPivotDetailRows = Boolean(nextPivot || sourceReport?.pivot) && !reportOverride && Boolean(sourceReport) && sourceReportMatchesEffectiveReportId && (!Array.isArray(sourceReport?.rows) || sourceReport.rows.length === 0) && pivotTableDataRefreshQuery.status !== "error";
+  const tableLoading = initialLoadInProgress || pendingPivotRefresh || awaitingPivotDetailRows || tablePageFetching && pagination.pageIndex > 0 || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const loading = chartLoading || tableLoading;
+  const lastUseReportLoadingLogRef = useRef24("");
+  useEffect33(() => {
+    const snapshot = {
+      reportId: effectiveReportId,
+      chartLoading,
+      tableLoading,
+      loading,
+      initialLoadInProgress,
+      initialLoad: {
+        status: initialLoadQuery.status,
+        fetchStatus: initialLoadQuery.fetchStatus,
+        isPending: initialLoadQuery.isPending,
+        isFetching: initialLoadQuery.isFetching,
+        hasData: initialLoadQuery.data !== void 0,
+        dataUpdatedAt: initialLoadQuery.dataUpdatedAt,
+        staleTime: 0
+      },
+      pendingPivotRefresh,
+      pivotRefresh: {
+        enabled: pivotRefreshQueryEnabled,
+        isFetching: pivotRefreshQuery.isFetching
+      },
+      tableRefresh: {
+        enabled: tableRefreshQueryEnabled,
+        isFetching: tableRefreshQuery.isFetching
+      },
+      pivotTableData: {
+        enabled: pivotTableDataRefreshQueryEnabled,
+        isFetching: pivotTableDataRefreshQuery.isFetching
+      },
+      tablePage: {
+        enabled: tablePageQueryEnabled,
+        isFetching: tablePageQuery.isFetching
+      },
+      uniqueValues: {
+        enabled: filterUniqueValuesEnabled,
+        isFetching: filterUniqueValuesQuery.isFetching,
+        isPending: filterUniqueValuesQuery.isPending
+      },
+      whyChartLoading: {
+        noClient: !client,
+        initialPending: initialLoadQuery.isPending,
+        initialFetching: initialLoadQuery.isFetching,
+        pendingPivotRefresh,
+        pivotRefreshFetching: Boolean(nextPivot) && pivotRefreshQuery.isFetching,
+        tableRefreshFetching: !nextPivot && tableRefreshQuery.isFetching
+      }
+    };
+    const serialized = JSON.stringify(snapshot);
+    if (serialized === lastUseReportLoadingLogRef.current) return;
+    lastUseReportLoadingLogRef.current = serialized;
+    profileDashboard("use-report-loading", snapshot);
+  }, [
+    client,
+    chartLoading,
+    effectiveReportId,
+    filterUniqueValuesEnabled,
+    filterUniqueValuesQuery.fetchStatus,
+    filterUniqueValuesQuery.isFetching,
+    filterUniqueValuesQuery.isPending,
+    initialLoadInProgress,
+    initialLoadQuery.data,
+    initialLoadQuery.dataUpdatedAt,
+    initialLoadQuery.fetchStatus,
+    initialLoadQuery.isFetching,
+    initialLoadQuery.isPending,
+    initialLoadQuery.status,
+    loading,
+    nextPivot,
+    pendingPivotRefresh,
+    pivotRefreshQuery.isFetching,
+    pivotRefreshQueryEnabled,
+    pivotTableDataRefreshQuery.isFetching,
+    pivotTableDataRefreshQueryEnabled,
+    tableLoading,
+    tablePageQuery.isFetching,
+    tablePageQueryEnabled,
+    tableRefreshQuery.isFetching,
+    tableRefreshQueryEnabled
+  ]);
   const buildSetReportColumnsFromIds = (nextColumnIds, settingsById) => {
     const normalizedNextIds = nextColumnIds.map((columnId) => String(columnId ?? "").trim()).filter(Boolean);
     return normalizedNextIds.map((columnId) => {
@@ -70714,7 +71045,7 @@ function useReport(reportIdArg, options = {}) {
       const option = columnOptionById.get(normalizedId);
       const pivotField = String(option?.field ?? normalizedId).trim();
       const pivotModel = chartAxesBaseChart.pivot;
-      const rowField = String(pivotModel?.rowField ?? "").trim();
+      const rowField = pivotRowKey(chartAxesBaseChart);
       if (!pivotModel) return null;
       const isPivotRowColumn = Boolean(
         pivotField && rowField && pivotField === rowField