@quillsql/react 2.16.68 → 2.16.70

package/dist/index.cjs

@@ -17269,6 +17269,7 @@ async function generatePivotWithSQL({
     sort: pivot.sort,
     sortDirection: pivot.sortDirection,
     sortField: pivot.sortField,
+    sortFieldTable: pivot.sortFieldTable,
     sortFieldType: pivot.sortFieldType,
     rowLimit: pivot.rowLimit,
     dateBucket: resolvedDateBucket
@@ -17306,10 +17307,15 @@ async function generatePivotWithSQL({
   const queryResponseFields = resp.data?.fields || resp.queries?.queryResults?.[0]?.fields || [];
   const rowCount = resp.queries?.queryResults?.[1]?.rows?.[0]?.row_count || 0;
   parseValueFromBigQueryDates(queryResponseRows, queryResponseFields);
+  const resultRowField = processColumnName(
+    String(
+      resp.data?.config?.rowField ?? pivot.rowField ?? ""
+    )
+  );
   const responseRows = queryResponseRows;
   const responseFields = queryResponseFields;
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const rows = resultRowField ? responseRows.map(
+    (row) => !row[resultRowField] ? { ...row, [resultRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17329,27 +17335,27 @@ async function generatePivotWithSQL({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === resultRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + resultRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === resultRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === resultRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (resultRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
+      let value = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17364,12 +17370,10 @@ async function generatePivotWithSQL({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[resultRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (resultRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[resultRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17379,7 +17383,7 @@ async function generatePivotWithSQL({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[resultRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17416,6 +17420,7 @@ async function generatePivotWithSQL({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: resultRowField || void 0,
     pivotQuery: report?.queryString || "",
     comparisonPivotQuery: comparisonPivotQuery || ""
   };
@@ -17515,14 +17520,18 @@ function processPivotData({
   rows: responseRows,
   fields: responseFields,
   pivot,
+  resultRowField,
   dateBucket,
   dateFilter,
   client,
   rowCount
 }) {
   const databaseType = client.databaseType || "postgresql";
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const pivotRowField = processColumnName(
+    String(resultRowField ?? pivot.rowField ?? "")
+  );
+  const rows = pivotRowField ? responseRows.map(
+    (row) => !row[pivotRowField] ? { ...row, [pivotRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17542,27 +17551,27 @@ function processPivotData({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === pivotRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + pivotRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === pivotRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === pivotRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (pivotRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
+      let value = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17577,12 +17586,10 @@ function processPivotData({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[pivotRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (pivotRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[pivotRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17592,7 +17599,7 @@ function processPivotData({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[pivotRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17629,6 +17636,7 @@ function processPivotData({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: pivotRowField || void 0,
     pivotQuery: "",
     comparisonPivotQuery: ""
   };
@@ -21988,12 +21996,14 @@ function buildPivotOnlyReportFromResponse({
   }
   let pivotRows = rawPivotRows;
   let pivotColumns = Array.isArray(response?.pivotColumns) ? response.pivotColumns : fallbackBaseReport.pivotColumns ?? [];
+  let pivotResultRowField;
   let pivotRowCount = typeof response?.pivotRowCount === "number" ? response.pivotRowCount : typeof response?.rowCount === "number" ? response.rowCount : rawPivotRows.length;
   if (effectivePivot && rawPivotFields.length > 0) {
     const pivotData = processPivotData({
       rows: rawPivotRows,
       fields: rawPivotFields,
       pivot: effectivePivot,
+      resultRowField: response?.config?.rowField,
       ...effectivePivot.dateBucket ? { dateBucket: effectivePivot.dateBucket } : {},
       client,
       rowCount: typeof response?.rowCount === "number" ? response.rowCount : void 0
@@ -22001,6 +22011,7 @@ function buildPivotOnlyReportFromResponse({
     pivotRows = pivotData.rows;
     pivotColumns = pivotData.columns;
     pivotRowCount = pivotData.rowCount;
+    pivotResultRowField = pivotData.rowField;
   }
   const pivotOnlyReport = {
     ...responseReport,
@@ -22012,7 +22023,9 @@ function buildPivotOnlyReportFromResponse({
     pivot: effectivePivot,
     pivotRows,
     pivotColumns,
-    pivotRowCount
+    pivotRowCount,
+    pivotResultRowField,
+    pivotResultSourceRowField: effectivePivot?.rowField
   };
   if (additionalProcessing) {
     pivotOnlyReport.pagination = additionalProcessing.page;
@@ -59991,12 +60004,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" },
@@ -60474,17 +60488,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) => {
@@ -63149,6 +63172,8 @@ async function loadViaReportBuilderState({
       pivotRows: refreshedPivotData?.rows ?? compatibleReportPivotRows ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRows : []) ?? [],
       pivotColumns: refreshedPivotData?.columns ?? compatibleReportPivotColumns ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotColumns : []) ?? [],
       pivotRowCount: refreshedPivotData?.rowCount ?? compatibleReportPivotRowCount ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRowCount : void 0) ?? 0,
+      pivotResultRowField: refreshedPivotData?.rowField ?? reportBuilderInfo.report.pivotResultRowField ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotResultRowField : void 0),
+      pivotResultSourceRowField: refreshedPivotData?.rowField && requestedPivotRowField ? requestedPivotRowField : reportBuilderInfo.report.pivotResultSourceRowField ? reportBuilderInfo.report.pivotResultSourceRowField : canReuseBasePivotRowsAndColumns ? baseReport.pivotResultSourceRowField : void 0,
       uniqueStringsByTable: reportBuilderInfo.uniqueStringsByTable,
       uniqueStringsByColumn: reportBuilderInfo.uniqueStringsByColumn,
       columnUniqueValues: reportBuilderInfo.uniqueStringsByColumn,
@@ -63286,6 +63311,7 @@ function useReport(reportIdArg, options = {}) {
   const { eventTracking } = (0, import_react61.useContext)(EventTrackingContext);
   const [draftSessionId, setDraftSessionId] = (0, import_react61.useState)(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;
@@ -64834,17 +64860,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,
@@ -64852,8 +64885,10 @@ function useReport(reportIdArg, options = {}) {
     appliedAggregationState,
     baseReportBuilderTables,
     dateBucket,
+    dateBucketMode,
     groupColumnsBy,
     groupRowsBy,
+    internalFilters,
     schemaForReportBuilderState,
     sourceReport?.columnInternal,
     sourceReport?.columns,
@@ -65197,6 +65232,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
@@ -65854,6 +65893,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
@@ -66170,6 +66213,8 @@ function useReport(reportIdArg, options = {}) {
           pivotRows: mergedPivotRows,
           pivotColumns: report.pivotColumns,
           pivotRowCount: mergedPivotRowCount,
+          pivotResultRowField: report.pivotResultRowField,
+          pivotResultSourceRowField: report.pivotResultSourceRowField,
           pivotQuery: report.pivotQuery,
           comparisonPivotQuery: report.comparisonPivotQuery,
           reportBuilderState: mergedReportBuilderState ? {
@@ -66189,7 +66234,11 @@ function useReport(reportIdArg, options = {}) {
   const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const chartPivot = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
+      ...chartPivot,
+      rowField: sourceReport.pivotResultRowField
+    } : chartPivot;
     const rowCountForChart = chartPivotForDisplay ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
     const referencedTablesForChart = effectiveReportBuilderState?.tables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;
@@ -68156,8 +68205,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. */

package/dist/index.d.cts

@@ -558,6 +558,8 @@ interface BasePivot {
     sort?: boolean;
     sortDirection?: 'ASC' | 'DESC';
     sortField?: string;
+    /** Source table for sortField when it references a pivot dimension. */
+    sortFieldTable?: string;
     sortFieldType?: string;
     title?: string;
     triggerButtonText?: string;
@@ -618,6 +620,8 @@ type PivotData = {
     rows: any[];
     columns: ColumnInternal[];
     rowCount: number;
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    rowField?: string;
     pivotQuery: string;
     comparisonPivotQuery?: string;
 };
@@ -789,6 +793,10 @@ interface QuillReport {
     pivotRows?: {
         [key: string]: string;
     }[];
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    pivotResultRowField?: string;
+    /** Logical row field used to request pivotResultRowField. */
+    pivotResultSourceRowField?: string;
     /**
      * A list of metadata about the pivot yAxes of this report.
      */
@@ -3053,6 +3061,12 @@ interface UseReportOptions {
     useInMemoryEngines?: boolean;
     reportOverride?: QuillReportInternal | null;
     initialReportBuilderState?: ReportBuilderState | null;
+    /**
+     * `dynamic` exposes an empty "Dynamic" selection when the bucket is inferred.
+     * `standard` exposes only concrete buckets and returns the currently resolved
+     * bucket from `useReport().dateBucket`. Defaults to `dynamic`.
+     */
+    dateBucketMode?: 'dynamic' | 'standard';
     /**
      * When the report payload has no `dashboardName` and the client has no
      * `defaultDashboard`, use this for engine tasks that require a dashboard
@@ -3184,6 +3198,8 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
         pivotRows?: {
             [key: string]: string;
         }[];
+        pivotResultRowField?: string;
+        pivotResultSourceRowField?: string;
         pivotColumns?: ColumnInternal[];
         pivotRowCount?: number;
     } | undefined;

package/dist/index.d.ts

@@ -558,6 +558,8 @@ interface BasePivot {
     sort?: boolean;
     sortDirection?: 'ASC' | 'DESC';
     sortField?: string;
+    /** Source table for sortField when it references a pivot dimension. */
+    sortFieldTable?: string;
     sortFieldType?: string;
     title?: string;
     triggerButtonText?: string;
@@ -618,6 +620,8 @@ type PivotData = {
     rows: any[];
     columns: ColumnInternal[];
     rowCount: number;
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    rowField?: string;
     pivotQuery: string;
     comparisonPivotQuery?: string;
 };
@@ -789,6 +793,10 @@ interface QuillReport {
     pivotRows?: {
         [key: string]: string;
     }[];
+    /** Row field name returned by the pivot query after backend disambiguation. */
+    pivotResultRowField?: string;
+    /** Logical row field used to request pivotResultRowField. */
+    pivotResultSourceRowField?: string;
     /**
      * A list of metadata about the pivot yAxes of this report.
      */
@@ -3053,6 +3061,12 @@ interface UseReportOptions {
     useInMemoryEngines?: boolean;
     reportOverride?: QuillReportInternal | null;
     initialReportBuilderState?: ReportBuilderState | null;
+    /**
+     * `dynamic` exposes an empty "Dynamic" selection when the bucket is inferred.
+     * `standard` exposes only concrete buckets and returns the currently resolved
+     * bucket from `useReport().dateBucket`. Defaults to `dynamic`.
+     */
+    dateBucketMode?: 'dynamic' | 'standard';
     /**
      * When the report payload has no `dashboardName` and the client has no
      * `defaultDashboard`, use this for engine tasks that require a dashboard
@@ -3184,6 +3198,8 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
         pivotRows?: {
             [key: string]: string;
         }[];
+        pivotResultRowField?: string;
+        pivotResultSourceRowField?: string;
         pivotColumns?: ColumnInternal[];
         pivotRowCount?: number;
     } | undefined;

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
@@ -17352,10 +17353,15 @@ async function generatePivotWithSQL({
   const queryResponseFields = resp.data?.fields || resp.queries?.queryResults?.[0]?.fields || [];
   const rowCount = resp.queries?.queryResults?.[1]?.rows?.[0]?.row_count || 0;
   parseValueFromBigQueryDates(queryResponseRows, queryResponseFields);
+  const resultRowField = processColumnName(
+    String(
+      resp.data?.config?.rowField ?? pivot.rowField ?? ""
+    )
+  );
   const responseRows = queryResponseRows;
   const responseFields = queryResponseFields;
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const rows = resultRowField ? responseRows.map(
+    (row) => !row[resultRowField] ? { ...row, [resultRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17375,27 +17381,27 @@ async function generatePivotWithSQL({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === resultRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + resultRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === resultRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === resultRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (resultRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
+      let value = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17410,12 +17416,10 @@ async function generatePivotWithSQL({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[resultRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (resultRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[resultRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17425,7 +17429,7 @@ async function generatePivotWithSQL({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[resultRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17462,6 +17466,7 @@ async function generatePivotWithSQL({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: resultRowField || void 0,
     pivotQuery: report?.queryString || "",
     comparisonPivotQuery: comparisonPivotQuery || ""
   };
@@ -17561,14 +17566,18 @@ function processPivotData({
   rows: responseRows,
   fields: responseFields,
   pivot,
+  resultRowField,
   dateBucket,
   dateFilter,
   client,
   rowCount
 }) {
   const databaseType = client.databaseType || "postgresql";
-  const rows = pivot.rowField ? responseRows.map(
-    (row) => !row[pivot.rowField] ? { ...row, [pivot.rowField]: "-" } : row
+  const pivotRowField = processColumnName(
+    String(resultRowField ?? pivot.rowField ?? "")
+  );
+  const rows = pivotRowField ? responseRows.map(
+    (row) => !row[pivotRowField] ? { ...row, [pivotRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
     rows.forEach((row) => {
@@ -17588,27 +17597,27 @@ function processPivotData({
         (field.field || field.name).replace("comparison_", "comparison ")
       )
     ),
-    format: (field.field || field.name) === pivot.rowField ? "string" : pivot.aggregations?.find(
+    format: processColumnName(field.field || field.name) === pivotRowField ? "string" : pivot.aggregations?.find(
       (agg) => agg.valueField === (field.field || field.name) || `${agg.valueField}_percentage` === (field.field || field.name) || !agg.valueField && agg.aggregationType === "percentage" && (field.field || field.name)?.endsWith("percentage")
     )?.aggregationType === "percentage" ? "percent" : "whole_number",
     fieldType: field.fieldType,
     jsType: field.jsType,
     dataTypeID: field.dataTypeID
   })).filter(
-    (field, index) => field.field !== "comparison_" + pivot.rowField || index === 0
+    (field, index) => field.field !== "comparison_" + pivotRowField || index === 0
   ).sort((a, b) => {
-    if (a.field === pivot.rowField) {
+    if (a.field === pivotRowField) {
       return -1;
     }
-    if (b.field === pivot.rowField) {
+    if (b.field === pivotRowField) {
       return 1;
     }
     return 0;
   });
-  if (pivot.rowField && !isStringType(pivot.rowFieldType || "")) {
+  if (pivotRowField && !isStringType(pivot.rowFieldType || "")) {
     rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
+      row.__quillRawDate = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
+      let value = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
       if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
         const rowDate = new Date(value);
         if (rowDate < dateFilter.startDate) {
@@ -17623,12 +17632,10 @@ function processPivotData({
         dateBucket,
         databaseType
       );
-      row[pivot.rowField || ""] = dateString;
+      row[pivotRowField] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
+    if (pivotRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
+      const dateSet = new Set(rows.map((row) => row[pivotRowField]));
       for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
         const formattedDate = getDateString(
           date.toISOString(),
@@ -17638,7 +17645,7 @@ function processPivotData({
         );
         if (!dateSet.has(formattedDate)) {
           const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
+          newRow[pivotRowField] = formattedDate;
           newRow.__quillRawDate = date.toISOString();
           rows.push(newRow);
           dateSet.add(formattedDate);
@@ -17675,6 +17682,7 @@ function processPivotData({
     rows,
     columns: columns ?? [],
     rowCount: rowCount || rows.length,
+    rowField: pivotRowField || void 0,
     pivotQuery: "",
     comparisonPivotQuery: ""
   };
@@ -21985,12 +21993,14 @@ function buildPivotOnlyReportFromResponse({
   }
   let pivotRows = rawPivotRows;
   let pivotColumns = Array.isArray(response?.pivotColumns) ? response.pivotColumns : fallbackBaseReport.pivotColumns ?? [];
+  let pivotResultRowField;
   let pivotRowCount = typeof response?.pivotRowCount === "number" ? response.pivotRowCount : typeof response?.rowCount === "number" ? response.rowCount : rawPivotRows.length;
   if (effectivePivot && rawPivotFields.length > 0) {
     const pivotData = processPivotData({
       rows: rawPivotRows,
       fields: rawPivotFields,
       pivot: effectivePivot,
+      resultRowField: response?.config?.rowField,
       ...effectivePivot.dateBucket ? { dateBucket: effectivePivot.dateBucket } : {},
       client,
       rowCount: typeof response?.rowCount === "number" ? response.rowCount : void 0
@@ -21998,6 +22008,7 @@ function buildPivotOnlyReportFromResponse({
     pivotRows = pivotData.rows;
     pivotColumns = pivotData.columns;
     pivotRowCount = pivotData.rowCount;
+    pivotResultRowField = pivotData.rowField;
   }
   const pivotOnlyReport = {
     ...responseReport,
@@ -22009,7 +22020,9 @@ function buildPivotOnlyReportFromResponse({
     pivot: effectivePivot,
     pivotRows,
     pivotColumns,
-    pivotRowCount
+    pivotRowCount,
+    pivotResultRowField,
+    pivotResultSourceRowField: effectivePivot?.rowField
   };
   if (additionalProcessing) {
     pivotOnlyReport.pagination = additionalProcessing.page;
@@ -60203,12 +60216,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" },
@@ -60686,17 +60700,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) => {
@@ -63361,6 +63384,8 @@ async function loadViaReportBuilderState({
       pivotRows: refreshedPivotData?.rows ?? compatibleReportPivotRows ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRows : []) ?? [],
       pivotColumns: refreshedPivotData?.columns ?? compatibleReportPivotColumns ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotColumns : []) ?? [],
       pivotRowCount: refreshedPivotData?.rowCount ?? compatibleReportPivotRowCount ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotRowCount : void 0) ?? 0,
+      pivotResultRowField: refreshedPivotData?.rowField ?? reportBuilderInfo.report.pivotResultRowField ?? (canReuseBasePivotRowsAndColumns ? baseReport.pivotResultRowField : void 0),
+      pivotResultSourceRowField: refreshedPivotData?.rowField && requestedPivotRowField ? requestedPivotRowField : reportBuilderInfo.report.pivotResultSourceRowField ? reportBuilderInfo.report.pivotResultSourceRowField : canReuseBasePivotRowsAndColumns ? baseReport.pivotResultSourceRowField : void 0,
       uniqueStringsByTable: reportBuilderInfo.uniqueStringsByTable,
       uniqueStringsByColumn: reportBuilderInfo.uniqueStringsByColumn,
       columnUniqueValues: reportBuilderInfo.uniqueStringsByColumn,
@@ -63498,6 +63523,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;
@@ -65046,17 +65072,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,
@@ -65064,8 +65097,10 @@ function useReport(reportIdArg, options = {}) {
     appliedAggregationState,
     baseReportBuilderTables,
     dateBucket,
+    dateBucketMode,
     groupColumnsBy,
     groupRowsBy,
+    internalFilters,
     schemaForReportBuilderState,
     sourceReport?.columnInternal,
     sourceReport?.columns,
@@ -65409,6 +65444,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
@@ -66066,6 +66105,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
@@ -66382,6 +66425,8 @@ function useReport(reportIdArg, options = {}) {
           pivotRows: mergedPivotRows,
           pivotColumns: report.pivotColumns,
           pivotRowCount: mergedPivotRowCount,
+          pivotResultRowField: report.pivotResultRowField,
+          pivotResultSourceRowField: report.pivotResultSourceRowField,
           pivotQuery: report.pivotQuery,
           comparisonPivotQuery: report.comparisonPivotQuery,
           reportBuilderState: mergedReportBuilderState ? {
@@ -66401,7 +66446,11 @@ function useReport(reportIdArg, options = {}) {
   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);
+    const chartPivot = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
+    const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
+      ...chartPivot,
+      rowField: sourceReport.pivotResultRowField
+    } : chartPivot;
     const rowCountForChart = chartPivotForDisplay ? sourceReport.pivotRowCount ?? (Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : sourceReport.rowCount) : useInMemoryEngines ? rowsForChart.length : sourceReport.rowCount;
     const referencedTablesForChart = effectiveReportBuilderState?.tables.map((table2) => table2.name).filter((name2) => Boolean(name2));
     const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;
@@ -68368,8 +68417,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. */

package/package.json

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