@quillsql/react 2.16.53 → 2.16.55

package/dist/index.cjs

@@ -369,8 +369,9 @@ var init_valueFormatter = __esm({
       return _getUTCDateHelper(value, "dd MMM yyyy");
     };
     format_MMM_d_MMM_d = (value, dateRange, databaseType) => {
-      const utcDate = (0, import_date_fns.parseISO)(value.split("T")[0]);
-      if (!(0, import_date_fns.isValid)(utcDate)) return "Invalid date";
+      const input = String(value);
+      const utcDate = (0, import_date_fns.parseISO)(input.split("T")[0] ?? "");
+      if (!(0, import_date_fns.isValid)(utcDate)) return input;
       let weekStartsOn = 1;
       if (databaseType && ["mssql"].includes(databaseType)) {
         weekStartsOn = 0;
@@ -32867,7 +32868,7 @@ var format_hh_ap_pm2 = (value) => _getUTCDateHelper2(value, "hh:mm aa");
 var format_MMM_dd_yyyy2 = (value) => _getUTCDateHelper2(value, "dd MMM yyyy");
 var format_MMM_dd_MMM_dd = (value) => {
   const utcDate = (0, import_date_fns_tz4.utcToZonedTime)(new Date(value), "UTC");
-  if (!(0, import_date_fns11.isValid)(utcDate)) return "Invalid date";
+  if (!(0, import_date_fns11.isValid)(utcDate)) return String(value);
   const monday = (0, import_date_fns11.startOfWeek)(utcDate, { weekStartsOn: 1 });
   const sunday = (0, import_date_fns11.endOfWeek)(utcDate, { weekStartsOn: 1 });
   if ((0, import_date_fns11.format)(monday, "MMM") === (0, import_date_fns11.format)(sunday, "MMM")) {
@@ -60774,7 +60775,7 @@ function buildAggregationLabel(aggregation, report) {
     return report?.pivot?.columnField ? "Count" : `Count ${snakeAndCamelCaseToTitleCase(tableNames[0] ?? "table")}`;
   }
   const rawTarget = aggregation.valueField ?? (tableNames.length > 0 ? tableNames.join(", ") : "table");
-  const target = report ? aggregation.valueField ? resolveValueFieldDisplayLabel(report, aggregation.valueField) : rawTarget : rawTarget;
+  const target = aggregation.valueField && report ? resolveValueFieldDisplayLabel(report, aggregation.valueField) : toTitleCaseLabel(rawTarget);
   if (String(aggregationType).toLowerCase() === "percentage") {
     const valueField2 = String(
       aggregation.valueField2 ?? ""
@@ -61924,6 +61925,20 @@ function coerceTableColumnFormatToAxisValue(raw) {
   if (byLabel) return byLabel.value;
   return t;
 }
+function resolveTableColumnDefaultFormat({
+  selectedFormat,
+  sourceFormat,
+  isDateColumn,
+  preserveStringFormat = false
+}) {
+  const explicitFormat = String(selectedFormat ?? "").trim();
+  if (explicitFormat) return explicitFormat;
+  const currentFormat = String(sourceFormat ?? "").trim() || "string";
+  if (isDateColumn && currentFormat === "string" && !preserveStringFormat) {
+    return "MMM_dd_yyyy";
+  }
+  return currentFormat;
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -62047,10 +62062,26 @@ function mergeDisplayAndSourceForTableFormats(args) {
       ).trim()}`;
       if (!seenKey || seenColumnsByTableAndField.has(seenKey)) continue;
       seenColumnsByTableAndField.add(seenKey);
+      const matchedTable = String(
+        selection.table || matchedColumn.table || ""
+      ).trim();
+      const schemaColumn = scopedSchemaColumns.find((column) => {
+        const sameField = String(column.field ?? "").trim() === matchedColumn.field;
+        const sameTable = !matchedTable || String(column.table ?? "").trim() === matchedTable;
+        return sameField && sameTable;
+      });
+      const isDateColumn = isDateType(String(schemaColumn?.fieldType ?? "").trim()) || String(schemaColumn?.jsType ?? "").trim().toLowerCase() === "date";
+      const pivotRowField = String(sourceReport?.pivot?.rowField ?? "").trim();
+      const isPivotDateBucketString = isDateColumn && matchedColumn.field === pivotRowField && String(sourceReport?.xAxisFormat ?? "").trim() === "string";
       const merged = {
         ...matchedColumn,
         ...selection.alias ? { label: selection.alias } : {},
-        ...selection.format ? { format: selection.format } : {}
+        format: resolveTableColumnDefaultFormat({
+          selectedFormat: selection.format,
+          sourceFormat: matchedColumn.format,
+          isDateColumn,
+          preserveStringFormat: isPivotDateBucketString
+        })
       };
       selectedColumnsForTable.push(merged);
       const id = encodeColumnOptionValue(selection.table, selection.field);
@@ -62123,6 +62154,7 @@ var CHART_TYPES2 = [
   "US map",
   "World map"
 ];
+var DEFAULT_CHART_TYPE = "table";
 function getChartTypeOptions2(formData) {
   const viableCharts = CHART_TYPES2;
   if (formData.pivot && !formData.pivot.rowField) {
@@ -64748,6 +64780,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     chartPivotHydrationEpoch
   ]);
+  const hasDatePivotRow = Boolean(String(pivotState?.rowField ?? "").trim()) && isDateType(String(pivotState?.rowFieldType ?? ""));
   (0, import_react61.useEffect)(() => {
     const previous = prevPivotStateForColumnExpansionRef.current;
     if (previous && !pivotState) {
@@ -65231,6 +65264,7 @@ function useReport(reportIdArg, options = {}) {
   const chartTypes = (0, import_react61.useMemo)(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
+  const resolvedChartType = chartTypes.find((option) => option.value === chartType)?.value ?? chartTypes.find((option) => option.value === sourceReport?.chartType)?.value ?? chartTypes.find((option) => option.value === DEFAULT_CHART_TYPE)?.value ?? chartTypes[0]?.value ?? DEFAULT_CHART_TYPE;
   (0, import_react61.useEffect)(() => {
     if (!sourceReport) {
       return;
@@ -66067,7 +66101,8 @@ function useReport(reportIdArg, options = {}) {
     const registerOption = (fieldRaw, labelRaw, formatRaw) => {
       const field = String(fieldRaw ?? "").trim();
       if (!field || optionsByField.has(field)) return;
-      const label = String(labelRaw ?? "").trim() || field;
+      const rawLabel = String(labelRaw ?? "").trim();
+      const label = !rawLabel || rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
       const format9 = toAxisFormat(formatRaw, "string");
       optionsByField.set(field, {
         value: field,
@@ -66186,7 +66221,8 @@ function useReport(reportIdArg, options = {}) {
       if (!field) return null;
       const option = chartAxisOptionByField.get(field);
       if (!option) return null;
-      const label = String(yAxisFieldRaw?.label ?? "").trim() || option.label;
+      const rawLabel = String(yAxisFieldRaw?.label ?? "").trim() || option.label;
+      const label = rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
       const format9 = toAxisFormat(yAxisFieldRaw?.format, option.format);
       return {
         field,
@@ -66289,7 +66325,7 @@ function useReport(reportIdArg, options = {}) {
     if (chartAxisEdits.xAxisLabel !== void 0) {
       return String(chartAxisEdits.xAxisLabel).trim();
     }
-    return defaultXLabel;
+    return !defaultXLabel || defaultXLabel === resolvedXAxisField ? toTitleCaseLabel(resolvedXAxisField) : defaultXLabel;
   }, [
     chartAxesBaseChart?.xAxisLabel,
     chartAxisEdits.xAxisLabel,
@@ -67722,7 +67758,7 @@ function useReport(reportIdArg, options = {}) {
         if (effectiveNextState.limit !== void 0)
           next.limit = effectiveNextState.limit;
         if (effectiveNextState.chartType !== void 0)
-          next.chartType = effectiveNextState.chartType || void 0;
+          next.chartType = effectiveNextState.chartType;
         const normalizedNext = processPivotState(next, {
           nextState: effectiveNextState,
           promoteColumnToRow: false,
@@ -67884,7 +67920,7 @@ function useReport(reportIdArg, options = {}) {
           String(effectiveReportBuilderState.tables[0].name)
         ) : "New report",
         // Match chart rendering (`chartData`): form `chartType` wins over stale `sourceReport`.
-        chartType: chartType ?? sourceRest.chartType ?? "table",
+        chartType: resolvedChartType,
         dashboardName: dashboardNameForNewReport,
         reportBuilderState: effectiveReportBuilderState,
         pivot: effectiveReportBuilderState.pivot ?? null,
@@ -67906,7 +67942,6 @@ function useReport(reportIdArg, options = {}) {
     });
     return resp;
   }, [
-    chartType,
     client,
     dashboardNameForNewReport,
     draftSessionId,
@@ -67917,6 +67952,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
+    resolvedChartType,
     resolvedYAxisFields,
     sourceReport,
     setDraftSessionId,
@@ -67944,7 +67980,7 @@ function useReport(reportIdArg, options = {}) {
     groupColumnsBy,
     groupColumnsByOptions,
     dateBucket,
-    dateBucketOptions: PIVOT_DATE_BUCKET_OPTIONS,
+    dateBucketOptions: hasDatePivotRow ? PIVOT_DATE_BUCKET_OPTIONS : [],
     /** Encoded selection per aggregation slot (`'sum:transactions::amount'`, `'count:transactions'`, `''` = placeholder). Update via `setReport({ aggregations: nextStringArray })`. */
     aggregations: aggregationValues,
     /** Flat aggregation pick list shared by all slots; always contains every non-empty `aggregations` entry. */
@@ -67952,7 +67988,7 @@ function useReport(reportIdArg, options = {}) {
     aggregationDescriptionOptions: cleanedAggregations,
     sort: cleanedSort,
     sortOptions,
-    chartType,
+    chartType: resolvedChartType,
     chartTypeOptions: chartTypes,
     /** Selected tabular columns in display order. */
     columns: tableColumnValues,
@@ -68168,7 +68204,7 @@ function ChatChartCard({
                   label: "Chart type",
                   width: 200,
                   options: chartTypeOptions,
-                  onChange: (e) => setReport({ chartType: e.target.value ?? "" })
+                  onChange: (e) => setReport({ chartType: e.target.value })
                 }
               )
             ]
@@ -68858,12 +68894,10 @@ function useReportFilterDraft(args) {
   const [draftQuery, setDraftQuery] = (0, import_react64.useState)(committed);
   const [hasUnappliedFilterChanges, setHasUnappliedFilterChanges] = (0, import_react64.useState)(false);
   const draftResetKey = `${reportId}|${committedSignature}|${resetEpoch}`;
-  const prevDraftResetKeyRef = (0, import_react64.useRef)(draftResetKey);
-  if (prevDraftResetKeyRef.current !== draftResetKey) {
-    prevDraftResetKeyRef.current = draftResetKey;
-    setDraftQuery(committed);
-    if (hasUnappliedFilterChanges) setHasUnappliedFilterChanges(false);
-  }
+  (0, import_react64.useEffect)(() => {
+    setDraftQuery(committedRef.current);
+    setHasUnappliedFilterChanges(false);
+  }, [draftResetKey]);
   const filterDraftKey = `${draftResetKey}|${fieldsSignature}`;
   const handleQueryChange = (0, import_react64.useCallback)((next) => {
     if (!isQueryBuilderDisplayGroup(next)) return;

package/dist/index.d.cts

@@ -2982,6 +2982,12 @@ type FilterFieldOptions = {
 type SetFiltersInput = QueryBuilderRuleGroup | ((prev: QueryBuilderRuleGroup) => QueryBuilderRuleGroup);
 /** Maps table column format dropdown values to persisted report column `format` (used by `columnActions.update`). */
 declare function tableColumnFormatFromUiSelection(raw: string): string;
+declare const CHART_TYPES: readonly ["column", "stacked", "line", "table", "metric", "gauge", "bar", "pie", "US map", "World map"];
+type ChartType = (typeof CHART_TYPES)[number];
+type ChartTypeOption = {
+    label: string;
+    value: ChartType;
+};
 type SetReportChartAxesInput = {
     xAxis?: Partial<{
         field: string;
@@ -3023,7 +3029,7 @@ interface SetReportBuilderInput {
     aggregations?: string[] | AggregationStateItem[] | string;
     sort?: ReportBuilderSort[] | string;
     limit?: ReportBuilderLimit | null;
-    chartType?: string;
+    chartType?: ChartType;
     /** When set, updates chart legend visibility (same source as `showLegend` from `useReport`). */
     showLegend?: boolean;
     /** Update the X-axis value returned by `useReport`. */
@@ -3208,11 +3214,8 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
         label: string;
         value: string;
     }[];
-    chartType: string | undefined;
-    chartTypeOptions: {
-        label: string;
-        value: string;
-    }[];
+    chartType: "table" | "column" | "metric" | "gauge" | "stacked" | "line" | "bar" | "pie" | "US map" | "World map";
+    chartTypeOptions: ChartTypeOption[];
     /** Selected tabular columns in display order. */
     columns: ReportColumnValue[];
     /** Pivot table columns only allow label and format changes. */
@@ -3267,10 +3270,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
     /** True while `report-builder-unique-values` runs for filter value options (not chart/table load). */
     filterUniqueValuesLoading: boolean;
     limit: ReportBuilderLimit | null;
-    chartTypes: {
-        label: string;
-        value: string;
-    }[];
+    chartTypes: ChartTypeOption[];
     columnsOptions: ColumnSelectionOption[];
     tableColumnOptions: ColumnSelectionOption[];
     setReport: (nextState: SetReportBuilderInput) => void;
@@ -4452,4 +4452,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, 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, 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

@@ -2982,6 +2982,12 @@ type FilterFieldOptions = {
 type SetFiltersInput = QueryBuilderRuleGroup | ((prev: QueryBuilderRuleGroup) => QueryBuilderRuleGroup);
 /** Maps table column format dropdown values to persisted report column `format` (used by `columnActions.update`). */
 declare function tableColumnFormatFromUiSelection(raw: string): string;
+declare const CHART_TYPES: readonly ["column", "stacked", "line", "table", "metric", "gauge", "bar", "pie", "US map", "World map"];
+type ChartType = (typeof CHART_TYPES)[number];
+type ChartTypeOption = {
+    label: string;
+    value: ChartType;
+};
 type SetReportChartAxesInput = {
     xAxis?: Partial<{
         field: string;
@@ -3023,7 +3029,7 @@ interface SetReportBuilderInput {
     aggregations?: string[] | AggregationStateItem[] | string;
     sort?: ReportBuilderSort[] | string;
     limit?: ReportBuilderLimit | null;
-    chartType?: string;
+    chartType?: ChartType;
     /** When set, updates chart legend visibility (same source as `showLegend` from `useReport`). */
     showLegend?: boolean;
     /** Update the X-axis value returned by `useReport`. */
@@ -3208,11 +3214,8 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
         label: string;
         value: string;
     }[];
-    chartType: string | undefined;
-    chartTypeOptions: {
-        label: string;
-        value: string;
-    }[];
+    chartType: "table" | "column" | "metric" | "gauge" | "stacked" | "line" | "bar" | "pie" | "US map" | "World map";
+    chartTypeOptions: ChartTypeOption[];
     /** Selected tabular columns in display order. */
     columns: ReportColumnValue[];
     /** Pivot table columns only allow label and format changes. */
@@ -3267,10 +3270,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
     /** True while `report-builder-unique-values` runs for filter value options (not chart/table load). */
     filterUniqueValuesLoading: boolean;
     limit: ReportBuilderLimit | null;
-    chartTypes: {
-        label: string;
-        value: string;
-    }[];
+    chartTypes: ChartTypeOption[];
     columnsOptions: ColumnSelectionOption[];
     tableColumnOptions: ColumnSelectionOption[];
     setReport: (nextState: SetReportBuilderInput) => void;
@@ -4452,4 +4452,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, 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, 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

@@ -383,8 +383,9 @@ var init_valueFormatter = __esm({
       return _getUTCDateHelper(value, "dd MMM yyyy");
     };
     format_MMM_d_MMM_d = (value, dateRange, databaseType) => {
-      const utcDate = parseISO(value.split("T")[0]);
-      if (!isValid(utcDate)) return "Invalid date";
+      const input = String(value);
+      const utcDate = parseISO(input.split("T")[0] ?? "");
+      if (!isValid(utcDate)) return input;
       let weekStartsOn = 1;
       if (databaseType && ["mssql"].includes(databaseType)) {
         weekStartsOn = 0;
@@ -32909,7 +32910,7 @@ var format_hh_ap_pm2 = (value) => _getUTCDateHelper2(value, "hh:mm aa");
 var format_MMM_dd_yyyy2 = (value) => _getUTCDateHelper2(value, "dd MMM yyyy");
 var format_MMM_dd_MMM_dd = (value) => {
   const utcDate = utcToZonedTime4(new Date(value), "UTC");
-  if (!isValid5(utcDate)) return "Invalid date";
+  if (!isValid5(utcDate)) return String(value);
   const monday = startOfWeek5(utcDate, { weekStartsOn: 1 });
   const sunday = endOfWeek2(utcDate, { weekStartsOn: 1 });
   if (format5(monday, "MMM") === format5(sunday, "MMM")) {
@@ -60986,7 +60987,7 @@ function buildAggregationLabel(aggregation, report) {
     return report?.pivot?.columnField ? "Count" : `Count ${snakeAndCamelCaseToTitleCase(tableNames[0] ?? "table")}`;
   }
   const rawTarget = aggregation.valueField ?? (tableNames.length > 0 ? tableNames.join(", ") : "table");
-  const target = report ? aggregation.valueField ? resolveValueFieldDisplayLabel(report, aggregation.valueField) : rawTarget : rawTarget;
+  const target = aggregation.valueField && report ? resolveValueFieldDisplayLabel(report, aggregation.valueField) : toTitleCaseLabel(rawTarget);
   if (String(aggregationType).toLowerCase() === "percentage") {
     const valueField2 = String(
       aggregation.valueField2 ?? ""
@@ -62136,6 +62137,20 @@ function coerceTableColumnFormatToAxisValue(raw) {
   if (byLabel) return byLabel.value;
   return t;
 }
+function resolveTableColumnDefaultFormat({
+  selectedFormat,
+  sourceFormat,
+  isDateColumn,
+  preserveStringFormat = false
+}) {
+  const explicitFormat = String(selectedFormat ?? "").trim();
+  if (explicitFormat) return explicitFormat;
+  const currentFormat = String(sourceFormat ?? "").trim() || "string";
+  if (isDateColumn && currentFormat === "string" && !preserveStringFormat) {
+    return "MMM_dd_yyyy";
+  }
+  return currentFormat;
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -62259,10 +62274,26 @@ function mergeDisplayAndSourceForTableFormats(args) {
       ).trim()}`;
       if (!seenKey || seenColumnsByTableAndField.has(seenKey)) continue;
       seenColumnsByTableAndField.add(seenKey);
+      const matchedTable = String(
+        selection.table || matchedColumn.table || ""
+      ).trim();
+      const schemaColumn = scopedSchemaColumns.find((column) => {
+        const sameField = String(column.field ?? "").trim() === matchedColumn.field;
+        const sameTable = !matchedTable || String(column.table ?? "").trim() === matchedTable;
+        return sameField && sameTable;
+      });
+      const isDateColumn = isDateType(String(schemaColumn?.fieldType ?? "").trim()) || String(schemaColumn?.jsType ?? "").trim().toLowerCase() === "date";
+      const pivotRowField = String(sourceReport?.pivot?.rowField ?? "").trim();
+      const isPivotDateBucketString = isDateColumn && matchedColumn.field === pivotRowField && String(sourceReport?.xAxisFormat ?? "").trim() === "string";
       const merged = {
         ...matchedColumn,
         ...selection.alias ? { label: selection.alias } : {},
-        ...selection.format ? { format: selection.format } : {}
+        format: resolveTableColumnDefaultFormat({
+          selectedFormat: selection.format,
+          sourceFormat: matchedColumn.format,
+          isDateColumn,
+          preserveStringFormat: isPivotDateBucketString
+        })
       };
       selectedColumnsForTable.push(merged);
       const id = encodeColumnOptionValue(selection.table, selection.field);
@@ -62335,6 +62366,7 @@ var CHART_TYPES2 = [
   "US map",
   "World map"
 ];
+var DEFAULT_CHART_TYPE = "table";
 function getChartTypeOptions2(formData) {
   const viableCharts = CHART_TYPES2;
   if (formData.pivot && !formData.pivot.rowField) {
@@ -64960,6 +64992,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     chartPivotHydrationEpoch
   ]);
+  const hasDatePivotRow = Boolean(String(pivotState?.rowField ?? "").trim()) && isDateType(String(pivotState?.rowFieldType ?? ""));
   useEffect31(() => {
     const previous = prevPivotStateForColumnExpansionRef.current;
     if (previous && !pivotState) {
@@ -65443,6 +65476,7 @@ function useReport(reportIdArg, options = {}) {
   const chartTypes = useMemo32(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
+  const resolvedChartType = chartTypes.find((option) => option.value === chartType)?.value ?? chartTypes.find((option) => option.value === sourceReport?.chartType)?.value ?? chartTypes.find((option) => option.value === DEFAULT_CHART_TYPE)?.value ?? chartTypes[0]?.value ?? DEFAULT_CHART_TYPE;
   useEffect31(() => {
     if (!sourceReport) {
       return;
@@ -66279,7 +66313,8 @@ function useReport(reportIdArg, options = {}) {
     const registerOption = (fieldRaw, labelRaw, formatRaw) => {
       const field = String(fieldRaw ?? "").trim();
       if (!field || optionsByField.has(field)) return;
-      const label = String(labelRaw ?? "").trim() || field;
+      const rawLabel = String(labelRaw ?? "").trim();
+      const label = !rawLabel || rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
       const format9 = toAxisFormat(formatRaw, "string");
       optionsByField.set(field, {
         value: field,
@@ -66398,7 +66433,8 @@ function useReport(reportIdArg, options = {}) {
       if (!field) return null;
       const option = chartAxisOptionByField.get(field);
       if (!option) return null;
-      const label = String(yAxisFieldRaw?.label ?? "").trim() || option.label;
+      const rawLabel = String(yAxisFieldRaw?.label ?? "").trim() || option.label;
+      const label = rawLabel === field ? toTitleCaseLabel(field) : rawLabel;
       const format9 = toAxisFormat(yAxisFieldRaw?.format, option.format);
       return {
         field,
@@ -66501,7 +66537,7 @@ function useReport(reportIdArg, options = {}) {
     if (chartAxisEdits.xAxisLabel !== void 0) {
       return String(chartAxisEdits.xAxisLabel).trim();
     }
-    return defaultXLabel;
+    return !defaultXLabel || defaultXLabel === resolvedXAxisField ? toTitleCaseLabel(resolvedXAxisField) : defaultXLabel;
   }, [
     chartAxesBaseChart?.xAxisLabel,
     chartAxisEdits.xAxisLabel,
@@ -67934,7 +67970,7 @@ function useReport(reportIdArg, options = {}) {
         if (effectiveNextState.limit !== void 0)
           next.limit = effectiveNextState.limit;
         if (effectiveNextState.chartType !== void 0)
-          next.chartType = effectiveNextState.chartType || void 0;
+          next.chartType = effectiveNextState.chartType;
         const normalizedNext = processPivotState(next, {
           nextState: effectiveNextState,
           promoteColumnToRow: false,
@@ -68096,7 +68132,7 @@ function useReport(reportIdArg, options = {}) {
           String(effectiveReportBuilderState.tables[0].name)
         ) : "New report",
         // Match chart rendering (`chartData`): form `chartType` wins over stale `sourceReport`.
-        chartType: chartType ?? sourceRest.chartType ?? "table",
+        chartType: resolvedChartType,
         dashboardName: dashboardNameForNewReport,
         reportBuilderState: effectiveReportBuilderState,
         pivot: effectiveReportBuilderState.pivot ?? null,
@@ -68118,7 +68154,6 @@ function useReport(reportIdArg, options = {}) {
     });
     return resp;
   }, [
-    chartType,
     client,
     dashboardNameForNewReport,
     draftSessionId,
@@ -68129,6 +68164,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat,
     resolvedXAxisLabel,
+    resolvedChartType,
     resolvedYAxisFields,
     sourceReport,
     setDraftSessionId,
@@ -68156,7 +68192,7 @@ function useReport(reportIdArg, options = {}) {
     groupColumnsBy,
     groupColumnsByOptions,
     dateBucket,
-    dateBucketOptions: PIVOT_DATE_BUCKET_OPTIONS,
+    dateBucketOptions: hasDatePivotRow ? PIVOT_DATE_BUCKET_OPTIONS : [],
     /** Encoded selection per aggregation slot (`'sum:transactions::amount'`, `'count:transactions'`, `''` = placeholder). Update via `setReport({ aggregations: nextStringArray })`. */
     aggregations: aggregationValues,
     /** Flat aggregation pick list shared by all slots; always contains every non-empty `aggregations` entry. */
@@ -68164,7 +68200,7 @@ function useReport(reportIdArg, options = {}) {
     aggregationDescriptionOptions: cleanedAggregations,
     sort: cleanedSort,
     sortOptions,
-    chartType,
+    chartType: resolvedChartType,
     chartTypeOptions: chartTypes,
     /** Selected tabular columns in display order. */
     columns: tableColumnValues,
@@ -68380,7 +68416,7 @@ function ChatChartCard({
                   label: "Chart type",
                   width: 200,
                   options: chartTypeOptions,
-                  onChange: (e) => setReport({ chartType: e.target.value ?? "" })
+                  onChange: (e) => setReport({ chartType: e.target.value })
                 }
               )
             ]
@@ -69004,7 +69040,7 @@ function Chat({
 }
 
 // src/hooks/useReportFilterDraft.ts
-import { useCallback as useCallback6, useMemo as useMemo34, useRef as useRef26, useState as useState43 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect33, useMemo as useMemo34, useRef as useRef26, useState as useState43 } from "react";
 var normalizeOperatorKey = (operator) => String(operator ?? "").trim().toLowerCase().replace(/[_\s]+/g, "");
 var defaultFilterRuleValueForOperator = (operator) => {
   const key = normalizeOperatorKey(operator);
@@ -69070,12 +69106,10 @@ function useReportFilterDraft(args) {
   const [draftQuery, setDraftQuery] = useState43(committed);
   const [hasUnappliedFilterChanges, setHasUnappliedFilterChanges] = useState43(false);
   const draftResetKey = `${reportId}|${committedSignature}|${resetEpoch}`;
-  const prevDraftResetKeyRef = useRef26(draftResetKey);
-  if (prevDraftResetKeyRef.current !== draftResetKey) {
-    prevDraftResetKeyRef.current = draftResetKey;
-    setDraftQuery(committed);
-    if (hasUnappliedFilterChanges) setHasUnappliedFilterChanges(false);
-  }
+  useEffect33(() => {
+    setDraftQuery(committedRef.current);
+    setHasUnappliedFilterChanges(false);
+  }, [draftResetKey]);
   const filterDraftKey = `${draftResetKey}|${fieldsSignature}`;
   const handleQueryChange = useCallback6((next) => {
     if (!isQueryBuilderDisplayGroup(next)) return;
@@ -69390,7 +69424,7 @@ function ReportDetail({
 init_valueFormatter();
 
 // src/hooks/useTenants.ts
-import { useContext as useContext39, useEffect as useEffect33 } from "react";
+import { useContext as useContext39, useEffect as useEffect34 } from "react";
 var useTenants = (dashboardName) => {
   const {
     tenants,
@@ -69404,12 +69438,12 @@ var useTenants = (dashboardName) => {
     getMappedTenantsForDashboard,
     getViewerTenantsByOwner
   } = useContext39(TenantContext);
-  useEffect33(() => {
+  useEffect34(() => {
     if (dashboardName) {
       fetchViewerTenantsForDashboard(dashboardName);
     }
   }, [dashboardName, fetchViewerTenantsForDashboard]);
-  useEffect33(() => {
+  useEffect34(() => {
     if (dashboardName) {
       fetchMappedTenantsForDashboard(dashboardName);
     }
@@ -69428,7 +69462,7 @@ var useTenants = (dashboardName) => {
 };
 
 // src/hooks/useQuill.ts
-import { useContext as useContext40, useEffect as useEffect34, useMemo as useMemo35, useState as useState45 } from "react";
+import { useContext as useContext40, useEffect as useEffect35, useMemo as useMemo35, useState as useState45 } from "react";
 init_paginationProcessing();
 init_tableProcessing();
 init_dataProcessing();
@@ -69611,7 +69645,7 @@ var useQuill = (reportId, pagination) => {
       setLoading(false);
     }
   };
-  useEffect34(() => {
+  useEffect35(() => {
     if (isClientLoading) return;
     if (reportId && specificReportFilters) {
       fetchReportHelper(reportId, {
@@ -69678,7 +69712,7 @@ var useMemoizedRows = (reportId) => {
 };
 
 // src/hooks/useAskQuill.tsx
-import { useContext as useContext41, useEffect as useEffect35, useState as useState46 } from "react";
+import { useContext as useContext41, useEffect as useEffect36, useState as useState46 } from "react";
 init_astProcessing();
 init_astFilterProcessing();
 init_pivotProcessing();
@@ -69924,7 +69958,7 @@ var useAskQuill = (dashboardName) => {
     });
     setLoading(false);
   };
-  useEffect35(() => {
+  useEffect36(() => {
     setAsk(() => askHelper);
   }, [schemaData.schema]);
   return {

package/package.json

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