@quillsql/react 2.16.93 → 2.16.94

package/dist/index.cjs

@@ -103,7 +103,7 @@ function formatIdentifierLabel(str) {
   if (hasUnderscore || hasCamelCaseBoundary) {
     return snakeAndCamelCaseToTitleCase(str);
   }
-  return str;
+  return str.split(/\s+/).map((word) => word === "id" ? "ID" : capitalize(word)).join(" ");
 }
 function removeDoubleQuotes(str) {
   if (!str) {
@@ -137,13 +137,14 @@ function getValidDate(dateString) {
   const dates = FORMATS.map((fmt) => (0, import_date_fns.parse)(dateString, fmt, /* @__PURE__ */ new Date()));
   return dates.find((date) => (0, import_date_fns.isValid)(date));
 }
-var import_date_fns, import_date_fns_tz, DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES, valueFormatter, quillFormat, quillAutoFormat, formatString, formatterDollar, formatDollarAmount, formatterCentsDollar, formatDollarCents, wholeNumberFormatter, formatWholeNumber, formatOneDecimalPlace, formatterTwoDecimalPlaces, formatTwoDecimalPlaces, formatterPercent, formatPercent, _getUTCDateHelper, format_YYYY, format_MMM_yyyy, format_hh_ap_pm, format_MMM_d, format_MMM_dd_yyyy, format_MMM_d_MMM_d, format_MMM_dd_hh_mm_ap_pm, format_wo_yyyy, localeFormatter, FORMATS, compareValues;
+var import_date_fns, import_date_fns_tz, DATE_OUTSIDE_RANGE, DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES, valueFormatter, quillFormat, quillAutoFormat, formatString, formatterDollar, formatDollarAmount, formatterCentsDollar, formatDollarCents, wholeNumberFormatter, formatWholeNumber, formatOneDecimalPlace, formatterTwoDecimalPlaces, formatTwoDecimalPlaces, formatterPercent, formatPercent, _getUTCDateHelper, format_YYYY, format_MMM_yyyy, format_hh_ap_pm, format_MMM_d, format_MMM_dd_yyyy, format_MMM_d_MMM_d, format_MMM_dd_hh_mm_ap_pm, format_wo_yyyy, localeFormatter, FORMATS, compareValues;
 var init_valueFormatter = __esm({
   "src/utils/valueFormatter.ts"() {
     "use strict";
     import_date_fns = require("date-fns");
     import_date_fns_tz = require("date-fns-tz");
     init_textProcessing();
+    DATE_OUTSIDE_RANGE = "Date outside range";
     DATE_FORMAT_TYPES = [
       "yyyy",
       "MMM_yyyy",
@@ -392,7 +393,7 @@ var init_valueFormatter = __esm({
             weekEnd = utcEnd;
           }
           if ((0, import_date_fns.isAfter)(weekStart, utcEnd) || (0, import_date_fns.isBefore)(weekEnd, utcStart)) {
-            return "Date outside range";
+            return DATE_OUTSIDE_RANGE;
           }
         }
       }
@@ -17136,79 +17137,6 @@ 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) {
@@ -17321,22 +17249,6 @@ 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",
@@ -17376,7 +17288,7 @@ async function generatePivotWithSQL({
   );
   const responseRows = queryResponseRows;
   const responseFields = queryResponseFields;
-  const rows = resultRowField ? responseRows.map(
+  let rows = resultRowField ? responseRows.map(
     (row) => !row[resultRowField] ? { ...row, [resultRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
@@ -17415,24 +17327,21 @@ async function generatePivotWithSQL({
     return 0;
   });
   if (resultRowField && !isStringType(pivot.rowFieldType || "")) {
-    rows.forEach((row) => {
-      row.__quillRawDate = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
-      let value = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
-      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
-        const rowDate = new Date(value);
-        if (rowDate < dateFilter.startDate) {
-          value = dateFilter.startDate.toISOString();
-        } else if (rowDate > dateFilter.endDate) {
-          value = dateFilter.endDate.toISOString();
-        }
-      }
+    const dateRange = dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0;
+    rows = rows.filter((row) => {
+      const rawValue = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
+      row.__quillRawDate = rawValue;
       const dateString = getDateString(
-        value,
-        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        rawValue,
+        dateRange,
         dateBucket,
         databaseType
       );
+      if (dateBucket === "week" && dateRange && dateString === DATE_OUTSIDE_RANGE) {
+        return false;
+      }
       row[resultRowField] = dateString;
+      return true;
     });
     if (resultRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
       const dateSet = new Set(rows.map((row) => row[resultRowField]));
@@ -17597,7 +17506,7 @@ function processPivotData({
   const pivotRowField = processColumnName(
     String(resultRowField ?? pivot.rowField ?? "")
   );
-  const rows = pivotRowField ? responseRows.map(
+  let rows = pivotRowField ? responseRows.map(
     (row) => !row[pivotRowField] ? { ...row, [pivotRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
@@ -17636,24 +17545,21 @@ function processPivotData({
     return 0;
   });
   if (pivotRowField && !isStringType(pivot.rowFieldType || "")) {
-    rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
-      let value = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
-      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
-        const rowDate = new Date(value);
-        if (rowDate < dateFilter.startDate) {
-          value = dateFilter.startDate.toISOString();
-        } else if (rowDate > dateFilter.endDate) {
-          value = dateFilter.endDate.toISOString();
-        }
-      }
+    const dateRange = dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0;
+    rows = rows.filter((row) => {
+      const rawValue = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
+      row.__quillRawDate = rawValue;
       const dateString = getDateString(
-        value,
-        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        rawValue,
+        dateRange,
         dateBucket,
         databaseType
       );
+      if (dateBucket === "week" && dateRange && dateString === DATE_OUTSIDE_RANGE) {
+        return false;
+      }
       row[pivotRowField] = dateString;
+      return true;
     });
     if (pivotRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
       const dateSet = new Set(rows.map((row) => row[pivotRowField]));
@@ -17715,9 +17621,9 @@ var init_pivotConstructor = __esm({
     init_columnType();
     init_dataFetcher();
     init_dataProcessing();
-    init_dashboardProfiler();
     init_dates();
     init_textProcessing();
+    init_valueFormatter();
   }
 });
 
@@ -20138,20 +20044,6 @@ 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 = {
@@ -20227,7 +20119,6 @@ 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();
@@ -20790,7 +20681,6 @@ var init_dataFetcher = __esm({
     init_dates();
     init_changelogNotify();
     init_reportRequestPool();
-    init_dashboardProfiler();
     quillFetch = async ({
       client,
       task,
@@ -20851,14 +20741,6 @@ var init_dataFetcher = __esm({
           return { error: "Failed to fetch data" };
         }
       };
-      profileDashboard(
-        "engine-fetch",
-        summarizeEngineRequest({
-          task,
-          shareRequest,
-          metadata
-        })
-      );
       if (!shareRequest) {
         return execute(abortSignal);
       }
@@ -21494,7 +21376,22 @@ init_dates();
 init_pivotConstructor();
 init_columnProcessing();
 init_paginationProcessing();
-init_dashboardProfiler();
+
+// 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
 var defaultDashboardItem = {
   id: "",
   name: "",
@@ -22901,13 +22798,13 @@ init_columnProcessing();
 init_dataFetcher();
 init_dataProcessing();
 init_dates();
+init_columnType();
 init_paginationProcessing();
 init_pivotProcessing();
 init_tableProcessing();
 init_textProcessing();
 init_valueFormatter();
 init_astFilterProcessing();
-init_dashboardProfiler();
 init_reportBuilder();
 init_astProcessing();
 
@@ -23827,6 +23724,15 @@ function hasPreformattedDateBucketLabels(report) {
   if (report.chartType?.toLowerCase() === "table") return false;
   return report.xAxisField?.trim() === pivot.rowField?.trim();
 }
+function resolvePivotBucketXAxisFormat(report) {
+  const pivot = report.pivot;
+  if (!pivot?.dateBucket) return null;
+  if (report.chartType?.toLowerCase() === "table") return null;
+  const rowField = pivot.rowField?.trim();
+  if (!rowField || report.xAxisField?.trim() !== rowField) return null;
+  if (!isDateType(String(pivot.rowFieldType ?? ""))) return null;
+  return getDateFormatFromBucket(pivot.dateBucket);
+}
 function applySavedPivotColumnLabels(report, pivotColumns) {
   return pivotColumns?.map((column) => {
     const savedColumn = report.columns?.find(
@@ -23902,6 +23808,10 @@ function convertInternalReportToReport(report, dashboardFilters, eventTracking,
         ...extractAllReportValuesFromQuillInternalReport(formattedReport),
         ...pivotFormatted
       };
+      const bucketXAxisFormat = resolvePivotBucketXAxisFormat(pivotReport);
+      if (bucketXAxisFormat) {
+        pivotReport.xAxisFormat = bucketXAxisFormat;
+      }
       pivotReport.formattedBaseRows = formattedBaseRows;
       return applyChartSort(pivotReport);
     }
@@ -26667,7 +26577,6 @@ function normalizePSTRanges(start, end) {
 
 // src/Context.tsx
 init_changelogNotify();
-init_dashboardProfiler();
 
 // src/reportStore.ts
 var import_react = require("react");
@@ -32438,7 +32347,7 @@ function QuillTable({
     setSortColumn(sort?.field || "");
     setSortDirection(sort?.direction || "desc");
   }, [sort]);
-  const holdFullPageLoader = Boolean(isLoading);
+  const holdFullPageLoader = rows?.length === 0 && isLoading;
   const pageCountUnknown = manualPagination && pageCount === -1;
   const { activeRows, maxPage } = (0, import_react14.useMemo)(() => {
     const start = currentPage * rowsPerPage;
@@ -34175,9 +34084,8 @@ function RadarChart({
                         fields: [{ field: xAxisField, format: xAxisFormat }]
                       }),
                       valueFormatter: (value, name2) => {
-                        const field = payloadItems.find(
-                          (p) => p.dataKey === name2
-                        )?.dataKey;
+                        const payloadItem = payloadItems.find((p) => p.dataKey === name2) ?? payloadItems.find((p) => p.name === name2);
+                        const field = payloadItem?.dataKey;
                         if (!field) return value;
                         return valueFormatter({
                           value,
@@ -37296,7 +37204,6 @@ 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 } = (0, import_react26.useContext)(
@@ -37675,7 +37582,8 @@ var useDashboards = () => {
         reports: Object.values(dashboard.config.sections ?? {}).flat(),
         tenantKeys: dashboard.config.tenantKeys,
         createdAt: dashboard.config.createdAt,
-        sectionOrder: dashboard.config.sectionOrder
+        sectionOrder: dashboard.config.sectionOrder,
+        hidden: dashboard.config.hidden
       };
     }).sort(
       (a, b) => (a.createdAt?.getTime() ?? 0) - (b.createdAt?.getTime() ?? 0)
@@ -38406,14 +38314,6 @@ 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;
@@ -38647,9 +38547,7 @@ var useDashboard = (dashboardName, config) => {
                   pivotColumns: pivotData.columns,
                   pivotRowCount: pivotData.rowCount,
                   pivotQuery: pivotData.pivotQuery,
-                  comparisonPivotQuery: pivotData.comparisonPivotQuery,
-                  pivotResultRowField: pivotData.rowField,
-                  pivotResultSourceRowField: reportInfo.pivot?.rowField
+                  comparisonPivotQuery: pivotData.comparisonPivotQuery
                 },
                 error: void 0
               };
@@ -38679,26 +38577,6 @@ 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,
@@ -39101,7 +38979,6 @@ var useDashboardReport = (reportId, config) => {
 };
 
 // src/components/Dashboard/DataLoader.tsx
-init_dashboardProfiler();
 var import_jsx_runtime46 = require("react/jsx-runtime");
 var constructReportFromItem = (item) => {
   return {
@@ -41517,7 +41394,6 @@ function QuillTableDashboardComponent({
 
 // src/Chart.tsx
 init_valueFormatter();
-init_dashboardProfiler();
 var import_jsx_runtime50 = require("react/jsx-runtime");
 function Chart({
   colors,
@@ -45502,7 +45378,6 @@ init_Filter();
 
 // src/StaticChart.tsx
 var import_react42 = require("react");
-init_dashboardProfiler();
 var import_jsx_runtime60 = require("react/jsx-runtime");
 var CHART_TYPE_STYLES = {
   metric: { height: "100px", width: "200px" },
@@ -46351,6 +46226,7 @@ var QuillProvider = ({
       isAdmin,
       getAuthorizationToken,
       eventTracking,
+      onChangelogs,
       children
     }
   ) });
@@ -62355,7 +62231,6 @@ function resolveReportFromCacheCab({
 }
 
 // src/hooks/useForm.tsx
-init_dashboardProfiler();
 init_reportRequestPool();
 
 // src/hooks/useForm.queries.ts
@@ -62401,15 +62276,6 @@ 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;
 }
@@ -63392,11 +63258,6 @@ 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;
@@ -63405,8 +63266,7 @@ function isPivotTableDateBucketRowAxis(chart, xAxisField) {
   }
   const rowField = String(chart.pivot.rowField ?? "").trim();
   const xf = String(xAxisField ?? "").trim();
-  const rowKey = pivotRowKey(chart);
-  if (!rowField || xf !== rowField && xf !== rowKey) return false;
+  if (!rowField || xf !== rowField) return false;
   return isDateType(String(chart.pivot.rowFieldType ?? ""));
 }
 var RESOLVABLE_X_AXIS_DATE_BUCKETS = /* @__PURE__ */ new Set([
@@ -63420,24 +63280,22 @@ 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();
-  const xf = String(xAxisField ?? "").trim();
-  const rowKey = pivotRowKey(chart);
-  if (!rowField || xf !== rowField && xf !== rowKey) return null;
+  if (!rowField || String(xAxisField ?? "").trim() !== rowField) return null;
   if (!isDateType(String(chart?.pivot?.rowFieldType ?? ""))) return null;
   return getDateFormatFromBucket(dateBucket);
 }
 function chartDetailRowsMissingPivotRowBucket(chart) {
   if (!chart?.pivot) return false;
-  const rowKey = pivotRowKey(chart);
-  if (!rowKey) return false;
+  const rowField = String(chart.pivot.rowField ?? "").trim();
+  if (!rowField) 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, rowKey)) return true;
-  const v = first[rowKey];
+  if (!Object.prototype.hasOwnProperty.call(first, rowField)) return true;
+  const v = first[rowField];
   return v === void 0 || v === null;
 }
 function shouldUsePivotRowFieldAsXAxis(chartType, pivotRowField, rowColumnFormat) {
@@ -63473,7 +63331,7 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   } : chart;
   if (!config) return config;
   if (!config.pivot) return config;
-  const pivotRowFieldEarly = pivotRowKey(config);
+  const pivotRowFieldEarly = String(config.pivot?.rowField ?? "").trim();
   const rowColumn = (config.pivotColumns ?? config.columns ?? []).find(
     (col) => String(col.field ?? "").trim() === pivotRowFieldEarly
   );
@@ -63492,11 +63350,23 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   const firstPivotRow = (withResolvedXAxis.rows ?? []).find(
     (row) => Object.keys(row).length > 0
   );
-  const pivotRowFields = firstPivotRow ? Object.keys(firstPivotRow).filter(
-    (field) => !INTERNAL_PIVOT_ROW_FIELDS.has(field)
-  ) : [];
+  const pivotRowFieldName = String(
+    withResolvedXAxis.pivot?.rowField ?? ""
+  ).trim();
+  const pivotRowFields = firstPivotRow ? (() => {
+    const keys = Object.keys(firstPivotRow).filter(
+      (field) => !INTERNAL_PIVOT_ROW_FIELDS.has(field)
+    );
+    if (pivotRowFieldName && keys.includes(pivotRowFieldName)) {
+      return [
+        pivotRowFieldName,
+        ...keys.filter((field) => field !== pivotRowFieldName)
+      ];
+    }
+    return keys;
+  })() : [];
   const pivotValueFields = pivotRowFields.filter(
-    (field) => field !== pivotRowKey(withResolvedXAxis) && field !== withResolvedXAxis.pivot?.rowField
+    (field) => field !== withResolvedXAxis.pivot?.rowField
   );
   const isAggregationOnlyPivot = !String(withResolvedXAxis.pivot?.rowField ?? "").trim() && !String(withResolvedXAxis.pivot?.columnField ?? "").trim();
   const yAxisFormatByField = new Map(
@@ -63507,6 +63377,10 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   );
   const resolveYAxisFormat = (field, aggregation) => {
     if (aggregation?.aggregationType === "count") {
+      const savedFormat = yAxisFormatByField.get(field) ?? yAxisFormatByField.get("count") ?? withResolvedXAxis.yAxisFields?.find(
+        (axis) => String(axis.field ?? "").trim() === field
+      )?.format ?? withResolvedXAxis.yAxisFields?.[0]?.format;
+      if (savedFormat) return savedFormat;
       return "whole_number";
     }
     if (aggregation?.aggregationType === "percentage") {
@@ -63613,7 +63487,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 === pivotRowKey(withResolvedXAxis) || field === withResolvedXAxis.pivot?.rowField ? isMetricOrGauge ? "string" : withResolvedXAxis.xAxisFormat ?? "string" : yAxisFallbackFormat);
+    const format9 = yAxis?.format ?? knownColumn?.format ?? (field === withResolvedXAxis.pivot?.rowField ? isMetricOrGauge ? "string" : withResolvedXAxis.xAxisFormat ?? "string" : yAxisFallbackFormat);
     return {
       field,
       label: yAxis?.label ?? knownColumn?.label ?? field,
@@ -63626,7 +63500,7 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
     const slotCol = getPivotTableSlotReportColumn(
       pivotTableSlotColumns,
       aggregations,
-      pivotRowKey(withResolvedXAxis) || withResolvedXAxis.pivot?.rowField,
+      withResolvedXAxis.pivot?.rowField,
       col.field
     );
     if (!slotCol) return col;
@@ -63648,7 +63522,9 @@ 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 = pivotRowKey(withResolvedXAxis);
+  const pivotDisplayRowField = String(
+    withResolvedXAxis.pivot?.rowField ?? ""
+  ).trim();
   const pivotDisplayRowFieldType = String(
     withResolvedXAxis.pivot?.rowFieldType ?? ""
   ).trim();
@@ -66612,30 +66488,19 @@ 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,
+          outcome: resolution.resolved ? "hit" : "fallback",
           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
+          durationMs: performance.now() - startedAt
         });
       }
-      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;
     },
     [
@@ -67209,15 +67074,9 @@ 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);
@@ -67736,29 +67595,6 @@ function useReport(reportIdArg, options = {}) {
   const initialLoadQuery = (0, import_react_query3.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(
@@ -67783,9 +67619,6 @@ function useReport(reportIdArg, options = {}) {
         operation: "initial"
       });
       if (cachedReport) {
-        profileDashboard("use-report-initial-load-served-from-cachecab", {
-          reportId: effectiveReportId
-        });
         return { report: cachedReport };
       }
       const allowReportTaskBootstrap = shouldBootstrapUseFormInitialLoad({
@@ -67800,12 +67633,6 @@ 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,
@@ -67825,12 +67652,6 @@ 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;
@@ -67842,17 +67663,7 @@ function useReport(reportIdArg, options = {}) {
       return loadResult;
     }),
     enabled: Boolean(effectiveReportId) && Boolean(client) && !reportOverride,
-    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
+    retry: false
   });
   const reportNameQueryReportId = String(effectiveReportId ?? "").trim();
   const reportNameQuery = (0, import_react_query3.useQuery)({
@@ -67903,6 +67714,15 @@ 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 ? [
           {
@@ -67969,9 +67789,6 @@ 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,
@@ -68485,12 +68302,13 @@ function useReport(reportIdArg, options = {}) {
       tables: effectiveReportBuilderState.tables,
       schemaTables: schemaForReportBuilderState
     });
-    if (allColumnsBySelectedTable.length === 0) {
+    const columnsToFetch = allColumnsBySelectedTable.length > 0 ? allColumnsBySelectedTable : effectiveReportBuilderState.columns;
+    if (columnsToFetch.length === 0) {
       return void 0;
     }
     return {
       ...effectiveReportBuilderState,
-      columns: allColumnsBySelectedTable,
+      columns: columnsToFetch,
       pivot: null,
       sort: [],
       limit: null
@@ -68533,29 +68351,6 @@ function useReport(reportIdArg, options = {}) {
     refreshDecision.shouldRefresh,
     queryFilters
   ]);
-  const shouldSkipRedundantPivotTableDataQuery = (0, import_react63.useMemo)(() => {
-    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 = (0, import_react63.useMemo)(
     () => ({
@@ -68604,14 +68399,8 @@ 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,
@@ -69225,8 +69014,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport
   ]);
   const pivotRefreshQueryEnabled = !reportOverride && pendingPivotRefresh && !shouldSkipPivotRefreshForUnchangedPivot && Boolean(sourceReport) && Boolean(client) && Boolean(effectiveReportBuilderState) && Boolean(nextPivot) && 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 pivotTableDataRefreshQueryEnabled = !reportOverride && Boolean(sourceReport) && Boolean(client) && Boolean(nextPivot) && Boolean(pivotTableDataReportBuilderState) && !pendingPivotRefresh && sourceReportMatchesEffectiveReportId;
   const pivotRefreshQuery = (0, import_react_query3.useQuery)({
     queryKey: createUseFormPivotRefreshQueryKey({
       reportId: effectiveReportId,
@@ -69340,7 +69128,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 && initialLoadSettled;
+  const tablePageQueryEnabled = !pageWithinBaseWindow && !reportOverride && !useInMemoryEngines && Boolean(client) && Boolean(sourceReport) && Boolean(tablePageReportBuilderState) && sourceReportMatchesEffectiveReportId && !pendingPivotRefresh;
   const tablePageQuery = (0, import_react_query3.useQuery)({
     queryKey: createUseFormTablePageQueryKey({
       reportId: effectiveReportId,
@@ -69512,17 +69300,21 @@ 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 rowCountForChart = chartPivot ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
+    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 referencedTablesForChart = effectiveReportBuilderState?.tables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;
-    const rowCountForChartResolved = chartPivot ? Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
+    const rowCountForChartResolved = chartPivotForDisplay ? Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
     const chartDataPayload = {
       ...sourceReport,
       rows: rowsForChart,
       rowCount: rowCountForChartResolved,
       chartType: chartType ?? sourceReport.chartType,
       reportBuilderState: effectiveReportBuilderState,
-      pivot: chartPivot,
+      pivot: chartPivotForDisplay,
       referencedTables: referencedTablesForChart && referencedTablesForChart.length > 0 ? referencedTablesForChart : sourceReport.referencedTables,
       pivotRows: pivotRowsForChart,
       pivotColumns: sourceReport.pivotColumns,
@@ -69573,6 +69365,15 @@ function useReport(reportIdArg, options = {}) {
     }
     for (const yAxis2 of chartAxesBaseChart.yAxisFields ?? []) {
       registerOption(yAxis2.field, yAxis2.label, yAxis2.format);
+      if (yAxis2.format) {
+        const existing = optionsByField.get(yAxis2.field);
+        if (existing) {
+          optionsByField.set(yAxis2.field, {
+            ...existing,
+            format: toAxisFormat(yAxis2.format, existing.format)
+          });
+        }
+      }
     }
     if (chartAxesBaseChart.pivot?.columnField) {
       for (const aggregationAxis of buildPivotAggregationAxisFields(
@@ -69586,11 +69387,22 @@ function useReport(reportIdArg, options = {}) {
         );
       }
     }
+    const xField = String(chartAxesBaseChart.xAxisField ?? "").trim();
+    const savedXFormat = String(chartAxesBaseChart.xAxisFormat ?? "").trim();
     registerOption(
-      chartAxesBaseChart.xAxisField,
+      xField,
       chartAxesBaseChart.xAxisLabel || chartAxesBaseChart.xAxisField,
       chartAxesBaseChart.xAxisFormat
     );
+    if (xField && savedXFormat) {
+      const existing = optionsByField.get(xField);
+      if (existing) {
+        optionsByField.set(xField, {
+          ...existing,
+          format: toAxisFormat(savedXFormat, existing.format)
+        });
+      }
+    }
     return Array.from(optionsByField.values());
   }, [chartAxesBaseChart, resolveTableDisplayLabel]);
   const chartAxisOptionByField = (0, import_react63.useMemo)(() => {
@@ -69603,7 +69415,7 @@ function useReport(reportIdArg, options = {}) {
   const xAxisOptions = (0, import_react63.useMemo)(() => {
     if (!chartAxesBaseChart) return chartAxisOptions;
     const pivot = chartAxesBaseChart.pivot;
-    const pivotRowField = pivotRowKey(chartAxesBaseChart);
+    const pivotRowField = String(pivot?.rowField ?? "").trim();
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
     if (pivot && pivotRowField) {
       if (["metric", "gauge"].includes(chartType2)) {
@@ -69724,7 +69536,9 @@ function useReport(reportIdArg, options = {}) {
   const resolvedXAxisField = (0, import_react63.useMemo)(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
-    const pivotRowField = pivotRowKey(chartAxesBaseChart);
+    const pivotRowField = String(
+      chartAxesBaseChart.pivot?.rowField ?? ""
+    ).trim();
     if (pivotRowField) {
       const rowColumn = (chartAxesBaseChart.pivotColumns ?? chartAxesBaseChart.columns ?? []).find((col) => String(col.field ?? "").trim() === pivotRowField);
       if (shouldUsePivotRowFieldAsXAxis(
@@ -69860,11 +69674,11 @@ function useReport(reportIdArg, options = {}) {
         columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
           columns: columns2 ?? baseChart.columns,
           yAxisFields: resolvedYAxisFieldsForDisplay,
-          pivotRowField: pivotRowKey(baseChart),
+          pivotRowField: String(baseChart.pivot.rowField ?? ""),
           xAxisLabel: resolvedXAxisLabel
         });
       } else {
-        const pivotRowField = pivotRowKey(baseChart);
+        const pivotRowField = String(baseChart.pivot.rowField ?? "").trim();
         const pivotLabelByField = new Map(
           (baseChart.pivotColumns ?? []).map((column) => [
             String(column.field ?? "").trim(),
@@ -69929,10 +69743,7 @@ function useReport(reportIdArg, options = {}) {
         const key = String(raw);
         const timestamp = new Date(key).getTime();
         if (Number.isNaN(timestamp)) continue;
-        labelsByRaw.set(
-          key,
-          String(record[pivotRowKey(chart)] ?? record[rowField] ?? key)
-        );
+        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()) {
@@ -70233,7 +70044,9 @@ function useReport(reportIdArg, options = {}) {
       sourceReport,
       includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     });
-    const pivotRowFieldForTable = pivotRowKey(sourceReport);
+    const pivotRowFieldForTable = String(
+      sourceReport?.pivot?.rowField ?? ""
+    ).trim();
     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 ? {
@@ -70245,7 +70058,7 @@ function useReport(reportIdArg, options = {}) {
     const pivotLabeledColumns = String(chartType ?? "").toLowerCase() === "table" && sourceReport?.pivot ? mergePivotTableDisplayColumnLabelsFromYAxis({
       columns: columns2,
       yAxisFields: resolvedYAxisFieldsForDisplay,
-      pivotRowField: pivotRowKey(sourceReport),
+      pivotRowField: String(sourceReport.pivot.rowField ?? ""),
       xAxisLabel: resolvedXAxisLabel
     }) ?? columns2 : columns2;
     const tableColumnsWithPivotDisplayLabels = pivotLabeledColumns.map(
@@ -70494,7 +70307,7 @@ function useReport(reportIdArg, options = {}) {
       if (slotFormatting) {
         const aggregations = slotFormatting.aggregations;
         const hasMultiple = aggregations.length > 1;
-        const rowField = pivotRowKey(chart);
+        const rowField = String(pivotState?.rowField ?? "").trim();
         const firstValueColumnFormat = String(
           (chart.columns ?? []).find(
             (c) => String(c.field ?? "").trim() !== rowField
@@ -70530,7 +70343,9 @@ function useReport(reportIdArg, options = {}) {
         }
       }
     }
-    const pivotRowFieldForSettings = pivotRowKey(chart);
+    const pivotRowFieldForSettings = String(
+      chart?.pivot?.rowField ?? ""
+    ).trim();
     const rowAxisLabel = String(resolvedXAxisLabel ?? "").trim();
     for (const columnId of activeTableColumnIds) {
       const option = columnOptionById.get(columnId);
@@ -70590,7 +70405,7 @@ function useReport(reportIdArg, options = {}) {
     tableColumnSettingsCoalesceRef.current = new Map(tableColumnSettingsById);
   }, [tableColumnSettingsById]);
   const tableColumnItems = (0, import_react63.useMemo)(() => {
-    const pivotRowFieldForFormat = pivotRowKey(chart);
+    const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     const items = activeTableColumnIds.map((columnId) => {
       const option = columnOptionById.get(columnId);
@@ -70629,7 +70444,7 @@ function useReport(reportIdArg, options = {}) {
     return new Map(tableColumnItems.map((item) => [item.id, item]));
   }, [tableColumnItems]);
   const tableColumnValues = (0, import_react63.useMemo)(() => {
-    const pivotRowFieldForFormat = pivotRowKey(chart);
+    const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     return tableColumnItems.map((item) => {
       const coerced = coerceTableColumnFormatToAxisValue(item.format);
@@ -70650,89 +70465,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 || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
-  const awaitingPivotDetailRows = Boolean(nextPivot || sourceReport?.pivot) && !reportOverride && Boolean(sourceReport) && sourceReportMatchesEffectiveReportId && (!Array.isArray(sourceReport?.rows) || sourceReport.rows.length === 0) && pivotTableDataRefreshQuery.status !== "error";
-  const tableLoading = initialLoadInProgress || pendingPivotRefresh || awaitingPivotDetailRows || tablePageFetching && pagination.pageIndex > 0 || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const tableLoading = initialLoadInProgress || pendingPivotRefresh || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const loading = chartLoading || tableLoading;
-  const lastUseReportLoadingLogRef = (0, import_react63.useRef)("");
-  (0, import_react63.useEffect)(() => {
-    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) => {
@@ -70772,7 +70506,7 @@ function useReport(reportIdArg, options = {}) {
       const option = columnOptionById.get(normalizedId);
       const pivotField = String(option?.field ?? normalizedId).trim();
       const pivotModel = chartAxesBaseChart.pivot;
-      const rowField = pivotRowKey(chartAxesBaseChart);
+      const rowField = String(pivotModel?.rowField ?? "").trim();
       if (!pivotModel) return null;
       const isPivotRowColumn = Boolean(
         pivotField && rowField && pivotField === rowField