@quillsql/react 2.16.63 → 2.16.64

package/dist/index.cjs

@@ -61220,22 +61220,18 @@ function normalizePivotChartForAxisControls(chart, reportId) {
     yAxisFields
   };
 }
-function buildPivotColumnPivotTableFormattingColumns(chart) {
-  if (!Array.isArray(chart.columns) || chart.columns.length === 0) {
-    return null;
-  }
-  const columnField = String(chart.pivot?.columnField ?? "").trim();
-  const aggregations = getPivotAggregations(chart);
-  if (!columnField || aggregations.length === 0) {
-    return null;
-  }
+function buildPivotColumnPivotTableFormattingColumns(pivot, chart) {
+  if (!pivot) return null;
+  const reportForControls = chart ? { ...chart, pivot } : { pivot };
+  const aggregations = getPivotAggregations(reportForControls);
+  if (aggregations.length === 0) return null;
   const hasMultipleAggregations = aggregations.length > 1;
-  const rowField = String(chart.pivot?.rowField ?? "").trim();
+  const rowField = String(pivot.rowField ?? "").trim();
   const tableColumns = [];
   const selectedColumnIds = [];
   if (rowField) {
-    const rowSource = chart.columns.find(
-      (c) => String(c.field ?? "").trim() === rowField
+    const rowSource = chart?.columns?.find(
+      (column) => String(column.field ?? "").trim() === rowField
     );
     const rowTable = String(
       rowSource?.table ?? ""
@@ -61243,8 +61239,8 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     tableColumns.push({
       field: rowField,
       label: String(
-        rowSource?.label ?? chart.xAxisLabel ?? chart.xAxisField ?? rowField
-      ).trim() || rowField
+        rowSource?.label ?? chart?.xAxisLabel ?? chart?.xAxisField ?? toTitleCaseLabel(rowField)
+      ).trim() || toTitleCaseLabel(rowField)
     });
     const rowId = encodeColumnOptionValue(rowTable || void 0, rowField);
     if (rowId) {
@@ -61259,14 +61255,14 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     if (!fieldKey) continue;
     tableColumns.push({
       field: fieldKey,
-      label: buildAggregationLabel(aggregation, chart)
+      label: buildAggregationLabel(aggregation, reportForControls)
     });
     const id = encodeColumnOptionValue(void 0, fieldKey);
     if (id) {
       selectedColumnIds.push(id);
     }
   }
-  return { tableColumns, selectedColumnIds };
+  return { tableColumns, selectedColumnIds, aggregations };
 }
 function mergePivotColumnSeriesLabelWithUserEdit(normalizedLabel, userRowLabel, pivotSeriesField) {
   const user = String(userRowLabel ?? "").trim();
@@ -64096,7 +64092,7 @@ function useReport(reportIdArg, options = {}) {
           }
         });
         return { uniqueValuesByColumn: normalizedUniqueValuesByColumn };
-      } catch (error) {
+      } catch {
         return { uniqueValuesByColumn: {} };
       }
     }),
@@ -66602,8 +66598,10 @@ function useReport(reportIdArg, options = {}) {
       }
     };
   }, [chart, filterOptions, filtersForQueryBuilder]);
