@quillsql/react 2.16.71 → 2.16.73

package/dist/index.cjs

@@ -47955,6 +47955,14 @@ var CHART_TYPES = [
   "US map",
   "World map"
 ];
+var SINGLE_AGGREGATION_CHART_TYPES = [
+  "stacked",
+  "stacked bar",
+  "bar",
+  "pie",
+  "gauge",
+  "metric"
+];
 var CHART_TO_LABELS = {
   column: { xAxisLabel: "X-Axis", yAxisLabel: "Y-Axis" },
   line: { xAxisLabel: "X-Axis", yAxisLabel: "Y-Axis" },
@@ -48161,7 +48169,10 @@ function getPivotMetricOptions(pivot, selectedPivotTable, chartType) {
   }
 }
 function getChartTypeOptions(formData, dashboard) {
-  let viableCharts = CHART_TYPES;
+  const hasMultipleAggregations = (formData.pivot?.aggregations?.length ?? 0) > 1;
+  let viableCharts = CHART_TYPES.filter(
+    (chartType) => !(hasMultipleAggregations && SINGLE_AGGREGATION_CHART_TYPES.includes(chartType))
+  );
   if (dashboard && dashboard.dateFilter && dashboard.dateFilter.comparison) {
     viableCharts = viableCharts.filter(
       (chart) => ![
@@ -49686,18 +49697,23 @@ function ChartBuilder({
         (col) => col.field === pivot.rowField
       );
     }) : void 0;
-    setFormData((formData2) => ({
-      ...formData2,
+    const updatedFormData = {
+      ...formData,
       ...newPivotFormData,
-      ...keepOldChartType && { chartType: formData2.chartType },
-      dateField: dateField ? { table: dateField.name, field: pivot.rowField } : formData2.dateField
-    }));
-    setChartTypes(
-      getChartTypeOptions(
-        { ...formData, ...newPivotFormData },
-        dashboardConfig[formData.dashboardName || ""]
-      )
+      ...keepOldChartType && { chartType: formData.chartType },
+      dateField: dateField ? { table: dateField.name, field: pivot.rowField } : formData.dateField
+    };
+    const chartTypeOptions = getChartTypeOptions(
+      updatedFormData,
+      dashboardConfig[formData.dashboardName || ""]
     );
+    if (!chartTypeOptions.some(
+      (option) => option.value === updatedFormData.chartType
+    )) {
+      updatedFormData.chartType = chartTypeOptions[0]?.value ?? "table";
+    }
+    setFormData(updatedFormData);
+    setChartTypes(chartTypeOptions);
   };
   const handleDeletePivot = () => {
     if (!formData.pivot) {
@@ -61745,13 +61761,7 @@ function mergeReportBuilderTables(baseTables, tableNamesToInclude, foreignKeyMap
     if (attachedTableCount > 0) {
       continue;
     }
-    const nextTableName = remainingTableNames.shift();
-    if (!nextTableName) {
-      break;
-    }
-    attachedTables.push(
-      baseTableByName.get(nextTableName) ?? { name: nextTableName }
-    );
+    break;
   }
   return attachedTables;
 }
@@ -61997,6 +62007,11 @@ function resolveTableColumnDefaultFormat({
   }
   return currentFormat;
 }
+function resolveTableColumnLabel(fieldRaw, labelRaw) {
+  const field = String(fieldRaw ?? "").trim();
+  const label = String(labelRaw ?? "").trim();
+  return !label || label === field ? toTitleCaseLabel(field) : label;
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -62050,6 +62065,7 @@ function mergeDisplayAndSourceForTableFormats(args) {
     };
   }).filter((column) => Boolean(column));
   const formatByColumnOptionId = /* @__PURE__ */ new Map();
+  const labelByColumnOptionId = /* @__PURE__ */ new Map();
   let columnsWithTableMeta = [];
   if (normalizedSourceColumns.length > 0 && normalizedDisplayColumns.length > 0) {
     const sourceColumnsByKey = /* @__PURE__ */ new Map();
@@ -62151,21 +62167,27 @@ function mergeDisplayAndSourceForTableFormats(args) {
       const id = encodeColumnOptionValue(selection.table, selection.field);
       if (id) {
         formatByColumnOptionId.set(id, String(merged.format ?? "").trim());
+        labelByColumnOptionId.set(
+          id,
+          resolveTableColumnLabel(merged.field, merged.label)
+        );
       }
     }
     columnsWithTableMeta = selectedColumnsForTable;
   }
   const columns = columnsWithTableMeta.map((column) => {
     const field = column.field;
-    const rawLabel = String(column.label ?? "").trim();
-    const label = !rawLabel || rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
     return {
-      label,
+      label: resolveTableColumnLabel(field, column.label),
       field,
       format: column.format
     };
   });
-  return { columns, formatByColumnOptionId };
+  return {
+    columns,
+    formatByColumnOptionId,
+    labelByColumnOptionId
+  };
 }
 function axisFormatToSelectLabel(format9) {
   const raw = String(format9 ?? "").trim();
@@ -62220,9 +62242,20 @@ var CHART_TYPES2 = [
   "US map",
   "World map"
 ];
+var SINGLE_AGGREGATION_CHART_TYPES2 = [
+  "stacked",
+  "stacked bar",
+  "bar",
+  "pie",
+  "gauge",
+  "metric"
+];
 var DEFAULT_CHART_TYPE = "table";
 function getChartTypeOptions2(formData) {
-  const viableCharts = CHART_TYPES2;
+  const hasMultipleAggregations = (formData.pivot?.aggregations?.length ?? 0) > 1;
+  const viableCharts = CHART_TYPES2.filter(
+    (chartType) => !(hasMultipleAggregations && SINGLE_AGGREGATION_CHART_TYPES2.includes(chartType))
+  );
   if (formData.pivot && !formData.pivot.rowField) {
     return viableCharts.filter((elem) => ["table", "metric", "gauge"].includes(elem)).map((elem) => ({ label: elem, value: elem }));
   }
@@ -63724,16 +63757,28 @@ function useReport(reportIdArg, options = {}) {
     queryColumnsBootstrapKey
   ]);
   const datasourceOptions = (0, import_react61.useMemo)(() => {
+    const tableNames = new Set(
+      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
+    );
     const seen = /* @__PURE__ */ new Set();
     const result = [];
     for (const table2 of schemaForReportBuilderState) {
       const name2 = String(table2.name ?? "").trim();
       if (!name2 || seen.has(name2)) continue;
       seen.add(name2);
-      result.push({ value: name2, label: toTitleCaseLabel(name2) });
+      result.push({
+        value: name2,
+        label: toTitleCaseLabel(name2),
+        joinOptions: getJoinCompatibleTableNames(
+          [name2],
+          schemaForeignKeyMap
+        ).filter(
+          (candidate) => candidate !== name2 && tableNames.has(candidate)
+        )
+      });
     }
     return result;
-  }, [schemaForReportBuilderState]);
+  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const queryBuilderFieldConfigByName = (0, import_react61.useMemo)(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState
@@ -66234,7 +66279,12 @@ function useReport(reportIdArg, options = {}) {
   const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const chartPivot = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const settledPivot = sourceReport.pivot ?? null;
+    const settledSourceRowField = String(
+      sourceReport.pivotResultSourceRowField ?? settledPivot?.rowField ?? ""
+    ).trim();
+    const pendingPivotChangesDimensions = pendingPivotRefresh && Boolean(nextPivot) && (settledSourceRowField !== String(nextPivot?.rowField ?? "").trim() || String(settledPivot?.rowFieldTable ?? "").trim() !== String(nextPivot?.rowFieldTable ?? "").trim() || String(settledPivot?.columnField ?? "").trim() !== String(nextPivot?.columnField ?? "").trim() || String(settledPivot?.columnFieldTable ?? "").trim() !== String(nextPivot?.columnFieldTable ?? "").trim());
+    const chartPivot = pendingPivotChangesDimensions ? sourceReport.pivot ?? null : nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
       ...chartPivot,
       rowField: sourceReport.pivotResultRowField
@@ -66260,6 +66310,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport,
     chartType,
     nextPivot,
+    pendingPivotRefresh,
     effectiveReportBuilderState,
     useInMemoryEngines,
     chartPivotHydrationEpoch
@@ -67250,11 +67301,18 @@ function useReport(reportIdArg, options = {}) {
         selectedColumn?.format ?? chartFallback?.format ?? ""
       ).trim();
       const isRowPivotCol = isPivotTableChart && Boolean(pivotRowFieldForSettings) && optionField === pivotRowFieldForSettings && Boolean(rowAxisLabel);
+      const selectedLabel = String(selectedColumn?.alias ?? "").trim();
+      const pivotLabel = String(
+        isRowPivotCol ? rowAxisLabel : chartFallback?.label ?? ""
+      ).trim();
+      const persistedTableLabel = String(
+        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? tableFormatMerge.columns.find(
+          (column) => column.field === optionField
+        )?.label ?? ""
+      ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {
-        label: String(
-          selectedColumn?.alias ?? (isRowPivotCol ? rowAxisLabel : chartFallback?.label) ?? ""
-        ).trim(),
+        label: selectedLabel || pivotLabel || (!isPivotTableChart ? persistedTableLabel : ""),
         format: resolvedColFormat
       });
     }
@@ -68132,6 +68190,7 @@ function useReport(reportIdArg, options = {}) {
       ...sourceRest
     } = sourceReport;
     const isFlatTable = String(resolvedChartType).toLowerCase() === "table" && !effectiveReportBuilderState.pivot;
+    const isPivotTable = String(resolvedChartType).toLowerCase() === "table" && Boolean(effectiveReportBuilderState.pivot);
     const resp = await saveReport({
       report: {
         ...EMPTY_INTERNAL_REPORT,
@@ -68142,8 +68201,8 @@ function useReport(reportIdArg, options = {}) {
         // Match chart rendering (`chartData`): form `chartType` wins over stale `sourceReport`.
         chartType: resolvedChartType,
         dashboardName: dashboardNameForNewReport,
+        ...!isPivotTable ? { columns: table.columns } : {},
         ...isFlatTable ? {
-          columns: table.columns,
           sort: effectiveReportBuilderState.sort?.[0] ?? null
         } : {},
         reportBuilderState: effectiveReportBuilderState,

package/dist/index.d.cts

@@ -2802,6 +2802,9 @@ type SelectOption = {
     label: string;
     value: string;
 };
+type DatasourceOption = SelectOption & {
+    joinOptions: string[];
+};
 type PivotDateBucket = NonNullable<Pivot['dateBucket']>;
 type UseFormTableRow = Record<string, unknown>;
 type UseFormTableColumn = {
@@ -3215,7 +3218,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
      */
     reportId: string | undefined;
     datasources: string[];
-    datasourceOptions: SelectOption[];
+    datasourceOptions: DatasourceOption[];
     groupRowsBy: string | undefined;
     groupRowsByOptions: SelectOption[];
     groupColumnsBy: string | undefined;
@@ -4475,4 +4478,4 @@ interface ReportTableProps {
 }
 declare const ReportTable: ({ reportBuilder, TableComponent, }: ReportTableProps) => react_jsx_runtime.JSX.Element;
 
-export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat$1 as AxisFormat, type BarChartInteraction, type ButtonComponentProps, Calculation, type ChangelogEntry, Chart, ChartDisplay, ChartEditor, type ChartEditorProps, type ChartProps, type ChartType, type ChartTypeOption, Chat, type ChatModelId, type ChatProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ColumnActions, type ColumnSelectionOption, type ContainerComponentProps, DEFAULT_PAGE_SIZE, DEFAULT_USE_REPORT_ROWS_PER_REQUEST, Dashboard, type DashboardDateFilter, type DashboardFilter, DashboardFilterType, DashboardLegacy, type DashboardLegacyProps, type DashboardMultiFilter, type DashboardProps, type DashboardSectionComponentProps, type DashboardSingleFilter, type DashboardTenantFilter, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterDraftQueryBuilderProps, type FilterFieldOptions, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type OnChangeFn, type Option, type PaginationState, type Pivot, type PivotAggregation, type PivotDateBucket, type PivotDimensionFilter, type PopoverComponentProps, type QueryBuilderDisplayGroup, type QueryBuilderDisplayRule, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, type QuillFetchOptions, type QuillPreviousMonthInterval, type QuillPreviousQuarterInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillResults, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, type ReportColumnInput, type ReportColumnValue, ReportDetail, type ReportDetailProps, type ReportDetailTable, ReportTable, type ReportXAxisValue, type ReportYAxisFieldValue, type ReportYAxisValue, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SetFiltersInput, type SetReportBuilderInput, type SetReportChartAxesInput, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, type Updater, type UseDashboardReload, type UseFormQueryBuilderField, type UseFormQueryBuilderProps, type UseReportFilterDraft, type UseReportQueryBuilder, areQueryBuilderFilterDraftsDirty, countFilterRules, defaultFilterRuleValueForOperator, downloadCSV, quillFormat as format, isQueryBuilderDisplayGroup, isQueryBuilderDisplayRule, normalizeRelativeDateRules, prepareQueryBuilderFiltersForSet, queryBuilderFiltersForEditor, quillFetch, stripQueryBuilderTransientFields, tableColumnFormatFromUiSelection, useAllReports, useAskQuill, useChangelogRefresh, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReport, useReportBuilder, useReportQueryBuilder, useReports, useTenants, useVirtualTables };
+export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat$1 as AxisFormat, type BarChartInteraction, type ButtonComponentProps, Calculation, type ChangelogEntry, Chart, ChartDisplay, ChartEditor, type ChartEditorProps, type ChartProps, type ChartType, type ChartTypeOption, Chat, type ChatModelId, type ChatProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ColumnActions, type ColumnSelectionOption, type ContainerComponentProps, DEFAULT_PAGE_SIZE, DEFAULT_USE_REPORT_ROWS_PER_REQUEST, Dashboard, type DashboardDateFilter, type DashboardFilter, DashboardFilterType, DashboardLegacy, type DashboardLegacyProps, type DashboardMultiFilter, type DashboardProps, type DashboardSectionComponentProps, type DashboardSingleFilter, type DashboardTenantFilter, type DatasourceOption, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterDraftQueryBuilderProps, type FilterFieldOptions, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type OnChangeFn, type Option, type PaginationState, type Pivot, type PivotAggregation, type PivotDateBucket, type PivotDimensionFilter, type PopoverComponentProps, type QueryBuilderDisplayGroup, type QueryBuilderDisplayRule, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, type QuillFetchOptions, type QuillPreviousMonthInterval, type QuillPreviousQuarterInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillResults, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, type ReportColumnInput, type ReportColumnValue, ReportDetail, type ReportDetailProps, type ReportDetailTable, ReportTable, type ReportXAxisValue, type ReportYAxisFieldValue, type ReportYAxisValue, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SetFiltersInput, type SetReportBuilderInput, type SetReportChartAxesInput, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, type Updater, type UseDashboardReload, type UseFormQueryBuilderField, type UseFormQueryBuilderProps, type UseReportFilterDraft, type UseReportQueryBuilder, areQueryBuilderFilterDraftsDirty, countFilterRules, defaultFilterRuleValueForOperator, downloadCSV, quillFormat as format, isQueryBuilderDisplayGroup, isQueryBuilderDisplayRule, normalizeRelativeDateRules, prepareQueryBuilderFiltersForSet, queryBuilderFiltersForEditor, quillFetch, stripQueryBuilderTransientFields, tableColumnFormatFromUiSelection, useAllReports, useAskQuill, useChangelogRefresh, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReport, useReportBuilder, useReportQueryBuilder, useReports, useTenants, useVirtualTables };

package/dist/index.d.ts

@@ -2802,6 +2802,9 @@ type SelectOption = {
     label: string;
     value: string;
 };
+type DatasourceOption = SelectOption & {
+    joinOptions: string[];
+};
 type PivotDateBucket = NonNullable<Pivot['dateBucket']>;
 type UseFormTableRow = Record<string, unknown>;
 type UseFormTableColumn = {
@@ -3215,7 +3218,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
      */
     reportId: string | undefined;
     datasources: string[];
-    datasourceOptions: SelectOption[];
+    datasourceOptions: DatasourceOption[];
     groupRowsBy: string | undefined;
     groupRowsByOptions: SelectOption[];
     groupColumnsBy: string | undefined;
@@ -4475,4 +4478,4 @@ interface ReportTableProps {
 }
 declare const ReportTable: ({ reportBuilder, TableComponent, }: ReportTableProps) => react_jsx_runtime.JSX.Element;
 
-export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat$1 as AxisFormat, type BarChartInteraction, type ButtonComponentProps, Calculation, type ChangelogEntry, Chart, ChartDisplay, ChartEditor, type ChartEditorProps, type ChartProps, type ChartType, type ChartTypeOption, Chat, type ChatModelId, type ChatProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ColumnActions, type ColumnSelectionOption, type ContainerComponentProps, DEFAULT_PAGE_SIZE, DEFAULT_USE_REPORT_ROWS_PER_REQUEST, Dashboard, type DashboardDateFilter, type DashboardFilter, DashboardFilterType, DashboardLegacy, type DashboardLegacyProps, type DashboardMultiFilter, type DashboardProps, type DashboardSectionComponentProps, type DashboardSingleFilter, type DashboardTenantFilter, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterDraftQueryBuilderProps, type FilterFieldOptions, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type OnChangeFn, type Option, type PaginationState, type Pivot, type PivotAggregation, type PivotDateBucket, type PivotDimensionFilter, type PopoverComponentProps, type QueryBuilderDisplayGroup, type QueryBuilderDisplayRule, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, type QuillFetchOptions, type QuillPreviousMonthInterval, type QuillPreviousQuarterInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillResults, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, type ReportColumnInput, type ReportColumnValue, ReportDetail, type ReportDetailProps, type ReportDetailTable, ReportTable, type ReportXAxisValue, type ReportYAxisFieldValue, type ReportYAxisValue, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SetFiltersInput, type SetReportBuilderInput, type SetReportChartAxesInput, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, type Updater, type UseDashboardReload, type UseFormQueryBuilderField, type UseFormQueryBuilderProps, type UseReportFilterDraft, type UseReportQueryBuilder, areQueryBuilderFilterDraftsDirty, countFilterRules, defaultFilterRuleValueForOperator, downloadCSV, quillFormat as format, isQueryBuilderDisplayGroup, isQueryBuilderDisplayRule, normalizeRelativeDateRules, prepareQueryBuilderFiltersForSet, queryBuilderFiltersForEditor, quillFetch, stripQueryBuilderTransientFields, tableColumnFormatFromUiSelection, useAllReports, useAskQuill, useChangelogRefresh, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReport, useReportBuilder, useReportQueryBuilder, useReports, useTenants, useVirtualTables };
+export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat$1 as AxisFormat, type BarChartInteraction, type ButtonComponentProps, Calculation, type ChangelogEntry, Chart, ChartDisplay, ChartEditor, type ChartEditorProps, type ChartProps, type ChartType, type ChartTypeOption, Chat, type ChatModelId, type ChatProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ColumnActions, type ColumnSelectionOption, type ContainerComponentProps, DEFAULT_PAGE_SIZE, DEFAULT_USE_REPORT_ROWS_PER_REQUEST, Dashboard, type DashboardDateFilter, type DashboardFilter, DashboardFilterType, DashboardLegacy, type DashboardLegacyProps, type DashboardMultiFilter, type DashboardProps, type DashboardSectionComponentProps, type DashboardSingleFilter, type DashboardTenantFilter, type DatasourceOption, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterDraftQueryBuilderProps, type FilterFieldOptions, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type OnChangeFn, type Option, type PaginationState, type Pivot, type PivotAggregation, type PivotDateBucket, type PivotDimensionFilter, type PopoverComponentProps, type QueryBuilderDisplayGroup, type QueryBuilderDisplayRule, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, type QuillFetchOptions, type QuillPreviousMonthInterval, type QuillPreviousQuarterInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillResults, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, type ReportColumnInput, type ReportColumnValue, ReportDetail, type ReportDetailProps, type ReportDetailTable, ReportTable, type ReportXAxisValue, type ReportYAxisFieldValue, type ReportYAxisValue, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SetFiltersInput, type SetReportBuilderInput, type SetReportChartAxesInput, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, type Updater, type UseDashboardReload, type UseFormQueryBuilderField, type UseFormQueryBuilderProps, type UseReportFilterDraft, type UseReportQueryBuilder, areQueryBuilderFilterDraftsDirty, countFilterRules, defaultFilterRuleValueForOperator, downloadCSV, quillFormat as format, isQueryBuilderDisplayGroup, isQueryBuilderDisplayRule, normalizeRelativeDateRules, prepareQueryBuilderFiltersForSet, queryBuilderFiltersForEditor, quillFetch, stripQueryBuilderTransientFields, tableColumnFormatFromUiSelection, useAllReports, useAskQuill, useChangelogRefresh, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReport, useReportBuilder, useReportQueryBuilder, useReports, useTenants, useVirtualTables };

package/dist/index.js

@@ -48117,6 +48117,14 @@ var CHART_TYPES = [
   "US map",
   "World map"
 ];
+var SINGLE_AGGREGATION_CHART_TYPES = [
+  "stacked",
+  "stacked bar",
+  "bar",
+  "pie",
+  "gauge",
+  "metric"
+];
 var CHART_TO_LABELS = {
   column: { xAxisLabel: "X-Axis", yAxisLabel: "Y-Axis" },
   line: { xAxisLabel: "X-Axis", yAxisLabel: "Y-Axis" },
@@ -48323,7 +48331,10 @@ function getPivotMetricOptions(pivot, selectedPivotTable, chartType) {
   }
 }
 function getChartTypeOptions(formData, dashboard) {
-  let viableCharts = CHART_TYPES;
+  const hasMultipleAggregations = (formData.pivot?.aggregations?.length ?? 0) > 1;
+  let viableCharts = CHART_TYPES.filter(
+    (chartType) => !(hasMultipleAggregations && SINGLE_AGGREGATION_CHART_TYPES.includes(chartType))
+  );
   if (dashboard && dashboard.dateFilter && dashboard.dateFilter.comparison) {
     viableCharts = viableCharts.filter(
       (chart) => ![
@@ -49848,18 +49859,23 @@ function ChartBuilder({
         (col) => col.field === pivot.rowField
       );
     }) : void 0;
-    setFormData((formData2) => ({
-      ...formData2,
+    const updatedFormData = {
+      ...formData,
       ...newPivotFormData,
-      ...keepOldChartType && { chartType: formData2.chartType },
-      dateField: dateField ? { table: dateField.name, field: pivot.rowField } : formData2.dateField
-    }));
-    setChartTypes(
-      getChartTypeOptions(
-        { ...formData, ...newPivotFormData },
-        dashboardConfig[formData.dashboardName || ""]
-      )
+      ...keepOldChartType && { chartType: formData.chartType },
+      dateField: dateField ? { table: dateField.name, field: pivot.rowField } : formData.dateField
+    };
+    const chartTypeOptions = getChartTypeOptions(
+      updatedFormData,
+      dashboardConfig[formData.dashboardName || ""]
     );
+    if (!chartTypeOptions.some(
+      (option) => option.value === updatedFormData.chartType
+    )) {
+      updatedFormData.chartType = chartTypeOptions[0]?.value ?? "table";
+    }
+    setFormData(updatedFormData);
+    setChartTypes(chartTypeOptions);
   };
   const handleDeletePivot = () => {
     if (!formData.pivot) {
@@ -61957,13 +61973,7 @@ function mergeReportBuilderTables(baseTables, tableNamesToInclude, foreignKeyMap
     if (attachedTableCount > 0) {
       continue;
     }
-    const nextTableName = remainingTableNames.shift();
-    if (!nextTableName) {
-      break;
-    }
-    attachedTables.push(
-      baseTableByName.get(nextTableName) ?? { name: nextTableName }
-    );
+    break;
   }
   return attachedTables;
 }
@@ -62209,6 +62219,11 @@ function resolveTableColumnDefaultFormat({
   }
   return currentFormat;
 }
+function resolveTableColumnLabel(fieldRaw, labelRaw) {
+  const field = String(fieldRaw ?? "").trim();
+  const label = String(labelRaw ?? "").trim();
+  return !label || label === field ? toTitleCaseLabel(field) : label;
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -62262,6 +62277,7 @@ function mergeDisplayAndSourceForTableFormats(args) {
     };
   }).filter((column) => Boolean(column));
   const formatByColumnOptionId = /* @__PURE__ */ new Map();
+  const labelByColumnOptionId = /* @__PURE__ */ new Map();
   let columnsWithTableMeta = [];
   if (normalizedSourceColumns.length > 0 && normalizedDisplayColumns.length > 0) {
     const sourceColumnsByKey = /* @__PURE__ */ new Map();
@@ -62363,21 +62379,27 @@ function mergeDisplayAndSourceForTableFormats(args) {
       const id = encodeColumnOptionValue(selection.table, selection.field);
       if (id) {
         formatByColumnOptionId.set(id, String(merged.format ?? "").trim());
+        labelByColumnOptionId.set(
+          id,
+          resolveTableColumnLabel(merged.field, merged.label)
+        );
       }
     }
     columnsWithTableMeta = selectedColumnsForTable;
   }
   const columns = columnsWithTableMeta.map((column) => {
     const field = column.field;
-    const rawLabel = String(column.label ?? "").trim();
-    const label = !rawLabel || rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
     return {
-      label,
+      label: resolveTableColumnLabel(field, column.label),
       field,
       format: column.format
     };
   });
-  return { columns, formatByColumnOptionId };
+  return {
+    columns,
+    formatByColumnOptionId,
+    labelByColumnOptionId
+  };
 }
 function axisFormatToSelectLabel(format9) {
   const raw = String(format9 ?? "").trim();
@@ -62432,9 +62454,20 @@ var CHART_TYPES2 = [
   "US map",
   "World map"
 ];
+var SINGLE_AGGREGATION_CHART_TYPES2 = [
+  "stacked",
+  "stacked bar",
+  "bar",
+  "pie",
+  "gauge",
+  "metric"
+];
 var DEFAULT_CHART_TYPE = "table";
 function getChartTypeOptions2(formData) {
-  const viableCharts = CHART_TYPES2;
+  const hasMultipleAggregations = (formData.pivot?.aggregations?.length ?? 0) > 1;
+  const viableCharts = CHART_TYPES2.filter(
+    (chartType) => !(hasMultipleAggregations && SINGLE_AGGREGATION_CHART_TYPES2.includes(chartType))
+  );
   if (formData.pivot && !formData.pivot.rowField) {
     return viableCharts.filter((elem) => ["table", "metric", "gauge"].includes(elem)).map((elem) => ({ label: elem, value: elem }));
   }
@@ -63936,16 +63969,28 @@ function useReport(reportIdArg, options = {}) {
     queryColumnsBootstrapKey
   ]);
   const datasourceOptions = useMemo33(() => {
+    const tableNames = new Set(
+      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
+    );
     const seen = /* @__PURE__ */ new Set();
     const result = [];
     for (const table2 of schemaForReportBuilderState) {
       const name2 = String(table2.name ?? "").trim();
       if (!name2 || seen.has(name2)) continue;
       seen.add(name2);
-      result.push({ value: name2, label: toTitleCaseLabel(name2) });
+      result.push({
+        value: name2,
+        label: toTitleCaseLabel(name2),
+        joinOptions: getJoinCompatibleTableNames(
+          [name2],
+          schemaForeignKeyMap
+        ).filter(
+          (candidate) => candidate !== name2 && tableNames.has(candidate)
+        )
+      });
     }
     return result;
-  }, [schemaForReportBuilderState]);
+  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const queryBuilderFieldConfigByName = useMemo33(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState
@@ -66446,7 +66491,12 @@ function useReport(reportIdArg, options = {}) {
   const chartData = useMemo33(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const chartPivot = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const settledPivot = sourceReport.pivot ?? null;
+    const settledSourceRowField = String(
+      sourceReport.pivotResultSourceRowField ?? settledPivot?.rowField ?? ""
+    ).trim();
+    const pendingPivotChangesDimensions = pendingPivotRefresh && Boolean(nextPivot) && (settledSourceRowField !== String(nextPivot?.rowField ?? "").trim() || String(settledPivot?.rowFieldTable ?? "").trim() !== String(nextPivot?.rowFieldTable ?? "").trim() || String(settledPivot?.columnField ?? "").trim() !== String(nextPivot?.columnField ?? "").trim() || String(settledPivot?.columnFieldTable ?? "").trim() !== String(nextPivot?.columnFieldTable ?? "").trim());
+    const chartPivot = pendingPivotChangesDimensions ? sourceReport.pivot ?? null : nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
       ...chartPivot,
       rowField: sourceReport.pivotResultRowField
@@ -66472,6 +66522,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport,
     chartType,
     nextPivot,
+    pendingPivotRefresh,
     effectiveReportBuilderState,
     useInMemoryEngines,
     chartPivotHydrationEpoch
@@ -67462,11 +67513,18 @@ function useReport(reportIdArg, options = {}) {
         selectedColumn?.format ?? chartFallback?.format ?? ""
       ).trim();
       const isRowPivotCol = isPivotTableChart && Boolean(pivotRowFieldForSettings) && optionField === pivotRowFieldForSettings && Boolean(rowAxisLabel);
+      const selectedLabel = String(selectedColumn?.alias ?? "").trim();
+      const pivotLabel = String(
+        isRowPivotCol ? rowAxisLabel : chartFallback?.label ?? ""
+      ).trim();
+      const persistedTableLabel = String(
+        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? tableFormatMerge.columns.find(
+          (column) => column.field === optionField
+        )?.label ?? ""
+      ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {
-        label: String(
-          selectedColumn?.alias ?? (isRowPivotCol ? rowAxisLabel : chartFallback?.label) ?? ""
-        ).trim(),
+        label: selectedLabel || pivotLabel || (!isPivotTableChart ? persistedTableLabel : ""),
         format: resolvedColFormat
       });
     }
@@ -68344,6 +68402,7 @@ function useReport(reportIdArg, options = {}) {
       ...sourceRest
     } = sourceReport;
     const isFlatTable = String(resolvedChartType).toLowerCase() === "table" && !effectiveReportBuilderState.pivot;
+    const isPivotTable = String(resolvedChartType).toLowerCase() === "table" && Boolean(effectiveReportBuilderState.pivot);
     const resp = await saveReport({
       report: {
         ...EMPTY_INTERNAL_REPORT,
@@ -68354,8 +68413,8 @@ function useReport(reportIdArg, options = {}) {
         // Match chart rendering (`chartData`): form `chartType` wins over stale `sourceReport`.
         chartType: resolvedChartType,
         dashboardName: dashboardNameForNewReport,
+        ...!isPivotTable ? { columns: table.columns } : {},
         ...isFlatTable ? {
-          columns: table.columns,
           sort: effectiveReportBuilderState.sort?.[0] ?? null
         } : {},
         reportBuilderState: effectiveReportBuilderState,

package/package.json

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