@quillsql/react 2.16.60 → 2.16.62

package/dist/index.cjs

@@ -26905,6 +26905,16 @@ init_dataFetcher();
 init_tableProcessing();
 init_paginationProcessing();
 init_inMemoryPivotEngine();
+
+// src/utils/dashboardPagination.ts
+function isDashboardPivotTable(report) {
+  return String(report?.chartType ?? "").toLowerCase() === "table" && Boolean(report?.pivot);
+}
+function getDashboardReportProcessing(report, serverPagination) {
+  return isDashboardPivotTable(report) ? {} : serverPagination;
+}
+
+// src/hooks/useDashboard.ts
 var useDashboardInternal = (dashboardName, customFilters) => {
   const [dashboard] = (0, import_react2.useContext)(DashboardContext);
   const {
@@ -27828,8 +27838,10 @@ var useDashboard = (dashboardName, config) => {
         const additionalProcessing = {
           page: pagination
         };
-        const useLocalPivotTablePagination = String(reportInfo.chartType ?? "").toLowerCase() === "table" && Boolean(reportInfo.pivot);
-        const reportAdditionalProcessing = useLocalPivotTablePagination ? void 0 : additionalProcessing;
+        const reportAdditionalProcessing = getDashboardReportProcessing(
+          reportInfo,
+          additionalProcessing
+        );
         const usePivotTask = !cacheEnabled && !!reportInfo.pivot;
         const allFilters = dashboardFilters2.concat(customFilters).concat(customReportFiltersArray);
         const applyInMemoryPivotIfNeeded = (report2) => {
@@ -43600,7 +43612,7 @@ function StaticChart(props) {
       direction: sort.direction
     });
   };
-  const useLocalPivotTablePagination = String(report?.chartType ?? "").toLowerCase() === "table" && Boolean(report?.pivot);
+  const useLocalPivotTablePagination = isDashboardPivotTable(report);
   const config = (0, import_react41.useMemo)(() => {
     return report ? {
       ...report,
@@ -66400,12 +66412,41 @@ function useReport(reportIdArg, options = {}) {
       resolvedYAxisFieldsForDisplay
     );
     if (String(baseChart.chartType ?? "").toLowerCase() === "table" && baseChart.pivot) {
-      columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
-        columns: columns2 ?? baseChart.columns,
-        yAxisFields: resolvedYAxisFieldsForDisplay,
-        pivotRowField: String(baseChart.pivot.rowField ?? ""),
-        xAxisLabel: resolvedXAxisLabel
+      const pivotAggregations = getPivotAggregations(baseChart);
+      const hasCustomMeasureLabel = resolvedYAxisFields.some((axis) => {
+        const aggregation = findAggregationForFieldStrict(
+          axis.field,
+          pivotAggregations
+        );
+        if (!aggregation) return false;
+        const label = String(axis.label ?? "").trim();
+        const defaultLabel = buildAggregationLabel(aggregation, baseChart);
+        return Boolean(label) && label !== defaultLabel;
       });
+      if (pivotAggregations.length > 1 || hasCustomMeasureLabel) {
+        columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
+          columns: columns2 ?? baseChart.columns,
+          yAxisFields: resolvedYAxisFieldsForDisplay,
+          pivotRowField: String(baseChart.pivot.rowField ?? ""),
+          xAxisLabel: resolvedXAxisLabel
+        });
+      } else {
+        const pivotRowField = String(baseChart.pivot.rowField ?? "").trim();
+        const pivotLabelByField = new Map(
+          (baseChart.pivotColumns ?? []).map((column) => [
+            String(column.field ?? "").trim(),
+            String(column.label ?? "").trim()
+          ])
+        );
+        columns2 = (columns2 ?? baseChart.columns)?.map((column) => {
+          const field = String(column.field ?? "").trim();
+          const rowLabel = field === pivotRowField ? String(resolvedXAxisLabel).trim() : "";
+          return {
+            ...column,
+            label: rowLabel || pivotLabelByField.get(field) || column.label || field
+          };
+        });
+      }
     }
     return {
       ...baseChart,
@@ -66420,6 +66461,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
+    resolvedYAxisFields,
     resolvedYAxisFieldsForDisplay
   ]);
   const pivotDateFilterRangeCacheRef = (0, import_react61.useRef)({ key: "", min: null, max: null });

package/dist/index.js

@@ -26926,6 +26926,16 @@ init_dataFetcher();
 init_tableProcessing();
 init_paginationProcessing();
 init_inMemoryPivotEngine();
+
+// src/utils/dashboardPagination.ts
+function isDashboardPivotTable(report) {
+  return String(report?.chartType ?? "").toLowerCase() === "table" && Boolean(report?.pivot);
+}
+function getDashboardReportProcessing(report, serverPagination) {
+  return isDashboardPivotTable(report) ? {} : serverPagination;
+}
+
+// src/hooks/useDashboard.ts
 var useDashboardInternal = (dashboardName, customFilters) => {
   const [dashboard] = useContext(DashboardContext);
   const {
@@ -27849,8 +27859,10 @@ var useDashboard = (dashboardName, config) => {
         const additionalProcessing = {
           page: pagination
         };
-        const useLocalPivotTablePagination = String(reportInfo.chartType ?? "").toLowerCase() === "table" && Boolean(reportInfo.pivot);
-        const reportAdditionalProcessing = useLocalPivotTablePagination ? void 0 : additionalProcessing;
+        const reportAdditionalProcessing = getDashboardReportProcessing(
+          reportInfo,
+          additionalProcessing
+        );
         const usePivotTask = !cacheEnabled && !!reportInfo.pivot;
         const allFilters = dashboardFilters2.concat(customFilters).concat(customReportFiltersArray);
         const applyInMemoryPivotIfNeeded = (report2) => {
@@ -43703,7 +43715,7 @@ function StaticChart(props) {
       direction: sort.direction
     });
   };
-  const useLocalPivotTablePagination = String(report?.chartType ?? "").toLowerCase() === "table" && Boolean(report?.pivot);
+  const useLocalPivotTablePagination = isDashboardPivotTable(report);
   const config = useMemo20(() => {
     return report ? {
       ...report,
@@ -66612,12 +66624,41 @@ function useReport(reportIdArg, options = {}) {
       resolvedYAxisFieldsForDisplay
     );
     if (String(baseChart.chartType ?? "").toLowerCase() === "table" && baseChart.pivot) {
-      columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
-        columns: columns2 ?? baseChart.columns,
-        yAxisFields: resolvedYAxisFieldsForDisplay,
-        pivotRowField: String(baseChart.pivot.rowField ?? ""),
-        xAxisLabel: resolvedXAxisLabel
+      const pivotAggregations = getPivotAggregations(baseChart);
+      const hasCustomMeasureLabel = resolvedYAxisFields.some((axis) => {
+        const aggregation = findAggregationForFieldStrict(
+          axis.field,
+          pivotAggregations
+        );
+        if (!aggregation) return false;
+        const label = String(axis.label ?? "").trim();
+        const defaultLabel = buildAggregationLabel(aggregation, baseChart);
+        return Boolean(label) && label !== defaultLabel;
       });
+      if (pivotAggregations.length > 1 || hasCustomMeasureLabel) {
+        columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
+          columns: columns2 ?? baseChart.columns,
+          yAxisFields: resolvedYAxisFieldsForDisplay,
+          pivotRowField: String(baseChart.pivot.rowField ?? ""),
+          xAxisLabel: resolvedXAxisLabel
+        });
+      } else {
+        const pivotRowField = String(baseChart.pivot.rowField ?? "").trim();
+        const pivotLabelByField = new Map(
+          (baseChart.pivotColumns ?? []).map((column) => [
+            String(column.field ?? "").trim(),
+            String(column.label ?? "").trim()
+          ])
+        );
+        columns2 = (columns2 ?? baseChart.columns)?.map((column) => {
+          const field = String(column.field ?? "").trim();
+          const rowLabel = field === pivotRowField ? String(resolvedXAxisLabel).trim() : "";
+          return {
+            ...column,
+            label: rowLabel || pivotLabelByField.get(field) || column.label || field
+          };
+        });
+      }
     }
     return {
       ...baseChart,
@@ -66632,6 +66673,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
+    resolvedYAxisFields,
     resolvedYAxisFieldsForDisplay
   ]);
   const pivotDateFilterRangeCacheRef = useRef24({ key: "", min: null, max: null });

package/package.json

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