-  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(
-    chart && chart.pivot && Array.isArray(chart.columns) && chart.columns.length > 0
+  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
+  const pivotTableColumnControls = (0, import_react61.useMemo)(
+    () => isPivotTableChart ? buildPivotColumnPivotTableFormattingColumns(pivotState, chart) : null,
+    [chart, isPivotTableChart, pivotState]
   );
   const chartAxes = (0, import_react61.useMemo)(() => {
     const yAxisItems = resolvedYAxisFields.map(
@@ -66903,24 +66901,19 @@ function useReport(reportIdArg, options = {}) {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
   } = (0, import_react61.useMemo)(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      const pivotTableColumns = aggregationSlotColumns ? aggregationSlotColumns.tableColumns : chart.columns.map((c) => ({
-        field: String(c.field ?? "").trim(),
-        label: String(c.label ?? c.field ?? "").trim() || String(c.field ?? "")
-      }));
-      const selectedPivotIds = aggregationSlotColumns ? aggregationSlotColumns.selectedColumnIds : chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
       return getAllColumnOptions({
         schemaColumnOptions,
-        tableColumns: pivotTableColumns,
-        selectedColumnIds: selectedPivotIds
+        tableColumns: pivotTableColumnControls.tableColumns,
+        selectedColumnIds: pivotTableColumnControls.selectedColumnIds
       });
     }
+    if (isPivotTableChart) {
+      return {
+        columnsOptions: [],
+        hasTableDrivenColumnOrder: true
+      };
+    }
     return getAllColumnOptions({
       schemaColumnOptions,
       tableColumns: table.columns,
@@ -66933,6 +66926,7 @@ function useReport(reportIdArg, options = {}) {
     chart?.xAxisLabel,
     columns,
     isPivotTableChart,
+    pivotTableColumnControls,
     schemaColumnOptions,
     table.columns
   ]);
@@ -66954,17 +66948,11 @@ function useReport(reportIdArg, options = {}) {
     [tableDerivedColumnOrder]
   );
   const activeTableColumnIds = (0, import_react61.useMemo)(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      if (aggregationSlotColumns) {
-        return aggregationSlotColumns.selectedColumnIds;
-      }
-      return chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
+      return pivotTableColumnControls.selectedColumnIds;
+    }
+    if (isPivotTableChart) {
+      return [];
     }
     const currentColumns = (columns ?? []).filter(Boolean);
     if (!hasTableDrivenColumnOrder) {
@@ -66989,6 +66977,7 @@ function useReport(reportIdArg, options = {}) {
     columns,
     hasTableDrivenColumnOrder,
     isPivotTableChart,
+    pivotTableColumnControls,
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
@@ -67043,12 +67032,12 @@ function useReport(reportIdArg, options = {}) {
       });
     }
     const columnPivotMeasureFormatByAggregationField = /* @__PURE__ */ new Map();
-    if (isPivotTableChart && chart?.pivot) {
-      const slotFormatting = buildPivotColumnPivotTableFormattingColumns(chart);
+    if (pivotTableColumnControls && chart) {
+      const slotFormatting = pivotTableColumnControls;
       if (slotFormatting) {
-        const aggregations = getPivotAggregations(chart);
+        const aggregations = slotFormatting.aggregations;
         const hasMultiple = aggregations.length > 1;
-        const rowField = String(chart.pivot.rowField ?? "").trim();
+        const rowField = String(pivotState?.rowField ?? "").trim();
         const firstValueColumnFormat = String(
           (chart.columns ?? []).find(
             (c) => String(c.field ?? "").trim() !== rowField
@@ -67128,6 +67117,8 @@ function useReport(reportIdArg, options = {}) {
     columnOptionById,
     displayColumnById,
     isPivotTableChart,
+    pivotState,
+    pivotTableColumnControls,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
     sourceReport?.columns,
@@ -67199,8 +67190,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 || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
-  const tableLoading = initialLoadInProgress || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const tableLoading = initialLoadInProgress || pendingPivotRefresh || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const loading = chartLoading || tableLoading;
   const buildSetReportColumnsFromIds = (nextColumnIds, settingsById) => {
     const normalizedNextIds = nextColumnIds.map((columnId) => String(columnId ?? "").trim()).filter(Boolean);
@@ -67553,13 +67544,25 @@ function useReport(reportIdArg, options = {}) {
           const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
           const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
-          if (addedDisplayColumns.length > 0) {
+          const hasPivotSelection = Boolean(
+            decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
+          ) || next.aggregationState.some(isAppliedAggregation);
+          const requestedDisplayTableNames = new Set(
+            normalizedDisplayColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
+          );
+          const selectedDatasourceTableNames = new Set(
+            (next.schemaDatasourceIds ?? []).map((tableName) => String(tableName ?? "").trim()).filter(Boolean)
+          );
+          const replacesDatasourceTableScope = !hasPivotSelection && requestedDisplayTableNames.size > 0 && selectedDatasourceTableNames.size > 0 && [...requestedDisplayTableNames].every(
+            (tableName) => !selectedDatasourceTableNames.has(tableName)
+          );
+          if (replacesDatasourceTableScope) {
+            next.queryColumns = normalizedDisplayColumns;
+            next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(
               next.queryColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
             );
-            const hasPivotSelection = Boolean(
-              decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
-            ) || next.aggregationState.some(isAppliedAggregation);
             const queryColumnsToInclude = addedDisplayColumns.filter(
               (column) => {
                 const tableName = String(column.table ?? "").trim();

package/dist/index.js

@@ -61432,22 +61432,18 @@ function normalizePivotChartForAxisControls(chart, reportId) {
     yAxisFields
   };
 }
-function buildPivotColumnPivotTableFormattingColumns(chart) {
-  if (!Array.isArray(chart.columns) || chart.columns.length === 0) {
-    return null;
-  }
-  const columnField = String(chart.pivot?.columnField ?? "").trim();
-  const aggregations = getPivotAggregations(chart);
-  if (!columnField || aggregations.length === 0) {
-    return null;
-  }
+function buildPivotColumnPivotTableFormattingColumns(pivot, chart) {
+  if (!pivot) return null;
+  const reportForControls = chart ? { ...chart, pivot } : { pivot };
+  const aggregations = getPivotAggregations(reportForControls);
+  if (aggregations.length === 0) return null;
   const hasMultipleAggregations = aggregations.length > 1;
-  const rowField = String(chart.pivot?.rowField ?? "").trim();
+  const rowField = String(pivot.rowField ?? "").trim();
   const tableColumns = [];
   const selectedColumnIds = [];
   if (rowField) {
-    const rowSource = chart.columns.find(
-      (c) => String(c.field ?? "").trim() === rowField
+    const rowSource = chart?.columns?.find(
+      (column) => String(column.field ?? "").trim() === rowField
     );
     const rowTable = String(
       rowSource?.table ?? ""
@@ -61455,8 +61451,8 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     tableColumns.push({
       field: rowField,
       label: String(
-        rowSource?.label ?? chart.xAxisLabel ?? chart.xAxisField ?? rowField
-      ).trim() || rowField
+        rowSource?.label ?? chart?.xAxisLabel ?? chart?.xAxisField ?? toTitleCaseLabel(rowField)
+      ).trim() || toTitleCaseLabel(rowField)
     });
     const rowId = encodeColumnOptionValue(rowTable || void 0, rowField);
     if (rowId) {
@@ -61471,14 +61467,14 @@ function buildPivotColumnPivotTableFormattingColumns(chart) {
     if (!fieldKey) continue;
     tableColumns.push({
       field: fieldKey,
-      label: buildAggregationLabel(aggregation, chart)
+      label: buildAggregationLabel(aggregation, reportForControls)
     });
     const id = encodeColumnOptionValue(void 0, fieldKey);
     if (id) {
       selectedColumnIds.push(id);
     }
   }
-  return { tableColumns, selectedColumnIds };
+  return { tableColumns, selectedColumnIds, aggregations };
 }
 function mergePivotColumnSeriesLabelWithUserEdit(normalizedLabel, userRowLabel, pivotSeriesField) {
   const user = String(userRowLabel ?? "").trim();
@@ -64308,7 +64304,7 @@ function useReport(reportIdArg, options = {}) {
           }
         });
         return { uniqueValuesByColumn: normalizedUniqueValuesByColumn };
-      } catch (error) {
+      } catch {
         return { uniqueValuesByColumn: {} };
       }
     }),
@@ -66814,8 +66810,10 @@ function useReport(reportIdArg, options = {}) {
       }
     };
   }, [chart, filterOptions, filtersForQueryBuilder]);
-  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(
-    chart && chart.pivot && Array.isArray(chart.columns) && chart.columns.length > 0
+  const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
+  const pivotTableColumnControls = useMemo32(
+    () => isPivotTableChart ? buildPivotColumnPivotTableFormattingColumns(pivotState, chart) : null,
+    [chart, isPivotTableChart, pivotState]
   );
   const chartAxes = useMemo32(() => {
     const yAxisItems = resolvedYAxisFields.map(
@@ -67115,24 +67113,19 @@ function useReport(reportIdArg, options = {}) {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
   } = useMemo32(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      const pivotTableColumns = aggregationSlotColumns ? aggregationSlotColumns.tableColumns : chart.columns.map((c) => ({
-        field: String(c.field ?? "").trim(),
-        label: String(c.label ?? c.field ?? "").trim() || String(c.field ?? "")
-      }));
-      const selectedPivotIds = aggregationSlotColumns ? aggregationSlotColumns.selectedColumnIds : chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
       return getAllColumnOptions({
         schemaColumnOptions,
-        tableColumns: pivotTableColumns,
-        selectedColumnIds: selectedPivotIds
+        tableColumns: pivotTableColumnControls.tableColumns,
+        selectedColumnIds: pivotTableColumnControls.selectedColumnIds
       });
     }
+    if (isPivotTableChart) {
+      return {
+        columnsOptions: [],
+        hasTableDrivenColumnOrder: true
+      };
+    }
     return getAllColumnOptions({
       schemaColumnOptions,
       tableColumns: table.columns,
@@ -67145,6 +67138,7 @@ function useReport(reportIdArg, options = {}) {
     chart?.xAxisLabel,
     columns,
     isPivotTableChart,
+    pivotTableColumnControls,
     schemaColumnOptions,
     table.columns
   ]);
@@ -67166,17 +67160,11 @@ function useReport(reportIdArg, options = {}) {
     [tableDerivedColumnOrder]
   );
   const activeTableColumnIds = useMemo32(() => {
-    if (isPivotTableChart && chart?.columns?.length) {
-      const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
-      if (aggregationSlotColumns) {
-        return aggregationSlotColumns.selectedColumnIds;
-      }
-      return chart.columns.map(
-        (c) => encodeColumnOptionValue(
-          String(c.table ?? "").trim() || void 0,
-          String(c.field ?? "").trim()
-        )
-      ).filter(Boolean);
+    if (pivotTableColumnControls) {
+      return pivotTableColumnControls.selectedColumnIds;
+    }
+    if (isPivotTableChart) {
+      return [];
     }
     const currentColumns = (columns ?? []).filter(Boolean);
     if (!hasTableDrivenColumnOrder) {
@@ -67201,6 +67189,7 @@ function useReport(reportIdArg, options = {}) {
     columns,
     hasTableDrivenColumnOrder,
     isPivotTableChart,
+    pivotTableColumnControls,
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
@@ -67255,12 +67244,12 @@ function useReport(reportIdArg, options = {}) {
       });
     }
     const columnPivotMeasureFormatByAggregationField = /* @__PURE__ */ new Map();
-    if (isPivotTableChart && chart?.pivot) {
-      const slotFormatting = buildPivotColumnPivotTableFormattingColumns(chart);
+    if (pivotTableColumnControls && chart) {
+      const slotFormatting = pivotTableColumnControls;
       if (slotFormatting) {
-        const aggregations = getPivotAggregations(chart);
+        const aggregations = slotFormatting.aggregations;
         const hasMultiple = aggregations.length > 1;
-        const rowField = String(chart.pivot.rowField ?? "").trim();
+        const rowField = String(pivotState?.rowField ?? "").trim();
         const firstValueColumnFormat = String(
           (chart.columns ?? []).find(
             (c) => String(c.field ?? "").trim() !== rowField
@@ -67340,6 +67329,8 @@ function useReport(reportIdArg, options = {}) {
     columnOptionById,
     displayColumnById,
     isPivotTableChart,
+    pivotState,
+    pivotTableColumnControls,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
     sourceReport?.columns,
@@ -67411,8 +67402,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 || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
-  const tableLoading = initialLoadInProgress || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const chartLoading = initialLoadInProgress || pendingPivotRefresh || (Boolean(nextPivot) ? pivotRefreshQuery.isFetching : tableRefreshQuery.isFetching);
+  const tableLoading = initialLoadInProgress || pendingPivotRefresh || tablePageFetching || (Boolean(nextPivot) ? pivotTableDataRefreshQuery.isFetching : tableRefreshQuery.isFetching);
   const loading = chartLoading || tableLoading;
   const buildSetReportColumnsFromIds = (nextColumnIds, settingsById) => {
     const normalizedNextIds = nextColumnIds.map((columnId) => String(columnId ?? "").trim()).filter(Boolean);
@@ -67765,13 +67756,25 @@ function useReport(reportIdArg, options = {}) {
           const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
           const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
-          if (addedDisplayColumns.length > 0) {
+          const hasPivotSelection = Boolean(
+            decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
+          ) || next.aggregationState.some(isAppliedAggregation);
+          const requestedDisplayTableNames = new Set(
+            normalizedDisplayColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
+          );
+          const selectedDatasourceTableNames = new Set(
+            (next.schemaDatasourceIds ?? []).map((tableName) => String(tableName ?? "").trim()).filter(Boolean)
+          );
+          const replacesDatasourceTableScope = !hasPivotSelection && requestedDisplayTableNames.size > 0 && selectedDatasourceTableNames.size > 0 && [...requestedDisplayTableNames].every(
+            (tableName) => !selectedDatasourceTableNames.has(tableName)
+          );
+          if (replacesDatasourceTableScope) {
+            next.queryColumns = normalizedDisplayColumns;
+            next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(
               next.queryColumns.map((column) => String(column.table ?? "").trim()).filter(Boolean)
             );
-            const hasPivotSelection = Boolean(
-              decodePivotGroupOptionValue(next.groupRowsBy) || decodePivotGroupOptionValue(next.groupColumnsBy)
-            ) || next.aggregationState.some(isAppliedAggregation);
             const queryColumnsToInclude = addedDisplayColumns.filter(
               (column) => {
                 const tableName = String(column.table ?? "").trim();

package/package.json

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