@quillsql/react 2.16.88 → 2.16.90

package/dist/index.cjs

@@ -23705,10 +23705,24 @@ function hasPreformattedDateBucketLabels(report) {
   if (report.chartType?.toLowerCase() === "table") return false;
   return report.xAxisField?.trim() === pivot.rowField?.trim();
 }
+function applySavedPivotColumnLabels(report, pivotColumns) {
+  return pivotColumns?.map((column) => {
+    const savedColumn = report.columns?.find(
+      ({ field }) => field === column.field
+    );
+    const rowLabel = column.field === report.pivot?.rowField ? report.xAxisLabel : void 0;
+    return {
+      ...column,
+      label: rowLabel || savedColumn?.label || column.label
+    };
+  });
+}
 function prepareStaticChartReport(report, { removePagination }) {
-  const config = report.pivot ? {
+  const pivotData = report.pivot ? formattedPivotRowsAndColumns(report, [], { formatRows: false }) : void 0;
+  const config = pivotData ? {
     ...report,
-    ...formattedPivotRowsAndColumns(report, [], { formatRows: false })
+    ...pivotData,
+    columns: applySavedPivotColumnLabels(report, pivotData.columns)
   } : { ...report };
   if (removePagination) {
     config.pagination = void 0;
@@ -64323,6 +64337,20 @@ function resolveTableColumnLabel(fieldRaw, labelRaw) {
   const label = String(labelRaw ?? "").trim();
   return !label || label === field ? toTitleCaseLabel(field) : label;
 }
+function reportColumnsContainPivotOutputFields(report) {
+  if (!report?.pivot || String(report.chartType ?? "").toLowerCase() !== "table" || !Array.isArray(report.columns) || report.columns.length === 0) {
+    return false;
+  }
+  const detailFields = new Set(
+    [
+      ...report.reportBuilderState?.columns ?? [],
+      ...report.columnInternal ?? []
+    ].flatMap((column) => [column.field, column.alias]).map((field) => String(field ?? "").trim()).filter(Boolean)
+  );
+  return report.columns.some(
+    (column) => !detailFields.has(String(column.field ?? "").trim())
+  );
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -64332,7 +64360,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
-  const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
+  const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+  const persistedReportColumns = !savedColumnsArePivotDisplayColumns && Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
   const pivotTableColumnsFromSchema = sourceReport?.pivot && !persistedReportColumns && scopedSchemaColumns.length > 0 && selectedTableNames.size > 0 ? scopedSchemaColumns.filter(
     (column) => selectedTableNames.has(String(column.table ?? "").trim())
   ) : [];
@@ -67716,7 +67745,8 @@ function useReport(reportIdArg, options = {}) {
             table: String(column.table ?? "").trim() || resolveColumnTableFromReportMetadata(sourceReport, column.field)
           }))
         );
-        const sourceDisplayColumns = savedDisplayColumns.length > 0 ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
+        const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+        const sourceDisplayColumns = savedDisplayColumns.length > 0 && !savedColumnsArePivotDisplayColumns ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
         const shouldKeepLocalRowGroup = groupRowsBySetViaSetReportRef.current || groupColumnsBySetViaSetReportRef.current && prev.groupRowsBy !== void 0;
         const shouldKeepLocalColumnGroup = groupColumnsBySetViaSetReportRef.current || groupRowsBySetViaSetReportRef.current && prev.groupColumnsBy !== void 0;
         const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalRowGroup ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
@@ -71144,6 +71174,28 @@ function useReport(reportIdArg, options = {}) {
       const hasReportFlagsOverride = overrides?.reportFlags !== void 0;
       const isFlatTable = String(resolvedChartType).toLowerCase() === "table" && !effectiveReportBuilderState.pivot;
       const isPivotTable = String(resolvedChartType).toLowerCase() === "table" && Boolean(effectiveReportBuilderState.pivot);
+      const fallbackDetailColumns = effectiveReportBuilderState.columns.map(
+        (column) => {
+          const field = String(column.alias ?? "").trim() || String(column.field ?? "").trim();
+          const tableName = String(column.table ?? "").trim();
+          const metadata = [
+            ...sourceReport.columnInternal ?? [],
+            ...sourceReport.columns ?? []
+          ].find((candidate) => {
+            const candidateField = String(candidate.field ?? "").trim();
+            const candidateTable = String(
+              candidate.table ?? ""
+            ).trim();
+            return (candidateField === field || candidateField === String(column.field ?? "").trim()) && (!tableName || !candidateTable || candidateTable === tableName);
+          });
+          return {
+            field,
+            label: String(metadata?.label ?? "").trim() || toTitleCaseLabel(field),
+            format: String(metadata?.format ?? "").trim() || "string"
+          };
+        }
+      );
+      const columnsSelectedForSave = table.columns.length > 0 ? table.columns : fallbackDetailColumns;
       const resp = await saveReport({
         report: {
           ...EMPTY_INTERNAL_REPORT,
@@ -71155,7 +71207,7 @@ function useReport(reportIdArg, options = {}) {
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
           ...hasSectionOverride ? { section: overrides.section } : {},
-          columns: isPivotTable ? chart?.columns ?? sourceReport.columns : table.columns,
+          columns: columnsSelectedForSave,
           ...isFlatTable ? {
             sort: effectiveReportBuilderState.sort?.[0] ?? null
           } : {},

package/dist/index.js

@@ -23687,10 +23687,24 @@ function hasPreformattedDateBucketLabels(report) {
   if (report.chartType?.toLowerCase() === "table") return false;
   return report.xAxisField?.trim() === pivot.rowField?.trim();
 }
+function applySavedPivotColumnLabels(report, pivotColumns) {
+  return pivotColumns?.map((column) => {
+    const savedColumn = report.columns?.find(
+      ({ field }) => field === column.field
+    );
+    const rowLabel = column.field === report.pivot?.rowField ? report.xAxisLabel : void 0;
+    return {
+      ...column,
+      label: rowLabel || savedColumn?.label || column.label
+    };
+  });
+}
 function prepareStaticChartReport(report, { removePagination }) {
-  const config = report.pivot ? {
+  const pivotData = report.pivot ? formattedPivotRowsAndColumns(report, [], { formatRows: false }) : void 0;
+  const config = pivotData ? {
     ...report,
-    ...formattedPivotRowsAndColumns(report, [], { formatRows: false })
+    ...pivotData,
+    columns: applySavedPivotColumnLabels(report, pivotData.columns)
   } : { ...report };
   if (removePagination) {
     config.pagination = void 0;
@@ -64531,6 +64545,20 @@ function resolveTableColumnLabel(fieldRaw, labelRaw) {
   const label = String(labelRaw ?? "").trim();
   return !label || label === field ? toTitleCaseLabel(field) : label;
 }
+function reportColumnsContainPivotOutputFields(report) {
+  if (!report?.pivot || String(report.chartType ?? "").toLowerCase() !== "table" || !Array.isArray(report.columns) || report.columns.length === 0) {
+    return false;
+  }
+  const detailFields = new Set(
+    [
+      ...report.reportBuilderState?.columns ?? [],
+      ...report.columnInternal ?? []
+    ].flatMap((column) => [column.field, column.alias]).map((field) => String(field ?? "").trim()).filter(Boolean)
+  );
+  return report.columns.some(
+    (column) => !detailFields.has(String(column.field ?? "").trim())
+  );
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -64540,7 +64568,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
-  const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
+  const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+  const persistedReportColumns = !savedColumnsArePivotDisplayColumns && Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
   const pivotTableColumnsFromSchema = sourceReport?.pivot && !persistedReportColumns && scopedSchemaColumns.length > 0 && selectedTableNames.size > 0 ? scopedSchemaColumns.filter(
     (column) => selectedTableNames.has(String(column.table ?? "").trim())
   ) : [];
@@ -67924,7 +67953,8 @@ function useReport(reportIdArg, options = {}) {
             table: String(column.table ?? "").trim() || resolveColumnTableFromReportMetadata(sourceReport, column.field)
           }))
         );
-        const sourceDisplayColumns = savedDisplayColumns.length > 0 ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
+        const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+        const sourceDisplayColumns = savedDisplayColumns.length > 0 && !savedColumnsArePivotDisplayColumns ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
         const shouldKeepLocalRowGroup = groupRowsBySetViaSetReportRef.current || groupColumnsBySetViaSetReportRef.current && prev.groupRowsBy !== void 0;
         const shouldKeepLocalColumnGroup = groupColumnsBySetViaSetReportRef.current || groupRowsBySetViaSetReportRef.current && prev.groupColumnsBy !== void 0;
         const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalRowGroup ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
@@ -71352,6 +71382,28 @@ function useReport(reportIdArg, options = {}) {
       const hasReportFlagsOverride = overrides?.reportFlags !== void 0;
       const isFlatTable = String(resolvedChartType).toLowerCase() === "table" && !effectiveReportBuilderState.pivot;
       const isPivotTable = String(resolvedChartType).toLowerCase() === "table" && Boolean(effectiveReportBuilderState.pivot);
+      const fallbackDetailColumns = effectiveReportBuilderState.columns.map(
+        (column) => {
+          const field = String(column.alias ?? "").trim() || String(column.field ?? "").trim();
+          const tableName = String(column.table ?? "").trim();
+          const metadata = [
+            ...sourceReport.columnInternal ?? [],
+            ...sourceReport.columns ?? []
+          ].find((candidate) => {
+            const candidateField = String(candidate.field ?? "").trim();
+            const candidateTable = String(
+              candidate.table ?? ""
+            ).trim();
+            return (candidateField === field || candidateField === String(column.field ?? "").trim()) && (!tableName || !candidateTable || candidateTable === tableName);
+          });
+          return {
+            field,
+            label: String(metadata?.label ?? "").trim() || toTitleCaseLabel(field),
+            format: String(metadata?.format ?? "").trim() || "string"
+          };
+        }
+      );
+      const columnsSelectedForSave = table.columns.length > 0 ? table.columns : fallbackDetailColumns;
       const resp = await saveReport({
         report: {
           ...EMPTY_INTERNAL_REPORT,
@@ -71363,7 +71415,7 @@ function useReport(reportIdArg, options = {}) {
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
           ...hasSectionOverride ? { section: overrides.section } : {},
-          columns: isPivotTable ? chart?.columns ?? sourceReport.columns : table.columns,
+          columns: columnsSelectedForSave,
           ...isFlatTable ? {
             sort: effectiveReportBuilderState.sort?.[0] ?? null
           } : {},

package/package.json

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