npm - @quillsql/react - Versions diffs - 2.16.48 → 2.16.49 - Mend

@quillsql/react 2.16.48 → 2.16.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.js CHANGED Viewed

@@ -58633,23 +58633,23 @@ function ChartEditor({
 }
 // src/Chat.tsx
-import { useContext as useContext37, useEffect as useEffect32, useRef as useRef26, useState as useState43 } from "react";
+import { useContext as useContext37, useEffect as useEffect32, useRef as useRef25, useState as useState42 } from "react";
 // src/ChatChartCard.tsx
-import { useMemo as useMemo34 } from "react";
+import { useMemo as useMemo33 } from "react";
 // src/hooks/useForm.tsx
 init_Filter();
 init_ReportBuilder();
 import {
-  useCallback as useCallback6,
+  useCallback as useCallback5,
   useContext as useContext36,
   useEffect as useEffect31,
   useLayoutEffect as useLayoutEffect4,
-  useMemo as useMemo33,
+  useMemo as useMemo32,
   useReducer as useReducer2,
-  useRef as useRef25,
-  useState as useState42
+  useRef as useRef24,
+  useState as useState41
 } from "react";
 import { keepPreviousData, useQuery } from "@tanstack/react-query";
 init_util();
@@ -59657,171 +59657,6 @@ function countFilterRules(value) {
   }, 0);
 }
