@quillsql/react 2.16.95 → 2.16.97

package/dist/index.js

@@ -23784,11 +23784,17 @@ function formattedPivotRowsAndColumns(report, dashboardFilters = [], options = {
     dashboardFilters
   );
   const pivotValueColumns = columns?.slice(1) ?? [];
-  const yAxisFields = report.pivot && !report.pivot.columnField && pivotValueColumns.length > 0 ? pivotValueColumns.map((col, index) => ({
-    field: col.field,
-    label: col.label ?? report.yAxisFields?.[index]?.label ?? col.field,
-    format: report.yAxisFields?.[index]?.format ?? legacyPivotFormat ?? col.format ?? "whole_number"
-  })) : formattedYAxisFields?.length > 0 ? formattedYAxisFields : pivotValueColumns.map((col) => ({
+  const yAxisFields = report.pivot && !report.pivot.columnField && pivotValueColumns.length > 0 ? pivotValueColumns.map((col) => {
+    const saved = report.yAxisFields?.find(
+      (axis) => axis.field === col.field
+    );
+    const savedLabel = String(saved?.label ?? "").trim();
+    return {
+      field: col.field,
+      label: savedLabel || col.label || col.field,
+      format: saved?.format ?? legacyPivotFormat ?? col.format ?? "whole_number"
+    };
+  }) : formattedYAxisFields?.length > 0 ? formattedYAxisFields : pivotValueColumns.map((col) => ({
     field: col.field,
     label: col.label ?? col.field,
     format: legacyPivotFormat ?? col.format ?? "whole_number"
@@ -41174,7 +41180,7 @@ function D3Gauge({
     if (!containerRef.current || !select) return;
     const container = containerRef.current;
     select(container).select("svg").remove();
-    svgRef.current = select(container).append("svg").attr("width", "100%").attr("height", "100%").attr("preserveAspectRatio", "xMidYMid meet");
+    svgRef.current = select(container).append("svg").attr("width", "100%").attr("height", "100%").attr("preserveAspectRatio", "xMidYMid meet").style("display", "block");
     gaugeGroupRef.current = svgRef.current.append("g");
     for (let i = 0; i < 3; i++) {
       gaugeGroupRef.current.append("path").attr("class", `arc-seg seg${i}`);
@@ -41309,7 +41315,7 @@ function D3Gauge({
     "div",
     {
       ref: containerRef,
-      style: { width: "100%", ...containerStyle },
+      style: { width: "100%", height: "100%", ...containerStyle },
       className
     }
   );
@@ -49472,10 +49478,10 @@ function InternalChart({
               config: report,
               containerStyle: {
                 minHeight: 300,
-                width: ["US map", "World map"].includes(report.chartType) ? "70%" : ["gauge"].includes(report.chartType) ? void 0 : "100%",
-                height: ["US map", "World map"].includes(report.chartType) ? "fit-content" : ["gauge"].includes(report.chartType) ? 500 : void 0,
-                marginLeft: ["gauge"].includes(report.chartType) ? "undefined" : "auto",
-                marginRight: ["gauge"].includes(report.chartType) ? "undefined" : "auto"
+                width: ["US map", "World map"].includes(report.chartType) ? "70%" : "100%",
+                height: ["US map", "World map"].includes(report.chartType) ? "fit-content" : report.chartType === "gauge" ? 300 : void 0,
+                marginLeft: "auto",
+                marginRight: "auto"
               },
               reportId: report.id,
               colors,
@@ -62800,9 +62806,6 @@ function getPageOptionsFromPageCount(pageCount) {
 
 // src/hooks/useForm.tsx
 var INTERNAL_PIVOT_ROW_FIELDS = /* @__PURE__ */ new Set(["__quillRawDate"]);
-var LEGACY_SINGLE_Y_AXIS_COLUMN_PIVOT_REPORT_IDS = /* @__PURE__ */ new Set([
-  "69b63941ac8df4cda178a38a"
-]);
 var AGGREGATION_OPTION_TYPES = [
   "sum",
   "average",
@@ -63607,10 +63610,7 @@ function normalizePivotColumnDisplayValue(value) {
   if (!normalized) return "-";
   return ["undefined", "null"].includes(normalized.toLowerCase()) ? "-" : normalized;
 }
-function getYAxisFormatFromAggregation(aggregation) {
-  return aggregation?.aggregationType === "percentage" ? "percentage" : "whole_number";
-}
-function getPivotTableSlotReportColumn(reportColumns, aggregations, rowField, pivotTableColumnKey) {
+function getPivotTableReportColumn(reportColumns, aggregations, rowField, pivotTableColumnKey) {
   const cols = reportColumns ?? [];
   if (cols.length === 0) return void 0;
   const row = String(rowField ?? "").trim();
@@ -63688,7 +63688,214 @@ function shouldUsePivotRowFieldAsXAxis(chartType, pivotRowField, rowColumnFormat
   }
   return true;
 }
-function normalizePivotChartForDisplay(chart, resolveTableLabel) {
+function pivotDisplayFieldKeys(chart) {
+  const rowField = String(chart.pivot?.rowField ?? "").trim();
+  const firstPivotRow = (chart.rows ?? []).find(
+    (row) => Object.keys(row).length > 0
+  );
+  if (!firstPivotRow) return [];
+  const keys = Object.keys(firstPivotRow).filter(
+    (field) => !INTERNAL_PIVOT_ROW_FIELDS.has(field)
+  );
+  if (rowField && keys.includes(rowField)) {
+    return [rowField, ...keys.filter((field) => field !== rowField)];
+  }
+  return keys;
+}
+function pivotValueFieldKeys(chart) {
+  const rowKey = pivotRowKey(chart);
+  const rowField = String(chart.pivot?.rowField ?? "").trim();
+  return pivotDisplayFieldKeys(chart).filter(
+    (field) => field !== rowKey && field !== rowField
+  );
+}
+function pivotFallbackValueKeys(chart) {
+  return (chart.pivotColumns ?? []).slice(1).map((column) => String(column.field ?? "").trim()).filter(Boolean);
+}
+function findSavedYAxisField(saved, field) {
+  return saved.find((axis) => String(axis.field ?? "").trim() === field) ?? (saved.length === 1 ? saved[0] : void 0);
+}
+function isPlaceholderAxisLabel(label, field) {
+  const trimmed = String(label ?? "").trim();
+  const fieldTrim = String(field ?? "").trim();
+  if (!trimmed) return true;
+  if (trimmed.toLowerCase() === fieldTrim.toLowerCase()) return true;
+  return trimmed === toTitleCaseLabel(fieldTrim);
+}
+function resolvedAxisLabel(savedLabel, field, generatedLabel) {
+  return isPlaceholderAxisLabel(savedLabel, field) ? generatedLabel : savedLabel;
+}
+function resolveYAxisFormatForField(field, aggregation, saved, fallback) {
+  const formatByField = new Map(
+    saved.map((axis) => [String(axis.field ?? "").trim(), axis.format])
+  );
+  if (aggregation?.aggregationType === "count") {
+    return formatByField.get(field) ?? formatByField.get("count") ?? saved[0]?.format ?? "whole_number";
+  }
+  if (aggregation?.aggregationType === "percentage") {
+    const savedFormat = formatByField.get(field);
+    if (savedFormat === "percent" || savedFormat === "percentage") {
+      return savedFormat;
+    }
+    return "percentage";
+  }
+  const aggType = aggregation?.aggregationType ? String(aggregation.aggregationType) : void 0;
+  return formatByField.get(field) ?? formatByField.get(trimAggregationSuffix(field, aggType)) ?? (aggregation?.valueField ? formatByField.get(aggregation.valueField) : void 0) ?? fallback;
+}
+function aggregationIdentityForField(field, aggregations) {
+  return getAggregationIdentityKey(
+    findAggregationForFieldStrict(field, aggregations)
+  );
+}
+function indexByAggregationIdentity(axes, aggregations) {
+  const byIdentity = /* @__PURE__ */ new Map();
+  for (const axis of axes) {
+    const identity = aggregationIdentityForField(axis.field, aggregations);
+    if (identity && !byIdentity.has(identity)) {
+      byIdentity.set(identity, axis);
+    }
+  }
+  return byIdentity;
+}
+function matchedValueKeyForAggregation(aggregation, valueKeys, canonicalField) {
+  if (valueKeys.includes(canonicalField)) return canonicalField;
+  return valueKeys.find(
+    (key) => findAggregationForFieldStrict(key, [aggregation])
+  );
+}
+function composePivotColumnSeriesLabel(field, aggregation, measureLabel, hasMultipleAggregations) {
+  if (!aggregation) return toTitleCaseLabel(String(field ?? ""));
+  const category = normalizePivotColumnDisplayValue(
+    getPivotColumnValueForSeries(field, aggregation, hasMultipleAggregations)
+  );
+  const isMeasureNamedSeries = Boolean(aggregation.valueField) && category === String(aggregation.valueField ?? "").trim();
+  if (isMeasureNamedSeries) return measureLabel;
+  if (!measureLabel || measureLabel === category) return category;
+  return `${category} \xB7 ${measureLabel}`;
+}
+function measureFromAggregation(aggregation, chart, saved, fallback, hasMultipleAggregations, resolveTableLabel) {
+  const canonicalField = getAggregationFieldKey(
+    aggregation,
+    hasMultipleAggregations
+  );
+  if (!canonicalField) return null;
+  const previous = findSavedYAxisField(saved, canonicalField);
+  const savedLabel = String(previous?.label ?? "").trim();
+  const generatedLabel = buildAggregationLabel(
+    aggregation,
+    chart,
+    resolveTableLabel
+  );
+  return {
+    field: canonicalField,
+    label: resolvedAxisLabel(savedLabel, canonicalField, generatedLabel),
+    format: resolveYAxisFormatForField(
+      canonicalField,
+      aggregation,
+      saved,
+      fallback
+    )
+  };
+}
+function applyYAxisEdits(measures, edits, aggregations) {
+  if (!edits) return measures;
+  const byField = new Map(
+    measures.map((measure) => [String(measure.field ?? "").trim(), measure])
+  );
+  const byIdentity = indexByAggregationIdentity(measures, aggregations);
+  const next = [];
+  for (const edit of edits) {
+    const field = String(edit.field ?? "").trim();
+    if (!field) continue;
+    const identity = aggregationIdentityForField(field, aggregations);
+    const base = (identity ? byIdentity.get(identity) : void 0) ?? byField.get(field);
+    const label = String(edit.label ?? "").trim();
+    if (!base) {
+      next.push({
+        field,
+        label: label || toTitleCaseLabel(field),
+        format: toAxisFormat(edit.format, "string")
+      });
+      continue;
+    }
+    next.push({
+      field: base.field,
+      label: label || base.label,
+      format: toAxisFormat(edit.format, base.format)
+    });
+  }
+  return next.length > 0 ? next : measures;
+}
+function resolveReportYAxis(chart, edits, resolveTableLabel) {
+  const saved = chart.yAxisFields ?? [];
+  if (!chart.pivot) {
+    const measures2 = applyYAxisEdits(saved, edits, []);
+    return { measures: measures2, series: measures2 };
+  }
+  const aggregations = getPivotAggregations(chart);
+  const hasMultipleAggregations = aggregations.length > 1;
+  const columnField = String(chart.pivot?.columnField ?? "").trim();
+  const isAggregationOnlyPivot = !String(chart.pivot?.rowField ?? "").trim() && !columnField;
+  const fallback = saved[0]?.format ?? chart.xAxisFormat ?? "whole_number";
+  const valueKeys = pivotValueFieldKeys(chart);
+  const fallbackKeys = pivotFallbackValueKeys(chart);
+  let measures = aggregations.flatMap((aggregation) => {
+    const measure = measureFromAggregation(
+      aggregation,
+      chart,
+      saved,
+      fallback,
+      hasMultipleAggregations,
+      resolveTableLabel
+    );
+    if (!measure) return [];
+    if (columnField) return [measure];
+    if (valueKeys.length === 0) return [measure];
+    const matchedKey = matchedValueKeyForAggregation(
+      aggregation,
+      valueKeys,
+      measure.field
+    );
+    if (matchedKey) return [{ ...measure, field: matchedKey }];
+    return isAggregationOnlyPivot ? [measure] : [];
+  });
+  if (!columnField && measures.length === 0 && saved.length > 0) {
+    measures = saved;
+  }
+  measures = applyYAxisEdits(measures, edits, aggregations);
+  if (!columnField) {
+    return { measures, series: measures };
+  }
+  const keys = valueKeys.length > 0 ? valueKeys : fallbackKeys;
+  const measureByIdentity = indexByAggregationIdentity(measures, aggregations);
+  const selectedIdentities = new Set(measureByIdentity.keys());
+  const series = keys.flatMap((field) => {
+    const aggregation = findAggregationForFieldStrict(field, aggregations);
+    const identity = getAggregationIdentityKey(aggregation);
+    if (selectedIdentities.size > 0 && identity && !selectedIdentities.has(identity)) {
+      return [];
+    }
+    const measure = (identity ? measureByIdentity.get(identity) : void 0) ?? (measures.length === 1 ? measures[0] : void 0);
+    const measureLabel = String(measure?.label ?? "").trim() || (aggregation ? buildAggregationLabel(aggregation, chart, resolveTableLabel) : toTitleCaseLabel(field));
+    return [
+      {
+        field,
+        label: composePivotColumnSeriesLabel(
+          field,
+          aggregation,
+          measureLabel,
+          hasMultipleAggregations
+        ),
+        format: measure?.format ?? resolveYAxisFormatForField(field, aggregation, saved, fallback)
+      }
+    ];
+  });
+  if (series.length > 0) {
+    return { measures, series };
+  }
+  return { measures, series: measures };
+}
+function normalizePivotChartForDisplay(chart) {
   const swapPivotRowsForChartRows = Boolean(chart?.pivot) && Array.isArray(chart?.pivotRows) && chart.pivotRows.length > 0;
   const syntheticAggregationOnlyRows = chart && !swapPivotRowsForChartRows ? buildSyntheticAggregationOnlyDisplayRows(chart) : null;
   const hasExplicitEmptyGroupedPivot = Boolean(
@@ -63724,136 +63931,13 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
     String(withResolvedXAxis.chartType ?? "").toLowerCase()
   );
   const aggregations = getPivotAggregations(withResolvedXAxis);
-  const hasMultipleAggregations = aggregations.length > 1;
   const yAxisFallbackFormat = withResolvedXAxis.yAxisFields?.[0]?.format ?? withResolvedXAxis.xAxisFormat ?? "whole_number";
   const firstPivotRow = (withResolvedXAxis.rows ?? []).find(
     (row) => Object.keys(row).length > 0
   );
-  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
-  );
-  const isAggregationOnlyPivot = !String(withResolvedXAxis.pivot?.rowField ?? "").trim() && !String(withResolvedXAxis.pivot?.columnField ?? "").trim();
-  const yAxisFormatByField = new Map(
-    (withResolvedXAxis.yAxisFields ?? []).map((axis) => [
-      axis.field,
-      axis.format
-    ])
-  );
-  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") {
-      const savedFormat = yAxisFormatByField.get(field);
-      if (savedFormat === "percent" || savedFormat === "percentage") {
-        return savedFormat;
-      }
-      return "percentage";
-    }
-    const directAxisFormat = yAxisFormatByField.get(field);
-    if (directAxisFormat) return directAxisFormat;
-    const aggType = aggregation?.aggregationType ? String(aggregation.aggregationType) : void 0;
-    const baseField = trimAggregationSuffix(field, aggType);
-    const baseAxisFormat = yAxisFormatByField.get(baseField);
-    if (baseAxisFormat) return baseAxisFormat;
-    if (aggregation?.valueField) {
-      const aggregationValueFieldFormat = yAxisFormatByField.get(
-        aggregation.valueField
-      );
-      if (aggregationValueFieldFormat) return aggregationValueFieldFormat;
-    }
-    return yAxisFallbackFormat;
-  };
-  const resolveAggregationAxisFieldForDisplay = (aggregation, canonicalField) => {
-    if (!canonicalField) return null;
-    if (pivotValueFields.includes(canonicalField)) {
-      return canonicalField;
-    }
-    if (!isAggregationOnlyPivot) {
-      return null;
-    }
-    const matchedPivotKey = pivotValueFields.find(
-      (pf) => findAggregationForFieldStrict(pf, [aggregation])
-    );
-    return matchedPivotKey ?? canonicalField;
-  };
-  const yAxisFromAggregations = !withResolvedXAxis.pivot?.columnField && aggregations.length > 0 ? aggregations.map((aggregation) => {
-    const canonicalField = getAggregationFieldKey(
-      aggregation,
-      hasMultipleAggregations
-    );
-    const field = resolveAggregationAxisFieldForDisplay(
-      aggregation,
-      canonicalField
-    );
-    if (!field) return null;
-    return {
-      field,
-      label: buildAggregationLabel(
-        aggregation,
-        withResolvedXAxis,
-        resolveTableLabel
-      ),
-      format: resolveYAxisFormat(field, aggregation)
-    };
-  }).filter((axis) => Boolean(axis)) : [];
-  const mappedValueFields = new Set(
-    yAxisFromAggregations.map((axis) => axis.field)
-  );
-  const yAxisFromPivotRowFields = pivotValueFields.filter((field) => !mappedValueFields.has(field)).map((field) => {
-    const aggregation = findAggregationForFieldStrict(field, aggregations);
-    const cleanedBaseField = aggregation?.aggregationType && hasMultipleAggregations ? trimAggregationSuffix(field, String(aggregation.aggregationType)) : field;
-    const displayBase = aggregation?.valueField && withResolvedXAxis.pivot?.columnField ? trimAggregationSuffix(cleanedBaseField, aggregation.valueField) : cleanedBaseField;
-    const displayBaseField = normalizePivotColumnDisplayValue(displayBase);
-    const aggregationLabel = aggregation ? buildAggregationLabel(
-      aggregation,
-      withResolvedXAxis,
-      resolveTableLabel
-    ) : void 0;
-    const isMeasureNamedSeries = Boolean(aggregation?.valueField) && displayBaseField === String(aggregation?.valueField ?? "").trim();
-    let pivotColumnSeriesLabel = displayBaseField;
-    if (withResolvedXAxis.pivot?.columnField && aggregation && aggregationLabel) {
-      if (isMeasureNamedSeries) {
-        pivotColumnSeriesLabel = aggregationLabel;
-      } else if (aggregationLabel !== displayBaseField) {
-        const alreadyCombined = String(displayBaseField).endsWith(` \xB7 ${aggregationLabel}`) || String(displayBaseField).endsWith(` \u2014 ${aggregationLabel}`) || String(displayBaseField).endsWith(` (${aggregationLabel})`);
-        pivotColumnSeriesLabel = alreadyCombined ? displayBaseField : `${displayBaseField} \xB7 ${aggregationLabel}`;
-      }
-    }
-    const label = aggregation ? withResolvedXAxis.pivot?.columnField ? pivotColumnSeriesLabel : aggregationLabel ?? displayBaseField : toTitleCaseLabel(String(field ?? ""));
-    return {
-      field,
-      label,
-      format: resolveYAxisFormat(field, aggregation)
-    };
-  });
-  const supplementalYAxisFromPivotRowFields = yAxisFromAggregations.length > 0 ? yAxisFromPivotRowFields.filter(
-    (axis) => Boolean(findAggregationForFieldStrict(axis.field, aggregations))
-  ) : yAxisFromPivotRowFields;
-  const yAxisFields = yAxisFromAggregations.length > 0 ? [...yAxisFromAggregations, ...supplementalYAxisFromPivotRowFields] : supplementalYAxisFromPivotRowFields.length > 0 ? supplementalYAxisFromPivotRowFields : (withResolvedXAxis.pivotColumns ?? []).slice(1).map((column) => ({
-    field: column.field,
-    label: column.label ?? column.field,
-    format: column.format ?? yAxisFallbackFormat
-  }));
+  const pivotRowFields = pivotDisplayFieldKeys(withResolvedXAxis);
+  const pivotValueFields = pivotValueFieldKeys(withResolvedXAxis);
+  const yAxisFields = withResolvedXAxis.yAxisFields ?? [];
   const knownColumnsByField = new Map(
     [
       ...withResolvedXAxis.pivotColumns ?? [],
@@ -63874,21 +63958,21 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
     };
   }) : withResolvedXAxis.columns ?? [];
   const isPivotTableChart = String(withResolvedXAxis.chartType ?? "").toLowerCase() === "table" && Boolean(withResolvedXAxis.pivot);
-  const pivotTableSlotColumns = isPivotTableChart && Array.isArray(withResolvedXAxis.pivotColumns) && withResolvedXAxis.pivotColumns.length > 0 ? withResolvedXAxis.pivotColumns : withResolvedXAxis.columns;
+  const savedPivotTableColumns = isPivotTableChart && Array.isArray(withResolvedXAxis.pivotColumns) && withResolvedXAxis.pivotColumns.length > 0 ? withResolvedXAxis.pivotColumns : withResolvedXAxis.columns;
   const pivotTableDisplayColumns = isPivotTableChart && pivotColumnFields.length > 0 ? normalizedPivotColumns.map((col) => {
-    const slotCol = getPivotTableSlotReportColumn(
-      pivotTableSlotColumns,
+    const savedColumn = getPivotTableReportColumn(
+      savedPivotTableColumns,
       aggregations,
       pivotRowKey(withResolvedXAxis) || withResolvedXAxis.pivot?.rowField,
       col.field
     );
-    if (!slotCol) return col;
+    if (!savedColumn) return col;
     const next = {
       ...col,
-      format: slotCol.format ?? col.format
+      format: savedColumn.format ?? col.format
     };
-    if (slotCol.inferFormat !== void 0) {
-      next.inferFormat = slotCol.inferFormat;
+    if (savedColumn.inferFormat !== void 0) {
+      next.inferFormat = savedColumn.inferFormat;
     }
     return next;
   }) : normalizedPivotColumns;
@@ -63949,100 +64033,10 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
     yAxisFields
   };
 }
-function buildPivotAggregationAxisFields(report, resolveTableLabel) {
-  const aggregations = getPivotAggregations(report);
-  const hasMultipleAggregations = aggregations.length > 1;
-  return aggregations.map((aggregation) => {
-    const field = getAggregationFieldKey(
-      aggregation,
-      hasMultipleAggregations
-    );
-    if (!field) return null;
-    return {
-      field,
-      label: buildAggregationLabel(aggregation, report, resolveTableLabel),
-      format: getYAxisFormatFromAggregation(aggregation)
-    };
-  }).filter((axis) => Boolean(axis));
-}
-function mergePivotColumnAxisFieldsWithMapped(aggregationAxisFields, mapped) {
-  const byField = /* @__PURE__ */ new Map();
-  for (const y of mapped) {
-    const f = String(y.field ?? "").trim();
-    if (f) byField.set(f, y);
-  }
-  return aggregationAxisFields.map((axis) => {
-    const f = String(axis.field ?? "").trim();
-    const mappedAxis = f ? byField.get(f) : void 0;
-    return mappedAxis ?? axis;
-  });
-}
-function normalizePivotChartForAxisControls(chart, reportId, resolveTableLabel) {
-  if (!chart?.pivot?.columnField) return chart;
-  const aggregations = getPivotAggregations(chart);
-  if (aggregations.length === 0) return chart;
-  const aggregationAxisFields = buildPivotAggregationAxisFields(
-    chart,
-    resolveTableLabel
-  );
-  if (aggregationAxisFields.length === 0) return chart;
-  const aggregationAxisByIdentity = /* @__PURE__ */ new Map();
-  for (const aggregationAxisField of aggregationAxisFields) {
-    const aggregation = findAggregationForFieldStrict(
-      aggregationAxisField.field,
-      aggregations
-    );
-    const aggregationIdentity = getAggregationIdentityKey(aggregation);
-    if (!aggregationIdentity || aggregationAxisByIdentity.has(aggregationIdentity)) {
-      continue;
-    }
-    aggregationAxisByIdentity.set(aggregationIdentity, aggregationAxisField);
-  }
-  const mappedExistingYAxisFields = [];
-  const seenMappedFields = /* @__PURE__ */ new Set();
-  for (const existingYAxisField of chart.yAxisFields ?? []) {
-    const aggregation = findAggregationForFieldStrict(
-      existingYAxisField.field,
-      aggregations
-    );
-    const aggregationIdentity = getAggregationIdentityKey(aggregation);
-    if (!aggregationIdentity) continue;
-    const mappedAggregationAxis = aggregationAxisByIdentity.get(aggregationIdentity);
-    if (!mappedAggregationAxis) continue;
-    if (seenMappedFields.has(mappedAggregationAxis.field)) continue;
-    seenMappedFields.add(mappedAggregationAxis.field);
-    mappedExistingYAxisFields.push({
-      field: mappedAggregationAxis.field,
-      label: String(existingYAxisField.label ?? "").trim() || mappedAggregationAxis.label,
-      format: toAxisFormat(
-        existingYAxisField.format,
-        mappedAggregationAxis.format
-      )
-    });
-  }
-  let yAxisFields;
-  if (aggregations.length > 1) {
-    const resolvedReportId = String(reportId ?? chart.id ?? "").trim();
-    if (LEGACY_SINGLE_Y_AXIS_COLUMN_PIVOT_REPORT_IDS.has(resolvedReportId)) {
-      yAxisFields = mappedExistingYAxisFields.length > 0 ? mappedExistingYAxisFields : [aggregationAxisFields[0]];
-    } else {
-      yAxisFields = mappedExistingYAxisFields.length === 0 || mappedExistingYAxisFields.length < aggregationAxisFields.length ? mergePivotColumnAxisFieldsWithMapped(
-        aggregationAxisFields,
-        mappedExistingYAxisFields
-      ) : mappedExistingYAxisFields;
-    }
-  } else {
-    yAxisFields = mappedExistingYAxisFields.length > 0 ? mappedExistingYAxisFields : [aggregationAxisFields[0]];
-  }
-  return {
-    ...chart,
-    yAxisFields
-  };
-}
-function buildPivotColumnPivotTableFormattingColumns(pivot, chart, resolveTableLabel) {
+function buildPivotTableColumns(pivot, chart, resolveTableLabel) {
   if (!pivot) return null;
-  const reportForControls = chart ? { ...chart, pivot } : { pivot };
-  const aggregations = getPivotAggregations(reportForControls);
+  const chartWithPivot = chart ? { ...chart, pivot } : { pivot };
+  const aggregations = getPivotAggregations(chartWithPivot);
   if (aggregations.length === 0) return null;
   const hasMultipleAggregations = aggregations.length > 1;
   const rowField = String(pivot.rowField ?? "").trim();
@@ -64076,7 +64070,7 @@ function buildPivotColumnPivotTableFormattingColumns(pivot, chart, resolveTableL
       field: fieldKey,
       label: buildAggregationLabel(
         aggregation,
-        reportForControls,
+        chartWithPivot,
         resolveTableLabel
       )
     });
@@ -64103,19 +64097,6 @@ function mergePivotColumnSeriesLabelWithUserEdit(normalizedLabel, userRowLabel,
   }
   return user;
 }
-function applySingleResolvedYAxisFormatToPivotDisplay(normalizedPivotYAxisFields, resolvedYAxisFields) {
-  if (resolvedYAxisFields.length !== 1) return normalizedPivotYAxisFields;
-  const only = resolvedYAxisFields[0];
-  return normalizedPivotYAxisFields.map((axis) => ({
-    ...axis,
-    label: mergePivotColumnSeriesLabelWithUserEdit(
-      String(axis.label ?? "").trim(),
-      only.label,
-      String(axis.field ?? "").trim() || void 0
-    ),
-    format: toAxisFormat(only.format, axis.format)
-  }));
-}
 function mergeChartColumnFormatsFromYAxisFields(columns, yAxisFields) {
   if (!columns?.length || !yAxisFields?.length) return columns;
   const formatByField = /* @__PURE__ */ new Map();
@@ -64173,71 +64154,6 @@ function mergePivotTableDisplayColumnLabelsFromYAxis({
     return { ...c, label: yl };
   });
 }
-function mapResolvedPivotYAxisFieldsForDisplay({
-  chart,
-  resolvedYAxisFields
-}) {
-  if (!chart.pivot?.columnField) return resolvedYAxisFields;
-  const normalizedPivotYAxisFields = chart.yAxisFields ?? [];
-  if (normalizedPivotYAxisFields.length === 0) return resolvedYAxisFields;
-  const aggregations = getPivotAggregations(chart);
-  if (aggregations.length === 0) {
-    return applySingleResolvedYAxisFormatToPivotDisplay(
-      normalizedPivotYAxisFields,
-      resolvedYAxisFields
-    );
-  }
-  const selectedAggregationByIdentity = /* @__PURE__ */ new Map();
-  for (const yAxisField of resolvedYAxisFields ?? []) {
-    const aggregation = findAggregationForFieldStrict(
-      yAxisField.field,
-      aggregations
-    );
-    const aggregationIdentity = getAggregationIdentityKey(aggregation);
-    if (!aggregationIdentity) continue;
-    selectedAggregationByIdentity.set(aggregationIdentity, yAxisField);
-  }
-  if (selectedAggregationByIdentity.size === 0) {
-    return applySingleResolvedYAxisFormatToPivotDisplay(
-      normalizedPivotYAxisFields,
-      resolvedYAxisFields
-    );
-  }
-  const mappedYAxisFields = [];
-  const seenMappedFields = /* @__PURE__ */ new Set();
-  for (const normalizedYAxisField of normalizedPivotYAxisFields) {
-    const aggregation = findAggregationForFieldStrict(
-      normalizedYAxisField.field,
-      aggregations
-    );
-    const aggregationIdentity = getAggregationIdentityKey(aggregation);
-    if (!aggregationIdentity) continue;
-    const selectedAggregationAxis = selectedAggregationByIdentity.get(aggregationIdentity);
-    if (!selectedAggregationAxis) continue;
-    const field = String(normalizedYAxisField.field ?? "").trim();
-    if (!field || seenMappedFields.has(field)) continue;
-    seenMappedFields.add(field);
-    mappedYAxisFields.push({
-      ...normalizedYAxisField,
-      label: mergePivotColumnSeriesLabelWithUserEdit(
-        String(normalizedYAxisField.label ?? "").trim(),
-        selectedAggregationAxis.label,
-        field || void 0
-      ),
-      format: toAxisFormat(
-        selectedAggregationAxis.format,
-        normalizedYAxisField.format
-      )
-    });
-  }
-  if (mappedYAxisFields.length > 0) {
-    return mappedYAxisFields;
-  }
-  return applySingleResolvedYAxisFormatToPivotDisplay(
-    normalizedPivotYAxisFields,
-    resolvedYAxisFields
-  );
-}
 function encodeColumnOptionValue(table, field) {
   if (!table || !table.trim()) return field;
   return `${table}_${field}`;
@@ -65826,8 +65742,7 @@ async function fetchReportBuilderStateByReportId({
     if (!state || typeof state !== "object") {
       return null;
     }
-    const parsedState = state;
-    return parsedState;
+    return state;
   } catch (error) {
     if (error instanceof Error && error.name === "AbortError") {
       throw error;
@@ -65866,10 +65781,11 @@ function applyFetchedReportBuilderState(result, fetchedReportBuilderState) {
   }).filter(
     (table) => Boolean(table)
   );
+  const keptExistingRules = existingRules.rules.length > 0;
   const mergedState = {
     tables: mergedTables,
     columns: existingColumns.length > 0 ? existingColumns : fetchedColumns,
-    rules: existingRules.rules.length > 0 ? existingRules : fetchedRules,
+    rules: keptExistingRules ? existingRules : fetchedRules,
     pivot: existingState?.pivot ?? fetchedReportBuilderState.pivot ?? null,
     sort: existingSort.length > 0 ? existingSort : fetchedSort,
     limit: existingState?.limit ?? fetchedReportBuilderState.limit ?? null
@@ -66687,7 +66603,7 @@ function useReport(reportIdArg, options = {}) {
   useEffect33(() => {
     setTableColumnsEditedSignature(null);
   }, [effectiveReportId]);
-  const [chartAxisEdits, setChartAxisEdits] = useState42({});
+  const [axisEdits, setAxisEdits] = useState42({});
   const [chartVisibilityOverrides, setChartVisibilityOverrides] = useState42({});
   const [chartSortOverride, setChartSortOverride] = useState42(void 0);
   const [client] = useContext37(ClientContext);
@@ -66819,7 +66735,7 @@ function useReport(reportIdArg, options = {}) {
     }
   }, [createdReportBootstrap?.reportId, propReportId]);
   useEffect33(() => {
-    setChartAxisEdits({});
+    setAxisEdits({});
     setChartVisibilityOverrides({});
     setChartSortOverride(void 0);
   }, [effectiveReportId]);
@@ -68107,6 +68023,24 @@ function useReport(reportIdArg, options = {}) {
     initialDataUpdatedAt: () => findCachedDashboardReportQuery(queryClient, effectiveReportId)?.state.dataUpdatedAt,
     staleTime: DASHBOARD_REPORT_STALE_TIME_MS
   });
+  const reportBuilderStateQuery = useQuery({
+    queryKey: ["useReport", "report-builder-state", effectiveReportId],
+    queryFn: createUseFormQueryFn((signal) => {
+      if (!client) {
+        return Promise.resolve(null);
+      }
+      return fetchReportBuilderStateByReportId({
+        reportId: effectiveReportId,
+        client,
+        getToken,
+        draftSessionId: draftSessionId || void 0,
+        tenants,
+        abortSignal: signal
+      });
+    }),
+    enabled: Boolean(effectiveReportId) && Boolean(client) && !reportOverride,
+    staleTime: 0
+  });
   const reportNameQueryReportId = String(effectiveReportId ?? "").trim();
   const reportNameQuery = useQuery({
     queryKey: createUseFormReportNameQueryKey({
@@ -68137,10 +68071,21 @@ function useReport(reportIdArg, options = {}) {
   const displayReportName = formReportName !== void 0 ? formReportName : resolvedReportName;
   useEffect33(() => {
     if (reportOverride) return;
-    const report = initialLoadQuery.data?.report ?? null;
+    const report = applyFetchedReportBuilderState(
+      initialLoadQuery.data ?? { report: null },
+      reportBuilderStateQuery.data ?? null
+    ).report ?? null;
     initializeSchemaScopeForReport(report);
     setSourceReport(report);
-  }, [initialLoadQuery.data, reportOverride, effectiveReportId]);
+  }, [
+    initialLoadQuery.data,
+    initialLoadQuery.fetchStatus,
+    initialLoadQuery.isFetching,
+    initialLoadQuery.isPending,
+    reportBuilderStateQuery.data,
+    reportOverride,
+    effectiveReportId
+  ]);
   useEffect33(() => {
     if (!sourceReport) {
       return;
@@ -69792,20 +69737,18 @@ function useReport(reportIdArg, options = {}) {
     chartPivotHydrationEpoch
   ]);
   const baseChart = useMemo33(
-    () => normalizePivotChartForDisplay(chartData, resolveTableDisplayLabel),
-    [chartData, resolveTableDisplayLabel]
+    () => normalizePivotChartForDisplay(chartData),
+    [chartData]
   );
-  const chartAxesBaseChart = useMemo33(() => {
-    if (!chartData) return void 0;
-    if (chartData.pivot?.columnField) {
-      return normalizePivotChartForAxisControls(
-        chartData,
-        effectiveReportId,
-        resolveTableDisplayLabel
-      );
-    }
-    return baseChart;
-  }, [baseChart, chartData, effectiveReportId, resolveTableDisplayLabel]);
+  const yAxisResolved = useMemo33(() => {
+    if (!baseChart) return { measures: [], series: [] };
+    return resolveReportYAxis(
+      baseChart,
+      axisEdits.yAxisFields,
+      resolveTableDisplayLabel
+    );
+  }, [baseChart, axisEdits.yAxisFields, resolveTableDisplayLabel]);
+  const chartAxesBaseChart = baseChart;
   const chartAxisOptions = useMemo33(() => {
     if (!chartAxesBaseChart) return [];
     const optionsByField = /* @__PURE__ */ new Map();
@@ -69824,7 +69767,7 @@ function useReport(reportIdArg, options = {}) {
     for (const column of chartAxesBaseChart.columns ?? []) {
       registerOption(column.field, column.label, column.format);
     }
-    for (const yAxis2 of chartAxesBaseChart.yAxisFields ?? []) {
+    for (const yAxis2 of yAxisResolved.measures) {
       registerOption(yAxis2.field, yAxis2.label, yAxis2.format);
       if (yAxis2.format) {
         const existing = optionsByField.get(yAxis2.field);
@@ -69836,18 +69779,6 @@ function useReport(reportIdArg, options = {}) {
         }
       }
     }
-    if (chartAxesBaseChart.pivot?.columnField) {
-      for (const aggregationAxis of buildPivotAggregationAxisFields(
-        chartAxesBaseChart,
-        resolveTableDisplayLabel
-      )) {
-        registerOption(
-          aggregationAxis.field,
-          aggregationAxis.label,
-          aggregationAxis.format
-        );
-      }
-    }
     const xField = String(chartAxesBaseChart.xAxisField ?? "").trim();
     const savedXFormat = String(chartAxesBaseChart.xAxisFormat ?? "").trim();
     registerOption(
@@ -69865,7 +69796,7 @@ function useReport(reportIdArg, options = {}) {
       }
     }
     return Array.from(optionsByField.values());
-  }, [chartAxesBaseChart, resolveTableDisplayLabel]);
+  }, [chartAxesBaseChart, yAxisResolved.measures]);
   const chartAxisOptionByField = useMemo33(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     for (const option of chartAxisOptions) {
@@ -69910,19 +69841,15 @@ function useReport(reportIdArg, options = {}) {
     const pivot = chartAxesBaseChart.pivot;
     const pivotRowField = String(pivot?.rowField ?? "").trim();
     if (pivot && !pivotRowField) {
-      const aggAxis = buildPivotAggregationAxisFields(
-        chartAxesBaseChart,
-        resolveTableDisplayLabel
-      );
-      if (aggAxis.length > 0) {
-        const allowed = new Set(aggAxis.map((a) => a.field));
+      const allowed = new Set(yAxisResolved.measures.map((axis) => axis.field));
+      if (allowed.size > 0) {
         eligible = eligible.filter((o) => allowed.has(o.value));
       }
     }
     const merged = new Map(
       eligible.map((o) => [o.value, o])
     );
-    for (const yAxisField of chartAxesBaseChart.yAxisFields ?? []) {
+    for (const yAxisField of yAxisResolved.measures) {
       const field = String(yAxisField?.field ?? "").trim();
       if (!field || merged.has(field)) continue;
       const opt = chartAxisOptionByField.get(field);
@@ -69933,8 +69860,8 @@ function useReport(reportIdArg, options = {}) {
     chartAxesBaseChart,
     chartAxisOptionByField,
     chartAxisOptions,
-    resolveTableDisplayLabel,
-    schemaColumnOptions
+    schemaColumnOptions,
+    yAxisResolved.measures
   ]);
   const normalizedChartXAxisOptions = useMemo33(() => {
     return xAxisOptions.map((option) => ({
@@ -69950,34 +69877,9 @@ function useReport(reportIdArg, options = {}) {
       format: String(option.format ?? "").trim()
     }));
   }, [yAxisOptions]);
-  const resolvedYAxisFields = useMemo33(() => {
-    if (!chartAxesBaseChart) return [];
-    const normalizeYAxisField = (yAxisFieldRaw) => {
-      const field = String(yAxisFieldRaw?.field ?? "").trim();
-      if (!field) return null;
-      const option = chartAxisOptionByField.get(field);
-      if (!option) return null;
-      const rawLabel = String(yAxisFieldRaw?.label ?? "").trim() || option.label;
-      const label = rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
-      const format9 = toAxisFormat(yAxisFieldRaw?.format, option.format);
-      return {
-        field,
-        label,
-        format: format9
-      };
-    };
-    const fallbackYAxisFields = (chartAxesBaseChart.yAxisFields ?? []).map((yAxisField) => normalizeYAxisField(yAxisField)).filter(
-      (yAxisField) => Boolean(yAxisField)
-    );
-    const requestedYAxisFields = Array.isArray(chartAxisEdits.yAxisFields) ? chartAxisEdits.yAxisFields : fallbackYAxisFields;
-    const normalizedRequestedYAxisFields = requestedYAxisFields.map((yAxisField) => normalizeYAxisField(yAxisField)).filter(
-      (yAxisField) => Boolean(yAxisField)
-    );
-    if (normalizedRequestedYAxisFields.length > 0) {
-      return normalizedRequestedYAxisFields;
-    }
-    if (fallbackYAxisFields.length > 0) {
-      return fallbackYAxisFields;
+  const yAxisMeasures = useMemo33(() => {
+    if (yAxisResolved.measures.length > 0) {
+      return yAxisResolved.measures;
     }
     const fallbackOption = chartAxisOptions[0];
     if (!fallbackOption) return [];
@@ -69988,12 +69890,7 @@ function useReport(reportIdArg, options = {}) {
         format: fallbackOption.format
       }
     ];
-  }, [
-    chartAxesBaseChart,
-    chartAxisEdits.yAxisFields,
-    chartAxisOptionByField,
-    chartAxisOptions
-  ]);
+  }, [chartAxisOptions, yAxisResolved.measures]);
   const resolvedXAxisField = useMemo33(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
@@ -70008,7 +69905,7 @@ function useReport(reportIdArg, options = {}) {
         return pivotRowField;
       }
     }
-    const requestedXAxisField = String(chartAxisEdits.xAxisField ?? "").trim();
+    const requestedXAxisField = String(axisEdits.xAxisField ?? "").trim();
     if (requestedXAxisField && chartAxisOptionByField.has(requestedXAxisField)) {
       return requestedXAxisField;
     }
@@ -70016,16 +69913,16 @@ function useReport(reportIdArg, options = {}) {
     if (baseXAxisField && chartAxisOptionByField.has(baseXAxisField)) {
       return baseXAxisField;
     }
-    return resolvedYAxisFields[0]?.field ?? chartAxisOptions[0]?.value ?? "";
+    return yAxisMeasures[0]?.field ?? chartAxisOptions[0]?.value ?? "";
   }, [
     chartAxesBaseChart,
-    chartAxisEdits.xAxisField,
+    axisEdits.xAxisField,
     chartAxisOptionByField,
     chartAxisOptions,
-    resolvedYAxisFields
+    yAxisMeasures
   ]);
   const xAxisMetadataField = String(
-    chartAxisEdits.xAxisField ?? chartData?.xAxisField ?? ""
+    axisEdits.xAxisField ?? chartData?.xAxisField ?? ""
   ).trim();
   const xAxisMetadataMatchesResolvedField = !xAxisMetadataField || xAxisMetadataField === resolvedXAxisField;
   const resolvedXAxisFormat = useMemo33(() => {
@@ -70033,7 +69930,7 @@ function useReport(reportIdArg, options = {}) {
       return "string";
     }
     let defaultFormat = toAxisFormat(
-      chartAxisOptionByField.get(resolvedXAxisField)?.format ?? chartAxesBaseChart.xAxisFormat ?? resolvedYAxisFields[0]?.format,
+      chartAxisOptionByField.get(resolvedXAxisField)?.format ?? chartAxesBaseChart.xAxisFormat ?? yAxisMeasures[0]?.format,
       "string"
     );
     const bucketFormat = resolvePivotDateBucketXAxisFormat(
@@ -70041,16 +69938,16 @@ function useReport(reportIdArg, options = {}) {
       resolvedXAxisField
     );
     if (bucketFormat) return bucketFormat;
-    if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && (!xAxisMetadataMatchesResolvedField || chartAxisEdits.xAxisFormat === void 0)) {
+    if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && (!xAxisMetadataMatchesResolvedField || axisEdits.xAxisFormat === void 0)) {
       defaultFormat = "string";
     }
-    return xAxisMetadataMatchesResolvedField && chartAxisEdits.xAxisFormat !== void 0 ? toAxisFormat(chartAxisEdits.xAxisFormat, defaultFormat) : defaultFormat;
+    return xAxisMetadataMatchesResolvedField && axisEdits.xAxisFormat !== void 0 ? toAxisFormat(axisEdits.xAxisFormat, defaultFormat) : defaultFormat;
   }, [
     chartAxesBaseChart,
-    chartAxisEdits.xAxisFormat,
+    axisEdits.xAxisFormat,
     chartAxisOptionByField,
     resolvedXAxisField,
-    resolvedYAxisFields,
+    yAxisMeasures,
     xAxisMetadataMatchesResolvedField
   ]);
   const resolvedXAxisLabel = useMemo33(() => {
@@ -70058,13 +69955,13 @@ function useReport(reportIdArg, options = {}) {
     const defaultXLabel = String(
       xAxisMetadataMatchesResolvedField ? chartAxesBaseChart?.xAxisLabel ?? fieldLabel : fieldLabel
     ).trim();
-    if (xAxisMetadataMatchesResolvedField && chartAxisEdits.xAxisLabel !== void 0) {
-      return String(chartAxisEdits.xAxisLabel).trim();
+    if (xAxisMetadataMatchesResolvedField && axisEdits.xAxisLabel !== void 0) {
+      return String(axisEdits.xAxisLabel).trim();
     }
     return !defaultXLabel || defaultXLabel === resolvedXAxisField ? toTitleCaseLabel(resolvedXAxisField) : defaultXLabel;
   }, [
     chartAxesBaseChart?.xAxisLabel,
-    chartAxisEdits.xAxisLabel,
+    axisEdits.xAxisLabel,
     chartAxisOptionByField,
     resolvedXAxisField,
     xAxisMetadataMatchesResolvedField
@@ -70094,7 +69991,7 @@ function useReport(reportIdArg, options = {}) {
   ]);
   const yAxis = useMemo33(
     () => ({
-      fields: resolvedYAxisFields.map((yAxisField) => ({
+      fields: yAxisMeasures.map((yAxisField) => ({
         field: yAxisField.field,
         label: String(yAxisField.label ?? "").trim(),
         format: axisFormatToSelectLabel(
@@ -70102,24 +69999,23 @@ function useReport(reportIdArg, options = {}) {
         )
       }))
     }),
-    [resolvedYAxisFields]
+    [yAxisMeasures]
   );
-  const resolvedYAxisFieldsForDisplay = useMemo33(() => {
-    if (!baseChart) return resolvedYAxisFields;
-    return mapResolvedPivotYAxisFieldsForDisplay({
-      chart: baseChart,
-      resolvedYAxisFields
-    });
-  }, [baseChart, resolvedYAxisFields]);
+  const yAxisSeries = useMemo33(() => {
+    if (yAxisResolved.series.length > 0) {
+      return yAxisResolved.series;
+    }
+    return yAxisMeasures;
+  }, [yAxisMeasures, yAxisResolved.series]);
   const chart = useMemo33(() => {
     if (!baseChart) return void 0;
     let columns2 = mergeChartColumnFormatsFromYAxisFields(
       baseChart.columns,
-      resolvedYAxisFieldsForDisplay
+      yAxisSeries
     );
     if (String(baseChart.chartType ?? "").toLowerCase() === "table" && baseChart.pivot) {
       const pivotAggregations2 = getPivotAggregations(baseChart);
-      const hasCustomMeasureLabel = resolvedYAxisFields.some((axis) => {
+      const hasCustomMeasureLabel = yAxisMeasures.some((axis) => {
         const aggregation = findAggregationForFieldStrict(
           axis.field,
           pivotAggregations2
@@ -70132,7 +70028,7 @@ function useReport(reportIdArg, options = {}) {
       if (pivotAggregations2.length > 1 || hasCustomMeasureLabel) {
         columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
           columns: columns2 ?? baseChart.columns,
-          yAxisFields: resolvedYAxisFieldsForDisplay,
+          yAxisFields: yAxisSeries,
           pivotRowField: pivotRowKey(baseChart),
           xAxisLabel: resolvedXAxisLabel
         });
@@ -70159,7 +70055,7 @@ function useReport(reportIdArg, options = {}) {
       xAxisField: resolvedXAxisField,
       xAxisFormat: resolvedXAxisFormat,
       xAxisLabel: resolvedXAxisLabel,
-      yAxisFields: resolvedYAxisFieldsForDisplay,
+      yAxisFields: yAxisSeries,
       columns: columns2 ?? baseChart.columns
     };
   }, [
@@ -70167,8 +70063,8 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
-    resolvedYAxisFields,
-    resolvedYAxisFieldsForDisplay
+    yAxisMeasures,
+    yAxisSeries
   ]);
   const pivotDateFilterRangeCacheRef = useRef24({ key: "", min: null, max: null });
   const filterOptions = useMemo33(() => {
@@ -70186,10 +70082,7 @@ function useReport(reportIdArg, options = {}) {
     if (rowField && isDateType(String(pivot?.rowFieldType ?? ""))) {
       const field = pivot?.rowFieldTable ? `${pivot.rowFieldTable}.${rowField}` : rowField;
       const chartBucket = dateBucket || pivot?.dateBucket || "month";
-      const bucket = inBucketDateBucketForField(
-        filtersForQueryBuilder.rules ?? [],
-        field
-      ) ?? chartBucket;
+      const bucket = inBucketDateBucketForField(filtersForQueryBuilder.rules ?? [], field) ?? chartBucket;
       const cacheKey = `${String(effectiveReportId ?? "")}\0${field}\0${bucket}`;
       if (pivotDateFilterRangeCacheRef.current.key !== cacheKey) {
         pivotDateFilterRangeCacheRef.current = {
@@ -70322,8 +70215,8 @@ function useReport(reportIdArg, options = {}) {
     [chartForUi, resolvedChartSort]
   );
   const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
-  const pivotTableColumnControls = useMemo33(
-    () => isPivotTableChart ? buildPivotColumnPivotTableFormattingColumns(
+  const pivotTableColumns = useMemo33(
+    () => isPivotTableChart ? buildPivotTableColumns(
       pivotState,
       chart,
       resolveTableDisplayLabel
@@ -70331,7 +70224,7 @@ function useReport(reportIdArg, options = {}) {
     [chart, isPivotTableChart, pivotState, resolveTableDisplayLabel]
   );
   const chartAxes = useMemo33(() => {
-    const yAxisItems = resolvedYAxisFields.map(
+    const yAxisItems = yAxisMeasures.map(
       (yAxisField, index) => ({
         id: String(index),
         field: yAxisField.field,
@@ -70339,7 +70232,7 @@ function useReport(reportIdArg, options = {}) {
         format: toAxisFormat(yAxisField.format, "string")
       })
     );
-    const getCurrentYAxisFields = () => resolvedYAxisFields.map((yAxisField) => ({
+    const getCurrentYAxisFields = () => yAxisMeasures.map((yAxisField) => ({
       field: yAxisField.field,
       label: yAxisField.label,
       format: toAxisFormat(yAxisField.format, "string")
@@ -70351,7 +70244,7 @@ function useReport(reportIdArg, options = {}) {
         options: xAxisOptions,
         formatOptions: AXIS_FORMAT_OPTIONS,
         update: (updates) => {
-          setChartAxisEdits((previousEdits) => {
+          setAxisEdits((previousEdits) => {
             const nextEdits = { ...previousEdits };
             if (updates.field !== void 0) {
               const requestedField = String(updates.field ?? "").trim();
@@ -70408,7 +70301,7 @@ function useReport(reportIdArg, options = {}) {
               resolvedXAxisFormat || "string"
             )
           };
-          setChartAxisEdits((previousEdits) => ({
+          setAxisEdits((previousEdits) => ({
             ...previousEdits,
             yAxisFields: [...currentYAxisFields, nextYAxisField]
           }));
@@ -70421,7 +70314,7 @@ function useReport(reportIdArg, options = {}) {
           if (index < 0 || index >= currentYAxisFields.length) return;
           const nextYAxisFields = [...currentYAxisFields];
           nextYAxisFields.splice(index, 1);
-          setChartAxisEdits((previousEdits) => ({
+          setAxisEdits((previousEdits) => ({
             ...previousEdits,
             yAxisFields: nextYAxisFields
           }));
@@ -70434,7 +70327,7 @@ function useReport(reportIdArg, options = {}) {
             newIndex
           );
           if (nextYAxisFields === currentYAxisFields) return;
-          setChartAxisEdits((previousEdits) => ({
+          setAxisEdits((previousEdits) => ({
             ...previousEdits,
             yAxisFields: nextYAxisFields
           }));
@@ -70463,7 +70356,7 @@ function useReport(reportIdArg, options = {}) {
             label: nextLabel,
             format: nextFormat
           };
-          setChartAxisEdits((previousEdits) => ({
+          setAxisEdits((previousEdits) => ({
             ...previousEdits,
             yAxisFields: nextYAxisFields
           }));
@@ -70475,7 +70368,7 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptionByField,
     resolvedXAxisField,
     resolvedXAxisFormat,
-    resolvedYAxisFields,
+    yAxisMeasures,
     xAxisOptions,
     yAxisOptions
   ]);
@@ -70507,7 +70400,7 @@ function useReport(reportIdArg, options = {}) {
       includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     });
     const pivotRowFieldForTable = pivotRowKey(sourceReport);
-    const pivotRowTableUsesAxisFormat = chartAxisEdits.xAxisFormat !== void 0;
+    const pivotRowTableUsesAxisFormat = axisEdits.xAxisFormat !== void 0;
     const columns2 = String(chartType ?? "").toLowerCase() === "table" && sourceReport?.pivot && pivotRowFieldForTable && String(resolvedXAxisField ?? "").trim() === pivotRowFieldForTable ? mergedFromReport.map(
       (column) => column.field === pivotRowFieldForTable ? {
         ...column,
@@ -70517,7 +70410,7 @@ function useReport(reportIdArg, options = {}) {
     ) : mergedFromReport;
     const pivotLabeledColumns = String(chartType ?? "").toLowerCase() === "table" && sourceReport?.pivot ? mergePivotTableDisplayColumnLabelsFromYAxis({
       columns: columns2,
-      yAxisFields: resolvedYAxisFieldsForDisplay,
+      yAxisFields: yAxisSeries,
       pivotRowField: pivotRowKey(sourceReport),
       xAxisLabel: resolvedXAxisLabel
     }) ?? columns2 : columns2;
@@ -70593,14 +70486,14 @@ function useReport(reportIdArg, options = {}) {
       getPageOptions: () => getPageOptionsFromPageCount(paginationPageCount)
     };
   }, [
-    chartAxisEdits.xAxisFormat,
+    axisEdits.xAxisFormat,
     chartType,
     displayColumns,
     effectiveReportBuilderTableNames,
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
-    resolvedYAxisFieldsForDisplay,
+    yAxisSeries,
     scopedSchemaColumns,
     sourceReport,
     tableColumnsEditedSignature,
@@ -70625,11 +70518,11 @@ function useReport(reportIdArg, options = {}) {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
   } = useMemo33(() => {
-    if (pivotTableColumnControls) {
+    if (pivotTableColumns) {
       return getAllColumnOptions({
         schemaColumnOptions,
-        tableColumns: pivotTableColumnControls.tableColumns,
-        selectedColumnIds: pivotTableColumnControls.selectedColumnIds
+        tableColumns: pivotTableColumns.tableColumns,
+        selectedColumnIds: pivotTableColumns.selectedColumnIds
       });
     }
     if (isPivotTableChart) {
@@ -70650,7 +70543,7 @@ function useReport(reportIdArg, options = {}) {
     chart?.xAxisLabel,
     columns,
     isPivotTableChart,
-    pivotTableColumnControls,
+    pivotTableColumns,
     schemaColumnOptions,
     table.columns
   ]);
@@ -70672,8 +70565,8 @@ function useReport(reportIdArg, options = {}) {
     [tableDerivedColumnOrder]
   );
   const activeTableColumnIds = useMemo33(() => {
-    if (pivotTableColumnControls) {
-      return pivotTableColumnControls.selectedColumnIds;
+    if (pivotTableColumns) {
+      return pivotTableColumns.selectedColumnIds;
     }
     if (isPivotTableChart) {
       return [];
@@ -70701,7 +70594,7 @@ function useReport(reportIdArg, options = {}) {
     columns,
     hasTableDrivenColumnOrder,
     isPivotTableChart,
-    pivotTableColumnControls,
+    pivotTableColumns,
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
@@ -70762,44 +70655,12 @@ function useReport(reportIdArg, options = {}) {
       });
     }
     const columnPivotMeasureFormatByAggregationField = /* @__PURE__ */ new Map();
-    if (pivotTableColumnControls && chart) {
-      const slotFormatting = pivotTableColumnControls;
-      if (slotFormatting) {
-        const aggregations = slotFormatting.aggregations;
-        const hasMultiple = aggregations.length > 1;
-        const rowField = pivotRowKey(chart);
-        const firstValueColumnFormat = String(
-          (chart.columns ?? []).find(
-            (c) => String(c.field ?? "").trim() !== rowField
-          )?.format ?? ""
-        ).trim();
-        for (let aggIdx = 0; aggIdx < aggregations.length; aggIdx++) {
-          const agg = aggregations[aggIdx];
-          const fieldKey = getAggregationFieldKey(agg, hasMultiple);
-          if (!fieldKey) continue;
-          let fmt = "";
-          if (!hasMultiple) {
-            fmt = String(chart.yAxisFields?.[0]?.format ?? "").trim() || firstValueColumnFormat;
-          } else {
-            for (const yAxisField of chart.yAxisFields ?? []) {
-              const wf = String(yAxisField.field ?? "").trim();
-              if (!wf) continue;
-              const matched = findAggregationForFieldStrict(wf, aggregations);
-              if (!matched || getAggregationIdentityKey(matched) !== getAggregationIdentityKey(agg)) {
-                continue;
-              }
-              fmt = String(yAxisField.format ?? "").trim();
-              break;
-            }
-            if (!fmt && sourceReport?.columns?.[aggIdx + 1]) {
-              fmt = String(
-                sourceReport.columns[aggIdx + 1]?.format ?? ""
-              ).trim();
-            }
-          }
-          if (fmt) {
-            columnPivotMeasureFormatByAggregationField.set(fieldKey, fmt);
-          }
+    if (pivotTableColumns) {
+      for (const measure of yAxisResolved.measures) {
+        const field = String(measure.field ?? "").trim();
+        const fmt = String(measure.format ?? "").trim();
+        if (field && fmt) {
+          columnPivotMeasureFormatByAggregationField.set(field, fmt);
         }
       }
     }
@@ -70850,11 +70711,11 @@ function useReport(reportIdArg, options = {}) {
     displayColumnById,
     isPivotTableChart,
     pivotState,
-    pivotTableColumnControls,
+    pivotTableColumns,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
-    sourceReport?.columns,
-    tableFormatMerge
+    tableFormatMerge,
+    yAxisResolved.measures
   ]);
   const tableColumnSettingsCoalesceRef = useRef24(
     /* @__PURE__ */ new Map()
@@ -70876,8 +70737,8 @@ function useReport(reportIdArg, options = {}) {
       const field = String(option?.field ?? "").trim() || columnId;
       const tableName = String(option?.tableName ?? "").trim();
       const coercedFormat = coerceTableColumnFormatToAxisValue(format9);
-      const isPivotDateRowSlot = isPivotTableChart && field === pivotRowFieldForFormat && isDateType(pivotRowFieldType);
-      const formatLabel = isPivotDateRowSlot && coercedFormat === "string" ? "date" : axisFormatToSelectLabel(coercedFormat);
+      const isPivotDateRow = isPivotTableChart && field === pivotRowFieldForFormat && isDateType(pivotRowFieldType);
+      const formatLabel = isPivotDateRow && coercedFormat === "string" ? "date" : axisFormatToSelectLabel(coercedFormat);
       return {
         id: columnId,
         label: customLabel || defaultLabel,
@@ -70920,7 +70781,7 @@ function useReport(reportIdArg, options = {}) {
     isPivotTableChart,
     tableColumnItems
   ]);
-  const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching);
+  const initialLoadInProgress = !reportOverride && Boolean(effectiveReportId) && (!client || initialLoadQuery.isPending || initialLoadQuery.isFetching || reportBuilderStateQuery.isPending || reportBuilderStateQuery.isFetching);
   const filterUniqueValuesLoading = filterUniqueValuesEnabled && (filterUniqueValuesQuery.isPending || filterUniqueValuesQuery.isFetching);
   const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const awaitingPivotDetailRows = Boolean(nextPivot || sourceReport?.pivot) && !reportOverride && Boolean(sourceReport) && sourceReportMatchesEffectiveReportId && (!Array.isArray(sourceReport?.rows) || sourceReport.rows.length === 0) && pivotTableDataRefreshQuery.status !== "error";
@@ -71070,15 +70931,15 @@ function useReport(reportIdArg, options = {}) {
         chartAxesBaseChart
       );
       const clickedAgg = findAggregationForFieldStrict(pivotField, aggs);
-      let nextY = resolvedYAxisFields;
+      let nextY = yAxisMeasures;
       if (updates.format !== void 0) {
         const axisFormatStr = tableColumnFormatFromUiSelection(
           String(updates.format ?? "").trim()
         );
-        nextY = resolvedYAxisFields.map((y) => {
+        nextY = yAxisMeasures.map((y) => {
           const yAgg = findAggregationForFieldStrict(y.field, aggs);
           const same = clickedAgg && yAgg && getAggregationIdentityKey(clickedAgg) === getAggregationIdentityKey(yAgg);
-          const singleBroadcast = Boolean(clickedAgg) && resolvedYAxisFields.length === 1;
+          const singleBroadcast = Boolean(clickedAgg) && yAxisMeasures.length === 1;
           if (same || singleBroadcast) {
             return {
               ...y,
@@ -71093,9 +70954,9 @@ function useReport(reportIdArg, options = {}) {
         nextY = nextY.map((y) => {
           const yAgg = findAggregationForFieldStrict(y.field, aggs);
           const same = clickedAgg && yAgg && getAggregationIdentityKey(clickedAgg) === getAggregationIdentityKey(yAgg);
-          const singleBroadcast = Boolean(clickedAgg) && resolvedYAxisFields.length === 1;
+          const singleBroadcast = Boolean(clickedAgg) && yAxisMeasures.length === 1;
           if (same || singleBroadcast) {
-            const nextLabel2 = resolvedYAxisFields.length === 1 && pivotModel.columnField ? mergePivotColumnSeriesLabelWithUserEdit(
+            const nextLabel2 = yAxisMeasures.length === 1 && pivotModel.columnField ? mergePivotColumnSeriesLabelWithUserEdit(
               String(y.label ?? "").trim(),
               lab,
               String(y.field ?? "").trim() || void 0
@@ -71208,7 +71069,7 @@ function useReport(reportIdArg, options = {}) {
         ...effectiveNextState.xAxis !== void 0 ? { xAxis: effectiveNextState.xAxis } : {},
         ...effectiveNextState.yAxis !== void 0 ? { yAxis: effectiveNextState.yAxis } : {}
       };
-      setChartAxisEdits((previousEdits) => {
+      setAxisEdits((previousEdits) => {
         const nextEdits = { ...previousEdits };
         if (cx.xAxis) {
           let suppressXAxisLabelFromPayload = false;
@@ -71748,7 +71609,9 @@ function useReport(reportIdArg, options = {}) {
   };
   const saveChanges = useCallback5(
     async (overrides) => {
-      if (!client || !sourceReport || !effectiveReportBuilderState) return;
+      if (!client || !sourceReport || !effectiveReportBuilderState) {
+        return;
+      }
       const sourceRest = {
         ...sourceReport
       };
@@ -71819,7 +71682,7 @@ function useReport(reportIdArg, options = {}) {
           xAxisField: resolvedXAxisField,
           xAxisFormat: resolvedXAxisFormat,
           xAxisLabel: resolvedXAxisLabel,
-          yAxisFields: resolvedYAxisFields,
+          yAxisFields: yAxisMeasures,
           showLegend: chartVisibility.showLegend,
           chartSort: resolvedChartSort ?? null,
           ...overrides?.filterMap !== void 0 ? { filterMap: overrides.filterMap } : {},
@@ -71872,7 +71735,7 @@ function useReport(reportIdArg, options = {}) {
       resolvedXAxisField,
       resolvedXAxisFormat,
       resolvedXAxisLabel,
-      resolvedYAxisFields,
+      yAxisMeasures,
       sourceReport,
       table.columns,
       tenants
@@ -71907,9 +71770,9 @@ function useReport(reportIdArg, options = {}) {
     groupColumnsByOptions,
     dateBucket: dateBucketMode === "standard" ? pivotState?.dateBucket : dateBucket,
     dateBucketOptions: hasDatePivotRow ? dateBucketMode === "standard" ? STANDARD_PIVOT_DATE_BUCKET_OPTIONS : PIVOT_DATE_BUCKET_OPTIONS : [],
-    /** Encoded selection per aggregation slot (`'sum:transactions::amount'`, `'count:transactions'`, `''` = placeholder). Update via `setReport({ aggregations: nextStringArray })`. */
+    /** Encoded selection per aggregation (`'sum:transactions::amount'`, `'count:transactions'`, `''` = placeholder). Update via `setReport({ aggregations: nextStringArray })`. */
     aggregations: aggregationValues,
-    /** Flat aggregation pick list shared by all slots; always contains every non-empty `aggregations` entry. */
+    /** Flat aggregation pick list shared by all aggregations; always contains every non-empty `aggregations` entry. */
     aggregationOptions,
     aggregationDescriptionOptions: cleanedAggregations,
     sort: cleanedSort,
@@ -72854,10 +72717,9 @@ function useReportFilterDraft(args) {
     );
     return stringField?.name ?? fields[0]?.name ?? "";
   }, []);
-  const getDefaultValue = useCallback6(
-    (rule) => defaultFilterRuleValueForOperator(rule?.operator),
-    []
-  );
+  const getDefaultValue = useCallback6((rule) => {
+    return defaultFilterRuleValueForOperator(rule?.operator);
+  }, []);
   const filterDraftQueryBuilderProps = useMemo35(
     () => ({
       ...queryBuilderProps,