@quillsql/react 2.16.48 → 2.16.49

package/dist/index.cjs

@@ -21022,7 +21022,6 @@ __export(index_exports, {
   Table: () => Table_default,
   ThemeContext: () => ThemeContext,
   areQueryBuilderFilterDraftsDirty: () => areQueryBuilderFilterDraftsDirty,
-  buildSeededFilterQuery: () => buildSeededFilterQuery,
   countFilterRules: () => countFilterRules,
   defaultFilterRuleValueForOperator: () => defaultFilterRuleValueForOperator,
   downloadCSV: () => downloadCSV,
@@ -21047,6 +21046,7 @@ __export(index_exports, {
   useQuill: () => useQuill,
   useReport: () => useReport,
   useReportBuilder: () => useReportBuilder,
+  useReportQueryBuilder: () => useReportQueryBuilder,
   useReports: () => useReports,
   useTenants: () => useTenants,
   useVirtualTables: () => useVirtualTables
@@ -58434,13 +58434,13 @@ function ChartEditor({
 }
 
 // src/Chat.tsx
-var import_react64 = require("react");
+var import_react63 = require("react");
 
 // src/ChatChartCard.tsx
-var import_react63 = require("react");
+var import_react62 = require("react");
 
 // src/hooks/useForm.tsx
-var import_react62 = require("react");
+var import_react61 = require("react");
 var import_react_query2 = require("@tanstack/react-query");
 init_Filter();
 init_ReportBuilder();
@@ -59449,171 +59449,6 @@ function countFilterRules(value) {
   }, 0);
 }
 
-// src/hooks/useReportFilterDraft.ts
-var import_react61 = require("react");
-var normalizeOperatorKey = (operator) => String(operator ?? "").trim().toLowerCase().replace(/[_\s]+/g, "");
-var defaultFilterRuleValueForOperator = (operator) => {
-  const key = normalizeOperatorKey(operator);
-  if (key === "in" || key === "notin") {
-    return [];
-  }
-  return "";
-};
-var buildSeededFilterQuery = (queryBuilderProps) => {
-  const fieldData = queryBuilderProps?.fields?.[0];
-  const fieldName = String(fieldData?.name ?? "").trim();
-  let operator = "in";
-  const firstOperator = queryBuilderProps?.getOperators?.(fieldName, {
-    fieldData
-  })?.[0];
-  if (firstOperator) {
-    operator = String(firstOperator.name ?? firstOperator.value ?? "in");
-  }
-  return {
-    combinator: "and",
-    rules: [
-      {
-        field: fieldName,
-        operator,
-        value: defaultFilterRuleValueForOperator(operator)
-      }
-    ]
-  };
-};
-var EMPTY_COMMITTED_FILTERS = {
-  combinator: "and",
-  rules: []
-};
-var hashString2 = (input) => {
-  let hash = 2166136261;
-  for (let i = 0; i < input.length; i++) {
-    hash ^= input.charCodeAt(i);
-    hash = Math.imul(hash, 16777619);
-  }
-  return String(hash >>> 0);
-};
-var fieldCatalogSignature = (fields) => {
-  const names = fields.map((field) => String(field.name ?? "").trim()).filter(Boolean).sort();
-  return `${names.length}:${hashString2(names.join("\0"))}`;
-};
-var committedFiltersSignature = (committed) => {
-  try {
-    return hashString2(
-      JSON.stringify(stripQueryBuilderTransientFields(committed))
-    );
-  } catch {
-    return "unserializable";
-  }
-};
-function useReportFilterDraft(args) {
-  const { reportId, committedFilters, queryBuilderProps, setFilters } = args;
-  const committed = isQueryBuilderDisplayGroup(committedFilters) ? committedFilters : EMPTY_COMMITTED_FILTERS;
-  const committedRef = (0, import_react61.useRef)(committed);
-  committedRef.current = committed;
-  const setFiltersRef = (0, import_react61.useRef)(setFilters);
-  setFiltersRef.current = setFilters;
-  const lastNonEmptyFieldsRef = (0, import_react61.useRef)([]);
-  const prevReportIdForFieldsRef = (0, import_react61.useRef)(reportId);
-  if (prevReportIdForFieldsRef.current !== reportId) {
-    prevReportIdForFieldsRef.current = reportId;
-    lastNonEmptyFieldsRef.current = [];
-  }
-  if (queryBuilderProps.fields.length > 0) {
-    lastNonEmptyFieldsRef.current = queryBuilderProps.fields;
-  }
-  const effectiveFields = queryBuilderProps.fields.length > 0 ? queryBuilderProps.fields : lastNonEmptyFieldsRef.current;
-  const effectiveFieldsRef = (0, import_react61.useRef)(effectiveFields);
-  effectiveFieldsRef.current = effectiveFields;
-  const getOperatorsRef = (0, import_react61.useRef)(queryBuilderProps.getOperators);
-  getOperatorsRef.current = queryBuilderProps.getOperators;
-  const committedSignature = (0, import_react61.useMemo)(
-    () => committedFiltersSignature(committed),
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- `committed` normalizes null to a stable constant
-    [committedFilters]
-  );
-  const fieldsSignature = (0, import_react61.useMemo)(
-    () => fieldCatalogSignature(effectiveFields),
-    [effectiveFields]
-  );
-  const [resetEpoch, setResetEpoch] = (0, import_react61.useState)(0);
-  const [seedEpoch, setSeedEpoch] = (0, import_react61.useState)(0);
-  const draftRef = (0, import_react61.useRef)(committed);
-  const [isFilterDraftDirty, setIsFilterDraftDirty] = (0, import_react61.useState)(false);
-  const [isFilterDraftEmpty, setIsFilterDraftEmpty] = (0, import_react61.useState)(
-    committed.rules.length === 0
-  );
-  const draftResetKey = `${reportId}|${committedSignature}|${resetEpoch}`;
-  const prevDraftResetKeyRef = (0, import_react61.useRef)(draftResetKey);
-  if (prevDraftResetKeyRef.current !== draftResetKey) {
-    prevDraftResetKeyRef.current = draftResetKey;
-    draftRef.current = committed;
-    const nextEmpty = committed.rules.length === 0;
-    if (isFilterDraftDirty) setIsFilterDraftDirty(false);
-    if (isFilterDraftEmpty !== nextEmpty) setIsFilterDraftEmpty(nextEmpty);
-  }
-  const filterDraftKey = `${draftResetKey}|${seedEpoch}|${fieldsSignature}`;
-  const handleQueryChange = (0, import_react61.useCallback)((next) => {
-    if (!isQueryBuilderDisplayGroup(next)) return;
-    const nextGroup = next;
-    draftRef.current = nextGroup;
-    const nextDirty = areQueryBuilderFilterDraftsDirty(
-      nextGroup,
-      committedRef.current
-    );
-    const nextEmpty = nextGroup.rules.length === 0;
-    setIsFilterDraftDirty((prev) => prev === nextDirty ? prev : nextDirty);
-    setIsFilterDraftEmpty((prev) => prev === nextEmpty ? prev : nextEmpty);
-  }, []);
-  const commitFilterDraft = (0, import_react61.useCallback)(() => {
-    setFiltersRef.current(draftRef.current);
-  }, []);
-  const resetFilterDraft = (0, import_react61.useCallback)(() => {
-    draftRef.current = committedRef.current;
-    setIsFilterDraftDirty(false);
-    setIsFilterDraftEmpty(committedRef.current.rules.length === 0);
-    setResetEpoch((epoch) => epoch + 1);
-  }, []);
-  const seedFilterDraft = (0, import_react61.useCallback)(() => {
-    const seeded = buildSeededFilterQuery({
-      fields: effectiveFieldsRef.current,
-      getOperators: getOperatorsRef.current
-    });
-    draftRef.current = seeded;
-    setIsFilterDraftDirty(
-      areQueryBuilderFilterDraftsDirty(seeded, committedRef.current)
-    );
-    setIsFilterDraftEmpty(false);
-    setSeedEpoch((epoch) => epoch + 1);
-  }, []);
-  const getDefaultValue = (0, import_react61.useCallback)(
-    (rule) => defaultFilterRuleValueForOperator(rule?.operator),
-    []
-  );
-  const filterDraftQueryBuilderProps = (0, import_react61.useMemo)(
-    () => ({
-      ...queryBuilderProps,
-      fields: effectiveFields,
-      // Uncontrolled: react-querybuilder owns the draft; only read at mount,
-      // so passing the live draft means popover/remount cycles keep edits.
-      defaultQuery: draftRef.current,
-      onQueryChange: handleQueryChange,
-      addRuleToNewGroups: true,
-      getDefaultValue
-    }),
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- filterDraftKey covers draftRef resets
-    [queryBuilderProps, effectiveFields, handleQueryChange, getDefaultValue, filterDraftKey]
-  );
-  return {
-    filterDraftKey,
-    filterDraftQueryBuilderProps,
-    isFilterDraftDirty,
-    isFilterDraftEmpty,
-    commitFilterDraft,
-    resetFilterDraft,
-    seedFilterDraft
-  };
-}
-
 // src/hooks/useFormRefreshDecision.ts
 var normalize = (value) => String(value ?? "").trim();
 var toColumnKey = (table, field) => `${table}::${field}`;
@@ -59871,6 +59706,13 @@ var AGGREGATION_OPTION_TYPES = [
 var QUERY_BUILDER_MULTI_VALUE_OPERATORS = /* @__PURE__ */ new Set(["in", "notin"]);
 var TABLE_FORMAT_CACHE_MAX_ENTRIES = 5e3;
 var PIVOT_DATE_BUCKET_FORMAT_OPTIONS = ["date"];
+var PIVOT_DATE_BUCKET_OPTIONS = [
+  { label: "Automatic", value: "" },
+  { label: "Daily", value: "day" },
+  { label: "Weekly", value: "week" },
+  { label: "Monthly", value: "month" },
+  { label: "Yearly", value: "year" }
+];
 var AXIS_FORMAT_OPTIONS = [
   { value: "string", label: "string" },
   { value: "whole_number", label: "whole number" },
@@ -59933,6 +59775,10 @@ var logUseFormPivotShapeDebug = (label, payload) => {
   if (!isUseFormPivotShapeDebugEnabled()) return;
   console.log(`[useReport][pivot-shape] ${label}`, payload);
 };
+var BOOLEAN_FILTER_VALUE_OPTIONS = [
+  { name: "true", label: "True", value: "true" },
+  { name: "false", label: "False", value: "false" }
+];
 function canonicalTablesForFilterUniqueValuesQueryKey(tables) {
   return (tables ?? []).map((table) => {
     const name2 = String(table?.name ?? "").trim();
@@ -62075,9 +61921,6 @@ function getChartTypeOptions2(formData) {
     (elem) => !(formData.pivot && formData.pivot.columnField && (elem === "bar" || elem === "pie" || elem === "US map" || elem === "World map"))
   ).map((elem) => ({ label: elem, value: elem }));
 }
-function isSetReportTableColumnSidebarPatch(columns) {
-  return Boolean(columns) && typeof columns === "object" && !Array.isArray(columns) && "patch" in columns && typeof columns.patch === "object" && columns.patch !== null && typeof columns.patch.id === "string";
-}
 function processPivotState(next, options = {}) {
   const {
     nextState,
@@ -62134,7 +61977,10 @@ function processPivotState(next, options = {}) {
         }
         const valueField = String(aggregation.valueField ?? "").trim();
         if (!valueField) {
-          return { ...aggregation, aggregationType: "count" };
+          return {
+            ...aggregation,
+            aggregationType: "count"
+          };
         }
         const valueField2 = String(aggregation.valueField2 ?? "").trim();
         if (valueField2 && valueField2 !== valueField) {
@@ -63146,10 +62992,10 @@ function generateDraftSessionId() {
 }
 function useReport(reportIdArg, options = {}) {
   const propReportId = String(reportIdArg ?? "").trim();
-  const [createdReportId, setCreatedReportId] = (0, import_react62.useState)(null);
+  const [createdReportId, setCreatedReportId] = (0, import_react61.useState)(null);
   const effectiveReportId = propReportId || createdReportId || "";
-  const { eventTracking } = (0, import_react62.useContext)(EventTrackingContext);
-  const [draftSessionId, setDraftSessionId] = (0, import_react62.useState)(generateDraftSessionId);
+  const { eventTracking } = (0, import_react61.useContext)(EventTrackingContext);
+  const [draftSessionId, setDraftSessionId] = (0, import_react61.useState)(generateDraftSessionId);
   const useInMemoryEngines = options.useInMemoryEngines ?? false;
   const restrictFieldOptionsToSelectedDatasources = options.restrictFieldOptionsToSelectedDatasources ?? true;
   const reportOverride = options.reportOverride ?? null;
@@ -63158,30 +63004,30 @@ function useReport(reportIdArg, options = {}) {
     options.destinationDashboardName ?? ""
   ).trim();
   const controlledPagination = options.state?.pagination;
-  const initialPaginationRef = (0, import_react62.useRef)({
+  const initialPaginationRef = (0, import_react61.useRef)({
     ...getDefaultPaginationState(),
     ...options.initialState?.pagination ?? {}
   });
-  const [internalPagination, setInternalPagination] = (0, import_react62.useState)(
+  const [internalPagination, setInternalPagination] = (0, import_react61.useState)(
     initialPaginationRef.current
   );
-  const [paginationInteracted, setPaginationInteracted] = (0, import_react62.useState)(
+  const [paginationInteracted, setPaginationInteracted] = (0, import_react61.useState)(
     () => Boolean(
       options.state?.pagination || options.initialState?.pagination || options.onPaginationChange
     )
   );
   const pagination = controlledPagination ?? internalPagination;
   const paginationActive = paginationInteracted || Boolean(controlledPagination);
-  const paginationRef = (0, import_react62.useRef)(pagination);
+  const paginationRef = (0, import_react61.useRef)(pagination);
   paginationRef.current = pagination;
-  const onPaginationChangeRef = (0, import_react62.useRef)(options.onPaginationChange);
+  const onPaginationChangeRef = (0, import_react61.useRef)(options.onPaginationChange);
   onPaginationChangeRef.current = options.onPaginationChange;
-  const controlledPaginationRef = (0, import_react62.useRef)(Boolean(controlledPagination));
+  const controlledPaginationRef = (0, import_react61.useRef)(Boolean(controlledPagination));
   controlledPaginationRef.current = Boolean(controlledPagination);
-  const autoResetPageIndexRef = (0, import_react62.useRef)(true);
+  const autoResetPageIndexRef = (0, import_react61.useRef)(true);
   autoResetPageIndexRef.current = options.autoResetPageIndex ?? true;
-  const paginationPageCountRef = (0, import_react62.useRef)(-1);
-  const applyPaginationUpdate = (0, import_react62.useCallback)(
+  const paginationPageCountRef = (0, import_react61.useRef)(-1);
+  const applyPaginationUpdate = (0, import_react61.useCallback)(
     (updater, { activate = true } = {}) => {
       if (activate) {
         setPaginationInteracted(true);
@@ -63193,11 +63039,11 @@ function useReport(reportIdArg, options = {}) {
     },
     []
   );
-  const setPagination = (0, import_react62.useCallback)(
+  const setPagination = (0, import_react61.useCallback)(
     (updater) => applyPaginationUpdate(updater),
     [applyPaginationUpdate]
   );
-  const setPageIndex = (0, import_react62.useCallback)(
+  const setPageIndex = (0, import_react61.useCallback)(
     (updater) => applyPaginationUpdate((old) => ({
       ...old,
       pageIndex: clampPageIndex(
@@ -63207,7 +63053,7 @@ function useReport(reportIdArg, options = {}) {
     })),
     [applyPaginationUpdate]
   );
-  const setPageSize = (0, import_react62.useCallback)(
+  const setPageSize = (0, import_react61.useCallback)(
     (updater) => applyPaginationUpdate(
       (old) => paginationStateAfterPageSizeChange(
         old,
@@ -63216,62 +63062,64 @@ function useReport(reportIdArg, options = {}) {
     ),
     [applyPaginationUpdate]
   );
-  const resetPagination = (0, import_react62.useCallback)(
+  const resetPagination = (0, import_react61.useCallback)(
     (defaultState) => applyPaginationUpdate(
       defaultState ? getDefaultPaginationState() : initialPaginationRef.current
     ),
     [applyPaginationUpdate]
   );
-  const resetPageIndex = (0, import_react62.useCallback)(
+  const resetPageIndex = (0, import_react61.useCallback)(
     (defaultState) => {
       const target = defaultState ? 0 : initialPaginationRef.current.pageIndex;
       setPageIndex(target);
     },
     [setPageIndex]
   );
-  const resetPageSize = (0, import_react62.useCallback)(
+  const resetPageSize = (0, import_react61.useCallback)(
     (defaultState) => {
       const target = defaultState ? getDefaultPaginationState().pageSize : initialPaginationRef.current.pageSize;
       setPageSize(target);
     },
     [setPageSize]
   );
-  const nextPage = (0, import_react62.useCallback)(
+  const nextPage = (0, import_react61.useCallback)(
     () => setPageIndex((old) => old + 1),
     [setPageIndex]
   );
-  const previousPage = (0, import_react62.useCallback)(
+  const previousPage = (0, import_react61.useCallback)(
     () => setPageIndex((old) => old - 1),
     [setPageIndex]
   );
-  const firstPage = (0, import_react62.useCallback)(() => setPageIndex(0), [setPageIndex]);
-  const lastPage = (0, import_react62.useCallback)(
+  const firstPage = (0, import_react61.useCallback)(() => setPageIndex(0), [setPageIndex]);
+  const lastPage = (0, import_react61.useCallback)(
     () => setPageIndex(paginationPageCountRef.current - 1),
     [setPageIndex]
   );
-  const chartPivotHydratedFromSourceRef = (0, import_react62.useRef)(false);
-  const lastPivotHydrateCompletedSourceIdRef = (0, import_react62.useRef)(null);
-  const groupRowsBySetViaSetReportRef = (0, import_react62.useRef)(false);
-  const groupColumnsBySetViaSetReportRef = (0, import_react62.useRef)(false);
-  const aggregationStateSetViaSetReportRef = (0, import_react62.useRef)(false);
-  const prevReportIdForChartPivotHydrationRef = (0, import_react62.useRef)(effectiveReportId);
+  const chartPivotHydratedFromSourceRef = (0, import_react61.useRef)(false);
+  const lastPivotHydrateCompletedSourceIdRef = (0, import_react61.useRef)(null);
+  const groupRowsBySetViaSetReportRef = (0, import_react61.useRef)(false);
+  const groupColumnsBySetViaSetReportRef = (0, import_react61.useRef)(false);
+  const dateBucketSetViaSetReportRef = (0, import_react61.useRef)(false);
+  const aggregationStateSetViaSetReportRef = (0, import_react61.useRef)(false);
+  const prevReportIdForChartPivotHydrationRef = (0, import_react61.useRef)(effectiveReportId);
   if (prevReportIdForChartPivotHydrationRef.current !== effectiveReportId) {
     prevReportIdForChartPivotHydrationRef.current = effectiveReportId;
     chartPivotHydratedFromSourceRef.current = false;
     groupRowsBySetViaSetReportRef.current = false;
     groupColumnsBySetViaSetReportRef.current = false;
+    dateBucketSetViaSetReportRef.current = false;
     aggregationStateSetViaSetReportRef.current = false;
   }
-  const [chartPivotHydrationEpoch, setChartPivotHydrationEpoch] = (0, import_react62.useState)(0);
+  const [chartPivotHydrationEpoch, setChartPivotHydrationEpoch] = (0, import_react61.useState)(0);
   const [
     expandReportBuilderColumnsForFlatTable,
     setExpandReportBuilderColumnsForFlatTable
-  ] = (0, import_react62.useState)(false);
-  const prevPivotStateForColumnExpansionRef = (0, import_react62.useRef)(null);
-  const [sourceReport, setSourceReport] = (0, import_react62.useState)(
+  ] = (0, import_react61.useState)(false);
+  const prevPivotStateForColumnExpansionRef = (0, import_react61.useRef)(null);
+  const [sourceReport, setSourceReport] = (0, import_react61.useState)(
     null
   );
-  const prevSourceReportIdForPivotHydrationRef = (0, import_react62.useRef)(null);
+  const prevSourceReportIdForPivotHydrationRef = (0, import_react61.useRef)(null);
   {
     const currentSourceId = sourceReport ? String(
       sourceReport.id ?? sourceReport._id ?? ""
@@ -63283,15 +63131,15 @@ function useReport(reportIdArg, options = {}) {
       lastPivotHydrateCompletedSourceIdRef.current = null;
     }
   }
-  const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = (0, import_react62.useState)(false);
-  const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = (0, import_react62.useState)(null);
-  const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = (0, import_react62.useState)(null);
-  const [chartAxisEdits, setChartAxisEdits] = (0, import_react62.useState)({});
-  const [chartVisibilityOverrides, setChartVisibilityOverrides] = (0, import_react62.useState)({});
-  const [client] = (0, import_react62.useContext)(ClientContext);
-  const [schemaData] = (0, import_react62.useContext)(SchemaDataContext);
-  const { tenants, flags } = (0, import_react62.useContext)(TenantContext);
-  const { getToken } = (0, import_react62.useContext)(FetchContext);
+  const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = (0, import_react61.useState)(false);
+  const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = (0, import_react61.useState)(null);
+  const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = (0, import_react61.useState)(null);
+  const [chartAxisEdits, setChartAxisEdits] = (0, import_react61.useState)({});
+  const [chartVisibilityOverrides, setChartVisibilityOverrides] = (0, import_react61.useState)({});
+  const [client] = (0, import_react61.useContext)(ClientContext);
+  const [schemaData] = (0, import_react61.useContext)(SchemaDataContext);
+  const { tenants, flags } = (0, import_react61.useContext)(TenantContext);
+  const { getToken } = (0, import_react61.useContext)(FetchContext);
   const clientDefaultDashboardName = String(
     client?.defaultDashboard?.name ?? ""
   ).trim();
@@ -63300,7 +63148,7 @@ function useReport(reportIdArg, options = {}) {
     clientDefaultDashboardName,
     destinationDashboardName
   ].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
-  const initialFormState = (0, import_react62.useMemo)(
+  const initialFormState = (0, import_react61.useMemo)(
     () => ({
       columns: [],
       queryColumns: [],
@@ -63308,6 +63156,7 @@ function useReport(reportIdArg, options = {}) {
       queryFilters: { combinator: "and", rules: [] },
       groupRowsBy: void 0,
       groupColumnsBy: void 0,
+      dateBucket: void 0,
       aggregationState: [],
       aggregationTablesByIndex: [],
       pivotSort: void 0,
@@ -63318,7 +63167,7 @@ function useReport(reportIdArg, options = {}) {
     }),
     []
   );
-  const [formRuntimeState, dispatchFormRuntime] = (0, import_react62.useReducer)(
+  const [formRuntimeState, dispatchFormRuntime] = (0, import_react61.useReducer)(
     useFormReducer,
     initialFormState,
     createInitialUseFormReducerState
@@ -63337,6 +63186,7 @@ function useReport(reportIdArg, options = {}) {
     queryFilters,
     groupRowsBy,
     groupColumnsBy,
+    dateBucket,
     aggregationState,
     aggregationTablesByIndex,
     pivotSort,
@@ -63346,32 +63196,32 @@ function useReport(reportIdArg, options = {}) {
     schemaDatasourceIds
   } = formState;
   const schemaDatasourceIdsKey = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).join("\0") ?? "";
-  const queryColumnsBootstrapKey = (0, import_react62.useMemo)(
+  const queryColumnsBootstrapKey = (0, import_react61.useMemo)(
     () => queryColumns.map(
       (c) => `${String(c.table ?? "").trim()}\0${String(c.field ?? "").trim()}`
     ).join("\n"),
     [queryColumns]
   );
-  const dashboardNameForNewReport = (0, import_react62.useMemo)(() => {
+  const dashboardNameForNewReport = (0, import_react61.useMemo)(() => {
     return [clientDefaultDashboardName, destinationDashboardName].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   }, [clientDefaultDashboardName, destinationDashboardName]);
-  const filterStackRef = (0, import_react62.useRef)(filterStack);
+  const filterStackRef = (0, import_react61.useRef)(filterStack);
   filterStackRef.current = filterStack;
   const resolvedGroupRowsBy = decodePivotGroupOptionValue(groupRowsBy);
   const resolvedGroupColumnsBy = decodePivotGroupOptionValue(groupColumnsBy);
   const useFormRefreshDebugEnabled = isUseFormRefreshDebugEnabled();
   const useFormFiltersDebugEnabled = isUseFormFiltersDebugEnabled();
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (propReportId) {
       setCreatedReportId(null);
     }
   }, [propReportId]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     setChartAxisEdits({});
     setChartVisibilityOverrides({});
   }, [effectiveReportId]);
-  const bootstrapReportTaskUsedForReportIdRef = (0, import_react62.useRef)(null);
-  const schemaScopeInitializedForReportIdRef = (0, import_react62.useRef)(null);
+  const bootstrapReportTaskUsedForReportIdRef = (0, import_react61.useRef)(null);
+  const schemaScopeInitializedForReportIdRef = (0, import_react61.useRef)(null);
   const initializeSchemaScopeForReport = (report) => {
     if (!report) return;
     if (schemaScopeInitializedForReportIdRef.current === effectiveReportId)
@@ -63384,26 +63234,26 @@ function useReport(reportIdArg, options = {}) {
     );
     schemaScopeInitializedForReportIdRef.current = effectiveReportId;
   };
-  const internalFilters = (0, import_react62.useMemo)(
+  const internalFilters = (0, import_react61.useMemo)(
     () => internalFiltersFromFilterStack(filterStack),
     [filterStack]
   );
-  const customFilters = (0, import_react62.useMemo)(
+  const customFilters = (0, import_react61.useMemo)(
     () => customFiltersFromFilterStack(filterStack),
     [filterStack]
   );
-  const reloadKey = (0, import_react62.useMemo)(() => 0, []);
-  const schemaForReportBuilderState = (0, import_react62.useMemo)(() => {
+  const reloadKey = (0, import_react61.useMemo)(() => 0, []);
+  const schemaForReportBuilderState = (0, import_react61.useMemo)(() => {
     if (schemaData.schemaWithCustomFields?.length) {
       return schemaData.schemaWithCustomFields;
     }
     return schemaData.schema ?? [];
   }, [schemaData.schema, schemaData.schemaWithCustomFields]);
-  const schemaForReportBuilderStateRef = (0, import_react62.useRef)(schemaForReportBuilderState);
-  const customFieldsRef = (0, import_react62.useRef)(schemaData.customFields);
+  const schemaForReportBuilderStateRef = (0, import_react61.useRef)(schemaForReportBuilderState);
+  const customFieldsRef = (0, import_react61.useRef)(schemaData.customFields);
   schemaForReportBuilderStateRef.current = schemaForReportBuilderState;
   customFieldsRef.current = schemaData.customFields;
-  const isBoolAggregationField = (0, import_react62.useCallback)(
+  const isBoolAggregationField = (0, import_react61.useCallback)(
     (field, table2) => {
       const fieldType = resolveFieldType({
         field,
@@ -63416,19 +63266,19 @@ function useReport(reportIdArg, options = {}) {
     },
     []
   );
-  const schemaForeignKeyMap = (0, import_react62.useMemo)(
+  const schemaForeignKeyMap = (0, import_react61.useMemo)(
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
   );
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
-  const selectedBaseTableNamesForFieldOptions = (0, import_react62.useMemo)(() => {
+  const selectedBaseTableNamesForFieldOptions = (0, import_react61.useMemo)(() => {
     const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
     if (fromPicker.length > 0) {
       return fromPicker;
     }
     return (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean);
   }, [schemaDatasourceIdsKey, reportBuilderBaseTableNamesKey]);
-  const fieldOptionsAllowedTableNames = (0, import_react62.useMemo)(() => {
+  const fieldOptionsAllowedTableNames = (0, import_react61.useMemo)(() => {
     if (!restrictFieldOptionsToSelectedDatasources) {
       return null;
     }
@@ -63440,7 +63290,7 @@ function useReport(reportIdArg, options = {}) {
     restrictFieldOptionsToSelectedDatasources,
     selectedBaseTableNamesForFieldOptions
   ]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (reportOverride) return;
     if (propReportId) return;
     if (createdReportId) return;
@@ -63530,18 +63380,18 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     queryColumnsBootstrapKey
   ]);
-  const datasourceOptions = (0, import_react62.useMemo)(() => {
+  const datasourceOptions = (0, import_react61.useMemo)(() => {
     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({ id: name2, label: toTitleCaseLabel(name2) });
+      result.push({ value: name2, label: toTitleCaseLabel(name2) });
     }
     return result;
   }, [schemaForReportBuilderState]);
-  const queryBuilderFieldConfigByName = (0, import_react62.useMemo)(() => {
+  const queryBuilderFieldConfigByName = (0, import_react61.useMemo)(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState
     );
@@ -63675,7 +63525,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.columns,
     sourceReport?.reportBuilderState?.columns
   ]);
-  const filterUniqueValuesRequest = (0, import_react62.useMemo)(() => {
+  const filterUniqueValuesRequest = (0, import_react61.useMemo)(() => {
     const dashboardName = resolvedSourceDashboardName;
     const reportBuilderStateFromSource = sourceReport?.reportBuilderState;
     const isStringReportBuilderColumn = (column) => {
@@ -63896,20 +63746,20 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.reportBuilderState,
     resolvedSourceDashboardName
   ]);
-  const filterUniqueValuesRequestHash = (0, import_react62.useMemo)(
+  const filterUniqueValuesRequestHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(
       filterUniqueValuesRequestForQueryKey(filterUniqueValuesRequest)
     ),
     [filterUniqueValuesRequest]
   );
-  const customFiltersHashForUniqueValues = (0, import_react62.useMemo)(
+  const customFiltersHashForUniqueValues = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(customFilters),
     [customFilters]
   );
   const filterUniqueValuesEnabled = Boolean(
     client && client?.queryEndpoint && filterUniqueValuesRequest && filterUniqueValuesRequest.stringColumns.length > 0
   );
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!useFormFiltersDebugEnabled) return;
     const hasClient = Boolean(client);
     const hasQueryEndpoint = Boolean(client?.queryEndpoint);
@@ -63999,7 +63849,7 @@ function useReport(reportIdArg, options = {}) {
     enabled: filterUniqueValuesEnabled,
     retry: false
   });
-  const backendUniqueValuesByFieldName = (0, import_react62.useMemo)(() => {
+  const backendUniqueValuesByFieldName = (0, import_react61.useMemo)(() => {
     const valuesByField = /* @__PURE__ */ new Map();
     const uniqueValuesByColumn = filterUniqueValuesQuery.data?.uniqueValuesByColumn;
     if (!uniqueValuesByColumn || typeof uniqueValuesByColumn !== "object") {
@@ -64032,7 +63882,7 @@ function useReport(reportIdArg, options = {}) {
     filterUniqueValuesQuery.data?.uniqueValuesByColumn,
     filterUniqueValuesRequest?.stringColumnsByTable
   ]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!useFormFiltersDebugEnabled) return;
     if (filterUniqueValuesQuery.status !== "success" && filterUniqueValuesQuery.status !== "error") {
       return;
@@ -64048,7 +63898,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     useFormFiltersDebugEnabled
   ]);
-  const filterValueOptionsByFieldName = (0, import_react62.useMemo)(() => {
+  const filterValueOptionsByFieldName = (0, import_react61.useMemo)(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     const selectedMultiselectByField = collectSelectedStringMultiselectValuesByField(queryFilters);
     const collectValuesForField = (fieldName) => {
@@ -64114,7 +63964,7 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const filterFieldsComputed = (0, import_react62.useMemo)(() => {
+  const filterFieldsComputed = (0, import_react61.useMemo)(() => {
     const fields = [];
     const seen = /* @__PURE__ */ new Set();
     const addField = (fieldName, fieldType, tableName, rawFieldName) => {
@@ -64215,9 +64065,9 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const filterFieldsStableReportIdRef = (0, import_react62.useRef)("");
-  const filterFieldsStableCacheRef = (0, import_react62.useRef)([]);
-  const filterFields = (0, import_react62.useMemo)(() => {
+  const filterFieldsStableReportIdRef = (0, import_react61.useRef)("");
+  const filterFieldsStableCacheRef = (0, import_react61.useRef)([]);
+  const filterFields = (0, import_react61.useMemo)(() => {
     const rid = String(effectiveReportId ?? "");
     if (filterFieldsStableReportIdRef.current !== rid) {
       filterFieldsStableReportIdRef.current = rid;
@@ -64232,14 +64082,14 @@ function useReport(reportIdArg, options = {}) {
     }
     return filterFieldsComputed;
   }, [effectiveReportId, filterFieldsComputed]);
-  const getFilterOperators = (0, import_react62.useMemo)(
+  const getFilterOperators = (0, import_react61.useMemo)(
     () => (_field, misc) => {
       const fieldType = misc?.fieldData?.quillFieldType ?? queryBuilderFieldConfigByName[String(_field ?? "").trim()]?.fieldType ?? "string";
       return QUERY_BUILDER_OPERATORS_BY_FIELD_TYPE[fieldType] ?? QUERY_BUILDER_OPERATORS_BY_FIELD_TYPE.string;
     },
     [queryBuilderFieldConfigByName]
   );
-  const getFilterInputType = (0, import_react62.useMemo)(
+  const getFilterInputType = (0, import_react61.useMemo)(
     () => (_field, operator, misc) => {
       const fieldType = misc?.fieldData?.quillFieldType ?? queryBuilderFieldConfigByName[String(_field ?? "").trim()]?.fieldType ?? "string";
       if (fieldType === "date" && isRelativeDateQueryBuilderOperator(operator)) {
@@ -64249,17 +64099,20 @@ function useReport(reportIdArg, options = {}) {
     },
     [queryBuilderFieldConfigByName]
   );
-  const getFilterValueEditorType = (0, import_react62.useMemo)(
+  const getFilterValueEditorType = (0, import_react61.useMemo)(
     () => (_field, operator, misc) => {
       const fieldType = misc?.fieldData?.quillFieldType ?? queryBuilderFieldConfigByName[String(_field ?? "").trim()]?.fieldType;
       if (fieldType === "string" && isMultiValueOperator(operator)) {
         return "multiselect";
       }
+      if (fieldType === "boolean") {
+        return "select";
+      }
       return void 0;
     },
     [queryBuilderFieldConfigByName]
   );
-  const getFilterValues = (0, import_react62.useMemo)(
+  const getFilterValues = (0, import_react61.useMemo)(
     () => (_field, operator, misc) => {
       const fieldName = String(_field ?? "").trim();
       if (!fieldName) {
@@ -64270,6 +64123,9 @@ function useReport(reportIdArg, options = {}) {
         misc,
         queryBuilderFieldConfigByName
       );
+      if (fieldType === "boolean") {
+        return BOOLEAN_FILTER_VALUE_OPTIONS;
+      }
       if (fieldType !== "string" || !isMultiValueOperator(operator)) {
         return [];
       }
@@ -64286,7 +64142,7 @@ function useReport(reportIdArg, options = {}) {
     },
     [filterValueOptionsByFieldName, queryBuilderFieldConfigByName]
   );
-  const filterQueryBuilderProps = (0, import_react62.useMemo)(
+  const filterQueryBuilderProps = (0, import_react61.useMemo)(
     () => ({
       fields: filterFields,
       listsAsArrays: true,
@@ -64303,7 +64159,7 @@ function useReport(reportIdArg, options = {}) {
       getFilterValues
     ]
   );
-  const filtersForQueryBuilder = (0, import_react62.useMemo)(
+  const filtersForQueryBuilder = (0, import_react61.useMemo)(
     () => canonicalizeMultiselectStringRulesToOptionValues(
       queryFilters,
       filterValueOptionsByFieldName,
@@ -64370,12 +64226,12 @@ function useReport(reportIdArg, options = {}) {
       ...table2 ? { table: table2 } : {}
     };
   };
-  const tenantHash = (0, import_react62.useMemo)(
+  const tenantHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(tenants),
     [tenants]
   );
-  const flagHash = (0, import_react62.useMemo)(() => stableSerializeForQueryKey(flags), [flags]);
-  const clientHash = (0, import_react62.useMemo)(
+  const flagHash = (0, import_react61.useMemo)(() => stableSerializeForQueryKey(flags), [flags]);
+  const clientHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey({
       publicKey: client?.publicKey,
       clientId: client?.clientId,
@@ -64383,16 +64239,16 @@ function useReport(reportIdArg, options = {}) {
     }),
     [client]
   );
-  const reloadKeyHash = (0, import_react62.useMemo)(
+  const reloadKeyHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(reloadKey),
     [reloadKey]
   );
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!reportOverride) return;
     initializeSchemaScopeForReport(reportOverride);
     setSourceReport(reportOverride);
   }, [reportOverride, propReportId]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     schemaScopeInitializedForReportIdRef.current = null;
     bootstrapReportTaskUsedForReportIdRef.current = null;
     setPreserveSchemaWideOptions(false);
@@ -64416,6 +64272,7 @@ function useReport(reportIdArg, options = {}) {
           // grouping from the prior report would otherwise win over the new report.
           groupRowsBy: void 0,
           groupColumnsBy: void 0,
+          dateBucket: void 0,
           aggregationState: [],
           aggregationTablesByIndex: [],
           pivotSort: void 0,
@@ -64497,13 +64354,13 @@ function useReport(reportIdArg, options = {}) {
   const sourceReportNameForTitle = String(sourceReport?.name ?? "").trim();
   const reportTitleFromTask = String(reportNameQuery.data?.name ?? "").trim();
   const resolvedReportName = reportNameQueryReportId && sourceReportIdForTitle === reportNameQueryReportId && sourceReportNameForTitle ? sourceReportNameForTitle : reportTitleFromTask || sourceReportNameForTitle || "";
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (reportOverride) return;
     const report = initialLoadQuery.data?.report ?? null;
     initializeSchemaScopeForReport(report);
     setSourceReport(report);
   }, [initialLoadQuery.data, reportOverride, effectiveReportId]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!sourceReport) {
       return;
     }
@@ -64602,6 +64459,8 @@ function useReport(reportIdArg, options = {}) {
         const sourceDisplayColumns = sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
         const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
         const nextGroupColumnsBy = shouldTakePivotGroupsFromSource ? groupColumnsBySetViaSetReportRef.current ? prev.groupColumnsBy : sourceColumnGroupOption : prev.groupColumnsBy !== void 0 ? prev.groupColumnsBy : prev.groupRowsBy !== void 0 ? prev.groupColumnsBy : sourceColumnGroupOption;
+        const sourceDateBucket = sourceReport.pivot?.dateBucket ?? sourceReport.reportBuilderState?.pivot?.dateBucket;
+        const nextDateBucket = dateBucketSetViaSetReportRef.current ? prev.dateBucket : sourceDateBucket;
         const nextFromSource = {
           ...prev,
           queryColumns: prev.queryColumns.length ? prev.queryColumns : sourceQueryColumns,
@@ -64610,6 +64469,7 @@ function useReport(reportIdArg, options = {}) {
           queryFilters: nextQueryFilters,
           groupRowsBy: nextGroupRowsBy,
           groupColumnsBy: nextGroupColumnsBy,
+          dateBucket: nextDateBucket,
           aggregationState: nextAggregationState,
           aggregationTablesByIndex: nextAggregationTablesByIndex,
           pivotSort: prev.pivotSort ?? (sourceReport.pivot?.sort && sourceReport.pivot?.sortField && sourceReport.pivot?.sortDirection ? {
@@ -64642,11 +64502,11 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     sourceReport
   ]);
-  const appliedAggregationState = (0, import_react62.useMemo)(
+  const appliedAggregationState = (0, import_react61.useMemo)(
     () => aggregationState.filter(isAppliedAggregation),
     [aggregationState]
   );
-  const pivotState = (0, import_react62.useMemo)(() => {
+  const pivotState = (0, import_react61.useMemo)(() => {
     if (!resolvedGroupRowsBy && !resolvedGroupColumnsBy && appliedAggregationState.length === 0) {
       return null;
     }
@@ -64690,6 +64550,7 @@ function useReport(reportIdArg, options = {}) {
       rowFieldType,
       columnField: effectiveColumnField,
       columnFieldType,
+      dateBucket: chartPivotHydratedFromSourceRef.current ? dateBucket : dateBucket ?? priorPivot?.dateBucket,
       aggregations,
       ...rowFieldTable ? { rowFieldTable } : {},
       ...columnFieldTable ? { columnFieldTable } : {}
@@ -64700,6 +64561,7 @@ function useReport(reportIdArg, options = {}) {
     aggregationTablesByIndex,
     appliedAggregationState,
     baseReportBuilderTables,
+    dateBucket,
     groupColumnsBy,
     groupRowsBy,
     schemaForReportBuilderState,
@@ -64711,7 +64573,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     chartPivotHydrationEpoch
   ]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     const previous = prevPivotStateForColumnExpansionRef.current;
     if (previous && !pivotState) {
       setExpandReportBuilderColumnsForFlatTable(true);
@@ -64721,7 +64583,7 @@ function useReport(reportIdArg, options = {}) {
     }
     prevPivotStateForColumnExpansionRef.current = pivotState;
   }, [pivotState]);
-  const effectiveReportBuilderTables = (0, import_react62.useMemo)(() => {
+  const effectiveReportBuilderTables = (0, import_react61.useMemo)(() => {
     const explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) && schemaDatasourceIds.length > 0 ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
     const baseTablesForMerge = explicitBaseFromSchemaPicker ?? baseReportBuilderTables;
     return mergeReportBuilderTables(
@@ -64745,28 +64607,18 @@ function useReport(reportIdArg, options = {}) {
     queryColumns,
     schemaDatasourceIds
   ]);
-  const datasources = (0, import_react62.useMemo)(() => {
-    return effectiveReportBuilderTables.map((table2) => {
-      const name2 = String(table2.name ?? "").trim();
-      if (!name2) return null;
-      const alias = String(table2.alias ?? "").trim();
-      return {
-        id: name2,
-        label: alias || name2
-      };
-    }).filter(
-      (entry) => Boolean(entry)
-    );
+  const datasources = (0, import_react61.useMemo)(() => {
+    return effectiveReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2));
   }, [effectiveReportBuilderTables]);
-  const effectiveReportBuilderTableNames = (0, import_react62.useMemo)(
+  const effectiveReportBuilderTableNames = (0, import_react61.useMemo)(
     () => effectiveReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [effectiveReportBuilderTables]
   );
-  const baseReportBuilderTableNames = (0, import_react62.useMemo)(
+  const baseReportBuilderTableNames = (0, import_react61.useMemo)(
     () => baseReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [baseReportBuilderTables]
   );
-  const normalizeQueryBuilderFieldNameForConfig = (0, import_react62.useMemo)(() => {
+  const normalizeQueryBuilderFieldNameForConfig = (0, import_react61.useMemo)(() => {
     const configEntries = Object.entries(queryBuilderFieldConfigByName);
     const preferredTableNames = /* @__PURE__ */ new Set([
       ...effectiveReportBuilderTableNames,
@@ -64828,7 +64680,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportBuilderTableNames,
     queryBuilderFieldConfigByName
   ]);
-  const normalizeQueryBuilderFiltersForConfig = (0, import_react62.useMemo)(() => {
+  const normalizeQueryBuilderFiltersForConfig = (0, import_react61.useMemo)(() => {
     const normalizeGroup = (group) => {
       const groupRules = Array.isArray(group.rules) ? group.rules : [];
       const nextRules = groupRules.map((entry) => {
@@ -64865,14 +64717,14 @@ function useReport(reportIdArg, options = {}) {
       return normalizeGroup(group);
     };
   }, [normalizeQueryBuilderFieldNameForConfig, queryBuilderFieldConfigByName]);
-  const refreshSelectionTables = (0, import_react62.useMemo)(() => {
+  const refreshSelectionTables = (0, import_react61.useMemo)(() => {
     return [
       getPivotGroupOptionTable(groupRowsBy),
       getPivotGroupOptionTable(groupColumnsBy),
       ...aggregationTablesByIndex
     ].map((tableName) => String(tableName ?? "").trim()).filter((tableName) => Boolean(tableName));
   }, [aggregationTablesByIndex, groupColumnsBy, groupRowsBy]);
-  const refreshSelectionFields = (0, import_react62.useMemo)(() => {
+  const refreshSelectionFields = (0, import_react61.useMemo)(() => {
     const resolveFieldTableForSelection = (field, tableHint) => {
       const fieldName = String(field ?? "").trim();
       if (!fieldName) return "";
@@ -64922,7 +64774,7 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     sourceReport
   ]);
-  const refreshDecision = (0, import_react62.useMemo)(
+  const refreshDecision = (0, import_react61.useMemo)(
     () => decideReportBuilderRefresh({
       baseTables: baseReportBuilderTables,
       baseColumns: baseReportBuilderColumns,
@@ -64936,7 +64788,7 @@ function useReport(reportIdArg, options = {}) {
       refreshSelectionTables
     ]
   );
-  const effectiveReportBuilderColumns = (0, import_react62.useMemo)(() => {
+  const effectiveReportBuilderColumns = (0, import_react61.useMemo)(() => {
     const columnsFromPivot = [];
     const appendPivotColumn = (field, tableHint) => {
       const normalizedField = String(field ?? "").trim();
@@ -64999,7 +64851,7 @@ function useReport(reportIdArg, options = {}) {
     queryColumns,
     sourceReport
   ]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!Array.isArray(filterStack) || filterStack.length === 0) {
       return;
     }
@@ -65034,7 +64886,7 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const resolvedSortFieldType = (0, import_react62.useMemo)(() => {
+  const resolvedSortFieldType = (0, import_react61.useMemo)(() => {
     const sortField = pivotSort?.sortField;
     if (!sortField || !pivotState) return void 0;
     if (sortField === resolvedGroupRowsBy) {
@@ -65055,7 +64907,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupColumnsBy,
     resolvedGroupRowsBy
   ]);
-  const effectiveReportBuilderState = (0, import_react62.useMemo)(() => {
+  const effectiveReportBuilderState = (0, import_react61.useMemo)(() => {
     if (!sourceReport && effectiveReportBuilderTables.length === 0) {
       return void 0;
     }
@@ -65094,12 +64946,12 @@ function useReport(reportIdArg, options = {}) {
     resolvedSortFieldType,
     sourceReport
   ]);
-  const effectiveReportBuilderStateHash = (0, import_react62.useMemo)(
+  const effectiveReportBuilderStateHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(effectiveReportBuilderState),
     [effectiveReportBuilderState]
   );
-  const prevPaginationResetStateHashRef = (0, import_react62.useRef)(null);
-  (0, import_react62.useEffect)(() => {
+  const prevPaginationResetStateHashRef = (0, import_react61.useRef)(null);
+  (0, import_react61.useEffect)(() => {
     const prevHash = prevPaginationResetStateHashRef.current;
     prevPaginationResetStateHashRef.current = effectiveReportBuilderStateHash;
     if (prevHash === null || prevHash === effectiveReportBuilderStateHash) {
@@ -65115,7 +64967,7 @@ function useReport(reportIdArg, options = {}) {
       activate: false
     });
   }, [applyPaginationUpdate, effectiveReportBuilderStateHash]);
-  const pivotTableDataReportBuilderState = (0, import_react62.useMemo)(() => {
+  const pivotTableDataReportBuilderState = (0, import_react61.useMemo)(() => {
     if (!effectiveReportBuilderState?.pivot) {
       return void 0;
     }
@@ -65135,11 +64987,11 @@ function useReport(reportIdArg, options = {}) {
       limit: null
     };
   }, [effectiveReportBuilderState, schemaForReportBuilderState]);
-  const pivotTableDataReportBuilderStateHash = (0, import_react62.useMemo)(
+  const pivotTableDataReportBuilderStateHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(pivotTableDataReportBuilderState),
     [pivotTableDataReportBuilderState]
   );
-  const sourceReportMatchesEffectiveReportId = (0, import_react62.useMemo)(() => {
+  const sourceReportMatchesEffectiveReportId = (0, import_react61.useMemo)(() => {
     const loadTarget = String(effectiveReportId ?? "").trim();
     if (!loadTarget || !sourceReport) {
       return true;
@@ -65149,7 +65001,7 @@ function useReport(reportIdArg, options = {}) {
     ).trim();
     return sid === loadTarget;
   }, [effectiveReportId, sourceReport]);
-  const shouldSkipRedundantFlatTableReportBuilderQuery = (0, import_react62.useMemo)(() => {
+  const shouldSkipRedundantFlatTableReportBuilderQuery = (0, import_react61.useMemo)(() => {
     if (!sourceReport || pivotState) {
       return false;
     }
@@ -65204,7 +65056,7 @@ function useReport(reportIdArg, options = {}) {
     enabled: tableRefreshQueryEnabled,
     retry: false
   });
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!tableRefreshQueryEnabled) return;
     const report = tableRefreshQuery.data?.report;
     if (tableRefreshQuery.data?.error || !report) return;
@@ -65215,10 +65067,10 @@ function useReport(reportIdArg, options = {}) {
     tableRefreshQueryEnabled,
     useFormRefreshDebugEnabled
   ]);
-  const chartTypes = (0, import_react62.useMemo)(() => {
+  const chartTypes = (0, import_react61.useMemo)(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!sourceReport) {
       return;
     }
@@ -65253,7 +65105,7 @@ function useReport(reportIdArg, options = {}) {
       });
     }
   }, [chartType, chartTypes, sourceReport]);
-  const schemaScopedTableNames = (0, import_react62.useMemo)(() => {
+  const schemaScopedTableNames = (0, import_react61.useMemo)(() => {
     if (preserveSchemaWideOptions) {
       return [];
     }
@@ -65268,7 +65120,7 @@ function useReport(reportIdArg, options = {}) {
     preserveSchemaWideOptions,
     sourceReport?.reportBuilderState?.tables
   ]);
-  const joinCompatibleSchemaTableNames = (0, import_react62.useMemo)(() => {
+  const joinCompatibleSchemaTableNames = (0, import_react61.useMemo)(() => {
     if (schemaScopedTableNames.length === 0) {
       return [];
     }
@@ -65277,7 +65129,7 @@ function useReport(reportIdArg, options = {}) {
       schemaForeignKeyMap
     );
   }, [schemaForeignKeyMap, schemaScopedTableNames]);
-  const aggregationFallbackTarget = (0, import_react62.useMemo)(() => {
+  const aggregationFallbackTarget = (0, import_react61.useMemo)(() => {
     const tableNames = effectiveReportBuilderTables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const referencedTableNames = (sourceReport?.referencedTables ?? []).filter(
       (name2) => typeof name2 === "string" && name2.length > 0
@@ -65285,7 +65137,7 @@ function useReport(reportIdArg, options = {}) {
     const tableNamesToUse = tableNames.length ? tableNames : referencedTableNames;
     return tableNamesToUse.length > 0 ? tableNamesToUse.join(", ") : "table";
   }, [effectiveReportBuilderTables, sourceReport?.referencedTables]);
-  const aggregationFallbackTableName = (0, import_react62.useMemo)(() => {
+  const aggregationFallbackTableName = (0, import_react61.useMemo)(() => {
     const tableNames = effectiveReportBuilderTables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const referencedTableNames = (sourceReport?.referencedTables ?? []).filter(
       (name2) => typeof name2 === "string" && name2.length > 0
@@ -65293,7 +65145,7 @@ function useReport(reportIdArg, options = {}) {
     const tableNamesToUse = tableNames.length ? tableNames : referencedTableNames;
     return tableNamesToUse[0] ?? "table";
   }, [effectiveReportBuilderTables, sourceReport?.referencedTables]);
-  const cleanedAggregations = (0, import_react62.useMemo)(() => {
+  const cleanedAggregations = (0, import_react61.useMemo)(() => {
     return aggregationState.filter((aggregation) => Boolean(aggregation?.aggregationType)).map((aggregation, index) => {
       const aggregationType = String(aggregation.aggregationType);
       const normalizedAggregationType = aggregationType.toLowerCase();
@@ -65315,7 +65167,7 @@ function useReport(reportIdArg, options = {}) {
     aggregationTablesByIndex,
     isBoolAggregationField
   ]);
-  const { aggregationBaseOptions, aggregationOptionTableLookup } = (0, import_react62.useMemo)(() => {
+  const { aggregationBaseOptions, aggregationOptionTableLookup } = (0, import_react61.useMemo)(() => {
     const joinScoped = fieldOptionsAllowedTableNames ? joinCompatibleSchemaTableNames.filter(
       (name2) => fieldOptionsAllowedTableNames.has(name2)
     ) : joinCompatibleSchemaTableNames;
@@ -65361,7 +65213,7 @@ function useReport(reportIdArg, options = {}) {
           if (!canAggregateColumn(column, aggregationType)) continue;
           const isNumberSharePercentage = aggregationType === "percentage" && !isBoolColumn;
           if (isNumberSharePercentage && !resolvedGroupRowsBy) continue;
-          const value = `${aggregationType}:${fieldName}`;
+          const value = tableName ? `${aggregationType}:${tableName}::${fieldName}` : `${aggregationType}:${fieldName}`;
           if (seen.has(value)) continue;
           const aggregationWord = aggregationType === "percentage" ? isBoolColumn ? "Percent" : "Percent of Total" : formatAggregationTypeForDisplay(aggregationType);
           options2.push({
@@ -65369,8 +65221,14 @@ function useReport(reportIdArg, options = {}) {
             label: tableName ? `${aggregationWord} ${toTitleCaseLabel(tableName)} ${toTitleCaseLabel(fieldName)}` : `${aggregationWord} ${toTitleCaseLabel(fieldName)}`
           });
           seen.add(value);
-          if (tableName && !tableLookup.has(value)) {
-            tableLookup.set(value, tableName);
+          if (tableName) {
+            if (!tableLookup.has(value)) {
+              tableLookup.set(value, tableName);
+            }
+            const unqualifiedValue = `${aggregationType}:${fieldName}`;
+            if (!tableLookup.has(unqualifiedValue)) {
+              tableLookup.set(unqualifiedValue, tableName);
+            }
           }
         }
       }
@@ -65392,7 +65250,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupRowsBy,
     schemaForReportBuilderState
   ]);
-  const { schemaColumnOptions, columnIdentifierLookup } = (0, import_react62.useMemo)(() => {
+  const { schemaColumnOptions, columnIdentifierLookup } = (0, import_react61.useMemo)(() => {
     const lookup = /* @__PURE__ */ new Map();
     const options2 = [];
     for (const table2 of schemaData.schemaWithCustomFields) {
@@ -65419,7 +65277,7 @@ function useReport(reportIdArg, options = {}) {
       columnIdentifierLookup: lookup
     };
   }, [schemaData.schemaWithCustomFields]);
-  const tableColumnPickerPoolOptions = (0, import_react62.useMemo)(() => {
+  const tableColumnPickerPoolOptions = (0, import_react61.useMemo)(() => {
     const allowed = new Set(
       effectiveReportBuilderTableNames.map((name2) => String(name2 ?? "").trim()).filter(Boolean)
     );
@@ -65430,16 +65288,16 @@ function useReport(reportIdArg, options = {}) {
       (option) => allowed.has(String(option.tableName ?? "").trim())
     );
   }, [effectiveReportBuilderTableNames, schemaColumnOptions]);
-  const columns = (0, import_react62.useMemo)(() => {
+  const columns = (0, import_react61.useMemo)(() => {
     return displayColumns.filter((column) => Boolean(column.field)).map((column) => encodeColumnOptionValue(column.table, column.field));
   }, [displayColumns]);
-  const selectedColumnOptions = (0, import_react62.useMemo)(() => {
+  const selectedColumnOptions = (0, import_react61.useMemo)(() => {
     return displayColumns.map((column) => {
       const value = column.alias || column.field;
       return value ? { label: value, value } : null;
     }).filter((option) => option !== null);
   }, [displayColumns]);
-  const scopedSchemaColumns = (0, import_react62.useMemo)(() => {
+  const scopedSchemaColumns = (0, import_react61.useMemo)(() => {
     const tableNames = fieldOptionsAllowedTableNames ? Array.from(fieldOptionsAllowedTableNames) : joinCompatibleSchemaTableNames;
     const schemaTables = schemaForReportBuilderState;
     const tablesToUse = tableNames.length ? schemaTables.filter((table2) => tableNames.includes(table2.name ?? "")) : schemaTables;
@@ -65460,7 +65318,7 @@ function useReport(reportIdArg, options = {}) {
     joinCompatibleSchemaTableNames,
     schemaForReportBuilderState
   ]);
-  const pivotUniqueValuesByColumn = (0, import_react62.useMemo)(() => {
+  const pivotUniqueValuesByColumn = (0, import_react61.useMemo)(() => {
     const explicitUniqueValues = sourceReport?.uniqueStringsByColumn ?? sourceReport?.columnUniqueValues ?? sourceReport?.uniqueValues;
     if (explicitUniqueValues && typeof explicitUniqueValues === "object" && !Array.isArray(explicitUniqueValues)) {
       return explicitUniqueValues;
@@ -65486,7 +65344,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return result;
   }, [sourceReport]);
-  const possiblePivotFields = (0, import_react62.useMemo)(() => {
+  const possiblePivotFields = (0, import_react61.useMemo)(() => {
     const options2 = getPossiblePivotFieldOptions(
       scopedSchemaColumns,
       pivotUniqueValuesByColumn
@@ -65497,7 +65355,7 @@ function useReport(reportIdArg, options = {}) {
       columnFields: options2.columnFields.filter((field) => !isIdColumn(field))
     };
   }, [scopedSchemaColumns, pivotUniqueValuesByColumn]);
-  const groupRowsByOptions = (0, import_react62.useMemo)(() => {
+  const groupRowsByOptions = (0, import_react61.useMemo)(() => {
     const allowedFields = new Set(possiblePivotFields.rowFields);
     const seenValues = /* @__PURE__ */ new Set();
     const options2 = [];
@@ -65524,7 +65382,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return options2;
   }, [groupRowsBy, possiblePivotFields.rowFields, scopedSchemaColumns]);
-  const groupColumnsByOptions = (0, import_react62.useMemo)(() => {
+  const groupColumnsByOptions = (0, import_react61.useMemo)(() => {
     const allowedFields = new Set(possiblePivotFields.columnFields);
     const seenValues = /* @__PURE__ */ new Set();
     const options2 = [];
@@ -65551,19 +65409,19 @@ function useReport(reportIdArg, options = {}) {
     }
     return options2;
   }, [groupColumnsBy, possiblePivotFields.columnFields, scopedSchemaColumns]);
-  const cleanedSort = (0, import_react62.useMemo)(() => {
+  const cleanedSort = (0, import_react61.useMemo)(() => {
     const activeSort = resolvedGroupRowsBy ? pivotSort : regularSort;
     if (!activeSort?.sortField || !activeSort?.sortDirection) {
       return "";
     }
     return toFlatSortValue(activeSort.sortField, activeSort.sortDirection);
   }, [pivotSort, regularSort, resolvedGroupRowsBy]);
-  const aggregationSortLabelFallbackTable = (0, import_react62.useMemo)(() => {
+  const aggregationSortLabelFallbackTable = (0, import_react61.useMemo)(() => {
     const reportBuilderTableName = effectiveReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).find((tableName) => Boolean(tableName));
     if (reportBuilderTableName) return reportBuilderTableName;
     return (sourceReport?.referencedTables ?? []).map((tableName) => String(tableName ?? "").trim()).find((tableName) => Boolean(tableName));
   }, [effectiveReportBuilderTables, sourceReport?.referencedTables]);
-  const sortOptions = (0, import_react62.useMemo)(() => {
+  const sortOptions = (0, import_react61.useMemo)(() => {
     if (resolvedGroupRowsBy) {
       const aggregationSortFields = getPivotAggregationSortFields(
         aggregationState,
@@ -65622,12 +65480,14 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupRowsBy,
     selectedColumnOptions
   ]);
-  const aggregationOptions = (0, import_react62.useMemo)(() => {
+  const { aggregationValues, aggregationOptions } = (0, import_react61.useMemo)(() => {
     const baseOptions = aggregationBaseOptions.map((option) => ({
       value: option.value,
       label: option.label
     }));
-    return aggregationState.map((aggregation, index) => {
+    const seenValues = new Set(baseOptions.map((option) => option.value));
+    const injectedOptions = [];
+    const values = aggregationState.map((aggregation, index) => {
       const normalizedAggregationType = String(
         aggregation.aggregationType ?? ""
       ).toLowerCase();
@@ -65635,27 +65495,36 @@ function useReport(reportIdArg, options = {}) {
       const currentValueField = String(aggregation.valueField ?? "").trim();
       const currentValueField2 = String(aggregation.valueField2 ?? "").trim();
       const isPercentageRatio = normalizedAggregationType === "percentage" && Boolean(currentValueField) && Boolean(currentValueField2);
-      const currentTarget = isPercentageRatio ? `${currentValueField}:${currentValueField2}` : currentValueField ? currentValueField : normalizedAggregationType === "count" || normalizedAggregationType === "percentage" ? tableHint || aggregationFallbackTableName : aggregationFallbackTarget;
-      const currentValue = aggregation.aggregationType ? `${aggregation.aggregationType}:${currentTarget}` : void 0;
-      const isBoolPercentage = normalizedAggregationType === "percentage" && Boolean(currentValueField) && isBoolAggregationField(currentValueField, tableHint || void 0) === true;
-      const currentLabel = aggregation.aggregationType ? isPercentageRatio ? `Percent ${toTitleCaseLabel(currentValueField)} of ${toTitleCaseLabel(currentValueField2)}` : normalizedAggregationType === "percentage" ? isBoolPercentage ? `Percent ${toTitleCaseLabel(currentTarget)}` : `Percent of Total ${toTitleCaseLabel(currentTarget)}` : `${formatAggregationTypeForDisplay(aggregation.aggregationType)} ${toTitleCaseLabel(currentTarget)}` : "Select aggregation";
-      const options2 = currentValue ? baseOptions.some((option) => option.value === currentValue) ? baseOptions : [{ value: currentValue, label: currentLabel }, ...baseOptions] : baseOptions;
-      return {
-        key: `aggregation-${index}`,
-        label: `Aggregation ${index + 1}`,
-        value: currentValue ?? "",
-        options: options2
-      };
+      const isTableTarget = !isPercentageRatio && !currentValueField && (normalizedAggregationType === "count" || normalizedAggregationType === "percentage");
+      const labelTarget = isPercentageRatio ? `${currentValueField}:${currentValueField2}` : currentValueField ? currentValueField : isTableTarget ? tableHint || aggregationFallbackTableName : aggregationFallbackTarget;
+      const fieldTable = isTableTarget || !aggregation.aggregationType ? "" : tableHint || String(
+        aggregationOptionTableLookup.get(
+          `${aggregation.aggregationType}:${labelTarget}`
+        ) ?? ""
+      ).trim();
+      const currentValue = aggregation.aggregationType ? `${aggregation.aggregationType}:${fieldTable ? `${fieldTable}::` : ""}${labelTarget}` : "";
+      if (currentValue && !seenValues.has(currentValue)) {
+        const isBoolPercentage = normalizedAggregationType === "percentage" && Boolean(currentValueField) && isBoolAggregationField(currentValueField, tableHint || void 0) === true;
+        const currentLabel = isPercentageRatio ? `Percent ${toTitleCaseLabel(currentValueField)} of ${toTitleCaseLabel(currentValueField2)}` : normalizedAggregationType === "percentage" ? isBoolPercentage ? `Percent ${toTitleCaseLabel(labelTarget)}` : `Percent of Total ${toTitleCaseLabel(labelTarget)}` : `${formatAggregationTypeForDisplay(aggregation.aggregationType)} ${toTitleCaseLabel(labelTarget)}`;
+        injectedOptions.push({ value: currentValue, label: currentLabel });
+        seenValues.add(currentValue);
+      }
+      return currentValue;
     });
+    return {
+      aggregationValues: values,
+      aggregationOptions: [...injectedOptions, ...baseOptions]
+    };
   }, [
     aggregationFallbackTableName,
     aggregationFallbackTarget,
     aggregationState,
     aggregationBaseOptions,
+    aggregationOptionTableLookup,
     aggregationTablesByIndex,
     isBoolAggregationField
   ]);
-  const nextPivot = (0, import_react62.useMemo)(() => {
+  const nextPivot = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return null;
     return pivotState ? {
       ...pivotState,
@@ -65666,15 +65535,15 @@ function useReport(reportIdArg, options = {}) {
       rowLimit: limit?.value
     } : null;
   }, [sourceReport, pivotState, pivotSort, limit, resolvedSortFieldType]);
-  const nextPivotHash = (0, import_react62.useMemo)(
+  const nextPivotHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(nextPivot),
     [nextPivot]
   );
-  const filterStackHash = (0, import_react62.useMemo)(
+  const filterStackHash = (0, import_react61.useMemo)(
     () => stableSerializeForQueryKey(filterStack),
     [filterStack]
   );
-  const shouldSkipPivotRefreshForUnchangedPivot = (0, import_react62.useMemo)(() => {
+  const shouldSkipPivotRefreshForUnchangedPivot = (0, import_react61.useMemo)(() => {
     if (!sourceReport || !nextPivot) return false;
     if (!Array.isArray(sourceReport.rows) || sourceReport.rows.length === 0) {
       return false;
@@ -65692,7 +65561,7 @@ function useReport(reportIdArg, options = {}) {
     );
     return hasSamePivot && sourceFilterStackHash === filterStackHash;
   }, [filterStackHash, nextPivot, sourceReport]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!pendingPivotRefresh) return;
     if (!nextPivot) {
       if (!sourceReport) {
@@ -65712,7 +65581,7 @@ function useReport(reportIdArg, options = {}) {
     shouldSkipPivotRefreshForUnchangedPivot,
     sourceReport
   ]);
-  const shouldSkipRedundantPivotTableDataReportBuilderQuery = (0, import_react62.useMemo)(() => {
+  const shouldSkipRedundantPivotTableDataReportBuilderQuery = (0, import_react61.useMemo)(() => {
     if (!sourceReport || !nextPivot) {
       return false;
     }
@@ -65814,7 +65683,7 @@ function useReport(reportIdArg, options = {}) {
   });
   const tablePageReportBuilderState = pivotTableDataReportBuilderState ?? effectiveReportBuilderState;
   const tablePageReportBuilderStateHash = pivotTableDataReportBuilderState ? pivotTableDataReportBuilderStateHash : effectiveReportBuilderStateHash;
-  const tablePaginationSort = (0, import_react62.useMemo)(() => {
+  const tablePaginationSort = (0, import_react61.useMemo)(() => {
     const sortEntry = tablePageReportBuilderState?.sort?.[0];
     const field = String(sortEntry?.field ?? "").trim();
     if (!field || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(field)) {
@@ -65876,7 +65745,7 @@ function useReport(reportIdArg, options = {}) {
   const tablePageRows = tablePageQueryEnabled && !tablePageQuery.data?.error && Array.isArray(tablePageQuery.data?.report?.rows) ? tablePageQuery.data.report.rows : void 0;
   const tablePageRowCount = tablePageQueryEnabled && typeof tablePageQuery.data?.report?.rowCount === "number" && tablePageQuery.data.report.rowCount > 0 ? tablePageQuery.data.report.rowCount : void 0;
   const tablePageFetching = tablePageQueryEnabled && tablePageQuery.isFetching;
-  const paginationTotalRowCount = (0, import_react62.useMemo)(() => {
+  const paginationTotalRowCount = (0, import_react61.useMemo)(() => {
     if (tablePageRowCount !== void 0) {
       return Math.max(tablePageRowCount, baseWindowRowsLength);
     }
@@ -65899,7 +65768,7 @@ function useReport(reportIdArg, options = {}) {
     pagination.pageSize
   );
   paginationPageCountRef.current = paginationPageCount;
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!pivotTableDataRefreshQueryEnabled) return;
     if (pivotTableDataRefreshQuery.status !== "success" && pivotTableDataRefreshQuery.status !== "error") {
       return;
@@ -65937,7 +65806,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     useFormRefreshDebugEnabled
   ]);
-  (0, import_react62.useEffect)(() => {
+  (0, import_react61.useEffect)(() => {
     if (!pivotRefreshQueryEnabled) return;
     if (pivotRefreshQuery.status !== "success" && pivotRefreshQuery.status !== "error") {
       return;
@@ -65990,7 +65859,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     useFormRefreshDebugEnabled
   ]);
-  const chartData = (0, import_react62.useMemo)(() => {
+  const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
     const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
@@ -66026,18 +65895,18 @@ function useReport(reportIdArg, options = {}) {
     useInMemoryEngines,
     chartPivotHydrationEpoch
   ]);
-  const baseChart = (0, import_react62.useMemo)(
+  const baseChart = (0, import_react61.useMemo)(
     () => normalizePivotChartForDisplay(chartData),
     [chartData]
   );
-  const chartAxesBaseChart = (0, import_react62.useMemo)(() => {
+  const chartAxesBaseChart = (0, import_react61.useMemo)(() => {
     if (!chartData) return void 0;
     if (chartData.pivot?.columnField) {
       return normalizePivotChartForAxisControls(chartData, effectiveReportId);
     }
     return baseChart;
   }, [baseChart, chartData, effectiveReportId]);
-  const chartAxisOptions = (0, import_react62.useMemo)(() => {
+  const chartAxisOptions = (0, import_react61.useMemo)(() => {
     if (!chartAxesBaseChart) return [];
     const optionsByField = /* @__PURE__ */ new Map();
     const registerOption = (fieldRaw, labelRaw, formatRaw) => {
@@ -66075,14 +65944,14 @@ function useReport(reportIdArg, options = {}) {
     );
     return Array.from(optionsByField.values());
   }, [chartAxesBaseChart]);
-  const chartAxisOptionByField = (0, import_react62.useMemo)(() => {
+  const chartAxisOptionByField = (0, import_react61.useMemo)(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     for (const option of chartAxisOptions) {
       optionsByField.set(option.value, option);
     }
     return optionsByField;
   }, [chartAxisOptions]);
-  const xAxisOptions = (0, import_react62.useMemo)(() => {
+  const xAxisOptions = (0, import_react61.useMemo)(() => {
     if (!chartAxesBaseChart) return chartAxisOptions;
     const pivot = chartAxesBaseChart.pivot;
     const pivotRowField = String(pivot?.rowField ?? "").trim();
@@ -66105,7 +65974,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return chartAxisOptions;
   }, [chartAxesBaseChart, chartAxisOptions, chartAxisOptionByField]);
-  const yAxisOptions = (0, import_react62.useMemo)(() => {
+  const yAxisOptions = (0, import_react61.useMemo)(() => {
     if (!chartAxesBaseChart) return [];
     const keepOption = (option) => {
       const col = findSchemaColumnForChartAxisField(
@@ -66141,21 +66010,21 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     schemaColumnOptions
   ]);
-  const normalizedChartXAxisOptions = (0, import_react62.useMemo)(() => {
+  const normalizedChartXAxisOptions = (0, import_react61.useMemo)(() => {
     return xAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
       label: String(option.label ?? option.value ?? "").trim(),
       format: String(option.format ?? "").trim()
     }));
   }, [xAxisOptions]);
-  const normalizedChartYAxisOptions = (0, import_react62.useMemo)(() => {
+  const normalizedChartYAxisOptions = (0, import_react61.useMemo)(() => {
     return yAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
       label: String(option.label ?? option.value ?? "").trim(),
       format: String(option.format ?? "").trim()
     }));
   }, [yAxisOptions]);
-  const resolvedYAxisFields = (0, import_react62.useMemo)(() => {
+  const resolvedYAxisFields = (0, import_react61.useMemo)(() => {
     if (!chartAxesBaseChart) return [];
     const normalizeYAxisField = (yAxisFieldRaw) => {
       const field = String(yAxisFieldRaw?.field ?? "").trim();
@@ -66198,7 +66067,7 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptionByField,
     chartAxisOptions
   ]);
-  const resolvedXAxisField = (0, import_react62.useMemo)(() => {
+  const resolvedXAxisField = (0, import_react61.useMemo)(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
     const pivotRowField = String(
@@ -66230,7 +66099,7 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     resolvedYAxisFields
   ]);
-  const resolvedXAxisFormat = (0, import_react62.useMemo)(() => {
+  const resolvedXAxisFormat = (0, import_react61.useMemo)(() => {
     if (!chartAxesBaseChart) {
       return "string";
     }
@@ -66258,7 +66127,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedYAxisFields
   ]);
-  const resolvedXAxisLabel = (0, import_react62.useMemo)(() => {
+  const resolvedXAxisLabel = (0, import_react61.useMemo)(() => {
     const defaultXLabel = String(
       chartAxesBaseChart?.xAxisLabel ?? chartAxisOptionByField.get(resolvedXAxisField)?.label ?? ""
     ).trim();
@@ -66272,13 +66141,13 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptionByField,
     resolvedXAxisField
   ]);
-  const chartVisibility = (0, import_react62.useMemo)(
+  const chartVisibility = (0, import_react61.useMemo)(
     () => ({
       showLegend: chartVisibilityOverrides.showLegend ?? Boolean(baseChart?.showLegend ?? false)
     }),
     [baseChart?.showLegend, chartVisibilityOverrides]
   );
-  const axisConfig = (0, import_react62.useMemo)(() => {
+  const axisConfig = (0, import_react61.useMemo)(() => {
     const pivotBucketXAxis = isPivotTableDateBucketRowAxis(
       chartAxesBaseChart,
       resolvedXAxisField
@@ -66320,14 +66189,14 @@ function useReport(reportIdArg, options = {}) {
     resolvedYAxisFields,
     chartVisibility.showLegend
   ]);
-  const resolvedYAxisFieldsForDisplay = (0, import_react62.useMemo)(() => {
+  const resolvedYAxisFieldsForDisplay = (0, import_react61.useMemo)(() => {
     if (!baseChart) return resolvedYAxisFields;
     return mapResolvedPivotYAxisFieldsForDisplay({
       chart: baseChart,
       resolvedYAxisFields
     });
   }, [baseChart, resolvedYAxisFields]);
-  const chart = (0, import_react62.useMemo)(() => {
+  const chart = (0, import_react61.useMemo)(() => {
     if (!baseChart) return void 0;
     let columns2 = mergeChartColumnFormatsFromYAxisFields(
       baseChart.columns,
@@ -66379,7 +66248,7 @@ function useReport(reportIdArg, options = {}) {
   const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(
     chart && chart.pivot && Array.isArray(chart.columns) && chart.columns.length > 0
   );
-  const chartAxes = (0, import_react62.useMemo)(() => {
+  const chartAxes = (0, import_react61.useMemo)(() => {
     const yAxisItems = resolvedYAxisFields.map(
       (yAxisField, index) => ({
         id: String(index),
@@ -66528,8 +66397,8 @@ function useReport(reportIdArg, options = {}) {
     xAxisOptions,
     yAxisOptions
   ]);
-  const tableFormatCacheRef = (0, import_react62.useRef)(/* @__PURE__ */ new Map());
-  const tableFormatMerge = (0, import_react62.useMemo)(
+  const tableFormatCacheRef = (0, import_react61.useRef)(/* @__PURE__ */ new Map());
+  const tableFormatMerge = (0, import_react61.useMemo)(
     () => mergeDisplayAndSourceForTableFormats({
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
@@ -66543,7 +66412,7 @@ function useReport(reportIdArg, options = {}) {
       sourceReport
     ]
   );
-  const table = (0, import_react62.useMemo)(() => {
+  const table = (0, import_react61.useMemo)(() => {
     const baseWindowRows = Array.isArray(sourceReport?.rows) ? sourceReport.rows : [];
     const rawRows = !paginationActive ? baseWindowRows : tablePageRows ?? baseWindowRows.slice(paginationRangeStart, paginationRangeEnd);
     const { columns: mergedFromReport } = mergeDisplayAndSourceForTableFormats({
@@ -66672,7 +66541,7 @@ function useReport(reportIdArg, options = {}) {
   const {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
-  } = (0, import_react62.useMemo)(() => {
+  } = (0, import_react61.useMemo)(() => {
     if (isPivotTableChart && chart?.columns?.length) {
       const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
       const pivotTableColumns = aggregationSlotColumns ? aggregationSlotColumns.tableColumns : chart.columns.map((c) => ({
@@ -66706,7 +66575,7 @@ function useReport(reportIdArg, options = {}) {
     schemaColumnOptions,
     table.columns
   ]);
-  const availableFields = (0, import_react62.useMemo)(
+  const availableFields = (0, import_react61.useMemo)(
     () => tableColumnPickerPoolOptions.map((option) => ({
       id: option.value,
       label: option.label,
@@ -66714,24 +66583,24 @@ function useReport(reportIdArg, options = {}) {
     })),
     [tableColumnPickerPoolOptions]
   );
-  const axisSelectFormatLabels = (0, import_react62.useMemo)(
+  const axisSelectFormatLabels = (0, import_react61.useMemo)(
     () => AXIS_FORMAT_OPTIONS.map((option) => option.label),
     []
   );
-  const xAxisFormatOptionLabels = (0, import_react62.useMemo)(() => {
+  const xAxisFormatOptionLabels = (0, import_react61.useMemo)(() => {
     if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField)) {
       return ["date", ...axisSelectFormatLabels];
     }
     return axisSelectFormatLabels;
   }, [chartAxesBaseChart, resolvedXAxisField, axisSelectFormatLabels]);
-  const tableDerivedColumnOrder = (0, import_react62.useMemo)(() => {
+  const tableDerivedColumnOrder = (0, import_react61.useMemo)(() => {
     return tableFormattingColumnOptions.map((option) => option.value);
   }, [tableFormattingColumnOptions]);
-  const tableDerivedColumnOrderSignature = (0, import_react62.useMemo)(
+  const tableDerivedColumnOrderSignature = (0, import_react61.useMemo)(
     () => tableDerivedColumnOrder.join("|"),
     [tableDerivedColumnOrder]
   );
-  const activeTableColumnIds = (0, import_react62.useMemo)(() => {
+  const activeTableColumnIds = (0, import_react61.useMemo)(() => {
     if (isPivotTableChart && chart?.columns?.length) {
       const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
       if (aggregationSlotColumns) {
@@ -66770,7 +66639,7 @@ function useReport(reportIdArg, options = {}) {
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
-  const columnOptionById = (0, import_react62.useMemo)(() => {
+  const columnOptionById = (0, import_react61.useMemo)(() => {
     const map = /* @__PURE__ */ new Map();
     for (const option of tableColumnPickerPoolOptions) {
       map.set(option.value, option);
@@ -66782,7 +66651,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return map;
   }, [tableColumnPickerPoolOptions, tableFormattingColumnOptions]);
-  const displayColumnById = (0, import_react62.useMemo)(() => {
+  const displayColumnById = (0, import_react61.useMemo)(() => {
     const map = /* @__PURE__ */ new Map();
     for (const column of displayColumns) {
       const field = String(column.field ?? "").trim();
@@ -66793,7 +66662,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return map;
   }, [displayColumns]);
-  const tableColumnSettingsById = (0, import_react62.useMemo)(() => {
+  const tableColumnSettingsById = (0, import_react61.useMemo)(() => {
     const map = /* @__PURE__ */ new Map();
     const effectiveById = tableFormatMerge.formatByColumnOptionId;
     const chartColById = /* @__PURE__ */ new Map();
@@ -66911,13 +66780,13 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.columns,
     tableFormatMerge
   ]);
-  const tableColumnSettingsCoalesceRef = (0, import_react62.useRef)(
+  const tableColumnSettingsCoalesceRef = (0, import_react61.useRef)(
     /* @__PURE__ */ new Map()
   );
-  (0, import_react62.useLayoutEffect)(() => {
+  (0, import_react61.useLayoutEffect)(() => {
     tableColumnSettingsCoalesceRef.current = new Map(tableColumnSettingsById);
   }, [tableColumnSettingsById]);
-  const tableColumnItems = (0, import_react62.useMemo)(() => {
+  const tableColumnItems = (0, import_react61.useMemo)(() => {
     const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     const items = activeTableColumnIds.map((columnId) => {
@@ -66953,19 +66822,18 @@ function useReport(reportIdArg, options = {}) {
     isPivotTableChart,
     tableColumnSettingsById
   ]);
-  const tableColumnById = (0, import_react62.useMemo)(() => {
+  const tableColumnById = (0, import_react61.useMemo)(() => {
     return new Map(tableColumnItems.map((item) => [item.id, item]));
   }, [tableColumnItems]);
-  const tableColumnList = (0, import_react62.useMemo)(() => {
+  const tableColumnValues = (0, import_react61.useMemo)(() => {
     const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     return tableColumnItems.map((item) => {
       const coerced = coerceTableColumnFormatToAxisValue(item.format);
       const usePivotDateOptions = isPivotTableChart && item.field === pivotRowFieldForFormat && isDateType(pivotRowFieldType) && coerced === "string";
       return {
-        id: item.id,
+        value: item.id,
         label: item.label,
-        visible: true,
         format: item.formatLabel,
         ...usePivotDateOptions ? { formatOptions: [...PIVOT_DATE_BUCKET_FORMAT_OPTIONS] } : {}
       };
@@ -67128,22 +66996,32 @@ function useReport(reportIdArg, options = {}) {
       columns: buildSetReportColumnsFromIds(nextColumnIds, nextSettingsById)
     };
   };
-  let setReport;
+  let applyReportChange;
+  const setReport = (nextState) => {
+    const { columns: nextColumns, ...rest } = nextState;
+    const nextSettingsById = nextColumns === void 0 ? tableColumnSettingsById : new Map(
+      nextColumns.map((column) => [
+        column.value,
+        { label: column.label, format: column.format }
+      ])
+    );
+    applyReportChange({
+      ...rest,
+      ...nextColumns !== void 0 ? {
+        columns: buildSetReportColumnsFromIds(
+          nextColumns.map((column) => column.value),
+          nextSettingsById
+        )
+      } : {}
+    });
+  };
   const commitTableColumns = (nextColumnIds, settingsById) => {
-    setReport({
+    applyReportChange({
       columns: buildSetReportColumnsFromIds(nextColumnIds, settingsById)
     });
   };
-  setReport = (nextState) => {
-    let effectiveNextState = nextState;
-    if (isSetReportTableColumnSidebarPatch(nextState.columns)) {
-      const expanded = buildColumnSidebarSetReportInput(
-        nextState.columns.patch
-      );
-      if (!expanded) return;
-      const { columns: _omitSidebarColumnPatch, ...rest } = nextState;
-      effectiveNextState = { ...rest, ...expanded };
-    }
+  applyReportChange = (nextState) => {
+    const effectiveNextState = nextState;
     if (effectiveNextState.showLegend !== void 0) {
       setChartVisibilityOverrides((previous) => ({
         ...previous,
@@ -67216,15 +67094,18 @@ function useReport(reportIdArg, options = {}) {
       });
     }
     const isPivotSortUpdate = effectiveNextState.sort !== void 0 && Boolean(nextPivot);
-    const indexedAggregationUpdate = effectiveNextState.aggregations !== void 0 && typeof effectiveNextState.aggregations === "object" && !Array.isArray(effectiveNextState.aggregations) && "index" in effectiveNextState.aggregations && "value" in effectiveNextState.aggregations ? effectiveNextState.aggregations : null;
-    const isAppendingEmptyAggregationPlaceholder = indexedAggregationUpdate !== null && indexedAggregationUpdate.index === aggregationState.length && String(indexedAggregationUpdate.value ?? "").trim().length === 0;
-    const touchesPivotState = effectiveNextState.groupRowsBy !== void 0 || effectiveNextState.groupColumnsBy !== void 0 || effectiveNextState.aggregations !== void 0 && !isAppendingEmptyAggregationPlaceholder || isPivotSortUpdate || effectiveNextState.limit !== void 0;
+    const isAppendingEmptyAggregationPlaceholder = Array.isArray(effectiveNextState.aggregations) && effectiveNextState.aggregations.length === aggregationValues.length + 1 && effectiveNextState.aggregations.slice(0, aggregationValues.length).every(
+      (value, index) => String(value ?? "") === aggregationValues[index]
+    ) && String(
+      effectiveNextState.aggregations[aggregationValues.length] ?? ""
+    ).trim().length === 0;
+    const touchesPivotState = effectiveNextState.groupRowsBy !== void 0 || effectiveNextState.groupColumnsBy !== void 0 || effectiveNextState.dateBucket !== void 0 || effectiveNextState.aggregations !== void 0 && !isAppendingEmptyAggregationPlaceholder || isPivotSortUpdate || effectiveNextState.limit !== void 0;
     const isDatasourceUpdate = effectiveNextState.datasources !== void 0;
     const hasRowGroupSelection = typeof effectiveNextState.groupRowsBy === "string" && effectiveNextState.groupRowsBy.trim().length > 0;
     const hasColumnGroupSelection = typeof effectiveNextState.groupColumnsBy === "string" && effectiveNextState.groupColumnsBy.trim().length > 0;
-    const hasAggregationSelection = effectiveNextState.aggregations !== void 0 && (typeof effectiveNextState.aggregations === "string" ? effectiveNextState.aggregations.trim().length > 0 : Array.isArray(effectiveNextState.aggregations) ? effectiveNextState.aggregations.some(
-      (aggregation) => Boolean(aggregation?.aggregationType) && Boolean(String(aggregation?.valueField ?? "").trim())
-    ) : String(effectiveNextState.aggregations.value ?? "").trim().length > 0);
+    const hasAggregationSelection = effectiveNextState.aggregations !== void 0 && (typeof effectiveNextState.aggregations === "string" ? effectiveNextState.aggregations.trim().length > 0 : effectiveNextState.aggregations.some(
+      (aggregation) => typeof aggregation === "string" ? aggregation.trim().length > 0 : Boolean(aggregation?.aggregationType) && Boolean(String(aggregation?.valueField ?? "").trim())
+    ));
     const isClearingRowGrouping = effectiveNextState.groupRowsBy !== void 0 && String(effectiveNextState.groupRowsBy ?? "").trim().length === 0;
     const queuePromoteColumnToRow = isClearingRowGrouping && !sourceReport;
     const shouldRefreshExpandedTableData = useInMemoryEngines && (hasRowGroupSelection || hasColumnGroupSelection || hasAggregationSelection) || !useInMemoryEngines && !nextPivot && effectiveNextState.sort !== void 0;
@@ -67297,7 +67178,7 @@ function useReport(reportIdArg, options = {}) {
             }
           }
         }
-        if (effectiveNextState.columns !== void 0 && !isSetReportTableColumnSidebarPatch(effectiveNextState.columns)) {
+        if (effectiveNextState.columns !== void 0) {
           const normalizedDisplayColumns = normalizeColumnsInput(
             effectiveNextState.columns,
             columnIdentifierLookup
@@ -67384,6 +67265,10 @@ function useReport(reportIdArg, options = {}) {
           groupColumnsBySetViaSetReportRef.current = true;
           next.groupColumnsBy = effectiveNextState.groupColumnsBy || void 0;
         }
+        if (effectiveNextState.dateBucket !== void 0) {
+          dateBucketSetViaSetReportRef.current = true;
+          next.dateBucket = effectiveNextState.dateBucket || void 0;
+        }
         if (effectiveNextState.aggregations !== void 0) {
           aggregationStateSetViaSetReportRef.current = true;
           next.aggregationTablesByIndex = [...next.aggregationTablesByIndex];
@@ -67398,54 +67283,7 @@ function useReport(reportIdArg, options = {}) {
             ],
             schemaForeignKeyMap
           ).map((table2) => table2.name).filter((name2) => Boolean(name2));
-          if (typeof effectiveNextState.aggregations === "object" && !Array.isArray(effectiveNextState.aggregations) && "index" in effectiveNextState.aggregations && "value" in effectiveNextState.aggregations) {
-            const { index, value } = effectiveNextState.aggregations;
-            if (index >= 0 && index <= next.aggregationState.length) {
-              const rawValue = String(value ?? "").trim();
-              next.aggregationState = [...next.aggregationState];
-              if (!rawValue) {
-                if (index === next.aggregationState.length) {
-                  next.aggregationState.push({ valueField: "" });
-                  next.aggregationTablesByIndex.push(void 0);
-                } else if (index < next.aggregationState.length) {
-                  next.aggregationState.splice(index, 1);
-                  next.aggregationTablesByIndex.splice(index, 1);
-                }
-              } else {
-                const [aggregationTypeRaw] = rawValue.split(":");
-                const aggregationType = aggregationTypeRaw;
-                const { field: target, table: table2 } = resolveAggregationSelection(
-                  rawValue,
-                  aggregationOptionTableLookup,
-                  preferredTables
-                );
-                const normalizedSelection = normalizeAggregationSelection(
-                  aggregationType,
-                  target,
-                  table2,
-                  preferredTables
-                );
-                const existing = next.aggregationState[index];
-                const preservedValueField2 = aggregationType !== "percentage" && existing?.valueField2 ? { valueField2: existing.valueField2 } : {};
-                const nextAggregation = {
-                  ...preservedValueField2,
-                  aggregationType,
-                  ...normalizedSelection.valueField ? { valueField: normalizedSelection.valueField } : {},
-                  ...normalizedSelection.valueField2 ? { valueField2: normalizedSelection.valueField2 } : {},
-                  ...normalizedSelection.table ? { valueFieldTable: normalizedSelection.table } : {}
-                };
-                if (index === next.aggregationState.length) {
-                  next.aggregationState.push(nextAggregation);
-                  next.aggregationTablesByIndex.push(
-                    normalizedSelection.table || void 0
-                  );
-                } else {
-                  next.aggregationState[index] = nextAggregation;
-                  next.aggregationTablesByIndex[index] = normalizedSelection.table || void 0;
-                }
-              }
-            }
-          } else if (typeof effectiveNextState.aggregations === "string") {
+          if (typeof effectiveNextState.aggregations === "string") {
             const rawValue = effectiveNextState.aggregations.trim();
             if (!rawValue) {
               next.aggregationState = [];
@@ -67477,15 +67315,49 @@ function useReport(reportIdArg, options = {}) {
               ];
             }
           } else {
-            next.aggregationState = effectiveNextState.aggregations;
-            next.aggregationTablesByIndex = effectiveNextState.aggregations.map(
-              (aggregation) => String(aggregation.valueFieldTable ?? "").trim() || resolveFieldTable({
-                report: sourceReport,
-                field: aggregation.valueField,
-                schemaTables: schemaForReportBuilderState,
-                preferredTables
-              }) || void 0
+            const decoded = effectiveNextState.aggregations.map(
+              (aggregation) => {
+                if (typeof aggregation !== "string") {
+                  return {
+                    aggregation,
+                    table: String(aggregation.valueFieldTable ?? "").trim() || resolveFieldTable({
+                      report: sourceReport,
+                      field: aggregation.valueField,
+                      schemaTables: schemaForReportBuilderState,
+                      preferredTables
+                    }) || void 0
+                  };
+                }
+                const rawValue = aggregation.trim();
+                if (!rawValue) {
+                  return { aggregation: { valueField: "" }, table: void 0 };
+                }
+                const [aggregationTypeRaw] = rawValue.split(":");
+                const aggregationType = aggregationTypeRaw;
+                const { field: target, table: table2 } = resolveAggregationSelection(
+                  rawValue,
+                  aggregationOptionTableLookup,
+                  preferredTables
+                );
+                const normalizedSelection = normalizeAggregationSelection(
+                  aggregationType,
+                  target,
+                  table2,
+                  preferredTables
+                );
+                return {
+                  aggregation: {
+                    aggregationType,
+                    ...normalizedSelection.valueField ? { valueField: normalizedSelection.valueField } : {},
+                    ...normalizedSelection.valueField2 ? { valueField2: normalizedSelection.valueField2 } : {},
+                    ...normalizedSelection.table ? { valueFieldTable: normalizedSelection.table } : {}
+                  },
+                  table: normalizedSelection.table || void 0
+                };
+              }
             );
+            next.aggregationState = decoded.map((entry) => entry.aggregation);
+            next.aggregationTablesByIndex = decoded.map((entry) => entry.table);
           }
         }
         if (effectiveNextState.sort !== void 0) {
@@ -67600,29 +67472,9 @@ function useReport(reportIdArg, options = {}) {
       }
     });
   };
-  const tableColumns = {
-    items: tableColumnItems,
-    optionById: columnOptionById,
-    byId: tableColumnById,
-    columnList: tableColumnList,
-    getSetReportColumns: (ids) => {
-      const out = [];
-      for (const rawId of ids) {
-        const id = String(rawId ?? "").trim();
-        if (!id) continue;
-        const option = columnOptionById.get(id);
-        if (!option) continue;
-        const item = tableColumnById.get(id);
-        const customLabel = String(item?.customLabel ?? "").trim();
-        const format9 = String(item?.format ?? "").trim();
-        out.push({
-          field: option.field,
-          ...option.tableName ? { table: option.tableName } : {},
-          ...customLabel ? { label: customLabel } : {},
-          ...format9 ? { format: format9 } : {}
-        });
-      }
-      return out;
+  const columnActions = {
+    replace: (nextColumns) => {
+      applyReportChange({ columns: nextColumns });
     },
     reorder: (oldIndex, newIndex) => {
       if (loading || isPivotTableChart) return;
@@ -67686,21 +67538,15 @@ function useReport(reportIdArg, options = {}) {
       setTableColumnsEditedSignature(tableDerivedColumnOrderSignature);
       commitTableColumns(nextColumnIds, tableColumnSettingsById);
     },
-    getColumnSidebarSetReportInput: (id, updates) => {
-      const normalizedId = String(id ?? "").trim();
-      if (!normalizedId) return null;
-      return {
-        columns: { patch: { id: normalizedId, ...updates } }
-      };
-    },
     update: (id, updates) => {
       const normalizedId = String(id ?? "").trim();
       if (!normalizedId) return;
-      setReport({
-        columns: { patch: { id: normalizedId, ...updates } }
+      const expanded = buildColumnSidebarSetReportInput({
+        id: normalizedId,
+        ...updates
       });
-    },
-    structureEditsLocked: isPivotTableChart
+      if (expanded) applyReportChange(expanded);
+    }
   };
   const setFilters = (nextFilters) => {
     const preparedForStack = prepareQueryBuilderFiltersForSet(
@@ -67758,13 +67604,7 @@ function useReport(reportIdArg, options = {}) {
       }
     }
   };
-  const filterDraft = useReportFilterDraft({
-    reportId: effectiveReportId,
-    committedFilters: filtersForQueryBuilder,
-    queryBuilderProps: filterQueryBuilderProps,
-    setFilters
-  });
-  const saveChanges = (0, import_react62.useCallback)(async () => {
+  const saveChanges = (0, import_react61.useCallback)(async () => {
     if (!client) return;
     if (!String(dashboardNameForNewReport ?? "").trim()) return;
     if (!sourceReport) return;
@@ -67842,17 +67682,23 @@ function useReport(reportIdArg, options = {}) {
     groupRowsByOptions,
     groupColumnsBy,
     groupColumnsByOptions,
-    aggregations: aggregationState,
+    dateBucket,
+    dateBucketOptions: 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. */
     aggregationOptions,
     aggregationDescriptionOptions: cleanedAggregations,
     sort: cleanedSort,
     sortOptions,
     chartType,
     chartTypeOptions: chartTypes,
-    /** Encoded field keys for the current column selection (for `setReport({ columns })`, etc.). */
-    columnIds: columns,
-    /** Selected columns + `reorder` / `toggle` / `update` / `remove`. */
-    columns: tableColumns,
+    /** Selected tabular columns in display order. */
+    columns: tableColumnValues,
+    /** Pivot table columns only allow label and format changes. */
+    columnStructureEditsLocked: isPivotTableChart,
+    /** Optional rich operations; simple selection updates use `setReport({ columns })`. */
+    columnActions,
     /** Schema columns for current datasources — pool for the table column picker. */
     columnOptions: tableColumnPickerPoolOptions,
     xAxis: chartAxes.xAxis,
@@ -67879,13 +67725,6 @@ function useReport(reportIdArg, options = {}) {
     hasTableDrivenColumnOrder,
     filters: filtersForQueryBuilder,
     filterQueryBuilderProps,
-    /**
-     * Draft → Apply lifecycle for react-querybuilder (flat keys):
-     * `<QueryBuilder key={filterDraftKey} {...filterDraftQueryBuilderProps} />`
-     * plus `isFilterDraftDirty` / `isFilterDraftEmpty` /
-     * `commitFilterDraft` / `resetFilterDraft` / `seedFilterDraft`.
-     */
-    ...filterDraft,
     /** True while `report-builder-unique-values` runs for filter value options (not chart/table load). */
     filterUniqueValuesLoading,
     limit,
@@ -67893,7 +67732,6 @@ function useReport(reportIdArg, options = {}) {
     chartTypes,
     columnsOptions: tableColumnPickerPoolOptions,
     tableColumnOptions: tableColumnPickerPoolOptions,
-    tableColumns,
     setReport,
     saveChanges,
     setFilters,
@@ -67911,7 +67749,7 @@ function ChatChartCard({
   ButtonComponent = MemoizedButton
 }) {
   const {
-    columnIds,
+    columns,
     columnOptions,
     groupRowsBy,
     groupRowsByOptions,
@@ -67925,20 +67763,10 @@ function ChatChartCard({
     loading,
     setReport
   } = useReport(reportId);
-  const columnSelectOptions = (0, import_react63.useMemo)(() => {
-    return (columnOptions ?? []).map((option) => {
-      const value = String(option?.value ?? "").trim();
-      if (!value) return null;
-      const tableName = String(option?.tableName ?? "").trim();
-      const fieldName = String(option?.field ?? "").trim() || String(option?.label ?? "").trim() || value;
-      return {
-        value,
-        label: tableName ? `${tableName}.${fieldName}` : fieldName
-      };
-    }).filter(
-      (option) => Boolean(option)
-    );
-  }, [columnOptions]);
+  const selectedColumnValues = (0, import_react62.useMemo)(
+    () => columns.map((column) => column.value),
+    [columns]
+  );
   return /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(
     "div",
     {
@@ -67974,7 +67802,7 @@ function ChatChartCard({
               padding: 16
             },
             children: [
-              JSON.stringify(columnIds, null, 2),
+              JSON.stringify(columns, null, 2),
               /* @__PURE__ */ (0, import_jsx_runtime87.jsxs)(
                 "label",
                 {
@@ -67991,13 +67819,24 @@ function ChatChartCard({
                       "select",
                       {
                         multiple: true,
-                        size: Math.min(10, Math.max(4, columnSelectOptions.length || 4)),
-                        value: columnIds,
+                        size: Math.min(10, Math.max(4, columnOptions.length || 4)),
+                        value: selectedColumnValues,
                         onChange: (event) => {
-                          const nextColumns = Array.from(event.target.selectedOptions).map(
-                            (option) => option.value
+                          const selectedByValue = new Map(
+                            columns.map((column) => [column.value, column])
+                          );
+                          const optionByValue = new Map(
+                            columnOptions.map((option) => [option.value, option])
                           );
-                          setReport({ columns: nextColumns });
+                          setReport({
+                            columns: Array.from(event.target.selectedOptions).map(
+                              (selectedOption) => selectedByValue.get(selectedOption.value) ?? {
+                                value: selectedOption.value,
+                                label: optionByValue.get(selectedOption.value)?.label ?? selectedOption.value,
+                                format: ""
+                              }
+                            )
+                          });
                         },
                         style: {
                           width: 200,
@@ -68007,7 +67846,7 @@ function ChatChartCard({
                           padding: 8,
                           background: "#fff"
                         },
-                        children: columnSelectOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime87.jsx)("option", { value: option.value, children: option.label }, option.value))
+                        children: columnOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime87.jsx)("option", { value: option.value, children: option.label }, option.value))
                       }
                     )
                   ]
@@ -68033,28 +67872,27 @@ function ChatChartCard({
                   onChange: (e) => setReport({ groupColumnsBy: e.target.value ?? "" })
                 }
               ),
-              aggregationOptions.map((row, index) => /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
+              aggregations.map((value, index) => /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
                 SelectComponent,
                 {
-                  value: row.value,
-                  label: row.label,
+                  value,
+                  label: `Aggregation ${index + 1}`,
                   width: 200,
-                  options: row.options,
+                  options: aggregationOptions,
                   onChange: (e) => setReport({
-                    aggregations: { index, value: e.target.value ?? "" }
+                    aggregations: aggregations.map(
+                      (aggregation, i) => i === index ? e.target.value ?? "" : aggregation
+                    )
                   })
                 },
-                row.key
+                `aggregation-${index}`
               )),
               /* @__PURE__ */ (0, import_jsx_runtime87.jsx)(
                 ButtonComponent,
                 {
                   label: "Add aggregation",
                   onClick: () => setReport({
-                    aggregations: {
-                      index: aggregations.length,
-                      value: "count transactions"
-                    }
+                    aggregations: [...aggregations, "count:transactions"]
                   })
                 }
               ),
@@ -68192,7 +68030,7 @@ function ToolCallBlock({ toolCall }) {
   );
 }
 function ToolCallResult({ content }) {
-  const [expanded, setExpanded] = (0, import_react64.useState)(false);
+  const [expanded, setExpanded] = (0, import_react63.useState)(false);
   if (!content) return null;
   const isLong = content.length > 300;
   const displayed = isLong && !expanded ? content.slice(0, 300) + "..." : content;
@@ -68244,18 +68082,18 @@ function Chat({
   agentEndpoint,
   suggestions
 }) {
-  const [client] = (0, import_react64.useContext)(ClientContext);
-  const { getToken } = (0, import_react64.useContext)(FetchContext);
-  const { tenants } = (0, import_react64.useContext)(TenantContext);
-  const [messages, setMessages] = (0, import_react64.useState)([]);
-  const [input, setInput] = (0, import_react64.useState)("");
-  const [inputError, setInputError] = (0, import_react64.useState)("");
-  const [isLoading, setIsLoading] = (0, import_react64.useState)(false);
-  const [model, setModel] = (0, import_react64.useState)("gemini-3-flash-preview");
-  const containerRef = (0, import_react64.useRef)(null);
-  const textareaRef = (0, import_react64.useRef)(null);
-  const abortControllerRef = (0, import_react64.useRef)(null);
-  (0, import_react64.useEffect)(() => {
+  const [client] = (0, import_react63.useContext)(ClientContext);
+  const { getToken } = (0, import_react63.useContext)(FetchContext);
+  const { tenants } = (0, import_react63.useContext)(TenantContext);
+  const [messages, setMessages] = (0, import_react63.useState)([]);
+  const [input, setInput] = (0, import_react63.useState)("");
+  const [inputError, setInputError] = (0, import_react63.useState)("");
+  const [isLoading, setIsLoading] = (0, import_react63.useState)(false);
+  const [model, setModel] = (0, import_react63.useState)("gemini-3-flash-preview");
+  const containerRef = (0, import_react63.useRef)(null);
+  const textareaRef = (0, import_react63.useRef)(null);
+  const abortControllerRef = (0, import_react63.useRef)(null);
+  (0, import_react63.useEffect)(() => {
     if (!containerRef.current) {
       return;
     }
@@ -68688,6 +68526,150 @@ function Chat({
   );
 }
 
+// src/hooks/useReportFilterDraft.ts
+var import_react64 = require("react");
+var normalizeOperatorKey = (operator) => String(operator ?? "").trim().toLowerCase().replace(/[_\s]+/g, "");
+var defaultFilterRuleValueForOperator = (operator) => {
+  const key = normalizeOperatorKey(operator);
+  if (key === "in" || key === "notin") {
+    return [];
+  }
+  return "";
+};
+var EMPTY_COMMITTED_FILTERS = {
+  combinator: "and",
+  rules: []
+};
+var hashString2 = (input) => {
+  let hash = 2166136261;
+  for (let i = 0; i < input.length; i++) {
+    hash ^= input.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return String(hash >>> 0);
+};
+var fieldCatalogSignature = (fields) => {
+  const names = fields.map((field) => String(field.name ?? "").trim()).filter(Boolean).sort();
+  return `${names.length}:${hashString2(names.join("\0"))}`;
+};
+var committedFiltersSignature = (committed) => {
+  try {
+    return hashString2(
+      JSON.stringify(stripQueryBuilderTransientFields(committed))
+    );
+  } catch {
+    return "unserializable";
+  }
+};
+function useReportFilterDraft(args) {
+  const { reportId, committedFilters, queryBuilderProps, setFilters } = args;
+  const committed = isQueryBuilderDisplayGroup(committedFilters) ? committedFilters : EMPTY_COMMITTED_FILTERS;
+  const committedRef = (0, import_react64.useRef)(committed);
+  committedRef.current = committed;
+  const setFiltersRef = (0, import_react64.useRef)(setFilters);
+  setFiltersRef.current = setFilters;
+  const lastNonEmptyFieldsRef = (0, import_react64.useRef)([]);
+  const prevReportIdForFieldsRef = (0, import_react64.useRef)(reportId);
+  if (prevReportIdForFieldsRef.current !== reportId) {
+    prevReportIdForFieldsRef.current = reportId;
+    lastNonEmptyFieldsRef.current = [];
+  }
+  if (queryBuilderProps.fields.length > 0) {
+    lastNonEmptyFieldsRef.current = queryBuilderProps.fields;
+  }
+  const effectiveFields = queryBuilderProps.fields.length > 0 ? queryBuilderProps.fields : lastNonEmptyFieldsRef.current;
+  const committedSignature = (0, import_react64.useMemo)(
+    () => committedFiltersSignature(committed),
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- `committed` normalizes null to a stable constant
+    [committedFilters]
+  );
+  const fieldsSignature = (0, import_react64.useMemo)(
+    () => fieldCatalogSignature(effectiveFields),
+    [effectiveFields]
+  );
+  const [resetEpoch, setResetEpoch] = (0, import_react64.useState)(0);
+  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);
+  }
+  const filterDraftKey = `${draftResetKey}|${fieldsSignature}`;
+  const handleQueryChange = (0, import_react64.useCallback)((next) => {
+    if (!isQueryBuilderDisplayGroup(next)) return;
+    const nextGroup = next;
+    setDraftQuery(nextGroup);
+    const nextDirty = areQueryBuilderFilterDraftsDirty(
+      nextGroup,
+      committedRef.current
+    );
+    setHasUnappliedFilterChanges(
+      (prev) => prev === nextDirty ? prev : nextDirty
+    );
+  }, []);
+  const applyFilterDraft = (0, import_react64.useCallback)(() => {
+    setFiltersRef.current(draftQuery);
+  }, [draftQuery]);
+  const resetFilterDraft = (0, import_react64.useCallback)(() => {
+    setDraftQuery(committedRef.current);
+    setHasUnappliedFilterChanges(false);
+    setResetEpoch((epoch) => epoch + 1);
+  }, []);
+  const getDefaultValue = (0, import_react64.useCallback)(
+    (rule) => defaultFilterRuleValueForOperator(rule?.operator),
+    []
+  );
+  const filterDraftQueryBuilderProps = (0, import_react64.useMemo)(
+    () => ({
+      ...queryBuilderProps,
+      fields: effectiveFields,
+      // Uncontrolled: react-querybuilder owns the draft; only read at mount,
+      // while state keeps the next mount hydrated from the latest edits.
+      defaultQuery: draftQuery,
+      onQueryChange: handleQueryChange,
+      addRuleToNewGroups: true,
+      getDefaultValue
+    }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- filterDraftKey covers draftRef resets
+    [
+      queryBuilderProps,
+      effectiveFields,
+      draftQuery,
+      handleQueryChange,
+      getDefaultValue,
+      filterDraftKey
+    ]
+  );
+  return {
+    filterDraftKey,
+    filterDraftQueryBuilderProps,
+    hasUnappliedFilterChanges,
+    applyFilterDraft,
+    resetFilterDraft
+  };
+}
+
+// src/hooks/useReportQueryBuilder.ts
+function useReportQueryBuilder(args) {
+  const draft = useReportFilterDraft({
+    reportId: args.reportId ?? "",
+    committedFilters: args.filters,
+    queryBuilderProps: args.queryBuilderProps,
+    setFilters: args.onApply
+  });
+  return {
+    key: draft.filterDraftKey,
+    props: draft.filterDraftQueryBuilderProps,
+    hasUnappliedChanges: draft.hasUnappliedFilterChanges,
+    apply: draft.applyFilterDraft,
+    discard: draft.resetFilterDraft,
+    reset: draft.resetFilterDraft
+  };
+}
+
 // src/ReportDetail.tsx
 var import_react65 = require("react");
 var import_jsx_runtime89 = require("react/jsx-runtime");
@@ -69818,7 +69800,6 @@ init_constants();
   Table,
   ThemeContext,
   areQueryBuilderFilterDraftsDirty,
-  buildSeededFilterQuery,
   countFilterRules,
   defaultFilterRuleValueForOperator,
   downloadCSV,
@@ -69843,6 +69824,7 @@ init_constants();
   useQuill,
   useReport,
   useReportBuilder,
+  useReportQueryBuilder,
   useReports,
   useTenants,
   useVirtualTables