-// src/hooks/useReportFilterDraft.ts
-import { useCallback as useCallback5, useMemo as useMemo32, useRef as useRef24, useState as useState41 } from "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 = useRef24(committed);
-  committedRef.current = committed;
-  const setFiltersRef = useRef24(setFilters);
-  setFiltersRef.current = setFilters;
-  const lastNonEmptyFieldsRef = useRef24([]);
-  const prevReportIdForFieldsRef = useRef24(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 = useRef24(effectiveFields);
-  effectiveFieldsRef.current = effectiveFields;
-  const getOperatorsRef = useRef24(queryBuilderProps.getOperators);
-  getOperatorsRef.current = queryBuilderProps.getOperators;
-  const committedSignature = useMemo32(
-    () => committedFiltersSignature(committed),
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- `committed` normalizes null to a stable constant
-    [committedFilters]
-  );
-  const fieldsSignature = useMemo32(
-    () => fieldCatalogSignature(effectiveFields),
-    [effectiveFields]
-  );
-  const [resetEpoch, setResetEpoch] = useState41(0);
-  const [seedEpoch, setSeedEpoch] = useState41(0);
-  const draftRef = useRef24(committed);
-  const [isFilterDraftDirty, setIsFilterDraftDirty] = useState41(false);
-  const [isFilterDraftEmpty, setIsFilterDraftEmpty] = useState41(
-    committed.rules.length === 0
-  );
-  const draftResetKey = `${reportId}|${committedSignature}|${resetEpoch}`;
-  const prevDraftResetKeyRef = useRef24(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 = useCallback5((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 = useCallback5(() => {
-    setFiltersRef.current(draftRef.current);
-  }, []);
-  const resetFilterDraft = useCallback5(() => {
-    draftRef.current = committedRef.current;
-    setIsFilterDraftDirty(false);
-    setIsFilterDraftEmpty(committedRef.current.rules.length === 0);
-    setResetEpoch((epoch) => epoch + 1);
-  }, []);
-  const seedFilterDraft = useCallback5(() => {
-    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 = useCallback5(
-    (rule) => defaultFilterRuleValueForOperator(rule?.operator),
-    []
-  );
-  const filterDraftQueryBuilderProps = useMemo32(
-    () => ({
-      ...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}`;
@@ -60079,6 +59914,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" },
@@ -60141,6 +59983,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();
@@ -62283,9 +62129,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,
@@ -62342,7 +62185,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) {
@@ -63354,10 +63200,10 @@ function generateDraftSessionId() {
 }
 function useReport(reportIdArg, options = {}) {
   const propReportId = String(reportIdArg ?? "").trim();
-  const [createdReportId, setCreatedReportId] = useState42(null);
+  const [createdReportId, setCreatedReportId] = useState41(null);
   const effectiveReportId = propReportId || createdReportId || "";
   const { eventTracking } = useContext36(EventTrackingContext);
-  const [draftSessionId, setDraftSessionId] = useState42(generateDraftSessionId);
+  const [draftSessionId, setDraftSessionId] = useState41(generateDraftSessionId);
   const useInMemoryEngines = options.useInMemoryEngines ?? false;
   const restrictFieldOptionsToSelectedDatasources = options.restrictFieldOptionsToSelectedDatasources ?? true;
   const reportOverride = options.reportOverride ?? null;
@@ -63366,30 +63212,30 @@ function useReport(reportIdArg, options = {}) {
     options.destinationDashboardName ?? ""
   ).trim();
   const controlledPagination = options.state?.pagination;
-  const initialPaginationRef = useRef25({
+  const initialPaginationRef = useRef24({
     ...getDefaultPaginationState(),
     ...options.initialState?.pagination ?? {}
   });
-  const [internalPagination, setInternalPagination] = useState42(
+  const [internalPagination, setInternalPagination] = useState41(
     initialPaginationRef.current
   );
-  const [paginationInteracted, setPaginationInteracted] = useState42(
+  const [paginationInteracted, setPaginationInteracted] = useState41(
     () => Boolean(
       options.state?.pagination || options.initialState?.pagination || options.onPaginationChange
     )
   );
   const pagination = controlledPagination ?? internalPagination;
   const paginationActive = paginationInteracted || Boolean(controlledPagination);
-  const paginationRef = useRef25(pagination);
+  const paginationRef = useRef24(pagination);
   paginationRef.current = pagination;
-  const onPaginationChangeRef = useRef25(options.onPaginationChange);
+  const onPaginationChangeRef = useRef24(options.onPaginationChange);
   onPaginationChangeRef.current = options.onPaginationChange;
-  const controlledPaginationRef = useRef25(Boolean(controlledPagination));
+  const controlledPaginationRef = useRef24(Boolean(controlledPagination));
   controlledPaginationRef.current = Boolean(controlledPagination);
-  const autoResetPageIndexRef = useRef25(true);
+  const autoResetPageIndexRef = useRef24(true);
   autoResetPageIndexRef.current = options.autoResetPageIndex ?? true;
-  const paginationPageCountRef = useRef25(-1);
-  const applyPaginationUpdate = useCallback6(
+  const paginationPageCountRef = useRef24(-1);
+  const applyPaginationUpdate = useCallback5(
     (updater, { activate = true } = {}) => {
       if (activate) {
         setPaginationInteracted(true);
@@ -63401,11 +63247,11 @@ function useReport(reportIdArg, options = {}) {
     },
     []
   );
-  const setPagination = useCallback6(
+  const setPagination = useCallback5(
     (updater) => applyPaginationUpdate(updater),
     [applyPaginationUpdate]
   );
-  const setPageIndex = useCallback6(
+  const setPageIndex = useCallback5(
     (updater) => applyPaginationUpdate((old) => ({
       ...old,
       pageIndex: clampPageIndex(
@@ -63415,7 +63261,7 @@ function useReport(reportIdArg, options = {}) {
     })),
     [applyPaginationUpdate]
   );
-  const setPageSize = useCallback6(
+  const setPageSize = useCallback5(
     (updater) => applyPaginationUpdate(
       (old) => paginationStateAfterPageSizeChange(
         old,
@@ -63424,62 +63270,64 @@ function useReport(reportIdArg, options = {}) {
     ),
     [applyPaginationUpdate]
   );
-  const resetPagination = useCallback6(
+  const resetPagination = useCallback5(
     (defaultState) => applyPaginationUpdate(
       defaultState ? getDefaultPaginationState() : initialPaginationRef.current
     ),
     [applyPaginationUpdate]
   );
-  const resetPageIndex = useCallback6(
+  const resetPageIndex = useCallback5(
     (defaultState) => {
       const target = defaultState ? 0 : initialPaginationRef.current.pageIndex;
       setPageIndex(target);
     },
     [setPageIndex]
   );
-  const resetPageSize = useCallback6(
+  const resetPageSize = useCallback5(
     (defaultState) => {
       const target = defaultState ? getDefaultPaginationState().pageSize : initialPaginationRef.current.pageSize;
       setPageSize(target);
     },
     [setPageSize]
   );
-  const nextPage = useCallback6(
+  const nextPage = useCallback5(
     () => setPageIndex((old) => old + 1),
     [setPageIndex]
   );
-  const previousPage = useCallback6(
+  const previousPage = useCallback5(
     () => setPageIndex((old) => old - 1),
     [setPageIndex]
   );
-  const firstPage = useCallback6(() => setPageIndex(0), [setPageIndex]);
-  const lastPage = useCallback6(
+  const firstPage = useCallback5(() => setPageIndex(0), [setPageIndex]);
+  const lastPage = useCallback5(
     () => setPageIndex(paginationPageCountRef.current - 1),
     [setPageIndex]
   );
-  const chartPivotHydratedFromSourceRef = useRef25(false);
-  const lastPivotHydrateCompletedSourceIdRef = useRef25(null);
-  const groupRowsBySetViaSetReportRef = useRef25(false);
-  const groupColumnsBySetViaSetReportRef = useRef25(false);
-  const aggregationStateSetViaSetReportRef = useRef25(false);
-  const prevReportIdForChartPivotHydrationRef = useRef25(effectiveReportId);
+  const chartPivotHydratedFromSourceRef = useRef24(false);
+  const lastPivotHydrateCompletedSourceIdRef = useRef24(null);
+  const groupRowsBySetViaSetReportRef = useRef24(false);
+  const groupColumnsBySetViaSetReportRef = useRef24(false);
+  const dateBucketSetViaSetReportRef = useRef24(false);
+  const aggregationStateSetViaSetReportRef = useRef24(false);
+  const prevReportIdForChartPivotHydrationRef = useRef24(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] = useState42(0);
+  const [chartPivotHydrationEpoch, setChartPivotHydrationEpoch] = useState41(0);
   const [
     expandReportBuilderColumnsForFlatTable,
     setExpandReportBuilderColumnsForFlatTable
-  ] = useState42(false);
-  const prevPivotStateForColumnExpansionRef = useRef25(null);
-  const [sourceReport, setSourceReport] = useState42(
+  ] = useState41(false);
+  const prevPivotStateForColumnExpansionRef = useRef24(null);
+  const [sourceReport, setSourceReport] = useState41(
     null
   );
-  const prevSourceReportIdForPivotHydrationRef = useRef25(null);
+  const prevSourceReportIdForPivotHydrationRef = useRef24(null);
   {
     const currentSourceId = sourceReport ? String(
       sourceReport.id ?? sourceReport._id ?? ""
@@ -63491,11 +63339,11 @@ function useReport(reportIdArg, options = {}) {
       lastPivotHydrateCompletedSourceIdRef.current = null;
     }
   }
-  const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = useState42(false);
-  const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = useState42(null);
-  const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = useState42(null);
-  const [chartAxisEdits, setChartAxisEdits] = useState42({});
-  const [chartVisibilityOverrides, setChartVisibilityOverrides] = useState42({});
+  const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = useState41(false);
+  const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = useState41(null);
+  const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = useState41(null);
+  const [chartAxisEdits, setChartAxisEdits] = useState41({});
+  const [chartVisibilityOverrides, setChartVisibilityOverrides] = useState41({});
   const [client] = useContext36(ClientContext);
   const [schemaData] = useContext36(SchemaDataContext);
   const { tenants, flags } = useContext36(TenantContext);
@@ -63508,7 +63356,7 @@ function useReport(reportIdArg, options = {}) {
     clientDefaultDashboardName,
     destinationDashboardName
   ].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
-  const initialFormState = useMemo33(
+  const initialFormState = useMemo32(
     () => ({
       columns: [],
       queryColumns: [],
@@ -63516,6 +63364,7 @@ function useReport(reportIdArg, options = {}) {
       queryFilters: { combinator: "and", rules: [] },
       groupRowsBy: void 0,
       groupColumnsBy: void 0,
+      dateBucket: void 0,
       aggregationState: [],
       aggregationTablesByIndex: [],
       pivotSort: void 0,
@@ -63545,6 +63394,7 @@ function useReport(reportIdArg, options = {}) {
     queryFilters,
     groupRowsBy,
     groupColumnsBy,
+    dateBucket,
     aggregationState,
     aggregationTablesByIndex,
     pivotSort,
@@ -63554,16 +63404,16 @@ function useReport(reportIdArg, options = {}) {
     schemaDatasourceIds
   } = formState;
   const schemaDatasourceIdsKey = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).join("\0") ?? "";
-  const queryColumnsBootstrapKey = useMemo33(
+  const queryColumnsBootstrapKey = useMemo32(
     () => queryColumns.map(
       (c) => `${String(c.table ?? "").trim()}\0${String(c.field ?? "").trim()}`
     ).join("\n"),
     [queryColumns]
   );
-  const dashboardNameForNewReport = useMemo33(() => {
+  const dashboardNameForNewReport = useMemo32(() => {
     return [clientDefaultDashboardName, destinationDashboardName].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   }, [clientDefaultDashboardName, destinationDashboardName]);
-  const filterStackRef = useRef25(filterStack);
+  const filterStackRef = useRef24(filterStack);
   filterStackRef.current = filterStack;
   const resolvedGroupRowsBy = decodePivotGroupOptionValue(groupRowsBy);
   const resolvedGroupColumnsBy = decodePivotGroupOptionValue(groupColumnsBy);
@@ -63578,8 +63428,8 @@ function useReport(reportIdArg, options = {}) {
     setChartAxisEdits({});
     setChartVisibilityOverrides({});
   }, [effectiveReportId]);
-  const bootstrapReportTaskUsedForReportIdRef = useRef25(null);
-  const schemaScopeInitializedForReportIdRef = useRef25(null);
+  const bootstrapReportTaskUsedForReportIdRef = useRef24(null);
+  const schemaScopeInitializedForReportIdRef = useRef24(null);
   const initializeSchemaScopeForReport = (report) => {
     if (!report) return;
     if (schemaScopeInitializedForReportIdRef.current === effectiveReportId)
@@ -63592,26 +63442,26 @@ function useReport(reportIdArg, options = {}) {
     );
     schemaScopeInitializedForReportIdRef.current = effectiveReportId;
   };
-  const internalFilters = useMemo33(
+  const internalFilters = useMemo32(
     () => internalFiltersFromFilterStack(filterStack),
     [filterStack]
   );
-  const customFilters = useMemo33(
+  const customFilters = useMemo32(
     () => customFiltersFromFilterStack(filterStack),
     [filterStack]
   );
-  const reloadKey = useMemo33(() => 0, []);
-  const schemaForReportBuilderState = useMemo33(() => {
+  const reloadKey = useMemo32(() => 0, []);
+  const schemaForReportBuilderState = useMemo32(() => {
     if (schemaData.schemaWithCustomFields?.length) {
       return schemaData.schemaWithCustomFields;
     }
     return schemaData.schema ?? [];
   }, [schemaData.schema, schemaData.schemaWithCustomFields]);
-  const schemaForReportBuilderStateRef = useRef25(schemaForReportBuilderState);
-  const customFieldsRef = useRef25(schemaData.customFields);
+  const schemaForReportBuilderStateRef = useRef24(schemaForReportBuilderState);
+  const customFieldsRef = useRef24(schemaData.customFields);
   schemaForReportBuilderStateRef.current = schemaForReportBuilderState;
   customFieldsRef.current = schemaData.customFields;
-  const isBoolAggregationField = useCallback6(
+  const isBoolAggregationField = useCallback5(
     (field, table2) => {
       const fieldType = resolveFieldType({
         field,
@@ -63624,19 +63474,19 @@ function useReport(reportIdArg, options = {}) {
     },
     []
   );
-  const schemaForeignKeyMap = useMemo33(
+  const schemaForeignKeyMap = useMemo32(
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
   );
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
-  const selectedBaseTableNamesForFieldOptions = useMemo33(() => {
+  const selectedBaseTableNamesForFieldOptions = useMemo32(() => {
     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 = useMemo33(() => {
+  const fieldOptionsAllowedTableNames = useMemo32(() => {
     if (!restrictFieldOptionsToSelectedDatasources) {
       return null;
     }
@@ -63738,18 +63588,18 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     queryColumnsBootstrapKey
   ]);
-  const datasourceOptions = useMemo33(() => {
+  const datasourceOptions = useMemo32(() => {
     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 = useMemo33(() => {
+  const queryBuilderFieldConfigByName = useMemo32(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState
     );
@@ -63883,7 +63733,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.columns,
     sourceReport?.reportBuilderState?.columns
   ]);
-  const filterUniqueValuesRequest = useMemo33(() => {
+  const filterUniqueValuesRequest = useMemo32(() => {
     const dashboardName = resolvedSourceDashboardName;
     const reportBuilderStateFromSource = sourceReport?.reportBuilderState;
     const isStringReportBuilderColumn = (column) => {
@@ -64104,13 +63954,13 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.reportBuilderState,
     resolvedSourceDashboardName
   ]);
-  const filterUniqueValuesRequestHash = useMemo33(
+  const filterUniqueValuesRequestHash = useMemo32(
     () => stableSerializeForQueryKey(
       filterUniqueValuesRequestForQueryKey(filterUniqueValuesRequest)
     ),
     [filterUniqueValuesRequest]
   );
-  const customFiltersHashForUniqueValues = useMemo33(
+  const customFiltersHashForUniqueValues = useMemo32(
     () => stableSerializeForQueryKey(customFilters),
     [customFilters]
   );
@@ -64207,7 +64057,7 @@ function useReport(reportIdArg, options = {}) {
     enabled: filterUniqueValuesEnabled,
     retry: false
   });
-  const backendUniqueValuesByFieldName = useMemo33(() => {
+  const backendUniqueValuesByFieldName = useMemo32(() => {
     const valuesByField = /* @__PURE__ */ new Map();
     const uniqueValuesByColumn = filterUniqueValuesQuery.data?.uniqueValuesByColumn;
     if (!uniqueValuesByColumn || typeof uniqueValuesByColumn !== "object") {
@@ -64256,7 +64106,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     useFormFiltersDebugEnabled
   ]);
-  const filterValueOptionsByFieldName = useMemo33(() => {
+  const filterValueOptionsByFieldName = useMemo32(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     const selectedMultiselectByField = collectSelectedStringMultiselectValuesByField(queryFilters);
     const collectValuesForField = (fieldName) => {
@@ -64322,7 +64172,7 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const filterFieldsComputed = useMemo33(() => {
+  const filterFieldsComputed = useMemo32(() => {
     const fields = [];
     const seen = /* @__PURE__ */ new Set();
     const addField = (fieldName, fieldType, tableName, rawFieldName) => {
@@ -64423,9 +64273,9 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const filterFieldsStableReportIdRef = useRef25("");
-  const filterFieldsStableCacheRef = useRef25([]);
-  const filterFields = useMemo33(() => {
+  const filterFieldsStableReportIdRef = useRef24("");
+  const filterFieldsStableCacheRef = useRef24([]);
+  const filterFields = useMemo32(() => {
     const rid = String(effectiveReportId ?? "");
     if (filterFieldsStableReportIdRef.current !== rid) {
       filterFieldsStableReportIdRef.current = rid;
@@ -64440,14 +64290,14 @@ function useReport(reportIdArg, options = {}) {
     }
     return filterFieldsComputed;
   }, [effectiveReportId, filterFieldsComputed]);
-  const getFilterOperators = useMemo33(
+  const getFilterOperators = useMemo32(
     () => (_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 = useMemo33(
+  const getFilterInputType = useMemo32(
     () => (_field, operator, misc) => {
       const fieldType = misc?.fieldData?.quillFieldType ?? queryBuilderFieldConfigByName[String(_field ?? "").trim()]?.fieldType ?? "string";
       if (fieldType === "date" && isRelativeDateQueryBuilderOperator(operator)) {
@@ -64457,17 +64307,20 @@ function useReport(reportIdArg, options = {}) {
     },
     [queryBuilderFieldConfigByName]
   );
-  const getFilterValueEditorType = useMemo33(
+  const getFilterValueEditorType = useMemo32(
     () => (_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 = useMemo33(
+  const getFilterValues = useMemo32(
     () => (_field, operator, misc) => {
       const fieldName = String(_field ?? "").trim();
       if (!fieldName) {
@@ -64478,6 +64331,9 @@ function useReport(reportIdArg, options = {}) {
         misc,
         queryBuilderFieldConfigByName
       );
+      if (fieldType === "boolean") {
+        return BOOLEAN_FILTER_VALUE_OPTIONS;
+      }
       if (fieldType !== "string" || !isMultiValueOperator(operator)) {
         return [];
       }
@@ -64494,7 +64350,7 @@ function useReport(reportIdArg, options = {}) {
     },
     [filterValueOptionsByFieldName, queryBuilderFieldConfigByName]
   );
-  const filterQueryBuilderProps = useMemo33(
+  const filterQueryBuilderProps = useMemo32(
     () => ({
       fields: filterFields,
       listsAsArrays: true,
@@ -64511,7 +64367,7 @@ function useReport(reportIdArg, options = {}) {
       getFilterValues
     ]
   );
-  const filtersForQueryBuilder = useMemo33(
+  const filtersForQueryBuilder = useMemo32(
     () => canonicalizeMultiselectStringRulesToOptionValues(
       queryFilters,
       filterValueOptionsByFieldName,
@@ -64578,12 +64434,12 @@ function useReport(reportIdArg, options = {}) {
       ...table2 ? { table: table2 } : {}
     };
   };
-  const tenantHash = useMemo33(
+  const tenantHash = useMemo32(
     () => stableSerializeForQueryKey(tenants),
     [tenants]
   );
-  const flagHash = useMemo33(() => stableSerializeForQueryKey(flags), [flags]);
-  const clientHash = useMemo33(
+  const flagHash = useMemo32(() => stableSerializeForQueryKey(flags), [flags]);
+  const clientHash = useMemo32(
     () => stableSerializeForQueryKey({
       publicKey: client?.publicKey,
       clientId: client?.clientId,
@@ -64591,7 +64447,7 @@ function useReport(reportIdArg, options = {}) {
     }),
     [client]
   );
-  const reloadKeyHash = useMemo33(
+  const reloadKeyHash = useMemo32(
     () => stableSerializeForQueryKey(reloadKey),
     [reloadKey]
   );
@@ -64624,6 +64480,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,
@@ -64810,6 +64667,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,
@@ -64818,6 +64677,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 ? {
@@ -64850,11 +64710,11 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     sourceReport
   ]);
-  const appliedAggregationState = useMemo33(
+  const appliedAggregationState = useMemo32(
     () => aggregationState.filter(isAppliedAggregation),
     [aggregationState]
   );
-  const pivotState = useMemo33(() => {
+  const pivotState = useMemo32(() => {
     if (!resolvedGroupRowsBy && !resolvedGroupColumnsBy && appliedAggregationState.length === 0) {
       return null;
     }
@@ -64898,6 +64758,7 @@ function useReport(reportIdArg, options = {}) {
       rowFieldType,
       columnField: effectiveColumnField,
       columnFieldType,
+      dateBucket: chartPivotHydratedFromSourceRef.current ? dateBucket : dateBucket ?? priorPivot?.dateBucket,
       aggregations,
       ...rowFieldTable ? { rowFieldTable } : {},
       ...columnFieldTable ? { columnFieldTable } : {}
@@ -64908,6 +64769,7 @@ function useReport(reportIdArg, options = {}) {
     aggregationTablesByIndex,
     appliedAggregationState,
     baseReportBuilderTables,
+    dateBucket,
     groupColumnsBy,
     groupRowsBy,
     schemaForReportBuilderState,
@@ -64929,7 +64791,7 @@ function useReport(reportIdArg, options = {}) {
     }
     prevPivotStateForColumnExpansionRef.current = pivotState;
   }, [pivotState]);
-  const effectiveReportBuilderTables = useMemo33(() => {
+  const effectiveReportBuilderTables = useMemo32(() => {
     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(
@@ -64953,28 +64815,18 @@ function useReport(reportIdArg, options = {}) {
     queryColumns,
     schemaDatasourceIds
   ]);
-  const datasources = useMemo33(() => {
-    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 = useMemo32(() => {
+    return effectiveReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2));
   }, [effectiveReportBuilderTables]);
-  const effectiveReportBuilderTableNames = useMemo33(
+  const effectiveReportBuilderTableNames = useMemo32(
     () => effectiveReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [effectiveReportBuilderTables]
   );
-  const baseReportBuilderTableNames = useMemo33(
+  const baseReportBuilderTableNames = useMemo32(
     () => baseReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [baseReportBuilderTables]
   );
-  const normalizeQueryBuilderFieldNameForConfig = useMemo33(() => {
+  const normalizeQueryBuilderFieldNameForConfig = useMemo32(() => {
     const configEntries = Object.entries(queryBuilderFieldConfigByName);
     const preferredTableNames = /* @__PURE__ */ new Set([
       ...effectiveReportBuilderTableNames,
@@ -65036,7 +64888,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportBuilderTableNames,
     queryBuilderFieldConfigByName
   ]);
-  const normalizeQueryBuilderFiltersForConfig = useMemo33(() => {
+  const normalizeQueryBuilderFiltersForConfig = useMemo32(() => {
     const normalizeGroup = (group) => {
       const groupRules = Array.isArray(group.rules) ? group.rules : [];
       const nextRules = groupRules.map((entry) => {
@@ -65073,14 +64925,14 @@ function useReport(reportIdArg, options = {}) {
       return normalizeGroup(group);
     };
   }, [normalizeQueryBuilderFieldNameForConfig, queryBuilderFieldConfigByName]);
-  const refreshSelectionTables = useMemo33(() => {
+  const refreshSelectionTables = useMemo32(() => {
     return [
       getPivotGroupOptionTable(groupRowsBy),
       getPivotGroupOptionTable(groupColumnsBy),
       ...aggregationTablesByIndex
     ].map((tableName) => String(tableName ?? "").trim()).filter((tableName) => Boolean(tableName));
   }, [aggregationTablesByIndex, groupColumnsBy, groupRowsBy]);
-  const refreshSelectionFields = useMemo33(() => {
+  const refreshSelectionFields = useMemo32(() => {
     const resolveFieldTableForSelection = (field, tableHint) => {
       const fieldName = String(field ?? "").trim();
       if (!fieldName) return "";
@@ -65130,7 +64982,7 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     sourceReport
   ]);
-  const refreshDecision = useMemo33(
+  const refreshDecision = useMemo32(
     () => decideReportBuilderRefresh({
       baseTables: baseReportBuilderTables,
       baseColumns: baseReportBuilderColumns,
@@ -65144,7 +64996,7 @@ function useReport(reportIdArg, options = {}) {
       refreshSelectionTables
     ]
   );
-  const effectiveReportBuilderColumns = useMemo33(() => {
+  const effectiveReportBuilderColumns = useMemo32(() => {
     const columnsFromPivot = [];
     const appendPivotColumn = (field, tableHint) => {
       const normalizedField = String(field ?? "").trim();
@@ -65242,7 +65094,7 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const resolvedSortFieldType = useMemo33(() => {
+  const resolvedSortFieldType = useMemo32(() => {
     const sortField = pivotSort?.sortField;
     if (!sortField || !pivotState) return void 0;
     if (sortField === resolvedGroupRowsBy) {
@@ -65263,7 +65115,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupColumnsBy,
     resolvedGroupRowsBy
   ]);
-  const effectiveReportBuilderState = useMemo33(() => {
+  const effectiveReportBuilderState = useMemo32(() => {
     if (!sourceReport && effectiveReportBuilderTables.length === 0) {
       return void 0;
     }
@@ -65302,11 +65154,11 @@ function useReport(reportIdArg, options = {}) {
     resolvedSortFieldType,
     sourceReport
   ]);
-  const effectiveReportBuilderStateHash = useMemo33(
+  const effectiveReportBuilderStateHash = useMemo32(
     () => stableSerializeForQueryKey(effectiveReportBuilderState),
     [effectiveReportBuilderState]
   );
-  const prevPaginationResetStateHashRef = useRef25(null);
+  const prevPaginationResetStateHashRef = useRef24(null);
   useEffect31(() => {
     const prevHash = prevPaginationResetStateHashRef.current;
     prevPaginationResetStateHashRef.current = effectiveReportBuilderStateHash;
@@ -65323,7 +65175,7 @@ function useReport(reportIdArg, options = {}) {
       activate: false
     });
   }, [applyPaginationUpdate, effectiveReportBuilderStateHash]);
-  const pivotTableDataReportBuilderState = useMemo33(() => {
+  const pivotTableDataReportBuilderState = useMemo32(() => {
     if (!effectiveReportBuilderState?.pivot) {
       return void 0;
     }
@@ -65343,11 +65195,11 @@ function useReport(reportIdArg, options = {}) {
       limit: null
     };
   }, [effectiveReportBuilderState, schemaForReportBuilderState]);
-  const pivotTableDataReportBuilderStateHash = useMemo33(
+  const pivotTableDataReportBuilderStateHash = useMemo32(
     () => stableSerializeForQueryKey(pivotTableDataReportBuilderState),
     [pivotTableDataReportBuilderState]
   );
-  const sourceReportMatchesEffectiveReportId = useMemo33(() => {
+  const sourceReportMatchesEffectiveReportId = useMemo32(() => {
     const loadTarget = String(effectiveReportId ?? "").trim();
     if (!loadTarget || !sourceReport) {
       return true;
@@ -65357,7 +65209,7 @@ function useReport(reportIdArg, options = {}) {
     ).trim();
     return sid === loadTarget;
   }, [effectiveReportId, sourceReport]);
-  const shouldSkipRedundantFlatTableReportBuilderQuery = useMemo33(() => {
+  const shouldSkipRedundantFlatTableReportBuilderQuery = useMemo32(() => {
     if (!sourceReport || pivotState) {
       return false;
     }
@@ -65423,7 +65275,7 @@ function useReport(reportIdArg, options = {}) {
     tableRefreshQueryEnabled,
     useFormRefreshDebugEnabled
   ]);
-  const chartTypes = useMemo33(() => {
+  const chartTypes = useMemo32(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
   useEffect31(() => {
@@ -65461,7 +65313,7 @@ function useReport(reportIdArg, options = {}) {
       });
     }
   }, [chartType, chartTypes, sourceReport]);
-  const schemaScopedTableNames = useMemo33(() => {
+  const schemaScopedTableNames = useMemo32(() => {
     if (preserveSchemaWideOptions) {
       return [];
     }
@@ -65476,7 +65328,7 @@ function useReport(reportIdArg, options = {}) {
     preserveSchemaWideOptions,
     sourceReport?.reportBuilderState?.tables
   ]);
-  const joinCompatibleSchemaTableNames = useMemo33(() => {
+  const joinCompatibleSchemaTableNames = useMemo32(() => {
     if (schemaScopedTableNames.length === 0) {
       return [];
     }
@@ -65485,7 +65337,7 @@ function useReport(reportIdArg, options = {}) {
       schemaForeignKeyMap
     );
   }, [schemaForeignKeyMap, schemaScopedTableNames]);
-  const aggregationFallbackTarget = useMemo33(() => {
+  const aggregationFallbackTarget = useMemo32(() => {
     const tableNames = effectiveReportBuilderTables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const referencedTableNames = (sourceReport?.referencedTables ?? []).filter(
       (name2) => typeof name2 === "string" && name2.length > 0
@@ -65493,7 +65345,7 @@ function useReport(reportIdArg, options = {}) {
     const tableNamesToUse = tableNames.length ? tableNames : referencedTableNames;
     return tableNamesToUse.length > 0 ? tableNamesToUse.join(", ") : "table";
   }, [effectiveReportBuilderTables, sourceReport?.referencedTables]);
-  const aggregationFallbackTableName = useMemo33(() => {
+  const aggregationFallbackTableName = useMemo32(() => {
     const tableNames = effectiveReportBuilderTables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const referencedTableNames = (sourceReport?.referencedTables ?? []).filter(
       (name2) => typeof name2 === "string" && name2.length > 0
@@ -65501,7 +65353,7 @@ function useReport(reportIdArg, options = {}) {
     const tableNamesToUse = tableNames.length ? tableNames : referencedTableNames;
     return tableNamesToUse[0] ?? "table";
   }, [effectiveReportBuilderTables, sourceReport?.referencedTables]);
-  const cleanedAggregations = useMemo33(() => {
+  const cleanedAggregations = useMemo32(() => {
     return aggregationState.filter((aggregation) => Boolean(aggregation?.aggregationType)).map((aggregation, index) => {
       const aggregationType = String(aggregation.aggregationType);
       const normalizedAggregationType = aggregationType.toLowerCase();
@@ -65523,7 +65375,7 @@ function useReport(reportIdArg, options = {}) {
     aggregationTablesByIndex,
     isBoolAggregationField
   ]);
-  const { aggregationBaseOptions, aggregationOptionTableLookup } = useMemo33(() => {
+  const { aggregationBaseOptions, aggregationOptionTableLookup } = useMemo32(() => {
     const joinScoped = fieldOptionsAllowedTableNames ? joinCompatibleSchemaTableNames.filter(
       (name2) => fieldOptionsAllowedTableNames.has(name2)
     ) : joinCompatibleSchemaTableNames;
@@ -65569,7 +65421,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({
@@ -65577,8 +65429,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);
+            }
           }
         }
       }
@@ -65600,7 +65458,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupRowsBy,
     schemaForReportBuilderState
   ]);
-  const { schemaColumnOptions, columnIdentifierLookup } = useMemo33(() => {
+  const { schemaColumnOptions, columnIdentifierLookup } = useMemo32(() => {
     const lookup = /* @__PURE__ */ new Map();
     const options2 = [];
     for (const table2 of schemaData.schemaWithCustomFields) {
@@ -65627,7 +65485,7 @@ function useReport(reportIdArg, options = {}) {
       columnIdentifierLookup: lookup
     };
   }, [schemaData.schemaWithCustomFields]);
-  const tableColumnPickerPoolOptions = useMemo33(() => {
+  const tableColumnPickerPoolOptions = useMemo32(() => {
     const allowed = new Set(
       effectiveReportBuilderTableNames.map((name2) => String(name2 ?? "").trim()).filter(Boolean)
     );
@@ -65638,16 +65496,16 @@ function useReport(reportIdArg, options = {}) {
       (option) => allowed.has(String(option.tableName ?? "").trim())
     );
   }, [effectiveReportBuilderTableNames, schemaColumnOptions]);
-  const columns = useMemo33(() => {
+  const columns = useMemo32(() => {
     return displayColumns.filter((column) => Boolean(column.field)).map((column) => encodeColumnOptionValue(column.table, column.field));
   }, [displayColumns]);
-  const selectedColumnOptions = useMemo33(() => {
+  const selectedColumnOptions = useMemo32(() => {
     return displayColumns.map((column) => {
       const value = column.alias || column.field;
       return value ? { label: value, value } : null;
     }).filter((option) => option !== null);
   }, [displayColumns]);
-  const scopedSchemaColumns = useMemo33(() => {
+  const scopedSchemaColumns = useMemo32(() => {
     const tableNames = fieldOptionsAllowedTableNames ? Array.from(fieldOptionsAllowedTableNames) : joinCompatibleSchemaTableNames;
     const schemaTables = schemaForReportBuilderState;
     const tablesToUse = tableNames.length ? schemaTables.filter((table2) => tableNames.includes(table2.name ?? "")) : schemaTables;
@@ -65668,7 +65526,7 @@ function useReport(reportIdArg, options = {}) {
     joinCompatibleSchemaTableNames,
     schemaForReportBuilderState
   ]);
-  const pivotUniqueValuesByColumn = useMemo33(() => {
+  const pivotUniqueValuesByColumn = useMemo32(() => {
     const explicitUniqueValues = sourceReport?.uniqueStringsByColumn ?? sourceReport?.columnUniqueValues ?? sourceReport?.uniqueValues;
     if (explicitUniqueValues && typeof explicitUniqueValues === "object" && !Array.isArray(explicitUniqueValues)) {
       return explicitUniqueValues;
@@ -65694,7 +65552,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return result;
   }, [sourceReport]);
-  const possiblePivotFields = useMemo33(() => {
+  const possiblePivotFields = useMemo32(() => {
     const options2 = getPossiblePivotFieldOptions(
       scopedSchemaColumns,
       pivotUniqueValuesByColumn
@@ -65705,7 +65563,7 @@ function useReport(reportIdArg, options = {}) {
       columnFields: options2.columnFields.filter((field) => !isIdColumn(field))
     };
   }, [scopedSchemaColumns, pivotUniqueValuesByColumn]);
-  const groupRowsByOptions = useMemo33(() => {
+  const groupRowsByOptions = useMemo32(() => {
     const allowedFields = new Set(possiblePivotFields.rowFields);
     const seenValues = /* @__PURE__ */ new Set();
     const options2 = [];
@@ -65732,7 +65590,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return options2;
   }, [groupRowsBy, possiblePivotFields.rowFields, scopedSchemaColumns]);
-  const groupColumnsByOptions = useMemo33(() => {
+  const groupColumnsByOptions = useMemo32(() => {
     const allowedFields = new Set(possiblePivotFields.columnFields);
     const seenValues = /* @__PURE__ */ new Set();
     const options2 = [];
@@ -65759,19 +65617,19 @@ function useReport(reportIdArg, options = {}) {
     }
     return options2;
   }, [groupColumnsBy, possiblePivotFields.columnFields, scopedSchemaColumns]);
-  const cleanedSort = useMemo33(() => {
+  const cleanedSort = useMemo32(() => {
     const activeSort = resolvedGroupRowsBy ? pivotSort : regularSort;
     if (!activeSort?.sortField || !activeSort?.sortDirection) {
       return "";
     }
     return toFlatSortValue(activeSort.sortField, activeSort.sortDirection);
   }, [pivotSort, regularSort, resolvedGroupRowsBy]);
-  const aggregationSortLabelFallbackTable = useMemo33(() => {
+  const aggregationSortLabelFallbackTable = useMemo32(() => {
     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 = useMemo33(() => {
+  const sortOptions = useMemo32(() => {
     if (resolvedGroupRowsBy) {
       const aggregationSortFields = getPivotAggregationSortFields(
         aggregationState,
@@ -65830,12 +65688,14 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupRowsBy,
     selectedColumnOptions
   ]);
-  const aggregationOptions = useMemo33(() => {
+  const { aggregationValues, aggregationOptions } = useMemo32(() => {
     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();
@@ -65843,27 +65703,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 = useMemo33(() => {
+  const nextPivot = useMemo32(() => {
     if (!sourceReport) return null;
     return pivotState ? {
       ...pivotState,
@@ -65874,15 +65743,15 @@ function useReport(reportIdArg, options = {}) {
       rowLimit: limit?.value
     } : null;
   }, [sourceReport, pivotState, pivotSort, limit, resolvedSortFieldType]);
-  const nextPivotHash = useMemo33(
+  const nextPivotHash = useMemo32(
     () => stableSerializeForQueryKey(nextPivot),
     [nextPivot]
   );
-  const filterStackHash = useMemo33(
+  const filterStackHash = useMemo32(
     () => stableSerializeForQueryKey(filterStack),
     [filterStack]
   );
-  const shouldSkipPivotRefreshForUnchangedPivot = useMemo33(() => {
+  const shouldSkipPivotRefreshForUnchangedPivot = useMemo32(() => {
     if (!sourceReport || !nextPivot) return false;
     if (!Array.isArray(sourceReport.rows) || sourceReport.rows.length === 0) {
       return false;
@@ -65920,7 +65789,7 @@ function useReport(reportIdArg, options = {}) {
     shouldSkipPivotRefreshForUnchangedPivot,
     sourceReport
   ]);
-  const shouldSkipRedundantPivotTableDataReportBuilderQuery = useMemo33(() => {
+  const shouldSkipRedundantPivotTableDataReportBuilderQuery = useMemo32(() => {
     if (!sourceReport || !nextPivot) {
       return false;
     }
@@ -66022,7 +65891,7 @@ function useReport(reportIdArg, options = {}) {
   });
   const tablePageReportBuilderState = pivotTableDataReportBuilderState ?? effectiveReportBuilderState;
   const tablePageReportBuilderStateHash = pivotTableDataReportBuilderState ? pivotTableDataReportBuilderStateHash : effectiveReportBuilderStateHash;
-  const tablePaginationSort = useMemo33(() => {
+  const tablePaginationSort = useMemo32(() => {
     const sortEntry = tablePageReportBuilderState?.sort?.[0];
     const field = String(sortEntry?.field ?? "").trim();
     if (!field || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(field)) {
@@ -66084,7 +65953,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 = useMemo33(() => {
+  const paginationTotalRowCount = useMemo32(() => {
     if (tablePageRowCount !== void 0) {
       return Math.max(tablePageRowCount, baseWindowRowsLength);
     }
@@ -66198,7 +66067,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     useFormRefreshDebugEnabled
   ]);
-  const chartData = useMemo33(() => {
+  const chartData = useMemo32(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
     const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
@@ -66234,18 +66103,18 @@ function useReport(reportIdArg, options = {}) {
     useInMemoryEngines,
     chartPivotHydrationEpoch
   ]);
-  const baseChart = useMemo33(
+  const baseChart = useMemo32(
     () => normalizePivotChartForDisplay(chartData),
     [chartData]
   );
-  const chartAxesBaseChart = useMemo33(() => {
+  const chartAxesBaseChart = useMemo32(() => {
     if (!chartData) return void 0;
     if (chartData.pivot?.columnField) {
       return normalizePivotChartForAxisControls(chartData, effectiveReportId);
     }
     return baseChart;
   }, [baseChart, chartData, effectiveReportId]);
-  const chartAxisOptions = useMemo33(() => {
+  const chartAxisOptions = useMemo32(() => {
     if (!chartAxesBaseChart) return [];
     const optionsByField = /* @__PURE__ */ new Map();
     const registerOption = (fieldRaw, labelRaw, formatRaw) => {
@@ -66283,14 +66152,14 @@ function useReport(reportIdArg, options = {}) {
     );
     return Array.from(optionsByField.values());
   }, [chartAxesBaseChart]);
-  const chartAxisOptionByField = useMemo33(() => {
+  const chartAxisOptionByField = useMemo32(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     for (const option of chartAxisOptions) {
       optionsByField.set(option.value, option);
     }
     return optionsByField;
   }, [chartAxisOptions]);
-  const xAxisOptions = useMemo33(() => {
+  const xAxisOptions = useMemo32(() => {
     if (!chartAxesBaseChart) return chartAxisOptions;
     const pivot = chartAxesBaseChart.pivot;
     const pivotRowField = String(pivot?.rowField ?? "").trim();
@@ -66313,7 +66182,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return chartAxisOptions;
   }, [chartAxesBaseChart, chartAxisOptions, chartAxisOptionByField]);
-  const yAxisOptions = useMemo33(() => {
+  const yAxisOptions = useMemo32(() => {
     if (!chartAxesBaseChart) return [];
     const keepOption = (option) => {
       const col = findSchemaColumnForChartAxisField(
@@ -66349,21 +66218,21 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     schemaColumnOptions
   ]);
-  const normalizedChartXAxisOptions = useMemo33(() => {
+  const normalizedChartXAxisOptions = useMemo32(() => {
     return xAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
       label: String(option.label ?? option.value ?? "").trim(),
       format: String(option.format ?? "").trim()
     }));
   }, [xAxisOptions]);
-  const normalizedChartYAxisOptions = useMemo33(() => {
+  const normalizedChartYAxisOptions = useMemo32(() => {
     return yAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
       label: String(option.label ?? option.value ?? "").trim(),
       format: String(option.format ?? "").trim()
     }));
   }, [yAxisOptions]);
-  const resolvedYAxisFields = useMemo33(() => {
+  const resolvedYAxisFields = useMemo32(() => {
     if (!chartAxesBaseChart) return [];
     const normalizeYAxisField = (yAxisFieldRaw) => {
       const field = String(yAxisFieldRaw?.field ?? "").trim();
@@ -66406,7 +66275,7 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptionByField,
     chartAxisOptions
   ]);
-  const resolvedXAxisField = useMemo33(() => {
+  const resolvedXAxisField = useMemo32(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
     const pivotRowField = String(
@@ -66438,7 +66307,7 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     resolvedYAxisFields
   ]);
-  const resolvedXAxisFormat = useMemo33(() => {
+  const resolvedXAxisFormat = useMemo32(() => {
     if (!chartAxesBaseChart) {
       return "string";
     }
@@ -66466,7 +66335,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedYAxisFields
   ]);
-  const resolvedXAxisLabel = useMemo33(() => {
+  const resolvedXAxisLabel = useMemo32(() => {
     const defaultXLabel = String(
       chartAxesBaseChart?.xAxisLabel ?? chartAxisOptionByField.get(resolvedXAxisField)?.label ?? ""
     ).trim();
@@ -66480,13 +66349,13 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptionByField,
     resolvedXAxisField
   ]);
-  const chartVisibility = useMemo33(
+  const chartVisibility = useMemo32(
     () => ({
       showLegend: chartVisibilityOverrides.showLegend ?? Boolean(baseChart?.showLegend ?? false)
     }),
     [baseChart?.showLegend, chartVisibilityOverrides]
   );
-  const axisConfig = useMemo33(() => {
+  const axisConfig = useMemo32(() => {
     const pivotBucketXAxis = isPivotTableDateBucketRowAxis(
       chartAxesBaseChart,
       resolvedXAxisField
@@ -66528,14 +66397,14 @@ function useReport(reportIdArg, options = {}) {
     resolvedYAxisFields,
     chartVisibility.showLegend
   ]);
-  const resolvedYAxisFieldsForDisplay = useMemo33(() => {
+  const resolvedYAxisFieldsForDisplay = useMemo32(() => {
     if (!baseChart) return resolvedYAxisFields;
     return mapResolvedPivotYAxisFieldsForDisplay({
       chart: baseChart,
       resolvedYAxisFields
     });
   }, [baseChart, resolvedYAxisFields]);
-  const chart = useMemo33(() => {
+  const chart = useMemo32(() => {
     if (!baseChart) return void 0;
     let columns2 = mergeChartColumnFormatsFromYAxisFields(
       baseChart.columns,
@@ -66587,7 +66456,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 = useMemo33(() => {
+  const chartAxes = useMemo32(() => {
     const yAxisItems = resolvedYAxisFields.map(
       (yAxisField, index) => ({
         id: String(index),
@@ -66736,8 +66605,8 @@ function useReport(reportIdArg, options = {}) {
     xAxisOptions,
     yAxisOptions
   ]);
-  const tableFormatCacheRef = useRef25(/* @__PURE__ */ new Map());
-  const tableFormatMerge = useMemo33(
+  const tableFormatCacheRef = useRef24(/* @__PURE__ */ new Map());
+  const tableFormatMerge = useMemo32(
     () => mergeDisplayAndSourceForTableFormats({
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
@@ -66751,7 +66620,7 @@ function useReport(reportIdArg, options = {}) {
       sourceReport
     ]
   );
-  const table = useMemo33(() => {
+  const table = useMemo32(() => {
     const baseWindowRows = Array.isArray(sourceReport?.rows) ? sourceReport.rows : [];
     const rawRows = !paginationActive ? baseWindowRows : tablePageRows ?? baseWindowRows.slice(paginationRangeStart, paginationRangeEnd);
     const { columns: mergedFromReport } = mergeDisplayAndSourceForTableFormats({
@@ -66880,7 +66749,7 @@ function useReport(reportIdArg, options = {}) {
   const {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
-  } = useMemo33(() => {
+  } = useMemo32(() => {
     if (isPivotTableChart && chart?.columns?.length) {
       const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
       const pivotTableColumns = aggregationSlotColumns ? aggregationSlotColumns.tableColumns : chart.columns.map((c) => ({
@@ -66914,7 +66783,7 @@ function useReport(reportIdArg, options = {}) {
     schemaColumnOptions,
     table.columns
   ]);
-  const availableFields = useMemo33(
+  const availableFields = useMemo32(
     () => tableColumnPickerPoolOptions.map((option) => ({
       id: option.value,
       label: option.label,
@@ -66922,24 +66791,24 @@ function useReport(reportIdArg, options = {}) {
     })),
     [tableColumnPickerPoolOptions]
   );
-  const axisSelectFormatLabels = useMemo33(
+  const axisSelectFormatLabels = useMemo32(
     () => AXIS_FORMAT_OPTIONS.map((option) => option.label),
     []
   );
-  const xAxisFormatOptionLabels = useMemo33(() => {
+  const xAxisFormatOptionLabels = useMemo32(() => {
     if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField)) {
       return ["date", ...axisSelectFormatLabels];
     }
     return axisSelectFormatLabels;
   }, [chartAxesBaseChart, resolvedXAxisField, axisSelectFormatLabels]);
-  const tableDerivedColumnOrder = useMemo33(() => {
+  const tableDerivedColumnOrder = useMemo32(() => {
     return tableFormattingColumnOptions.map((option) => option.value);
   }, [tableFormattingColumnOptions]);
-  const tableDerivedColumnOrderSignature = useMemo33(
+  const tableDerivedColumnOrderSignature = useMemo32(
     () => tableDerivedColumnOrder.join("|"),
     [tableDerivedColumnOrder]
   );
-  const activeTableColumnIds = useMemo33(() => {
+  const activeTableColumnIds = useMemo32(() => {
     if (isPivotTableChart && chart?.columns?.length) {
       const aggregationSlotColumns = buildPivotColumnPivotTableFormattingColumns(chart);
       if (aggregationSlotColumns) {
@@ -66978,7 +66847,7 @@ function useReport(reportIdArg, options = {}) {
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
-  const columnOptionById = useMemo33(() => {
+  const columnOptionById = useMemo32(() => {
     const map = /* @__PURE__ */ new Map();
     for (const option of tableColumnPickerPoolOptions) {
       map.set(option.value, option);
@@ -66990,7 +66859,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return map;
   }, [tableColumnPickerPoolOptions, tableFormattingColumnOptions]);
-  const displayColumnById = useMemo33(() => {
+  const displayColumnById = useMemo32(() => {
     const map = /* @__PURE__ */ new Map();
     for (const column of displayColumns) {
       const field = String(column.field ?? "").trim();
@@ -67001,7 +66870,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return map;
   }, [displayColumns]);
-  const tableColumnSettingsById = useMemo33(() => {
+  const tableColumnSettingsById = useMemo32(() => {
     const map = /* @__PURE__ */ new Map();
     const effectiveById = tableFormatMerge.formatByColumnOptionId;
     const chartColById = /* @__PURE__ */ new Map();
@@ -67119,13 +66988,13 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.columns,
     tableFormatMerge
   ]);
-  const tableColumnSettingsCoalesceRef = useRef25(
+  const tableColumnSettingsCoalesceRef = useRef24(
     /* @__PURE__ */ new Map()
   );
   useLayoutEffect4(() => {
     tableColumnSettingsCoalesceRef.current = new Map(tableColumnSettingsById);
   }, [tableColumnSettingsById]);
-  const tableColumnItems = useMemo33(() => {
+  const tableColumnItems = useMemo32(() => {
     const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     const items = activeTableColumnIds.map((columnId) => {
@@ -67161,19 +67030,18 @@ function useReport(reportIdArg, options = {}) {
     isPivotTableChart,
     tableColumnSettingsById
   ]);
-  const tableColumnById = useMemo33(() => {
+  const tableColumnById = useMemo32(() => {
     return new Map(tableColumnItems.map((item) => [item.id, item]));
   }, [tableColumnItems]);
-  const tableColumnList = useMemo33(() => {
+  const tableColumnValues = useMemo32(() => {
     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] } : {}
       };
@@ -67336,22 +67204,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,
@@ -67424,15 +67302,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;
@@ -67505,7 +67386,7 @@ function useReport(reportIdArg, options = {}) {
             }
           }
         }
-        if (effectiveNextState.columns !== void 0 && !isSetReportTableColumnSidebarPatch(effectiveNextState.columns)) {
+        if (effectiveNextState.columns !== void 0) {
           const normalizedDisplayColumns = normalizeColumnsInput(
             effectiveNextState.columns,
             columnIdentifierLookup
@@ -67592,6 +67473,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];
@@ -67606,54 +67491,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 = [];
@@ -67685,15 +67523,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) {
@@ -67808,29 +67680,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;
@@ -67894,21 +67746,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(
@@ -67966,13 +67812,7 @@ function useReport(reportIdArg, options = {}) {
       }
     }
   };
-  const filterDraft = useReportFilterDraft({
-    reportId: effectiveReportId,
-    committedFilters: filtersForQueryBuilder,
-    queryBuilderProps: filterQueryBuilderProps,
-    setFilters
-  });
-  const saveChanges = useCallback6(async () => {
+  const saveChanges = useCallback5(async () => {
     if (!client) return;
     if (!String(dashboardNameForNewReport ?? "").trim()) return;
     if (!sourceReport) return;
@@ -68050,17 +67890,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,
@@ -68087,13 +67933,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,
@@ -68101,7 +67940,6 @@ function useReport(reportIdArg, options = {}) {
     chartTypes,
     columnsOptions: tableColumnPickerPoolOptions,
     tableColumnOptions: tableColumnPickerPoolOptions,
-    tableColumns,
     setReport,
     saveChanges,
     setFilters,
@@ -68119,7 +67957,7 @@ function ChatChartCard({
   ButtonComponent = MemoizedButton
 }) {
   const {
-    columnIds,
+    columns,
     columnOptions,
     groupRowsBy,
     groupRowsByOptions,
@@ -68133,20 +67971,10 @@ function ChatChartCard({
     loading,
     setReport
   } = useReport(reportId);
-  const columnSelectOptions = useMemo34(() => {
-    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 = useMemo33(
+    () => columns.map((column) => column.value),
+    [columns]
+  );
   return /* @__PURE__ */ jsxs64(
     "div",
     {
@@ -68182,7 +68010,7 @@ function ChatChartCard({
               padding: 16
             },
             children: [
-              JSON.stringify(columnIds, null, 2),
+              JSON.stringify(columns, null, 2),
               /* @__PURE__ */ jsxs64(
                 "label",
                 {
@@ -68199,13 +68027,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,
@@ -68215,7 +68054,7 @@ function ChatChartCard({
                           padding: 8,
                           background: "#fff"
                         },
-                        children: columnSelectOptions.map((option) => /* @__PURE__ */ jsx87("option", { value: option.value, children: option.label }, option.value))
+                        children: columnOptions.map((option) => /* @__PURE__ */ jsx87("option", { value: option.value, children: option.label }, option.value))
                       }
                     )
                   ]
@@ -68241,28 +68080,27 @@ function ChatChartCard({
                   onChange: (e) => setReport({ groupColumnsBy: e.target.value ?? "" })
                 }
               ),
-              aggregationOptions.map((row, index) => /* @__PURE__ */ jsx87(
+              aggregations.map((value, index) => /* @__PURE__ */ jsx87(
                 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__ */ jsx87(
                 ButtonComponent,
                 {
                   label: "Add aggregation",
                   onClick: () => setReport({
-                    aggregations: {
-                      index: aggregations.length,
-                      value: "count transactions"
-                    }
+                    aggregations: [...aggregations, "count:transactions"]
                   })
                 }
               ),
@@ -68400,7 +68238,7 @@ function ToolCallBlock({ toolCall }) {
   );
 }
 function ToolCallResult({ content }) {
-  const [expanded, setExpanded] = useState43(false);
+  const [expanded, setExpanded] = useState42(false);
   if (!content) return null;
   const isLong = content.length > 300;
   const displayed = isLong && !expanded ? content.slice(0, 300) + "..." : content;
@@ -68455,14 +68293,14 @@ function Chat({
   const [client] = useContext37(ClientContext);
   const { getToken } = useContext37(FetchContext);
   const { tenants } = useContext37(TenantContext);
-  const [messages, setMessages] = useState43([]);
-  const [input, setInput] = useState43("");
-  const [inputError, setInputError] = useState43("");
-  const [isLoading, setIsLoading] = useState43(false);
-  const [model, setModel] = useState43("gemini-3-flash-preview");
-  const containerRef = useRef26(null);
-  const textareaRef = useRef26(null);
-  const abortControllerRef = useRef26(null);
+  const [messages, setMessages] = useState42([]);
+  const [input, setInput] = useState42("");
+  const [inputError, setInputError] = useState42("");
+  const [isLoading, setIsLoading] = useState42(false);
+  const [model, setModel] = useState42("gemini-3-flash-preview");
+  const containerRef = useRef25(null);
+  const textareaRef = useRef25(null);
+  const abortControllerRef = useRef25(null);
   useEffect32(() => {
     if (!containerRef.current) {
       return;
@@ -68896,6 +68734,150 @@ function Chat({
   );
 }
+// src/hooks/useReportFilterDraft.ts
+import { useCallback as useCallback6, useMemo as useMemo34, useRef as useRef26, useState as useState43 } from "react";
+var normalizeOperatorKey = (operator) => String(operator ?? "").trim().toLowerCase().replace(/[_\s]+/g, "");
+var defaultFilterRuleValueForOperator = (operator) => {
+  const key = normalizeOperatorKey(operator);
+  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 = useRef26(committed);
+  committedRef.current = committed;
+  const setFiltersRef = useRef26(setFilters);
+  setFiltersRef.current = setFilters;
+  const lastNonEmptyFieldsRef = useRef26([]);
+  const prevReportIdForFieldsRef = useRef26(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 = useMemo34(
+    () => committedFiltersSignature(committed),
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- `committed` normalizes null to a stable constant
+    [committedFilters]
+  );
+  const fieldsSignature = useMemo34(
+    () => fieldCatalogSignature(effectiveFields),
+    [effectiveFields]
+  );
+  const [resetEpoch, setResetEpoch] = useState43(0);
+  const [draftQuery, setDraftQuery] = useState43(committed);
+  const [hasUnappliedFilterChanges, setHasUnappliedFilterChanges] = useState43(false);
+  const draftResetKey = `${reportId}|${committedSignature}|${resetEpoch}`;
+  const prevDraftResetKeyRef = useRef26(draftResetKey);
+  if (prevDraftResetKeyRef.current !== draftResetKey) {
+    prevDraftResetKeyRef.current = draftResetKey;
+    setDraftQuery(committed);
+    if (hasUnappliedFilterChanges) setHasUnappliedFilterChanges(false);
+  }
+  const filterDraftKey = `${draftResetKey}|${fieldsSignature}`;
+  const handleQueryChange = useCallback6((next) => {
+    if (!isQueryBuilderDisplayGroup(next)) return;
+    const nextGroup = next;
+    setDraftQuery(nextGroup);
+    const nextDirty = areQueryBuilderFilterDraftsDirty(
+      nextGroup,
+      committedRef.current
+    );
+    setHasUnappliedFilterChanges(
+      (prev) => prev === nextDirty ? prev : nextDirty
+    );
+  }, []);
+  const applyFilterDraft = useCallback6(() => {
+    setFiltersRef.current(draftQuery);
+  }, [draftQuery]);
+  const resetFilterDraft = useCallback6(() => {
+    setDraftQuery(committedRef.current);
+    setHasUnappliedFilterChanges(false);
+    setResetEpoch((epoch) => epoch + 1);
+  }, []);
+  const getDefaultValue = useCallback6(
+    (rule) => defaultFilterRuleValueForOperator(rule?.operator),
+    []
+  );
+  const filterDraftQueryBuilderProps = useMemo34(
+    () => ({
+      ...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
 import {
   useContext as useContext38,
@@ -70030,7 +70012,6 @@ export {
   Table_default as Table,
   ThemeContext,
   areQueryBuilderFilterDraftsDirty,
-  buildSeededFilterQuery,
   countFilterRules,
   defaultFilterRuleValueForOperator,
   downloadCSV,
@@ -70055,6 +70036,7 @@ export {
   useQuill,
   useReport,
   useReportBuilder,
+  useReportQueryBuilder,
   useReports,
   useTenants,
   useVirtualTables