@quillsql/react 2.16.61 → 2.16.63

package/dist/index.cjs

@@ -61638,7 +61638,7 @@ function mergeReportBuilderTables(baseTables, tableNamesToInclude, foreignKeyMap
       return void 0;
     }
     return {
-      type: "JOIN" /* JOIN */,
+      type: "LEFT JOIN" /* LEFT */,
       condition: {
         operator: "=",
         left: {
@@ -61680,7 +61680,7 @@ function mergeReportBuilderTables(baseTables, tableNamesToInclude, foreignKeyMap
     }
     return void 0;
   };
-  const preferredPrimaryTableName = normalizedIncludedTableNames[0] ?? dedupedBaseTables.map((table) => String(table.name ?? "").trim()).find(Boolean) ?? "";
+  const preferredPrimaryTableName = dedupedBaseTables.map((table) => String(table.name ?? "").trim()).find(Boolean) ?? normalizedIncludedTableNames[0] ?? "";
   const initialTableName = preferredPrimaryTableName || allTableNames[0] || "";
   if (!initialTableName) {
     return [];
@@ -66412,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,
@@ -66432,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

@@ -61850,7 +61850,7 @@ function mergeReportBuilderTables(baseTables, tableNamesToInclude, foreignKeyMap
       return void 0;
     }
     return {
-      type: "JOIN" /* JOIN */,
+      type: "LEFT JOIN" /* LEFT */,
       condition: {
         operator: "=",
         left: {
@@ -61892,7 +61892,7 @@ function mergeReportBuilderTables(baseTables, tableNamesToInclude, foreignKeyMap
     }
     return void 0;
   };
-  const preferredPrimaryTableName = normalizedIncludedTableNames[0] ?? dedupedBaseTables.map((table) => String(table.name ?? "").trim()).find(Boolean) ?? "";
+  const preferredPrimaryTableName = dedupedBaseTables.map((table) => String(table.name ?? "").trim()).find(Boolean) ?? normalizedIncludedTableNames[0] ?? "";
   const initialTableName = preferredPrimaryTableName || allTableNames[0] || "";
   if (!initialTableName) {
     return [];
@@ -66624,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,
@@ -66644,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.61",
+  "version": "2.16.63",
   "type": "module",
   "exports": {
     ".": {