@quillsql/react 2.16.67 → 2.16.69

package/dist/index.js

@@ -17315,6 +17315,7 @@ async function generatePivotWithSQL({
     sort: pivot.sort,
     sortDirection: pivot.sortDirection,
     sortField: pivot.sortField,
+    sortFieldTable: pivot.sortFieldTable,
     sortFieldType: pivot.sortFieldType,
     rowLimit: pivot.rowLimit,
     dateBucket: resolvedDateBucket
@@ -21037,7 +21038,7 @@ import {
   useContext as useContext21,
   useEffect as useEffect19,
   useState as useState26,
-  useMemo as useMemo19,
+  useMemo as useMemo20,
   useRef as useRef15
 } from "react";
 
@@ -21046,7 +21047,7 @@ import {
   useState as useState20,
   useEffect as useEffect16,
   useContext as useContext17,
-  useMemo as useMemo16,
+  useMemo as useMemo17,
   useRef as useRef13
 } from "react";
 
@@ -28153,12 +28154,10 @@ var useDashboardReportInternal = (reportId, config) => {
   const { dashboardCustomFilters } = useContext(DashboardFiltersContext);
   const reportState = reports[reportId];
   const reportDashboardName = reportState?.dashboardName;
+  const reportDashboardFilterState = reportDashboardName ? dashboardFilters[reportDashboardName] : void 0;
   const reportDashboardFilters = useMemo2(() => {
-    if (!reportDashboardName) return [];
-    return Object.values(dashboardFilters[reportDashboardName] ?? {}).map(
-      (f) => f.filter
-    );
-  }, [dashboardFilters, reportDashboardName]);
+    return Object.values(reportDashboardFilterState ?? {}).map((f) => f.filter);
+  }, [reportDashboardFilterState]);
   const {
     data: dashboardData,
     dashboardFilters: dashboardFiltersInternal,
@@ -29108,7 +29107,7 @@ var BarList = React2.forwardRef((props, ref) => {
 var BarList_default = BarList;
 
 // src/components/Chart/PieChart.tsx
-import React4 from "react";
+import React4, { useMemo as useMemo4 } from "react";
 import { Legend, Pie, PieChart, ResponsiveContainer, Tooltip } from "recharts";
 
 // src/utils/color.ts
@@ -31801,7 +31800,7 @@ import { jsx as jsx28, jsxs as jsxs20 } from "react/jsx-runtime";
 var defaultValueFormatter = (value) => (value * 1).toFixed(1) + "%";
 var parseData2 = (data, colors, categoryKey, valueKey) => {
   const maxItems = 20;
-  const slicedData = deepCopy(data).slice(0, maxItems);
+  const slicedData = deepCopy(data.slice(0, maxItems));
   const totalValue = slicedData.reduce(
     (acc, dataPoint) => (
       // Big(acc)
@@ -32047,8 +32046,8 @@ var PieChartWrapper = React4.forwardRef(
       category = "pct_of_the_total",
       index = "status",
       data,
-      colors = [],
-      colorMap = {},
+      colors,
+      colorMap,
       variant = "donut",
       valueFormatter: valueFormatter2 = defaultValueFormatter,
       className,
@@ -32058,10 +32057,24 @@ var PieChartWrapper = React4.forwardRef(
       onClickLegendElement,
       yAxisFields,
       showLegend = false,
+      showAnimation,
+      isAnimationActive,
       ...other
     } = props;
     const isDonut = variant == "donut";
-    if (!data || data.length === 0) {
+    const chartData = data ?? [];
+    const parsedData = useMemo4(() => {
+      const palette = colorMap?.[category]?.primary ?? colors ?? [];
+      const containsCssVars = palette.some(
+        (color) => typeof color === "string" && color.includes("var(")
+      );
+      const resolvedColors = containsCssVars ? Array.from({ length: chartData.length }).map(
+        (_, idx) => palette[idx % palette.length] ?? palette[palette.length - 1] ?? "#808080"
+      ) : palette.length >= chartData.length ? palette.slice(0, chartData.length) : generateArrayFromColor(palette, chartData.length);
+      return parseData2(chartData, resolvedColors, index, category);
+    }, [category, colorMap, colors, chartData, index]);
+    const animationActive = isAnimationActive ?? showAnimation ?? true;
+    if (chartData.length === 0) {
       return /* @__PURE__ */ jsx28(
         "div",
         {
@@ -32104,28 +32117,11 @@ var PieChartWrapper = React4.forwardRef(
             height: "100%",
             minWidth: 0,
             minHeight: 0,
-            initialDimension: { width: 1, height: 1 },
             children: /* @__PURE__ */ jsxs20(PieChart, { children: [
               /* @__PURE__ */ jsx28(
                 Pie,
                 {
-                  data: parseData2(
-                    data,
-                    (() => {
-                      const colorArray = colorMap[category] && colorMap[category]["primary"] && colorMap[category]["primary"] || colors;
-                      const containsCssVars = colorArray.some(
-                        (color) => typeof color === "string" && color.includes("var(")
-                      );
-                      if (containsCssVars) {
-                        return Array.from({ length: data.length }).map(
-                          (_, idx) => colorArray[idx % colorArray.length] ?? colorArray[colorArray.length - 1] ?? "#808080"
-                        );
-                      }
-                      return colorArray.length >= data.length ? colorArray.slice(0, data.length) : generateArrayFromColor(colorArray, data.length);
-                    })(),
-                    index,
-                    category
-                  ),
+                  data: parsedData,
                   cx: "50%",
                   cy: "50%",
                   startAngle: 90,
@@ -32135,7 +32131,7 @@ var PieChartWrapper = React4.forwardRef(
                   paddingAngle: 0,
                   dataKey: category,
                   nameKey: index,
-                  isAnimationActive: true,
+                  isAnimationActive: animationActive,
                   onClick: onClickChartElement,
                   labelLine: false,
                   label: false
@@ -32192,7 +32188,7 @@ var PieChart_default = PieChartWrapper;
 
 // src/components/QuillTable.tsx
 init_valueFormatter();
-import { useContext as useContext6, useEffect as useEffect8, useMemo as useMemo4, useState as useState10 } from "react";
+import { useContext as useContext6, useEffect as useEffect8, useMemo as useMemo5, useState as useState10 } from "react";
 import { jsx as jsx29, jsxs as jsxs21 } from "react/jsx-runtime";
 var NUMERIC_TABLE_FORMATS = /* @__PURE__ */ new Set([
   "whole_number",
@@ -32251,7 +32247,7 @@ function QuillTable({
   }, [sort]);
   const holdFullPageLoader = rows?.length === 0 && isLoading;
   const pageCountUnknown = manualPagination && pageCount === -1;
-  const { activeRows, maxPage } = useMemo4(() => {
+  const { activeRows, maxPage } = useMemo5(() => {
     const start = currentPage * rowsPerPage;
     const end = (currentPage + 1) * rowsPerPage;
     const rowList = rows ?? [];
@@ -33412,7 +33408,7 @@ function hashCode(obj) {
 }
 
 // src/components/Chart/LineChart.tsx
-import { useMemo as useMemo5 } from "react";
+import { useMemo as useMemo6 } from "react";
 
 // src/components/Chart/CustomReferenceLine.tsx
 init_constants();
@@ -33533,7 +33529,7 @@ function LineChart({
   referenceLines,
   showLegend = false
 }) {
-  const formattedData = useMemo5(() => {
+  const formattedData = useMemo6(() => {
     if (!data || data.length === 0) {
       return createLineForEmptyChart(
         yAxisFields,
@@ -33585,7 +33581,7 @@ function LineChart({
     if (x.field?.startsWith("comparison_")) return sum + 1;
     return sum;
   }, 0);
-  const allowDecimals = useMemo5(
+  const allowDecimals = useMemo6(
     () => getAllowDecimals(data, yAxisFields, referenceLines),
     [data, yAxisFields, referenceLines]
   );
@@ -33596,7 +33592,6 @@ function LineChart({
       height: "100%",
       minWidth: 0,
       minHeight: 0,
-      initialDimension: { width: 1, height: 1 },
       children: /* @__PURE__ */ jsxs26(
         ComposedChart,
         {
@@ -33838,7 +33833,7 @@ import {
   ResponsiveContainer as ResponsiveContainer3,
   Tooltip as Tooltip3
 } from "recharts";
-import { useMemo as useMemo6 } from "react";
+import { useMemo as useMemo7 } from "react";
 init_textProcessing();
 import { jsx as jsx36, jsxs as jsxs27 } from "react/jsx-runtime";
 function RadarChart({
@@ -33860,7 +33855,7 @@ function RadarChart({
   dateFilter,
   showLegend = false
 }) {
-  const formattedData = useMemo6(() => {
+  const formattedData = useMemo7(() => {
     if (!data || data.length === 0) {
       return [];
     }
@@ -33890,7 +33885,7 @@ function RadarChart({
     );
   }
   const getCustomColor = (index, field) => {
-    let key = index === 0 ? "comparison" : "primary";
+    const key = index === 0 ? "comparison" : "primary";
     field = field.replace("comparison_", "");
     if (colorMap && colorMap[field]) {
       return colorMap[field][key];
@@ -33914,7 +33909,6 @@ function RadarChart({
       height: "100%",
       minWidth: 0,
       minHeight: 0,
-      initialDimension: { width: 1, height: 1 },
       children: /* @__PURE__ */ jsxs27(
         RechartsRadarChart,
         {
@@ -34069,7 +34063,7 @@ import {
 } from "recharts";
 
 // src/components/Chart/CustomBar.tsx
-import { memo, useMemo as useMemo7 } from "react";
+import { memo, useMemo as useMemo8 } from "react";
 import { jsx as jsx37 } from "react/jsx-runtime";
 function isTopMostBarWithValue(yAxisFields, dataKey, payload) {
   if (!dataKey || !yAxisFields.length) return false;
@@ -34131,17 +34125,17 @@ var CustomBar = memo((props) => {
   }
   const sizeBasis = isHorizontalBars ? height : width;
   const customCornerRadius = theme?.barChartCornerRadius ?? (theme?.barChartCornerRadiusRatio ? theme?.barChartCornerRadiusRatio * sizeBasis : void 0);
-  const shouldRoundCorners = useMemo7(() => {
+  const shouldRoundCorners = useMemo8(() => {
     return customCornerRadius !== void 0 ? customCornerRadius > 0 : isTopMostBarWithValue(yAxisFields, dataKey, payload);
   }, [customCornerRadius, yAxisFields, dataKey, payload]);
-  const radius = useMemo7(() => {
+  const radius = useMemo8(() => {
     return shouldRoundCorners ? Math.min(
       customCornerRadius || sizeBasis * 0.1,
       width / 2,
       Math.abs(height) / 2
     ) : 0;
   }, [shouldRoundCorners, customCornerRadius, sizeBasis, width, height]);
-  const path = useMemo7(() => {
+  const path = useMemo8(() => {
     if (isHorizontalBars) {
       const isNegative2 = rawWidth < 0;
       return radius > 0 ? createHorizontalRoundedPath(x, y, width, height, radius, !isNegative2) : `M ${x} ${y} h ${isNegative2 ? -width : width} v ${height} h ${isNegative2 ? width : -width} z`;
@@ -34183,7 +34177,7 @@ var CustomBar_default = CustomBar;
 // src/components/Chart/BarChart.tsx
 init_columnProcessing();
 init_textProcessing();
-import { useMemo as useMemo8 } from "react";
+import { useMemo as useMemo9 } from "react";
 import { Fragment as Fragment3, jsx as jsx38, jsxs as jsxs28 } from "react/jsx-runtime";
 var CATEGORY_AXIS_WIDTH = 120;
 var VALUE_AXIS_WIDTH = 44;
@@ -34278,11 +34272,11 @@ function BarChart({
     }
     return fields;
   };
-  const valueDomain = useMemo8(
+  const valueDomain = useMemo9(
     () => stackedMode ? getStackedDomain(data, yAxisFields, comparison) : getDomain(data, yAxisFields, referenceLines),
     [stackedMode, data, yAxisFields, referenceLines, comparison]
   );
-  const allowDecimals = useMemo8(
+  const allowDecimals = useMemo9(
     () => getAllowDecimals(data, yAxisFields, referenceLines),
     [data, yAxisFields, referenceLines]
   );
@@ -34300,12 +34294,12 @@ function BarChart({
       fields: [{ field: xAxisField, format: xAxisFormat }]
     })
   );
-  const customBarShape = useMemo8(() => {
+  const customBarShape = useMemo9(() => {
     if (!theme?.barChartCornerRadius && !theme?.barChartCornerRadiusRatio)
       return void 0;
     return createCustomBar(sortYAxisFields([...yAxisFields]), theme, layout);
   }, [isStacked, yAxisFields, theme, layout]);
-  const customActiveBarShape = useMemo8(() => {
+  const customActiveBarShape = useMemo9(() => {
     if (!theme?.barChartCornerRadius && !theme?.barChartCornerRadiusRatio)
       return void 0;
     return createCustomBar(
@@ -34350,7 +34344,6 @@ function BarChart({
           height: "100%",
           minWidth: 0,
           minHeight: 0,
-          initialDimension: { width: 1, height: 1 },
           children: /* @__PURE__ */ jsxs28(
             ReChartsBarChart,
             {
@@ -34733,7 +34726,7 @@ init_filterProcessing();
 
 // src/components/Dashboard/DashboardFilter.tsx
 init_dateRangePickerUtils();
-import { useMemo as useMemo12 } from "react";
+import { useMemo as useMemo13 } from "react";
 
 // src/DateRangePicker/QuillDateRangePicker.tsx
 import {
@@ -34761,7 +34754,7 @@ import {
 // src/components/QuillSelect.tsx
 import {
   useContext as useContext8,
-  useMemo as useMemo9,
+  useMemo as useMemo10,
   useRef as useRef6,
   useState as useState11,
   useEffect as useEffect9
@@ -34791,7 +34784,7 @@ function QuillSelectComponent({
     },
     showModal
   );
-  const sortedItems = useMemo9(() => {
+  const sortedItems = useMemo10(() => {
     return options.sort((a, b) => {
       if (a.value === null) {
         return -1;
@@ -34802,7 +34795,7 @@ function QuillSelectComponent({
       return 0;
     });
   }, [options]);
-  const nullLabel = useMemo9(() => {
+  const nullLabel = useMemo10(() => {
     return sortedItems.some((item) => item.value === "-") ? "None" : "-";
   }, [sortedItems]);
   const [popoverPosition, setPopoverPosition] = useState11(void 0);
@@ -35648,7 +35641,7 @@ function getAnchorEndDate(startDate, endDate) {
 import React7, {
   useContext as useContext10,
   useEffect as useEffect11,
-  useMemo as useMemo10,
+  useMemo as useMemo11,
   useRef as useRef8,
   useState as useState13
 } from "react";
@@ -35684,17 +35677,17 @@ function QuillMultiSelectComponentWithCombo({
     CheckboxState2[CheckboxState2["UNSELECTED"] = 1] = "UNSELECTED";
     CheckboxState2[CheckboxState2["INDETERMINATE"] = 2] = "INDETERMINATE";
   })(CheckboxState || (CheckboxState = {}));
-  const optionValues = useMemo10(
+  const optionValues = useMemo11(
     () => new Set(options.map((opt) => opt.value ?? "")),
     [options]
   );
-  const potentialOptions = useMemo10(() => {
+  const potentialOptions = useMemo11(() => {
     return value.filter((opt) => !optionValues.has(opt ?? "")).map((opt) => ({
       label: opt === "" ? "-" : opt?.toString() ?? "-",
       value: opt ?? ""
     })).concat(options);
   }, [value, options]);
-  const selectedOptionsLabel = useMemo10(() => {
+  const selectedOptionsLabel = useMemo11(() => {
     if (!value || !value.length) {
       return "Select";
     }
@@ -35787,7 +35780,7 @@ function QuillMultiSelectComponentWithCombo({
       return 0;
     }).slice(0, 20);
   }, [potentialOptions, searchQuery]);
-  const nullLabel = useMemo10(() => {
+  const nullLabel = useMemo11(() => {
     return filteredItems.some((item) => item.value === "-") ? "None" : "-";
   }, [filteredItems]);
   const updatePosition = () => {
@@ -36313,7 +36306,7 @@ var ListboxTextInput = ({
 // src/components/QuillSelectWithCombo.tsx
 import React8, {
   useContext as useContext11,
-  useMemo as useMemo11,
+  useMemo as useMemo12,
   useRef as useRef9,
   useState as useState14
 } from "react";
@@ -36364,10 +36357,10 @@ function QuillSelectComponentWithCombo({
       return 0;
     })?.slice(0, 20) ?? [];
   }, [options, searchQuery]);
-  const nullLabel = useMemo11(() => {
+  const nullLabel = useMemo12(() => {
     return filteredItems.some((item) => item.value === "-") ? "None" : "-";
   }, [filteredItems]);
-  const selectedLabel = useMemo11(() => {
+  const selectedLabel = useMemo12(() => {
     const selectedOption = options?.find((elem) => elem.value === value);
     return selectedOption && selectedOption.label == "-" ? nullLabel : selectedOption?.label ?? "Select";
   }, [value, options, nullLabel]);
@@ -36635,7 +36628,7 @@ function DashboardFilter2({
   disabled,
   containerStyle
 }) {
-  const preset = useMemo12(() => {
+  const preset = useMemo13(() => {
     if (
       /*'preset' in filter && */
       "primaryRange" in filter
@@ -37289,7 +37282,7 @@ var MetricDisplay = ({
 };
 
 // src/components/Dashboard/DataLoader.tsx
-import { useContext as useContext13, useEffect as useEffect12, useMemo as useMemo13, useRef as useRef10, useState as useState15 } from "react";
+import { useContext as useContext13, useEffect as useEffect12, useMemo as useMemo14, useRef as useRef10, useState as useState15 } from "react";
 init_paginationProcessing();
 init_tableProcessing();
 import equal2 from "fast-deep-equal";
@@ -37403,7 +37396,7 @@ function DataLoader({
   const { reportFilters } = useContext13(ReportFiltersContext);
   const { getToken } = useContext13(FetchContext);
   const { eventTracking } = useContext13(EventTrackingContext);
-  const contextFilters = useMemo13(() => {
+  const contextFilters = useMemo14(() => {
     return dashboardName ? Object.values(dashboardFilters[dashboardName] ?? {}).map(
       (f) => f.filter
     ) : Object.values(reportFilters[item.id] ?? {}).map((f) => f.filter);
@@ -37413,7 +37406,7 @@ function DataLoader({
   const [error, setError] = useState15(void 0);
   const [previousPage, setPreviousPage] = useState15(0);
   const [additionalProcessing, setAdditionalProcessing] = useState15(defaultAdditionalProcessing);
-  const chartReport = useMemo13(() => {
+  const chartReport = useMemo14(() => {
     const report = (dashboardName ? dashboard : reports)[item.id];
     if (report) {
       return convertInternalReportToReport(
@@ -37830,7 +37823,7 @@ var ChartDataLoader = ({
   const { eventTracking } = useContext13(EventTrackingContext);
   const { reportFilters } = useContext13(ReportFiltersContext);
   const { tenants, flags } = useContext13(TenantContext);
-  const contextFilters = useMemo13(() => {
+  const contextFilters = useMemo14(() => {
     return dashboardName ? Object.values(dashboardFilters[dashboardName] ?? {}).map(
       (f) => f.filter
     ) : Object.values(reportFilters[item.id] ?? {}).map((f) => f.filter);
@@ -37846,7 +37839,7 @@ var ChartDataLoader = ({
   const previousCustomFields = useRef10(schemaData.customFields);
   const fetchReportAbortController = useRef10(null);
   const rowsRequestId = useRef10(0);
-  const chartReport = useMemo13(() => {
+  const chartReport = useMemo14(() => {
     const report = dashboardName ? dashboard[item.id] : reports[item.id];
     if (!report) {
       return constructReportFromItem(item);
@@ -38120,13 +38113,13 @@ var useReportInternal = (reportId) => {
 import equal3 from "fast-deep-equal";
 
 // src/components/Chart/MapChart.tsx
-import { useEffect as useEffect13, useMemo as useMemo15, useRef as useRef11, useState as useState17 } from "react";
+import { useEffect as useEffect13, useMemo as useMemo16, useRef as useRef11, useState as useState17 } from "react";
 init_valueFormatter();
 import usStates10m from "us-atlas/states-10m.json";
 import worldCountries50m from "world-atlas/countries-50m.json";
 
 // src/utils/simpleMaps.ts
-import React10, { useContext as useContext15, useMemo as useMemo14, useState as useState16 } from "react";
+import React10, { useContext as useContext15, useMemo as useMemo15, useState as useState16 } from "react";
 var d3GeoModule;
 var topojsonClientModule;
 var projections = {};
@@ -38161,7 +38154,7 @@ var requireTopojsonClientModule = () => {
 };
 var MapContext = React10.createContext(void 0);
 var MapProvider = ({ width, height, projection, projectionConfig = {}, children }) => {
-  const projectionMemo = useMemo14(() => {
+  const projectionMemo = useMemo15(() => {
     if (typeof projection === "function") return projection;
     const projectionFactory = projections[String(projection)];
     if (!projectionFactory) {
@@ -38182,11 +38175,11 @@ var MapProvider = ({ width, height, projection, projectionConfig = {}, children
     }
     return proj;
   }, [width, height, projection, projectionConfig]);
-  const pathMemo = useMemo14(() => {
+  const pathMemo = useMemo15(() => {
     const { geoPath } = requireD3GeoModule();
     return geoPath().projection(projectionMemo);
   }, [projectionMemo]);
-  const value = useMemo14(() => {
+  const value = useMemo15(() => {
     return {
       width,
       height,
@@ -38285,12 +38278,12 @@ var ComposableMap = ({
 };
 var Geographies = ({ geography, children, parseGeographies, className = "", ...restProps }) => {
   const { path, projection } = useLocalMapContext();
-  const prepared = useMemo14(() => {
+  const prepared = useMemo15(() => {
     const raw = getFeatures(geography);
     const parsed = parseGeographies ? parseGeographies(raw) : raw;
     return prepareFeatures(parsed, path);
   }, [geography, parseGeographies, path]);
-  const meshData = useMemo14(() => {
+  const meshData = useMemo15(() => {
     return prepareMesh(getMesh(geography), path);
   }, [geography, path]);
   return React10.createElement(
@@ -38324,7 +38317,7 @@ var Geography = ({
   const { path } = useLocalMapContext();
   const [isPressed, setPressed] = useState16(false);
   const [isFocused, setFocused] = useState16(false);
-  const geographyEventData = useMemo14(() => {
+  const geographyEventData = useMemo15(() => {
     const { geoCentroid, geoBounds } = requireD3GeoModule();
     const centroid = geography?.geometry ? geoCentroid(geography) : null;
     const bounds = geography?.geometry ? geoBounds(geography) : null;
@@ -38750,7 +38743,7 @@ function USMap({
       setScaleLog(() => scale.scaleLog);
     });
   }, []);
-  const colorScale = useMemo15(() => {
+  const colorScale = useMemo16(() => {
     if (!scaleLog) return () => "#FFFFFF";
     const values = Object.values(mappedData).map((d) => parseFloat(d[measureField])).filter((v) => !isNaN(v));
     const minValue = Math.min(...values);
@@ -38776,7 +38769,7 @@ function USMap({
     colors,
     scaleLog
   ]);
-  const hoveredValue = useMemo15(() => {
+  const hoveredValue = useMemo16(() => {
     return !hoveredState ? void 0 : mappedData[fipsToNames[hoveredState]?.abbreviation ?? ""]?.[measureField] ?? mappedData[fipsToNames[hoveredState]?.name ?? ""]?.[measureField] ?? mappedData[fipsToNames[hoveredState]?.abbreviation?.toLowerCase() ?? ""]?.[measureField] ?? mappedData[fipsToNames[hoveredState]?.name?.toLowerCase() ?? ""]?.[measureField];
   }, [hoveredState, mappedData, measureField]);
   if (!measureField) {
@@ -38946,7 +38939,7 @@ function WorldMap({
       setScaleLog(() => scale.scaleLog);
     });
   }, []);
-  const colorScale = useMemo15(() => {
+  const colorScale = useMemo16(() => {
     if (!scaleLog) return () => "#FFFFFF";
     const values = Object.values(mappedData).map((d) => parseFloat(d[measureField])).filter((v) => !isNaN(v));
     const minValue = Math.min(...values);
@@ -38972,7 +38965,7 @@ function WorldMap({
     colors,
     scaleLog
   ]);
-  const hoveredValue = useMemo15(() => {
+  const hoveredValue = useMemo16(() => {
     return !hoveredCountry ? void 0 : mappedData[isoToNames[hoveredCountry]?.abbreviation ?? ""]?.[measureField] ?? mappedData[isoToNames[hoveredCountry]?.name ?? ""]?.[measureField] ?? mappedData[isoToNames[hoveredCountry]?.abbreviation?.toLowerCase() ?? ""]?.[measureField] ?? mappedData[isoToNames[hoveredCountry]?.name?.toLowerCase() ?? ""]?.[measureField];
   }, [hoveredCountry, mappedData, measureField]);
   if (!measureField) {
@@ -39687,12 +39680,6 @@ function QuillTableDashboardComponent({
 init_valueFormatter();
 import { Fragment as Fragment6, jsx as jsx50, jsxs as jsxs38 } from "react/jsx-runtime";
 var MAX_ROWS_FOR_GENERIC_TABLE = 500;
-function sumByKey(arr, key) {
-  return arr.reduce((acc, cur) => {
-    const val = parseInt(cur[key], 10);
-    return isNaN(val) ? acc : acc + val;
-  }, 0);
-}
 function Chart({
   colors,
   reportId,
@@ -39740,23 +39727,23 @@ function Chart({
   const { dashboardFilters } = useDashboardInternal(
     allReportsById[reportId]?.dashboardName ?? null
   );
-  const specificReportFilters = useMemo16(() => {
+  const specificReportFilters = useMemo17(() => {
     const reportFilterValues = reportFilters[reportId];
     if (reportFilterValues && !hideFilters)
       return Object.values(reportFilterValues ?? {}).map((f) => f.filter);
     if (allReportsById[reportId]) return dashboardFilters ?? [];
     return [];
   }, [reportFilters[reportId], allReportsById[reportId], dashboardFilters]);
-  const reportDateFilter = useMemo16(() => {
+  const reportDateFilter = useMemo17(() => {
     return specificReportFilters.find((f) => f.filterType === "date_range");
   }, [specificReportFilters]);
-  const presetOptions = useMemo16(() => {
+  const presetOptions = useMemo17(() => {
     return reportDateFilter ? convertPresetOptionsToSelectableList(
       reportDateFilter.presetOptions ?? [],
       reportDateFilter.defaultPresetRanges ?? []
     ) : defaultOptionsV2;
   }, [reportDateFilter]);
-  const userFilters = useMemo16(() => {
+  const userFilters = useMemo17(() => {
     return filters?.filter((f) => f.filterType !== "date" /* Date */)?.map(convertCustomFilter) ?? dashboardCustomFilters[allReportsById[reportId]?.dashboardName ?? ""];
   }, [
     filters,
@@ -39831,32 +39818,32 @@ function Chart({
       });
     }
   }, [previousFilters.current]);
-  const dashboardReport = useMemo16(
+  const dashboardReport = useMemo17(
     () => allReportsById[reportId],
     [reportId, allReportsById]
   );
-  const report = useMemo16(() => reports[reportId], [reports, reportId]);
+  const report = useMemo17(() => reports[reportId], [reports, reportId]);
   const [loading, setLoading] = useState20(true);
   const [theme] = useContext17(ThemeContext);
-  const colorMap = useMemo16(() => {
+  const colorMap = useMemo17(() => {
     if (mapColorsToFields && report && theme) {
       return mapColorsToFields(report, theme);
     }
   }, [report, theme]);
   const [client, clientLoading] = useContext17(ClientContext);
-  const cloudCacheEnabled = useMemo16(() => {
+  const cloudCacheEnabled = useMemo17(() => {
     return !!client?.features?.cloudCache;
   }, [client]);
   const shouldShowCloudCacheValidationErrors = isAdmin && cloudCacheEnabled;
-  const isMissingDateField = useMemo16(() => {
+  const isMissingDateField = useMemo17(() => {
     if (!shouldShowCloudCacheValidationErrors) return false;
     return isDateFieldMissingInReport(report);
   }, [report, shouldShowCloudCacheValidationErrors]);
-  const usesLimitInQuery = useMemo16(() => {
+  const usesLimitInQuery = useMemo17(() => {
     if (!shouldShowCloudCacheValidationErrors) return false;
     return reportUsesLimitClause(report);
   }, [report, shouldShowCloudCacheValidationErrors]);
-  const missingDashboardFilterFields = useMemo16(() => {
+  const missingDashboardFilterFields = useMemo17(() => {
     if (!shouldShowCloudCacheValidationErrors || !report) return [];
     return getMissingDashboardFilterFields({
       rows: report.rows,
@@ -40190,24 +40177,24 @@ var ChartDisplay = ({
   const [theme] = useContext17(ThemeContext);
   const { dashboardFilters } = useContext17(DashboardFiltersContext);
   const { reportFilters } = useContext17(ReportFiltersContext);
-  const specificDashboardFilters = useMemo16(() => {
+  const specificDashboardFilters = useMemo17(() => {
     const dashboardName = config?.dashboardName;
     if (!dashboardName) return [];
     return Object.values(dashboardFilters[dashboardName] ?? {}).map(
       (f) => f.filter
     );
   }, [dashboardFilters, config?.dashboardName]);
-  const specificReportFilters = useMemo16(() => {
+  const specificReportFilters = useMemo17(() => {
     if (!reportId) return [];
     return Object.values(reportFilters[reportId] ?? []).map((f) => f.filter);
   }, [reportFilters, reportId]);
-  const chartColors = useMemo16(() => {
+  const chartColors = useMemo17(() => {
     if (overrideTheme && overrideTheme.chartColors) {
       return colors?.length ? colors : overrideTheme && overrideTheme.chartColors && overrideTheme.chartColors.length ? overrideTheme.chartColors : ["#4E80EE", "#E14F62", "#55B5A6", "#E9A23B", "#6466E9", "#55B685"];
     }
     return colors?.length ? colors : theme && theme.chartColors && theme.chartColors.length ? theme.chartColors : ["#4E80EE", "#E14F62", "#55B5A6", "#E9A23B", "#6466E9", "#55B685"];
   }, [colors]);
-  const dateFilter = useMemo16(() => {
+  const dateFilter = useMemo17(() => {
     const filters = specificReportFilters.length > 0 ? specificReportFilters : specificDashboardFilters;
     if (!hideDateRangeFilter && filters) {
       return findAndProcessDateFilter(filters.map((f) => f));
@@ -40217,7 +40204,7 @@ var ChartDisplay = ({
   const resolvedShowLegend = showLegend !== void 0 ? showLegend : config?.showLegend ?? false;
   const [page, setPage] = useState20(0);
   const rowCountForLimit = config?.pivot ? config.pivotRowCount ?? config.pivotRows?.length ?? config.rows?.length : config?.rowCount ?? config?.rows?.length;
-  const tableDisplay = useMemo16(() => {
+  const tableDisplay = useMemo17(() => {
     if (!config || config.chartType?.toLowerCase() !== "table") {
       return void 0;
     }
@@ -40231,6 +40218,22 @@ var ChartDisplay = ({
       )
     };
   }, [config]);
+  const pieData = useMemo17(() => {
+    if (!config || config.chartType?.toLowerCase() !== "pie") return [];
+    if (config.pivot) return config.rows ?? [];
+    const rows = config.rows ?? [];
+    const configuredValueField = config.yAxisFields?.[0]?.field;
+    if (!configuredValueField) return rows;
+    const valueField = configuredValueField;
+    const total = rows.reduce((sum, row) => {
+      const value = parseInt(row[valueField] ?? "", 10);
+      return isNaN(value) ? sum : sum + value;
+    }, 0);
+    return rows.map((row) => ({
+      ...row,
+      count: parseInt(row[valueField] ?? "", 10) / total
+    }));
+  }, [config]);
   if (loading) {
     return /* @__PURE__ */ jsx50("div", { className, style: containerStyle, children: /* @__PURE__ */ jsx50(LoadingComponent, {}) });
   } else if (config && !["metric", "table", "gauge", "US map", "World map"].includes(
@@ -40249,15 +40252,7 @@ var ChartDisplay = ({
       {
         className,
         containerStyle,
-        data: !config?.pivot ? config?.rows?.map((row) => {
-          return {
-            ...row,
-            count: (
-              // @ts-ignore
-              parseInt(row[config?.yAxisFields[0]?.field]) / sumByKey(config?.rows, config?.yAxisFields[0]?.field)
-            )
-          };
-        }) || [] : config?.rows || [],
+        data: pieData,
         category: config?.yAxisFields?.[0]?.field,
         index: config?.xAxisField,
         colors: chartColors,
@@ -40266,7 +40261,8 @@ var ChartDisplay = ({
         onClickChartElement,
         onClickLegendElement,
         yAxisFields: config?.yAxisFields,
-        showLegend: resolvedShowLegend
+        showLegend: resolvedShowLegend,
+        isAnimationActive
       }
     );
   }
@@ -40316,7 +40312,8 @@ var ChartDisplay = ({
         className,
         colorMap,
         onClickChartElement,
-        scrollable
+        scrollable,
+        showAnimation: isAnimationActive
       }
     );
   }
@@ -40821,7 +40818,7 @@ import {
   forwardRef as forwardRef2,
   useContext as useContext20,
   useEffect as useEffect17,
-  useMemo as useMemo17,
+  useMemo as useMemo18,
   useRef as useRef14,
   useState as useState22
 } from "react";
@@ -41322,7 +41319,7 @@ var FilterPopoverWrapper = ({
   const [uniqueValues, setUniqueValues] = useState22(void 0);
   const [uniqueValuesIsLoading, setUniqueValuesIsLoading] = useState22(false);
   const prevFiltersRef = useRef14("");
-  const columnInternals = useMemo17(() => {
+  const columnInternals = useMemo18(() => {
     if (!tables) {
       return null;
     }
@@ -41406,7 +41403,7 @@ var FilterPopoverWrapper = ({
 
 // src/components/ReportBuilder/FilterModal.tsx
 init_Filter();
-import { useState as useState23, useEffect as useEffect18, useMemo as useMemo18 } from "react";
+import { useState as useState23, useEffect as useEffect18, useMemo as useMemo19 } from "react";
 init_textProcessing();
 init_filterProcessing();
 import { format as format8, isValid as isValid6, parse as parse4, startOfToday as startOfToday2 } from "date-fns";
@@ -41448,11 +41445,11 @@ function FilterModal({
   );
   const [filterInitialized, setFilterInitialized] = useState23(false);
   const [table, setTable] = useState23(void 0);
-  const memoizedFieldValuesMap = useMemo18(
+  const memoizedFieldValuesMap = useMemo19(
     () => fieldValuesMap,
     [JSON.stringify(fieldValuesMap)]
   );
-  const memoizedFilter = useMemo18(() => filter, [JSON.stringify(filter)]);
+  const memoizedFilter = useMemo19(() => filter, [JSON.stringify(filter)]);
   useEffect18(() => {
     if (!filter) {
       onFieldChange(field, fieldOptions, table);
@@ -42477,7 +42474,7 @@ function DashboardLegacy({
 }) {
   const [userFilters, setUserFilters] = useState26({});
   const [selectedSection, setSelectedSection] = useState26("");
-  const dataLoaderUserFilters = useMemo19(() => {
+  const dataLoaderUserFilters = useMemo20(() => {
     return (filters?.map((f) => convertCustomFilter(f)) ?? []).concat(
       Object.values(userFilters)
     );
@@ -42500,7 +42497,7 @@ function DashboardLegacy({
   const { getToken } = useContext21(FetchContext);
   const { customFilterDispatch } = useContext21(DashboardFiltersContext);
   const { eventTracking } = useContext21(EventTrackingContext);
-  const metrics = useMemo19(() => {
+  const metrics = useMemo20(() => {
     const map = {};
     Object.keys(data?.sections ?? {}).forEach((section) => {
       if (!data?.sections?.[section]) return;
@@ -42528,7 +42525,7 @@ function DashboardLegacy({
     });
     return map;
   }, [data?.sections, data?.sectionOrder]);
-  const charts = useMemo19(() => {
+  const charts = useMemo20(() => {
     const map = {};
     Object.keys(data?.sections ?? {}).forEach((section) => {
       if (!data?.sections?.[section]) return;
@@ -42554,7 +42551,7 @@ function DashboardLegacy({
     });
     return map;
   }, [data?.sections, data?.sectionOrder]);
-  const tables = useMemo19(() => {
+  const tables = useMemo20(() => {
     const map = {};
     Object.keys(data?.sections ?? {}).forEach((section) => {
       if (!data?.sections?.[section]) return;
@@ -42615,7 +42612,7 @@ function DashboardLegacy({
     filterListAddFilterPopoverIsOpen,
     setFilterListAddFilterPopoverIsOpen
   ] = useState26(false);
-  const presetOptions = useMemo19(() => {
+  const presetOptions = useMemo20(() => {
     return populatedDashboardFilters?.[0]?.filterType === "date_range" ? convertPresetOptionsToSelectableList(
       populatedDashboardFilters[0].presetOptions ?? [],
       populatedDashboardFilters[0].defaultPresetRanges ?? []
@@ -42632,7 +42629,7 @@ function DashboardLegacy({
     previousFilters.current = filters;
   }
   const isInitialLoadOfDashboardRef = useRef15(false);
-  const referencedTables = useMemo19(() => {
+  const referencedTables = useMemo20(() => {
     const sections = data?.sections || {};
     const tables2 = Object.values(sections).flatMap(
       (section) => section.map((chart) => chart.referencedTables)
@@ -43667,11 +43664,11 @@ function QuillDashboardTemplate({
 }
 
 // src/Dashboard.tsx
-import { useContext as useContext22, useMemo as useMemo21 } from "react";
+import { useContext as useContext22, useMemo as useMemo22 } from "react";
 init_Filter();
 
 // src/StaticChart.tsx
-import { useMemo as useMemo20 } from "react";
+import { useMemo as useMemo21 } from "react";
 import { jsx as jsx60 } from "react/jsx-runtime";
 var CHART_TYPE_STYLES = {
   metric: { height: "100px", width: "200px" },
@@ -43686,6 +43683,7 @@ function StaticChart(props) {
     onClickLegendElement,
     containerStyle,
     showLegend,
+    showAnimation,
     className,
     hideTableChartOuterBorder = true
   } = props;
@@ -43723,7 +43721,7 @@ function StaticChart(props) {
     });
   };
   const useLocalPivotTablePagination = isDashboardPivotTable(report);
-  const config = useMemo20(() => {
+  const config = useMemo21(() => {
     return report ? {
       ...report,
       ...useLocalPivotTablePagination ? { pagination: void 0 } : {},
@@ -43744,6 +43742,7 @@ function StaticChart(props) {
       className,
       containerStyle: safeContainerStyle,
       showLegend,
+      isAnimationActive: showAnimation,
       onPageChange: useLocalPivotTablePagination ? void 0 : onPageChange,
       tableRowsLoading: useLocalPivotTablePagination ? false : pageLoading,
       onSortChange: useLocalPivotTablePagination ? void 0 : onSortChange,
@@ -44094,11 +44093,11 @@ function Dashboard({
   EmptyDashboardComponent
 }) {
   const [themeFromContext] = useContext22(ThemeContext);
-  const theme = useMemo21(
+  const theme = useMemo22(
     () => ({ ...defaultQuillTheme, ...themeFromContext ?? {} }),
     [themeFromContext]
   );
-  const themedStyles = useMemo21(() => getThemedStyles(theme), [theme]);
+  const themedStyles = useMemo22(() => getThemedStyles(theme), [theme]);
   const { sections, sectionOrder, isLoading, filters, applyFilters } = useDashboard(name2);
   const toValidDate = (value) => {
     if (value === void 0 || value === null || value === "") {
@@ -44300,11 +44299,11 @@ function DashboardContent({
     const capitalized = name2.charAt(0).toUpperCase() + name2.slice(1);
     return sections[capitalized] ?? [];
   };
-  const rootSectionReports = useMemo21(
+  const rootSectionReports = useMemo22(
     () => [...getSection("")].sort(sortByOrdering2),
     [sections]
   );
-  const { chartReports, metricReports, tableReports } = useMemo21(() => {
+  const { chartReports, metricReports, tableReports } = useMemo22(() => {
     const metricReports2 = rootSectionReports.filter(
       ({ chartType }) => chartType === "metric"
     );
@@ -44316,7 +44315,7 @@ function DashboardContent({
     );
     return { chartReports: chartReports2, metricReports: metricReports2, tableReports: tableReports2 };
   }, [rootSectionReports]);
-  const orderedNonRootSectionEntries = useMemo21(() => {
+  const orderedNonRootSectionEntries = useMemo22(() => {
     const sectionEntries = Object.entries(sections ?? {}).filter(
       ([sectionName, reports]) => sectionName !== "" && reports.length > 0
     );
@@ -44513,7 +44512,7 @@ var QuillProvider_default = QuillProvider;
 import {
   useContext as useContext23,
   useEffect as useEffect20,
-  useMemo as useMemo22,
+  useMemo as useMemo23,
   useState as useState27
 } from "react";
 init_Filter();
@@ -44533,17 +44532,17 @@ var Table = ({
   const { eventTracking } = useContext23(EventTrackingContext);
   const { allReportsById } = useAllReports();
   const [loading, setLoading] = useState27(false);
-  const report = useMemo22(() => {
+  const report = useMemo23(() => {
     return props.reportId ? allReportsById[props.reportId] : null;
   }, [allReportsById[props.reportId ?? ""]]);
   const { reportFilters, customReportFilters, reportFiltersDispatch } = useContext23(ReportFiltersContext);
   const { reports, fetchIndividualReport, reportsDispatch } = useContext23(ReportsContext);
-  const specificReportFilters = useMemo22(() => {
+  const specificReportFilters = useMemo23(() => {
     return Object.values(
       reportFilters[props.reportId ?? ""] ?? (dashboard[report?.dashboardName ?? ""]?.[report?.id ?? ""] ? dashboardFilters[report.dashboardName] : null) ?? {}
     ).map((f) => f.filter);
   }, [reportFilters[props.reportId ?? ""]]);
-  const userFilters = useMemo22(() => {
+  const userFilters = useMemo23(() => {
     return (props.filters?.filter((f) => f.filterType !== "date" /* Date */)?.map(convertCustomFilter) ?? []).concat(
       customReportFilters[props.reportId ?? ""] ?? dashboardCustomFilters[report?.dashboardName ?? ""] ?? []
     );
@@ -44699,7 +44698,7 @@ import {
   useContext as useContext30,
   useEffect as useEffect25,
   useRef as useRef20,
-  useMemo as useMemo27,
+  useMemo as useMemo28,
   useCallback as useCallback4
 } from "react";
 import MonacoEditor from "@monaco-editor/react";
@@ -44710,7 +44709,7 @@ import {
   useRef as useRef19,
   useState as useState31,
   useContext as useContext28,
-  useMemo as useMemo26,
+  useMemo as useMemo27,
   useCallback as useCallback3
 } from "react";
 import {
@@ -44734,7 +44733,7 @@ import { CSS as DND_CSS } from "@dnd-kit/utilities";
 import {
   useCallback as useCallback2,
   useContext as useContext25,
-  useMemo as useMemo23,
+  useMemo as useMemo24,
   useState as useState28,
   useEffect as useEffect21,
   useRef as useRef16
@@ -45242,13 +45241,13 @@ var PivotModal = ({
     "bottom"
   );
   const popoverRef = useRef16(null);
-  const columnsToShow = useMemo23(() => {
+  const columnsToShow = useMemo24(() => {
     return (columns || []).reduce((map, col) => {
       map[col.field] = col.format;
       return map;
     }, {});
   }, [columns]);
-  const columnTypes = useMemo23(() => {
+  const columnTypes = useMemo24(() => {
     return (columns || []).reduce((map, col) => {
       map[col.field] = col.jsType;
       return map;
@@ -46981,7 +46980,7 @@ import {
   useState as useState29,
   useEffect as useEffect22,
   useContext as useContext26,
-  useMemo as useMemo24,
+  useMemo as useMemo25,
   useRef as useRef17,
   useLayoutEffect as useLayoutEffect3
 } from "react";
@@ -47105,7 +47104,7 @@ function InternalChart({
   const { eventTracking } = useContext26(EventTrackingContext);
   const [filtersPopoverOpen, setFiltersPopoverOpen] = useState29(false);
   const filtersButtonRef = useRef17(null);
-  const currentReportFilters = useMemo24(() => {
+  const currentReportFilters = useMemo25(() => {
     const dashFilters = dashboardConfig[report?.dashboardName ?? ""]?.config.filters;
     if (!dashFilters)
       return Object.values(reportFilters[report?.id ?? TEMP_REPORT_ID] ?? {});
@@ -47121,12 +47120,12 @@ function InternalChart({
       }
     });
   }, [reportFilters, report?.id]);
-  const reportDateFilter = useMemo24(() => {
+  const reportDateFilter = useMemo25(() => {
     return Object.values(
       reportFilters[report?.id ?? TEMP_REPORT_ID] ?? {}
     ).find((f) => f.filter.filterType === "date_range")?.filter;
   }, [reportFilters, report?.id]);
-  const presetOptions = useMemo24(() => {
+  const presetOptions = useMemo25(() => {
     return reportDateFilter ? convertPresetOptionsToSelectableList(
       reportDateFilter.presetOptions ?? [],
       reportDateFilter.defaultPresetRanges ?? []
@@ -47173,7 +47172,7 @@ function InternalChart({
     }
   }, [filters]);
   const [theme] = useContext26(ThemeContext);
-  const colorMap = useMemo24(() => {
+  const colorMap = useMemo25(() => {
     if (mapColorsToFields && report && theme) {
       return mapColorsToFields(report, theme);
     }
@@ -47298,7 +47297,7 @@ function InternalChart({
   const [filtersExpanded, setFiltersExpanded] = useState29(false);
   const filtersContainerRef = useRef17(null);
   const [visibleFilters, setVisibleFilters] = useState29([]);
-  const filtersOverflowing = useMemo24(() => {
+  const filtersOverflowing = useMemo25(() => {
     return visibleFilters.some((visible) => visible);
   }, [visibleFilters]);
   const measureItems = () => {
@@ -47561,7 +47560,7 @@ init_dates();
 // src/components/QuillMultiSelectSectionList.tsx
 import React16, {
   useContext as useContext27,
-  useMemo as useMemo25,
+  useMemo as useMemo26,
   useRef as useRef18,
   useState as useState30
 } from "react";
@@ -47635,7 +47634,7 @@ function QuillMultiSelectSectionList({
   const filteredLength = React16.useMemo(() => {
     return Object.values(filteredItems).reduce((a, b) => a + b.length, 0);
   }, [filteredItems]);
-  const selectedOptionsLabel = useMemo25(() => {
+  const selectedOptionsLabel = useMemo26(() => {
     const valuesLength = Object.values(value).reduce((a, b) => a + b.length, 0);
     if (!valuesLength) {
       return "Select";
@@ -48499,11 +48498,11 @@ function ChartBuilder({
   const { dashboardConfig } = useContext28(DashboardConfigContext);
   const { tenants, flags } = useContext28(TenantContext);
   const isReportLoading = reportId && !tempReport && reportsLoadingState[reportId];
-  const report = useMemo26(() => {
+  const report = useMemo27(() => {
     const resolvedReport = reportId && !tempReport ? allReportsById[reportId] : tempReport;
     return resolvedReport;
   }, [reportId, tempReport, allReportsById]);
-  const reportFieldsByName = useMemo26(() => {
+  const reportFieldsByName = useMemo27(() => {
     const fields = report?.fields;
     if (!fields || fields.length === 0) {
       return {};
@@ -48603,7 +48602,7 @@ function ChartBuilder({
   const modalPadding = 20;
   const deleteButtonMargin = -12;
   const { dashboardFilters } = useContext28(DashboardFiltersContext);
-  const specificDashboardFilters = useMemo26(() => {
+  const specificDashboardFilters = useMemo27(() => {
     return Object.values(
       dashboardFilters[report?.dashboardName ?? ""] ?? {}
     ).map((f) => f.filter);
@@ -48654,7 +48653,7 @@ function ChartBuilder({
   const { reportsDispatch } = useContext28(ReportsContext);
   const initialFilters = useRef19(reportFilters[report?.id ?? TEMP_REPORT_ID]);
   const [reportFiltersLoaded, setReportFiltersLoaded] = useState31(!filtersEnabled);
-  const hasExistingData = useMemo26(() => {
+  const hasExistingData = useMemo27(() => {
     return report?.rows && report.rows.length > 0 || report?.pivotRows && report.pivotRows.length > 0;
   }, [report?.rows, report?.pivotRows]);
   useEffect23(() => {
@@ -48685,7 +48684,7 @@ function ChartBuilder({
       }
     };
   }, []);
-  const currentDashboardFilters = useMemo26(() => {
+  const currentDashboardFilters = useMemo27(() => {
     return Object.values(reportFilters[report?.id ?? TEMP_REPORT_ID] ?? {}).map(
       (f) => f.filter
     );
@@ -48763,14 +48762,14 @@ function ChartBuilder({
   const [referencedColumnsWithoutStar, setReferencedColumnsWithoutStar] = useState31({});
   const [referencedTablesLoaded, setReferencedTablesLoaded] = useState31(false);
   const [filterMap, setFilterMap] = useState31(report?.filterMap ?? {});
-  const canonicalFilterMap = useMemo26(() => {
+  const canonicalFilterMap = useMemo27(() => {
     return Object.fromEntries(
       Object.entries(filterMap).filter(
         (f) => f[1].table !== void 0 && f[1].field !== void 0
       )
     );
   }, [filterMap]);
-  const validFilter = useMemo26(() => {
+  const validFilter = useMemo27(() => {
     return specificDashboardFilters.reduce(
       (acc, filter) => {
         if (filter.filterType === "date_range" || filter.filterType === "tenant" || !referencedTablesLoaded) {
@@ -48996,12 +48995,12 @@ function ChartBuilder({
   const [formData, setFormData] = useState31(
     formFormDataFromReport(report, destinationSection ?? getCurrentSection())
   );
-  const reportCustomFields = useMemo26(() => {
+  const reportCustomFields = useMemo27(() => {
     return report?.columnsWithCustomFields?.filter(
       (col) => !report?.columns?.some((c) => col.field === c.field)
     ) ?? [];
   }, [report?.columnsWithCustomFields, report?.columns]);
-  const referenceLineQueryResults = useMemo26(() => {
+  const referenceLineQueryResults = useMemo27(() => {
     return formData?.referenceLines?.map((line) => {
       if (line.label === REFERENCE_LINE) {
         return [Number(line.y1) || 0, Number(line.y2) || 0];
@@ -49015,10 +49014,10 @@ function ChartBuilder({
       );
     });
   }, [formData?.referenceLines]);
-  const currentDashboard = useMemo26(() => {
+  const currentDashboard = useMemo27(() => {
     return dashboardConfig[formData.dashboardName ?? report?.dashboardName ?? ""]?.config;
   }, [dashboardConfig, formData.dashboardName, report?.dashboardName]);
-  const currentDashboardTenants = useMemo26(() => {
+  const currentDashboardTenants = useMemo27(() => {
     return currentDashboard?.tenantKeys?.map(
       (tenantKey) => client?.allTenantTypes?.find(
         (t) => t.tenantField === tenantKey
@@ -49026,7 +49025,7 @@ function ChartBuilder({
     ) ?? [];
   }, [client?.allTenantTypes, currentDashboard?.tenantKeys]);
   const dashboardOwner = currentDashboardTenants?.[0];
-  const currentTenantAsFormFlags = useMemo26(() => {
+  const currentTenantAsFormFlags = useMemo27(() => {
     if (!tenants || !tenants.length) {
       return void 0;
     }
@@ -49037,7 +49036,7 @@ function ChartBuilder({
     const tenantIds = typeof tenants[0] !== "object" ? tenants : tenants[0]?.tenantIds;
     return { [tenantField]: tenantIds };
   }, [tenants, dashboardOwner]);
-  const invalidColumns = useMemo26(() => {
+  const invalidColumns = useMemo27(() => {
     if (!rows || !rows.length) {
       return [];
     }
@@ -49059,7 +49058,7 @@ function ChartBuilder({
       );
     })()
   );
-  const reportContainsCustomFields = useMemo26(() => {
+  const reportContainsCustomFields = useMemo27(() => {
     const customFieldsMap = schemaData.customFields;
     const reportQueryContainsCustomFields = allTables.some((table) => {
       const tableColumns = referencedColumnsWithoutStar[table] ?? [];
@@ -49070,7 +49069,7 @@ function ChartBuilder({
     });
     return reportQueryContainsCustomFields;
   }, [allTables, referencedColumnsWithoutStar]);
-  const chartBuilderFormDataContainsCustomFields = useMemo26(() => {
+  const chartBuilderFormDataContainsCustomFields = useMemo27(() => {
     const customFields = allTables.map((table) => schemaData.customFields?.[table] ?? []).flat();
     const customFieldsMap = schemaData.customFields;
     const pivotContainsCustomFields = customFields.some(
@@ -49103,13 +49102,13 @@ function ChartBuilder({
     formData.dateField,
     canonicalFilterMap
   ]);
-  const customFieldsInTabularColumns = useMemo26(() => {
+  const customFieldsInTabularColumns = useMemo27(() => {
     const customFields = allTables.map((table) => schemaData.customFields?.[table] ?? []).flat();
     return formData.columns.some((col) => {
       return customFields.some((field) => field.field === col.field);
     });
   }, [allTables, formData.columns]);
-  const containsCustomFields = useMemo26(() => {
+  const containsCustomFields = useMemo27(() => {
     return reportContainsCustomFields || customFieldsInTabularColumns || chartBuilderFormDataContainsCustomFields;
   }, [
     reportContainsCustomFields,
@@ -49282,7 +49281,7 @@ function ChartBuilder({
       handleRunQuery(baseProcessing, currentDashboardFilters);
     }
   }, [runQueryOnMount, reportFiltersLoaded, filtersEnabled]);
-  const allTenantMap = useMemo26(() => {
+  const allTenantMap = useMemo27(() => {
     return client?.allTenantTypes?.reduce(
       (acc, tenantType) => {
         if (tenantType.scope === "database") {
@@ -49322,14 +49321,14 @@ function ChartBuilder({
     },
     [columns, selectedPivotTable]
   );
-  const pivotCardTable = useMemo26(() => {
+  const pivotCardTable = useMemo27(() => {
     return {
       pivot: formData.pivot,
       rows: selectedPivotTable?.rows ?? [],
       columns: selectedPivotTable?.columns ?? []
     };
   }, [selectedPivotTable, formData.pivot]);
-  const chartData = useMemo26(() => {
+  const chartData = useMemo27(() => {
     const data = createReportFromForm(
       formData,
       report ? { ...report, rowCount } : tempReport,
@@ -49351,7 +49350,7 @@ function ChartBuilder({
     rowCount,
     currentDashboardFilters
   ]);
-  const xAxisFormatOptions = useMemo26(() => {
+  const xAxisFormatOptions = useMemo27(() => {
     return chartData?.chartType === "gauge" ? [
       { value: "whole_number", label: "whole number" },
       { value: "two_decimal_places", label: "two decimal places" },
@@ -49415,7 +49414,7 @@ function ChartBuilder({
       setSelectedPivotTable(void 0);
     }
   };
-  const formattedRows = useMemo26(() => {
+  const formattedRows = useMemo27(() => {
     const shouldUsePivotTableRows = selectedPivotTable && selectedPivotTable.columns && formData.chartType === "table";
     if (shouldUsePivotTableRows) {
       const columns2 = selectedPivotTable.columns;
@@ -50102,7 +50101,7 @@ function ChartBuilder({
     setIsSubmitting(false);
     setTriggeredEditChart(false);
   };
-  const memoizedTooltipText = useMemo26(() => {
+  const memoizedTooltipText = useMemo27(() => {
     const getTooltipText = () => {
       if (formData.name === "") {
         return "Please enter a name for the chart";
@@ -52536,7 +52535,7 @@ function SQLEditor({
   const { getToken, quillFetchWithToken } = useContext30(FetchContext);
   const { eventTracking } = useContext30(EventTrackingContext);
   const { allReportsById } = useAllReports();
-  const destinationDashboardConfig = useMemo27(() => {
+  const destinationDashboardConfig = useMemo28(() => {
     return dashboards?.find((d) => d.name === destinationDashboard);
   }, [dashboards, destinationDashboard]);
   const [query, setQuery] = useState33(defaultQuery);
@@ -52544,7 +52543,7 @@ function SQLEditor({
   const [columns, setColumns] = useState33([]);
   const [schemaData] = useContext30(SchemaDataContext);
   const { dashboardFilters } = useContext30(DashboardFiltersContext);
-  const specificDashboardFilters = useMemo27(() => {
+  const specificDashboardFilters = useMemo28(() => {
     return Object.values(
       dashboardFilters[report?.dashboardName ?? destinationDashboard ?? ""] ?? {}
     ).map((f) => f.filter);
@@ -52582,7 +52581,7 @@ function SQLEditor({
   const DEFAULT_ROWS_PER_PAGE = 5;
   const ROW_HEIGHT = 37;
   const TABLE_TAB_HEIGHT = 75;
-  const filteredSchema = useMemo27(() => {
+  const filteredSchema = useMemo28(() => {
     return schemaData.schemaWithCustomFields?.filter((table) => {
       return destinationDashboardConfig?.tenantKeys?.[0] === SINGLE_TENANT || !table.ownerTenantFields || table.ownerTenantFields?.length === 0 || table.ownerTenantFields?.includes(
         destinationDashboardConfig?.tenantKeys?.[0] ?? ""
@@ -52657,7 +52656,7 @@ function SQLEditor({
   };
   const [currentPage, setCurrentPage] = useState33(0);
   const [currentSort, setCurrentSort] = useState33(void 0);
-  const currentProcessing = useMemo27(() => {
+  const currentProcessing = useMemo28(() => {
     return {
       page: {
         currentPage,
@@ -52670,7 +52669,7 @@ function SQLEditor({
       sort: currentSort
     };
   }, [currentPage, rowsPerPage, currentSort]);
-  const displayedTableData = useMemo27(() => {
+  const displayedTableData = useMemo28(() => {
     return filteredSchema?.filter((table) => {
       return table.name?.toLowerCase()?.includes(tableSearchQuery.toLowerCase().trim()) || table.columns.some(
         (col) => col.field?.toLowerCase()?.includes(tableSearchQuery.toLowerCase().trim())
@@ -54057,7 +54056,7 @@ import {
 init_constants();
 
 // src/hooks/useReportBuilder.tsx
-import { useContext as useContext31, useEffect as useEffect26, useMemo as useMemo28, useState as useState34 } from "react";
+import { useContext as useContext31, useEffect as useEffect26, useMemo as useMemo29, useState as useState34 } from "react";
 init_tableProcessing();
 init_ReportBuilder();
 init_constants();
@@ -54086,10 +54085,10 @@ var useReportBuilderInternal = ({
   } = useDashboardInternal(destinationDashboard);
   const { getToken, quillFetchWithToken } = useContext31(FetchContext);
   const { eventTracking } = useContext31(EventTrackingContext);
-  const destinationDashboardConfig = useMemo28(() => {
+  const destinationDashboardConfig = useMemo29(() => {
     return dashboards?.find((d) => d.name === destinationDashboard);
   }, [dashboards, destinationDashboard]);
-  const filteredSchema = useMemo28(() => {
+  const filteredSchema = useMemo29(() => {
     return schemaData.schemaWithCustomFields?.filter((table) => {
       return destinationDashboardConfig?.tenantKeys?.[0] === SINGLE_TENANT || !table.ownerTenantFields || table.ownerTenantFields?.length === 0 || table.ownerTenantFields?.includes(
         destinationDashboardConfig?.tenantKeys?.[0] ?? ""
@@ -54120,7 +54119,7 @@ var useReportBuilderInternal = ({
   const [pivot, setPivot] = useState34(null);
   const [sort, setSort] = useState34([]);
   const [limit, setLimit] = useState34(null);
-  const reportBuilderState = useMemo28(() => {
+  const reportBuilderState = useMemo29(() => {
     return {
       tables,
       columns,
@@ -54152,7 +54151,7 @@ var useReportBuilderInternal = ({
   const [pivotData, setPivotData] = useState34(null);
   const [numberOfRows, setNumberOfRows] = useState34(0);
   const [rowCountIsLoading, setRowCountIsLoading] = useState34(false);
-  const reportColumnsToStateColumns = useMemo28(() => {
+  const reportColumnsToStateColumns = useMemo29(() => {
     const positionMap = {};
     columns.forEach((column, index) => {
       positionMap[column.field] = index;
@@ -54206,7 +54205,7 @@ var useReportBuilderInternal = ({
     origin: "ReportBuilder",
     loadDescription: "Loading ask AI"
   });
-  const isSelectStar = useMemo28(() => {
+  const isSelectStar = useMemo29(() => {
     if (tables.length === 1) {
       const totalColumnLength = tables.reduce((acc, table) => {
         const tableColumns = filteredSchema.find((t) => t.name === table.name)?.columns.length ?? 0;
@@ -54217,14 +54216,14 @@ var useReportBuilderInternal = ({
       return false;
     }
   }, [tables, columns, filteredSchema]);
-  const mssqlSortWarning = useMemo28(() => {
+  const mssqlSortWarning = useMemo29(() => {
     if (!client || client?.databaseType !== "mssql") {
       return void 0;
     } else if (!pivot && !limit) {
       return "Please add a limit.";
     }
   }, [client, limit, pivot]);
-  const foreignKeyMap = useMemo28(() => {
+  const foreignKeyMap = useMemo29(() => {
     return getSchemaForeignKeyMapping(filteredSchema);
   }, [filteredSchema]);
   const clearAllState = (resetStateStack = true) => {
@@ -55541,7 +55540,7 @@ var useReportBuilder = ({
     reportBuilder.setAiPrompt(prompt);
     await reportBuilder.fetchAstFromPromptHelper(prompt);
   };
-  const cleanedSchema = useMemo28(() => {
+  const cleanedSchema = useMemo29(() => {
     return reportBuilder.filteredSchema.reduce(
       (acc, table) => {
         acc[table.name] = table.columns;
@@ -55550,7 +55549,7 @@ var useReportBuilder = ({
       {}
     );
   }, [reportBuilder.filteredSchema]);
-  const cleanedFilterStack = useMemo28(() => {
+  const cleanedFilterStack = useMemo29(() => {
     return reportBuilder.filterStack.map((filter) => {
       return filter.value ? convertInternalFilterToFilter(filter.value) : null;
     }).filter((filter) => filter !== null);
@@ -55587,7 +55586,7 @@ var useReportBuilder = ({
 init_ReportBuilder();
 
 // src/components/ReportBuilder/AddColumnModal.tsx
-import { useState as useState35, useRef as useRef21, useMemo as useMemo29, useEffect as useEffect27, useContext as useContext32 } from "react";
+import { useState as useState35, useRef as useRef21, useMemo as useMemo30, useEffect as useEffect27, useContext as useContext32 } from "react";
 import {
   DndContext as DndContext2,
   closestCenter as closestCenter2,
@@ -55632,7 +55631,7 @@ function AddColumnModal({
   const [modalSelectedColumns, setModalSelectedColumns] = useState35(
     selectedColumns.map((col) => `${col.table}.${col.field}`)
   );
-  const columnOptions = useMemo29(() => {
+  const columnOptions = useMemo30(() => {
     return schema.filter((table) => {
       if (!primaryTable) return true;
       return table.name === primaryTable || foreignKeyMap[primaryTable]?.some(
@@ -55658,7 +55657,7 @@ function AddColumnModal({
   }, [schema, primaryTable]);
   const [orderedColumnNames, setOrderedColumnNames] = useState35([]);
   const isSelectedAllColumns = columnOptions.length === modalSelectedColumns.length;
-  const searchResults = useMemo29(() => {
+  const searchResults = useMemo30(() => {
     return orderedColumnNames.filter((column) => {
       return columnOptions.includes(column) && (search.length === 0 || column.toLowerCase().includes(search.toLowerCase()) || snakeAndCamelCaseToTitleCase(column).toLowerCase().includes(search.toLowerCase()));
     });
@@ -56034,7 +56033,7 @@ import {
   sortableKeyboardCoordinates as sortableKeyboardCoordinates3,
   verticalListSortingStrategy as verticalListSortingStrategy3
 } from "@dnd-kit/sortable";
-import { useMemo as useMemo30 } from "react";
+import { useMemo as useMemo31 } from "react";
 import { jsx as jsx73, jsxs as jsxs53 } from "react/jsx-runtime";
 function DraggableColumns({
   columns,
@@ -56048,7 +56047,7 @@ function DraggableColumns({
       coordinateGetter: sortableKeyboardCoordinates3
     })
   );
-  const columnNames = useMemo30(() => {
+  const columnNames = useMemo31(() => {
     return columns.map(
       (col) => `${col.table}.${col.alias ?? col.field}`
     );
@@ -58589,7 +58588,7 @@ function ReportBuilder({
 import {
   useContext as useContext35,
   useEffect as useEffect30,
-  useMemo as useMemo31,
+  useMemo as useMemo32,
   useRef as useRef23,
   useState as useState40
 } from "react";
@@ -58644,7 +58643,7 @@ function ChartEditor({
   const [modalHeight, setModalHeight] = useState40(200);
   const { allReportsById } = useAllReports();
   const report = allReportsById[reportId];
-  const resolvedDashboard = useMemo31(
+  const resolvedDashboard = useMemo32(
     () => destinationDashboard ?? report?.dashboardName ?? null,
     [destinationDashboard, report?.dashboardName]
   );
@@ -58656,7 +58655,7 @@ function ChartEditor({
   const { dashboardFilters } = useContext35(DashboardFiltersContext);
   const { eventTracking } = useContext35(EventTrackingContext);
   const { reload } = useDashboardInternal(resolvedDashboard);
-  const specificDashboardFilters = useMemo31(() => {
+  const specificDashboardFilters = useMemo32(() => {
     if (!report) {
       return [];
     }
@@ -58669,7 +58668,7 @@ function ChartEditor({
   const dateFilter = Object.values(specificDashboardFilters).find(
     (filter) => filter.filterType === "date_range"
   );
-  const dateRange = useMemo31(() => {
+  const dateRange = useMemo32(() => {
     return dateFilter?.startDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0;
   }, [dateFilter]);
   useEffect30(() => {
@@ -58820,7 +58819,7 @@ function ChartEditor({
 import { useContext as useContext37, useEffect as useEffect32, useRef as useRef25, useState as useState42 } from "react";
 
 // src/ChatChartCard.tsx
-import { useMemo as useMemo33 } from "react";
+import { useMemo as useMemo34 } from "react";
 
 // src/hooks/useForm.tsx
 init_Filter();
@@ -58830,7 +58829,7 @@ import {
   useContext as useContext36,
   useEffect as useEffect31,
   useLayoutEffect as useLayoutEffect4,
-  useMemo as useMemo32,
+  useMemo as useMemo33,
   useReducer as useReducer2,
   useRef as useRef24,
   useState as useState41
@@ -60205,12 +60204,13 @@ 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: "Dynamic", value: "" },
   { label: "Daily", value: "day" },
   { label: "Weekly", value: "week" },
   { label: "Monthly", value: "month" },
   { label: "Yearly", value: "year" }
 ];
+var STANDARD_PIVOT_DATE_BUCKET_OPTIONS = PIVOT_DATE_BUCKET_OPTIONS.slice(1);
 var AXIS_FORMAT_OPTIONS = [
   { value: "string", label: "string" },
   { value: "whole_number", label: "whole number" },
@@ -60688,17 +60688,26 @@ function buildPivotAggregationsWithFieldTables({
     columnFieldTable
   };
 }
+function resolvePivotSortFieldTable(pivot, sortField) {
+  const explicitTable = String(pivot?.sortFieldTable ?? "").trim();
+  if (explicitTable && sortField === pivot?.sortField) return explicitTable;
+  if (sortField === pivot?.rowField) return pivot?.rowFieldTable;
+  if (sortField === pivot?.columnField) return pivot?.columnFieldTable;
+  return void 0;
+}
 function normalizePivotForRefreshComparison(pivot) {
   if (pivot == null) return pivot;
   const record = pivot;
   const {
     rowFieldTable: _pivotRowTable,
     columnFieldTable: _pivotColumnTable,
+    sortFieldTable: _pivotSortTable,
     rowFilter: _rowFilter,
     columnFilter: _columnFilter,
     aggregations,
     ...pivotRest
   } = record;
+  void _pivotSortTable;
   const next = { ...pivotRest };
   if (Array.isArray(aggregations)) {
     next.aggregations = aggregations.map((entry) => {
@@ -63500,6 +63509,7 @@ function useReport(reportIdArg, options = {}) {
   const { eventTracking } = useContext36(EventTrackingContext);
   const [draftSessionId, setDraftSessionId] = useState41(generateDraftSessionId);
   const useInMemoryEngines = options.useInMemoryEngines ?? false;
+  const dateBucketMode = options.dateBucketMode ?? "dynamic";
   const restrictFieldOptionsToSelectedDatasources = options.restrictFieldOptionsToSelectedDatasources ?? true;
   const reportOverride = options.reportOverride ?? null;
   const initialReportBuilderState = options.initialReportBuilderState ?? null;
@@ -63654,7 +63664,7 @@ function useReport(reportIdArg, options = {}) {
     clientDefaultDashboardName,
     destinationDashboardName
   ].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
-  const initialFormState = useMemo32(
+  const initialFormState = useMemo33(
     () => ({
       reportName: void 0,
       columns: [],
@@ -63704,13 +63714,13 @@ function useReport(reportIdArg, options = {}) {
     schemaDatasourceIds
   } = formState;
   const schemaDatasourceIdsKey = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).join("\0") ?? "";
-  const queryColumnsBootstrapKey = useMemo32(
+  const queryColumnsBootstrapKey = useMemo33(
     () => queryColumns.map(
       (c) => `${String(c.table ?? "").trim()}\0${String(c.field ?? "").trim()}`
     ).join("\n"),
     [queryColumns]
   );
-  const dashboardNameForNewReport = useMemo32(() => {
+  const dashboardNameForNewReport = useMemo33(() => {
     return [clientDefaultDashboardName, destinationDashboardName].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   }, [clientDefaultDashboardName, destinationDashboardName]);
   const { mutate: createReport } = useMutation({
@@ -63784,16 +63794,16 @@ function useReport(reportIdArg, options = {}) {
     );
     schemaScopeInitializedForReportIdRef.current = effectiveReportId;
   };
-  const internalFilters = useMemo32(
+  const internalFilters = useMemo33(
     () => internalFiltersFromFilterStack(filterStack),
     [filterStack]
   );
-  const customFilters = useMemo32(
+  const customFilters = useMemo33(
     () => customFiltersFromFilterStack(filterStack),
     [filterStack]
   );
-  const reloadKey = useMemo32(() => 0, []);
-  const schemaForReportBuilderState = useMemo32(() => {
+  const reloadKey = useMemo33(() => 0, []);
+  const schemaForReportBuilderState = useMemo33(() => {
     if (schemaData.schemaWithCustomFields?.length) {
       return schemaData.schemaWithCustomFields;
     }
@@ -63816,19 +63826,19 @@ function useReport(reportIdArg, options = {}) {
     },
     []
   );
-  const schemaForeignKeyMap = useMemo32(
+  const schemaForeignKeyMap = useMemo33(
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
   );
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
-  const selectedBaseTableNamesForFieldOptions = useMemo32(() => {
+  const selectedBaseTableNamesForFieldOptions = useMemo33(() => {
     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 = useMemo32(() => {
+  const fieldOptionsAllowedTableNames = useMemo33(() => {
     if (!restrictFieldOptionsToSelectedDatasources) {
       return null;
     }
@@ -63905,7 +63915,7 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     queryColumnsBootstrapKey
   ]);
-  const datasourceOptions = useMemo32(() => {
+  const datasourceOptions = useMemo33(() => {
     const seen = /* @__PURE__ */ new Set();
     const result = [];
     for (const table2 of schemaForReportBuilderState) {
@@ -63916,7 +63926,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return result;
   }, [schemaForReportBuilderState]);
-  const queryBuilderFieldConfigByName = useMemo32(() => {
+  const queryBuilderFieldConfigByName = useMemo33(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState
     );
@@ -64050,7 +64060,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.columns,
     sourceReport?.reportBuilderState?.columns
   ]);
-  const filterUniqueValuesRequest = useMemo32(() => {
+  const filterUniqueValuesRequest = useMemo33(() => {
     const dashboardName = resolvedSourceDashboardName;
     const reportBuilderStateFromSource = sourceReport?.reportBuilderState;
     const isStringReportBuilderColumn = (column) => {
@@ -64271,13 +64281,13 @@ function useReport(reportIdArg, options = {}) {
     sourceReport?.reportBuilderState,
     resolvedSourceDashboardName
   ]);
-  const filterUniqueValuesRequestHash = useMemo32(
+  const filterUniqueValuesRequestHash = useMemo33(
     () => stableSerializeForQueryKey(
       filterUniqueValuesRequestForQueryKey(filterUniqueValuesRequest)
     ),
     [filterUniqueValuesRequest]
   );
-  const customFiltersHashForUniqueValues = useMemo32(
+  const customFiltersHashForUniqueValues = useMemo33(
     () => stableSerializeForQueryKey(customFilters),
     [customFilters]
   );
@@ -64354,7 +64364,7 @@ function useReport(reportIdArg, options = {}) {
     enabled: filterUniqueValuesEnabled,
     retry: false
   });
-  const backendUniqueValuesByFieldName = useMemo32(() => {
+  const backendUniqueValuesByFieldName = useMemo33(() => {
     const valuesByField = /* @__PURE__ */ new Map();
     const uniqueValuesByColumn = filterUniqueValuesQuery.data?.uniqueValuesByColumn;
     if (!uniqueValuesByColumn || typeof uniqueValuesByColumn !== "object") {
@@ -64387,7 +64397,7 @@ function useReport(reportIdArg, options = {}) {
     filterUniqueValuesQuery.data?.uniqueValuesByColumn,
     filterUniqueValuesRequest?.stringColumnsByTable
   ]);
-  const filterValueOptionsByFieldName = useMemo32(() => {
+  const filterValueOptionsByFieldName = useMemo33(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     const selectedMultiselectByField = collectSelectedStringMultiselectValuesByField(queryFilters);
     const collectValuesForField = (fieldName) => {
@@ -64453,7 +64463,7 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const filterFieldsComputed = useMemo32(() => {
+  const filterFieldsComputed = useMemo33(() => {
     const fields = [];
     const seen = /* @__PURE__ */ new Set();
     const addField = (fieldName, fieldType, tableName, rawFieldName) => {
@@ -64556,7 +64566,7 @@ function useReport(reportIdArg, options = {}) {
   ]);
   const filterFieldsStableReportIdRef = useRef24("");
   const filterFieldsStableCacheRef = useRef24([]);
-  const filterFields = useMemo32(() => {
+  const filterFields = useMemo33(() => {
     const rid = String(effectiveReportId ?? "");
     if (filterFieldsStableReportIdRef.current !== rid) {
       filterFieldsStableReportIdRef.current = rid;
@@ -64571,14 +64581,14 @@ function useReport(reportIdArg, options = {}) {
     }
     return filterFieldsComputed;
   }, [effectiveReportId, filterFieldsComputed]);
-  const getFilterOperators = useMemo32(
+  const getFilterOperators = useMemo33(
     () => (_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 = useMemo32(
+  const getFilterInputType = useMemo33(
     () => (_field, operator, misc) => {
       const fieldType = misc?.fieldData?.quillFieldType ?? queryBuilderFieldConfigByName[String(_field ?? "").trim()]?.fieldType ?? "string";
       if (fieldType === "date" && isRelativeDateQueryBuilderOperator(operator)) {
@@ -64588,7 +64598,7 @@ function useReport(reportIdArg, options = {}) {
     },
     [queryBuilderFieldConfigByName]
   );
-  const getFilterValueEditorType = useMemo32(
+  const getFilterValueEditorType = useMemo33(
     () => (_field, operator, misc) => {
       const fieldType = misc?.fieldData?.quillFieldType ?? queryBuilderFieldConfigByName[String(_field ?? "").trim()]?.fieldType;
       if (fieldType === "string" && isMultiValueOperator(operator)) {
@@ -64601,7 +64611,7 @@ function useReport(reportIdArg, options = {}) {
     },
     [queryBuilderFieldConfigByName]
   );
-  const getFilterValues = useMemo32(
+  const getFilterValues = useMemo33(
     () => (_field, operator, misc) => {
       const fieldName = String(_field ?? "").trim();
       if (!fieldName) {
@@ -64631,7 +64641,7 @@ function useReport(reportIdArg, options = {}) {
     },
     [filterValueOptionsByFieldName, queryBuilderFieldConfigByName]
   );
-  const filterQueryBuilderProps = useMemo32(
+  const filterQueryBuilderProps = useMemo33(
     () => ({
       fields: filterFields,
       listsAsArrays: true,
@@ -64648,7 +64658,7 @@ function useReport(reportIdArg, options = {}) {
       getFilterValues
     ]
   );
-  const filtersForQueryBuilder = useMemo32(
+  const filtersForQueryBuilder = useMemo33(
     () => canonicalizeMultiselectStringRulesToOptionValues(
       queryFilters,
       filterValueOptionsByFieldName,
@@ -64715,12 +64725,12 @@ function useReport(reportIdArg, options = {}) {
       ...table2 ? { table: table2 } : {}
     };
   };
-  const tenantHash = useMemo32(
+  const tenantHash = useMemo33(
     () => stableSerializeForQueryKey(tenants),
     [tenants]
   );
-  const flagHash = useMemo32(() => stableSerializeForQueryKey(flags), [flags]);
-  const clientHash = useMemo32(
+  const flagHash = useMemo33(() => stableSerializeForQueryKey(flags), [flags]);
+  const clientHash = useMemo33(
     () => stableSerializeForQueryKey({
       publicKey: client?.publicKey,
       clientId: client?.clientId,
@@ -64728,7 +64738,7 @@ function useReport(reportIdArg, options = {}) {
     }),
     [client]
   );
-  const reloadKeyHash = useMemo32(
+  const reloadKeyHash = useMemo33(
     () => stableSerializeForQueryKey(reloadKey),
     [reloadKey]
   );
@@ -65006,11 +65016,11 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     sourceReport
   ]);
-  const appliedAggregationState = useMemo32(
+  const appliedAggregationState = useMemo33(
     () => aggregationState.filter(isAppliedAggregation),
     [aggregationState]
   );
-  const pivotState = useMemo32(() => {
+  const pivotState = useMemo33(() => {
     if (!resolvedGroupRowsBy && !resolvedGroupColumnsBy && appliedAggregationState.length === 0) {
       return null;
     }
@@ -65048,17 +65058,24 @@ function useReport(reportIdArg, options = {}) {
       rowTableHint,
       columnTableHint
     });
+    const configuredDateBucket = chartPivotHydratedFromSourceRef.current ? dateBucket : dateBucket ?? priorPivot?.dateBucket;
     const built = {
       ...priorPivot ?? {},
       rowField: effectiveRowField,
       rowFieldType,
       columnField: effectiveColumnField,
       columnFieldType,
-      dateBucket: chartPivotHydratedFromSourceRef.current ? dateBucket : dateBucket ?? priorPivot?.dateBucket,
+      dateBucket: configuredDateBucket,
       aggregations,
       ...rowFieldTable ? { rowFieldTable } : {},
       ...columnFieldTable ? { columnFieldTable } : {}
     };
+    if (dateBucketMode === "standard" && effectiveRowField && isDateType(String(rowFieldType ?? ""))) {
+      built.dateBucket = resolvePivotDateBucket({
+        pivot: built,
+        filters: internalFilters
+      }) ?? "month";
+    }
     return built;
   }, [
     aggregationState,
@@ -65066,8 +65083,10 @@ function useReport(reportIdArg, options = {}) {
     appliedAggregationState,
     baseReportBuilderTables,
     dateBucket,
+    dateBucketMode,
     groupColumnsBy,
     groupRowsBy,
+    internalFilters,
     schemaForReportBuilderState,
     sourceReport?.columnInternal,
     sourceReport?.columns,
@@ -65088,7 +65107,7 @@ function useReport(reportIdArg, options = {}) {
     }
     prevPivotStateForColumnExpansionRef.current = pivotState;
   }, [pivotState]);
-  const effectiveReportBuilderTables = useMemo32(() => {
+  const effectiveReportBuilderTables = useMemo33(() => {
     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(
@@ -65112,18 +65131,18 @@ function useReport(reportIdArg, options = {}) {
     queryColumns,
     schemaDatasourceIds
   ]);
-  const datasources = useMemo32(() => {
+  const datasources = useMemo33(() => {
     return effectiveReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2));
   }, [effectiveReportBuilderTables]);
-  const effectiveReportBuilderTableNames = useMemo32(
+  const effectiveReportBuilderTableNames = useMemo33(
     () => effectiveReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [effectiveReportBuilderTables]
   );
-  const baseReportBuilderTableNames = useMemo32(
+  const baseReportBuilderTableNames = useMemo33(
     () => baseReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [baseReportBuilderTables]
   );
-  const normalizeQueryBuilderFieldNameForConfig = useMemo32(() => {
+  const normalizeQueryBuilderFieldNameForConfig = useMemo33(() => {
     const configEntries = Object.entries(queryBuilderFieldConfigByName);
     const preferredTableNames = /* @__PURE__ */ new Set([
       ...effectiveReportBuilderTableNames,
@@ -65172,7 +65191,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportBuilderTableNames,
     queryBuilderFieldConfigByName
   ]);
-  const normalizeQueryBuilderFiltersForConfig = useMemo32(() => {
+  const normalizeQueryBuilderFiltersForConfig = useMemo33(() => {
     const normalizeGroup = (group) => {
       const groupRules = Array.isArray(group.rules) ? group.rules : [];
       const nextRules = groupRules.map((entry) => {
@@ -65209,14 +65228,14 @@ function useReport(reportIdArg, options = {}) {
       return normalizeGroup(group);
     };
   }, [normalizeQueryBuilderFieldNameForConfig, queryBuilderFieldConfigByName]);
-  const refreshSelectionTables = useMemo32(() => {
+  const refreshSelectionTables = useMemo33(() => {
     return [
       getPivotGroupOptionTable(groupRowsBy),
       getPivotGroupOptionTable(groupColumnsBy),
       ...aggregationTablesByIndex
     ].map((tableName) => String(tableName ?? "").trim()).filter((tableName) => Boolean(tableName));
   }, [aggregationTablesByIndex, groupColumnsBy, groupRowsBy]);
-  const refreshSelectionFields = useMemo32(() => {
+  const refreshSelectionFields = useMemo33(() => {
     const resolveFieldTableForSelection = (field, tableHint) => {
       const fieldName = String(field ?? "").trim();
       if (!fieldName) return "";
@@ -65266,7 +65285,7 @@ function useReport(reportIdArg, options = {}) {
     schemaForReportBuilderState,
     sourceReport
   ]);
-  const refreshDecision = useMemo32(
+  const refreshDecision = useMemo33(
     () => decideReportBuilderRefresh({
       baseTables: baseReportBuilderTables,
       baseColumns: baseReportBuilderColumns,
@@ -65280,7 +65299,7 @@ function useReport(reportIdArg, options = {}) {
       refreshSelectionTables
     ]
   );
-  const effectiveReportBuilderColumns = useMemo32(() => {
+  const effectiveReportBuilderColumns = useMemo33(() => {
     const columnsFromPivot = [];
     const appendPivotColumn = (field, tableHint) => {
       const normalizedField = String(field ?? "").trim();
@@ -65378,7 +65397,7 @@ function useReport(reportIdArg, options = {}) {
     queryBuilderFieldConfigByName,
     queryFilters
   ]);
-  const resolvedSortFieldType = useMemo32(() => {
+  const resolvedSortFieldType = useMemo33(() => {
     const sortField = pivotSort?.sortField;
     if (!sortField || !pivotState) return void 0;
     if (sortField === resolvedGroupRowsBy) {
@@ -65399,7 +65418,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupColumnsBy,
     resolvedGroupRowsBy
   ]);
-  const effectiveReportBuilderState = useMemo32(() => {
+  const effectiveReportBuilderState = useMemo33(() => {
     if (!sourceReport && effectiveReportBuilderTables.length === 0) {
       return void 0;
     }
@@ -65411,6 +65430,10 @@ function useReport(reportIdArg, options = {}) {
         ...pivotState,
         sort: Boolean(pivotSort?.sortField),
         sortField: pivotSort?.sortField,
+        sortFieldTable: resolvePivotSortFieldTable(
+          pivotState,
+          pivotSort?.sortField
+        ),
         sortDirection: pivotSort?.sortDirection,
         sortFieldType: resolvedSortFieldType,
         rowLimit: limit?.value
@@ -65438,7 +65461,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedSortFieldType,
     sourceReport
   ]);
-  const effectiveReportBuilderStateHash = useMemo32(
+  const effectiveReportBuilderStateHash = useMemo33(
     () => stableSerializeForQueryKey(effectiveReportBuilderState),
     [effectiveReportBuilderState]
   );
@@ -65459,7 +65482,7 @@ function useReport(reportIdArg, options = {}) {
       activate: false
     });
   }, [applyPaginationUpdate, effectiveReportBuilderStateHash]);
-  const pivotTableDataReportBuilderState = useMemo32(() => {
+  const pivotTableDataReportBuilderState = useMemo33(() => {
     if (!effectiveReportBuilderState?.pivot) {
       return void 0;
     }
@@ -65479,11 +65502,11 @@ function useReport(reportIdArg, options = {}) {
       limit: null
     };
   }, [effectiveReportBuilderState, schemaForReportBuilderState]);
-  const pivotTableDataReportBuilderStateHash = useMemo32(
+  const pivotTableDataReportBuilderStateHash = useMemo33(
     () => stableSerializeForQueryKey(pivotTableDataReportBuilderState),
     [pivotTableDataReportBuilderState]
   );
-  const sourceReportMatchesEffectiveReportId = useMemo32(() => {
+  const sourceReportMatchesEffectiveReportId = useMemo33(() => {
     const loadTarget = String(effectiveReportId ?? "").trim();
     if (!loadTarget || !sourceReport) {
       return true;
@@ -65493,7 +65516,7 @@ function useReport(reportIdArg, options = {}) {
     ).trim();
     return sid === loadTarget;
   }, [effectiveReportId, sourceReport]);
-  const shouldSkipRedundantFlatTableReportBuilderQuery = useMemo32(() => {
+  const shouldSkipRedundantFlatTableReportBuilderQuery = useMemo33(() => {
     if (!sourceReport || pivotState) {
       return false;
     }
@@ -65604,7 +65627,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     sourceReport?.id
   ]);
-  const chartTypes = useMemo32(() => {
+  const chartTypes = useMemo33(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
   const resolvedChartType = chartTypes.find((option) => option.value === chartType)?.value ?? chartTypes.find((option) => option.value === sourceReport?.chartType)?.value ?? chartTypes.find((option) => option.value === DEFAULT_CHART_TYPE)?.value ?? chartTypes[0]?.value ?? DEFAULT_CHART_TYPE;
@@ -65643,7 +65666,7 @@ function useReport(reportIdArg, options = {}) {
       });
     }
   }, [chartType, chartTypes, sourceReport]);
-  const schemaScopedTableNames = useMemo32(() => {
+  const schemaScopedTableNames = useMemo33(() => {
     if (preserveSchemaWideOptions) {
       return [];
     }
@@ -65658,7 +65681,7 @@ function useReport(reportIdArg, options = {}) {
     preserveSchemaWideOptions,
     sourceReport?.reportBuilderState?.tables
   ]);
-  const joinCompatibleSchemaTableNames = useMemo32(() => {
+  const joinCompatibleSchemaTableNames = useMemo33(() => {
     if (schemaScopedTableNames.length === 0) {
       return [];
     }
@@ -65667,7 +65690,7 @@ function useReport(reportIdArg, options = {}) {
       schemaForeignKeyMap
     );
   }, [schemaForeignKeyMap, schemaScopedTableNames]);
-  const aggregationFallbackTarget = useMemo32(() => {
+  const aggregationFallbackTarget = useMemo33(() => {
     const tableNames = effectiveReportBuilderTables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const referencedTableNames = (sourceReport?.referencedTables ?? []).filter(
       (name2) => typeof name2 === "string" && name2.length > 0
@@ -65675,7 +65698,7 @@ function useReport(reportIdArg, options = {}) {
     const tableNamesToUse = tableNames.length ? tableNames : referencedTableNames;
     return tableNamesToUse.length > 0 ? tableNamesToUse.join(", ") : "table";
   }, [effectiveReportBuilderTables, sourceReport?.referencedTables]);
-  const aggregationFallbackTableName = useMemo32(() => {
+  const aggregationFallbackTableName = useMemo33(() => {
     const tableNames = effectiveReportBuilderTables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const referencedTableNames = (sourceReport?.referencedTables ?? []).filter(
       (name2) => typeof name2 === "string" && name2.length > 0
@@ -65683,7 +65706,7 @@ function useReport(reportIdArg, options = {}) {
     const tableNamesToUse = tableNames.length ? tableNames : referencedTableNames;
     return tableNamesToUse[0] ?? "table";
   }, [effectiveReportBuilderTables, sourceReport?.referencedTables]);
-  const cleanedAggregations = useMemo32(() => {
+  const cleanedAggregations = useMemo33(() => {
     return aggregationState.filter((aggregation) => Boolean(aggregation?.aggregationType)).map((aggregation, index) => {
       const aggregationType = String(aggregation.aggregationType);
       const normalizedAggregationType = aggregationType.toLowerCase();
@@ -65705,7 +65728,7 @@ function useReport(reportIdArg, options = {}) {
     aggregationTablesByIndex,
     isBoolAggregationField
   ]);
-  const { aggregationBaseOptions, aggregationOptionTableLookup } = useMemo32(() => {
+  const { aggregationBaseOptions, aggregationOptionTableLookup } = useMemo33(() => {
     const joinScoped = fieldOptionsAllowedTableNames ? joinCompatibleSchemaTableNames.filter(
       (name2) => fieldOptionsAllowedTableNames.has(name2)
     ) : joinCompatibleSchemaTableNames;
@@ -65788,7 +65811,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupRowsBy,
     schemaForReportBuilderState
   ]);
-  const { schemaColumnOptions, columnIdentifierLookup } = useMemo32(() => {
+  const { schemaColumnOptions, columnIdentifierLookup } = useMemo33(() => {
     const lookup = /* @__PURE__ */ new Map();
     const options2 = [];
     for (const table2 of schemaData.schemaWithCustomFields) {
@@ -65815,7 +65838,7 @@ function useReport(reportIdArg, options = {}) {
       columnIdentifierLookup: lookup
     };
   }, [schemaData.schemaWithCustomFields]);
-  const tableColumnPickerPoolOptions = useMemo32(() => {
+  const tableColumnPickerPoolOptions = useMemo33(() => {
     const allowed = new Set(
       effectiveReportBuilderTableNames.map((name2) => String(name2 ?? "").trim()).filter(Boolean)
     );
@@ -65826,16 +65849,16 @@ function useReport(reportIdArg, options = {}) {
       (option) => allowed.has(String(option.tableName ?? "").trim())
     );
   }, [effectiveReportBuilderTableNames, schemaColumnOptions]);
-  const columns = useMemo32(() => {
+  const columns = useMemo33(() => {
     return displayColumns.filter((column) => Boolean(column.field)).map((column) => encodeColumnOptionValue(column.table, column.field));
   }, [displayColumns]);
-  const selectedColumnOptions = useMemo32(() => {
+  const selectedColumnOptions = useMemo33(() => {
     return displayColumns.map((column) => {
       const value = column.alias || column.field;
       return value ? { label: value, value } : null;
     }).filter((option) => option !== null);
   }, [displayColumns]);
-  const scopedSchemaColumns = useMemo32(() => {
+  const scopedSchemaColumns = useMemo33(() => {
     const tableNames = fieldOptionsAllowedTableNames ? Array.from(fieldOptionsAllowedTableNames) : joinCompatibleSchemaTableNames;
     const schemaTables = schemaForReportBuilderState;
     const tablesToUse = tableNames.length ? schemaTables.filter((table2) => tableNames.includes(table2.name ?? "")) : schemaTables;
@@ -65856,7 +65879,7 @@ function useReport(reportIdArg, options = {}) {
     joinCompatibleSchemaTableNames,
     schemaForReportBuilderState
   ]);
-  const pivotUniqueValuesByColumn = useMemo32(() => {
+  const pivotUniqueValuesByColumn = useMemo33(() => {
     const explicitUniqueValues = sourceReport?.uniqueStringsByColumn ?? sourceReport?.columnUniqueValues ?? sourceReport?.uniqueValues;
     if (explicitUniqueValues && typeof explicitUniqueValues === "object" && !Array.isArray(explicitUniqueValues)) {
       return explicitUniqueValues;
@@ -65882,7 +65905,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return result;
   }, [sourceReport]);
-  const possiblePivotFields = useMemo32(() => {
+  const possiblePivotFields = useMemo33(() => {
     const options2 = getPossiblePivotFieldOptions(
       scopedSchemaColumns,
       pivotUniqueValuesByColumn
@@ -65893,7 +65916,7 @@ function useReport(reportIdArg, options = {}) {
       columnFields: options2.columnFields.filter((field) => !isIdColumn(field))
     };
   }, [scopedSchemaColumns, pivotUniqueValuesByColumn]);
-  const groupRowsByOptions = useMemo32(() => {
+  const groupRowsByOptions = useMemo33(() => {
     const allowedFields = new Set(possiblePivotFields.rowFields);
     const seenValues = /* @__PURE__ */ new Set();
     const options2 = [];
@@ -65920,7 +65943,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return options2;
   }, [groupRowsBy, possiblePivotFields.rowFields, scopedSchemaColumns]);
-  const groupColumnsByOptions = useMemo32(() => {
+  const groupColumnsByOptions = useMemo33(() => {
     const allowedFields = new Set(possiblePivotFields.columnFields);
     const seenValues = /* @__PURE__ */ new Set();
     const options2 = [];
@@ -65947,19 +65970,19 @@ function useReport(reportIdArg, options = {}) {
     }
     return options2;
   }, [groupColumnsBy, possiblePivotFields.columnFields, scopedSchemaColumns]);
-  const cleanedSort = useMemo32(() => {
+  const cleanedSort = useMemo33(() => {
     const activeSort = resolvedGroupRowsBy ? pivotSort : regularSort;
     if (!activeSort?.sortField || !activeSort?.sortDirection) {
       return "";
     }
     return toFlatSortValue(activeSort.sortField, activeSort.sortDirection);
   }, [pivotSort, regularSort, resolvedGroupRowsBy]);
-  const aggregationSortLabelFallbackTable = useMemo32(() => {
+  const aggregationSortLabelFallbackTable = useMemo33(() => {
     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 = useMemo32(() => {
+  const sortOptions = useMemo33(() => {
     if (resolvedGroupRowsBy) {
       const aggregationSortFields = getPivotAggregationSortFields(
         aggregationState,
@@ -66018,7 +66041,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedGroupRowsBy,
     selectedColumnOptions
   ]);
-  const { aggregationValues, aggregationOptions } = useMemo32(() => {
+  const { aggregationValues, aggregationOptions } = useMemo33(() => {
     const baseOptions = aggregationBaseOptions.map((option) => ({
       value: option.value,
       label: option.label
@@ -66062,26 +66085,30 @@ function useReport(reportIdArg, options = {}) {
     aggregationTablesByIndex,
     isBoolAggregationField
   ]);
-  const nextPivot = useMemo32(() => {
+  const nextPivot = useMemo33(() => {
     if (!sourceReport) return null;
     return pivotState ? {
       ...pivotState,
       sort: Boolean(pivotSort?.sortField),
       sortField: pivotSort?.sortField,
+      sortFieldTable: resolvePivotSortFieldTable(
+        pivotState,
+        pivotSort?.sortField
+      ),
       sortDirection: pivotSort?.sortDirection,
       sortFieldType: resolvedSortFieldType,
       rowLimit: limit?.value
     } : null;
   }, [sourceReport, pivotState, pivotSort, limit, resolvedSortFieldType]);
-  const nextPivotHash = useMemo32(
+  const nextPivotHash = useMemo33(
     () => stableSerializeForQueryKey(nextPivot),
     [nextPivot]
   );
-  const filterStackHash = useMemo32(
+  const filterStackHash = useMemo33(
     () => stableSerializeForQueryKey(filterStack),
     [filterStack]
   );
-  const shouldSkipPivotRefreshForUnchangedPivot = useMemo32(() => {
+  const shouldSkipPivotRefreshForUnchangedPivot = useMemo33(() => {
     if (!sourceReport || !nextPivot) return false;
     if (!Array.isArray(sourceReport.rows) || sourceReport.rows.length === 0) {
       return false;
@@ -66119,7 +66146,7 @@ function useReport(reportIdArg, options = {}) {
     shouldSkipPivotRefreshForUnchangedPivot,
     sourceReport
   ]);
-  const shouldSkipRedundantPivotTableDataReportBuilderQuery = useMemo32(() => {
+  const shouldSkipRedundantPivotTableDataReportBuilderQuery = useMemo33(() => {
     if (!sourceReport || !nextPivot) {
       return false;
     }
@@ -66221,7 +66248,7 @@ function useReport(reportIdArg, options = {}) {
   });
   const tablePageReportBuilderState = pivotTableDataReportBuilderState ?? effectiveReportBuilderState;
   const tablePageReportBuilderStateHash = pivotTableDataReportBuilderState ? pivotTableDataReportBuilderStateHash : effectiveReportBuilderStateHash;
-  const tablePaginationSort = useMemo32(() => {
+  const tablePaginationSort = useMemo33(() => {
     const sortEntry = tablePageReportBuilderState?.sort?.[0];
     const field = String(sortEntry?.field ?? "").trim();
     if (!field || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(field)) {
@@ -66284,7 +66311,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 = useMemo32(() => {
+  const paginationTotalRowCount = useMemo33(() => {
     if (tablePageRowCount !== void 0) {
       return Math.max(tablePageRowCount, baseWindowRowsLength);
     }
@@ -66400,7 +66427,7 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQueryEnabled,
     effectiveReportId
   ]);
-  const chartData = useMemo32(() => {
+  const chartData = useMemo33(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
     const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
@@ -66429,18 +66456,18 @@ function useReport(reportIdArg, options = {}) {
     useInMemoryEngines,
     chartPivotHydrationEpoch
   ]);
-  const baseChart = useMemo32(
+  const baseChart = useMemo33(
     () => normalizePivotChartForDisplay(chartData),
     [chartData]
   );
-  const chartAxesBaseChart = useMemo32(() => {
+  const chartAxesBaseChart = useMemo33(() => {
     if (!chartData) return void 0;
     if (chartData.pivot?.columnField) {
       return normalizePivotChartForAxisControls(chartData, effectiveReportId);
     }
     return baseChart;
   }, [baseChart, chartData, effectiveReportId]);
-  const chartAxisOptions = useMemo32(() => {
+  const chartAxisOptions = useMemo33(() => {
     if (!chartAxesBaseChart) return [];
     const optionsByField = /* @__PURE__ */ new Map();
     const registerOption = (fieldRaw, labelRaw, formatRaw) => {
@@ -66479,14 +66506,14 @@ function useReport(reportIdArg, options = {}) {
     );
     return Array.from(optionsByField.values());
   }, [chartAxesBaseChart]);
-  const chartAxisOptionByField = useMemo32(() => {
+  const chartAxisOptionByField = useMemo33(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     for (const option of chartAxisOptions) {
       optionsByField.set(option.value, option);
     }
     return optionsByField;
   }, [chartAxisOptions]);
-  const xAxisOptions = useMemo32(() => {
+  const xAxisOptions = useMemo33(() => {
     if (!chartAxesBaseChart) return chartAxisOptions;
     const pivot = chartAxesBaseChart.pivot;
     const pivotRowField = String(pivot?.rowField ?? "").trim();
@@ -66509,7 +66536,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return chartAxisOptions;
   }, [chartAxesBaseChart, chartAxisOptions, chartAxisOptionByField]);
-  const yAxisOptions = useMemo32(() => {
+  const yAxisOptions = useMemo33(() => {
     if (!chartAxesBaseChart) return [];
     const keepOption = (option) => {
       const col = findSchemaColumnForChartAxisField(
@@ -66545,21 +66572,21 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     schemaColumnOptions
   ]);
-  const normalizedChartXAxisOptions = useMemo32(() => {
+  const normalizedChartXAxisOptions = useMemo33(() => {
     return xAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
       label: String(option.label ?? option.value ?? "").trim(),
       format: String(option.format ?? "").trim()
     }));
   }, [xAxisOptions]);
-  const normalizedChartYAxisOptions = useMemo32(() => {
+  const normalizedChartYAxisOptions = useMemo33(() => {
     return yAxisOptions.map((option) => ({
       value: String(option.value ?? "").trim(),
       label: String(option.label ?? option.value ?? "").trim(),
       format: String(option.format ?? "").trim()
     }));
   }, [yAxisOptions]);
-  const resolvedYAxisFields = useMemo32(() => {
+  const resolvedYAxisFields = useMemo33(() => {
     if (!chartAxesBaseChart) return [];
     const normalizeYAxisField = (yAxisFieldRaw) => {
       const field = String(yAxisFieldRaw?.field ?? "").trim();
@@ -66603,7 +66630,7 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptionByField,
     chartAxisOptions
   ]);
-  const resolvedXAxisField = useMemo32(() => {
+  const resolvedXAxisField = useMemo33(() => {
     if (!chartAxesBaseChart) return "";
     const chartType2 = String(chartAxesBaseChart.chartType ?? "").toLowerCase();
     const pivotRowField = String(
@@ -66635,7 +66662,7 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptions,
     resolvedYAxisFields
   ]);
-  const resolvedXAxisFormat = useMemo32(() => {
+  const resolvedXAxisFormat = useMemo33(() => {
     if (!chartAxesBaseChart) {
       return "string";
     }
@@ -66661,7 +66688,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedYAxisFields
   ]);
-  const resolvedXAxisLabel = useMemo32(() => {
+  const resolvedXAxisLabel = useMemo33(() => {
     const defaultXLabel = String(
       chartAxesBaseChart?.xAxisLabel ?? chartAxisOptionByField.get(resolvedXAxisField)?.label ?? ""
     ).trim();
@@ -66675,13 +66702,13 @@ function useReport(reportIdArg, options = {}) {
     chartAxisOptionByField,
     resolvedXAxisField
   ]);
-  const chartVisibility = useMemo32(
+  const chartVisibility = useMemo33(
     () => ({
       showLegend: chartVisibilityOverrides.showLegend ?? Boolean(baseChart?.showLegend ?? false)
     }),
     [baseChart?.showLegend, chartVisibilityOverrides]
   );
-  const xAxis = useMemo32(() => {
+  const xAxis = useMemo33(() => {
     const pivotBucketXAxis = isPivotTableDateBucketRowAxis(
       chartAxesBaseChart,
       resolvedXAxisField
@@ -66698,7 +66725,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisField,
     resolvedXAxisFormat
   ]);
-  const yAxis = useMemo32(
+  const yAxis = useMemo33(
     () => ({
       fields: resolvedYAxisFields.map((yAxisField) => ({
         field: yAxisField.field,
@@ -66710,14 +66737,14 @@ function useReport(reportIdArg, options = {}) {
     }),
     [resolvedYAxisFields]
   );
-  const resolvedYAxisFieldsForDisplay = useMemo32(() => {
+  const resolvedYAxisFieldsForDisplay = useMemo33(() => {
     if (!baseChart) return resolvedYAxisFields;
     return mapResolvedPivotYAxisFieldsForDisplay({
       chart: baseChart,
       resolvedYAxisFields
     });
   }, [baseChart, resolvedYAxisFields]);
-  const chart = useMemo32(() => {
+  const chart = useMemo33(() => {
     if (!baseChart) return void 0;
     let columns2 = mergeChartColumnFormatsFromYAxisFields(
       baseChart.columns,
@@ -66777,7 +66804,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedYAxisFieldsForDisplay
   ]);
   const pivotDateFilterRangeCacheRef = useRef24({ key: "", min: null, max: null });
-  const filterOptions = useMemo32(() => {
+  const filterOptions = useMemo33(() => {
     const out = [];
     for (const [field, values] of filterValueOptionsByFieldName) {
       out.push({
@@ -66839,7 +66866,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportId,
     filterValueOptionsByFieldName
   ]);
-  const chartForUi = useMemo32(() => {
+  const chartForUi = useMemo33(() => {
     if (!chart?.pivot) return chart;
     const pivot = chart.pivot;
     const qualify = (field, table2) => table2 ? `${table2}.${field}` : field;
@@ -66915,11 +66942,11 @@ function useReport(reportIdArg, options = {}) {
     };
   }, [chart, filterOptions, filtersForQueryBuilder]);
   const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(pivotState);
-  const pivotTableColumnControls = useMemo32(
+  const pivotTableColumnControls = useMemo33(
     () => isPivotTableChart ? buildPivotColumnPivotTableFormattingColumns(pivotState, chart) : null,
     [chart, isPivotTableChart, pivotState]
   );
-  const chartAxes = useMemo32(() => {
+  const chartAxes = useMemo33(() => {
     const yAxisItems = resolvedYAxisFields.map(
       (yAxisField, index) => ({
         id: String(index),
@@ -67069,7 +67096,7 @@ function useReport(reportIdArg, options = {}) {
     yAxisOptions
   ]);
   const tableFormatCacheRef = useRef24(/* @__PURE__ */ new Map());
-  const tableFormatMerge = useMemo32(
+  const tableFormatMerge = useMemo33(
     () => mergeDisplayAndSourceForTableFormats({
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
@@ -67085,7 +67112,7 @@ function useReport(reportIdArg, options = {}) {
       tableColumnsEditedSignature
     ]
   );
-  const table = useMemo32(() => {
+  const table = useMemo33(() => {
     const baseWindowRows = Array.isArray(sourceReport?.rows) ? sourceReport.rows : [];
     const rawRows = !paginationActive ? baseWindowRows : tablePageRows ?? baseWindowRows.slice(paginationRangeStart, paginationRangeEnd);
     const { columns: mergedFromReport } = mergeDisplayAndSourceForTableFormats({
@@ -67216,7 +67243,7 @@ function useReport(reportIdArg, options = {}) {
   const {
     columnsOptions: tableFormattingColumnOptions,
     hasTableDrivenColumnOrder
-  } = useMemo32(() => {
+  } = useMemo33(() => {
     if (pivotTableColumnControls) {
       return getAllColumnOptions({
         schemaColumnOptions,
@@ -67246,24 +67273,24 @@ function useReport(reportIdArg, options = {}) {
     schemaColumnOptions,
     table.columns
   ]);
-  const axisSelectFormatLabels = useMemo32(
+  const axisSelectFormatLabels = useMemo33(
     () => AXIS_FORMAT_OPTIONS.map((option) => option.label),
     []
   );
-  const xAxisFormatOptionLabels = useMemo32(() => {
+  const xAxisFormatOptionLabels = useMemo33(() => {
     if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField)) {
       return ["date", ...axisSelectFormatLabels];
     }
     return axisSelectFormatLabels;
   }, [chartAxesBaseChart, resolvedXAxisField, axisSelectFormatLabels]);
-  const tableDerivedColumnOrder = useMemo32(() => {
+  const tableDerivedColumnOrder = useMemo33(() => {
     return tableFormattingColumnOptions.map((option) => option.value);
   }, [tableFormattingColumnOptions]);
-  const tableDerivedColumnOrderSignature = useMemo32(
+  const tableDerivedColumnOrderSignature = useMemo33(
     () => tableDerivedColumnOrder.join("|"),
     [tableDerivedColumnOrder]
   );
-  const activeTableColumnIds = useMemo32(() => {
+  const activeTableColumnIds = useMemo33(() => {
     if (pivotTableColumnControls) {
       return pivotTableColumnControls.selectedColumnIds;
     }
@@ -67297,7 +67324,7 @@ function useReport(reportIdArg, options = {}) {
     tableDerivedColumnOrder,
     tableFormattingColumnOptions
   ]);
-  const columnOptionById = useMemo32(() => {
+  const columnOptionById = useMemo33(() => {
     const map = /* @__PURE__ */ new Map();
     for (const option of tableColumnPickerPoolOptions) {
       map.set(option.value, option);
@@ -67309,7 +67336,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return map;
   }, [tableColumnPickerPoolOptions, tableFormattingColumnOptions]);
-  const displayColumnById = useMemo32(() => {
+  const displayColumnById = useMemo33(() => {
     const map = /* @__PURE__ */ new Map();
     for (const column of displayColumns) {
       const field = String(column.field ?? "").trim();
@@ -67320,7 +67347,7 @@ function useReport(reportIdArg, options = {}) {
     }
     return map;
   }, [displayColumns]);
-  const tableColumnSettingsById = useMemo32(() => {
+  const tableColumnSettingsById = useMemo33(() => {
     const map = /* @__PURE__ */ new Map();
     const effectiveById = tableFormatMerge.formatByColumnOptionId;
     const chartColById = /* @__PURE__ */ new Map();
@@ -67446,7 +67473,7 @@ function useReport(reportIdArg, options = {}) {
   useLayoutEffect4(() => {
     tableColumnSettingsCoalesceRef.current = new Map(tableColumnSettingsById);
   }, [tableColumnSettingsById]);
-  const tableColumnItems = useMemo32(() => {
+  const tableColumnItems = useMemo33(() => {
     const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     const items = activeTableColumnIds.map((columnId) => {
@@ -67482,10 +67509,10 @@ function useReport(reportIdArg, options = {}) {
     isPivotTableChart,
     tableColumnSettingsById
   ]);
-  const tableColumnById = useMemo32(() => {
+  const tableColumnById = useMemo33(() => {
     return new Map(tableColumnItems.map((item) => [item.id, item]));
   }, [tableColumnItems]);
-  const tableColumnValues = useMemo32(() => {
+  const tableColumnValues = useMemo33(() => {
     const pivotRowFieldForFormat = String(chart?.pivot?.rowField ?? "").trim();
     const pivotRowFieldType = String(chart?.pivot?.rowFieldType ?? "").trim();
     return tableColumnItems.map((item) => {
@@ -68370,8 +68397,8 @@ function useReport(reportIdArg, options = {}) {
     groupRowsByOptions,
     groupColumnsBy,
     groupColumnsByOptions,
-    dateBucket,
-    dateBucketOptions: hasDatePivotRow ? PIVOT_DATE_BUCKET_OPTIONS : [],
+    dateBucket: dateBucketMode === "standard" ? pivotState?.dateBucket : dateBucket,
+    dateBucketOptions: hasDatePivotRow ? dateBucketMode === "standard" ? STANDARD_PIVOT_DATE_BUCKET_OPTIONS : 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. */
@@ -68455,7 +68482,7 @@ function ChatChartCard({
     loading,
     setReport
   } = useReport(reportId);
-  const selectedColumnValues = useMemo33(
+  const selectedColumnValues = useMemo34(
     () => columns.map((column) => column.value),
     [columns]
   );
@@ -69219,7 +69246,7 @@ function Chat({
 }
 
 // src/hooks/useReportFilterDraft.ts
-import { useCallback as useCallback6, useEffect as useEffect33, useMemo as useMemo34, useRef as useRef26, useState as useState43 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect33, useMemo as useMemo35, 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);
@@ -69272,12 +69299,12 @@ function useReportFilterDraft(args) {
     lastNonEmptyFieldsRef.current = queryBuilderProps.fields;
   }
   const effectiveFields = queryBuilderProps.fields.length > 0 ? queryBuilderProps.fields : lastNonEmptyFieldsRef.current;
-  const committedSignature = useMemo34(
+  const committedSignature = useMemo35(
     () => committedFiltersSignature(committed),
     // eslint-disable-next-line react-hooks/exhaustive-deps -- `committed` normalizes null to a stable constant
     [committedFilters]
   );
-  const fieldsSignature = useMemo34(
+  const fieldsSignature = useMemo35(
     () => fieldCatalogSignature(effectiveFields),
     [effectiveFields]
   );
@@ -69320,7 +69347,7 @@ function useReportFilterDraft(args) {
     (rule) => defaultFilterRuleValueForOperator(rule?.operator),
     []
   );
-  const filterDraftQueryBuilderProps = useMemo34(
+  const filterDraftQueryBuilderProps = useMemo35(
     () => ({
       ...queryBuilderProps,
       fields: effectiveFields,
@@ -69643,7 +69670,7 @@ var useTenants = (dashboardName) => {
 };
 
 // src/hooks/useQuill.ts
-import { useContext as useContext40, useEffect as useEffect35, useMemo as useMemo35, useState as useState45 } from "react";
+import { useContext as useContext40, useEffect as useEffect35, useMemo as useMemo36, useState as useState45 } from "react";
 init_paginationProcessing();
 init_tableProcessing();
 init_dataProcessing();
@@ -69651,14 +69678,14 @@ var useQuill = (reportId, pagination) => {
   const { reports, reportsDispatch, fetchIndividualReport } = useContext40(ReportsContext);
   const { allReportsById } = useAllReports();
   const { getToken } = useContext40(FetchContext);
-  const dashboardReport = useMemo35(() => {
+  const dashboardReport = useMemo36(() => {
     return allReportsById[reportId ?? ""];
   }, [allReportsById[reportId ?? ""]]);
   const { dashboardFilters, dashboardCustomFilters } = useContext40(
     DashboardFiltersContext
   );
   const { reportFilters, customReportFilters, reportFiltersDispatch } = useContext40(ReportFiltersContext);
-  const specificReportFilters = useMemo35(() => {
+  const specificReportFilters = useMemo36(() => {
     if (!reportId) return null;
     return Object.values(reportFilters[reportId] ?? []).map((f) => f.filter);
   }, [reportFilters, reportId]);
@@ -69669,7 +69696,7 @@ var useQuill = (reportId, pagination) => {
   const [loading, setLoading] = useState45(true);
   const [error, setError] = useState45(void 0);
   const [previousPage, setPreviousPage] = useState45(0);
-  const processedReport = useMemo35(() => {
+  const processedReport = useMemo36(() => {
     return reportId && allReportsById[reportId] ? convertInternalReportToReport(
       mergeComparisonRange(allReportsById[reportId]),
       specificReportFilters ?? [],
@@ -69866,10 +69893,10 @@ var useQuill = (reportId, pagination) => {
 
 // src/hooks/useFormat.ts
 init_valueFormatter();
-import { useMemo as useMemo36 } from "react";
+import { useMemo as useMemo37 } from "react";
 var useMemoizedRows = (reportId) => {
   const { data } = useQuill(reportId);
-  const formattedRows = useMemo36(() => {
+  const formattedRows = useMemo37(() => {
     if (!data || !data.rows || !data.columns)
       return { rows: [], loading: true };
     return {