@quillsql/react 2.16.68 → 2.16.69

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
@@ -59991,12 +59992,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 +60476,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) => {
@@ -63286,6 +63297,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 +64846,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 +64871,10 @@ function useReport(reportIdArg, options = {}) {
     appliedAggregationState,
     baseReportBuilderTables,
     dateBucket,
+    dateBucketMode,
     groupColumnsBy,
     groupRowsBy,
+    internalFilters,
     schemaForReportBuilderState,
     sourceReport?.columnInternal,
     sourceReport?.columns,
@@ -65197,6 +65218,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 +65879,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
@@ -68156,8 +68185,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;
@@ -3053,6 +3055,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

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;
@@ -3053,6 +3055,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

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
@@ -60203,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" },
@@ -60686,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) => {
@@ -63498,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;
@@ -65046,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,
@@ -65064,8 +65083,10 @@ function useReport(reportIdArg, options = {}) {
     appliedAggregationState,
     baseReportBuilderTables,
     dateBucket,
+    dateBucketMode,
     groupColumnsBy,
     groupRowsBy,
+    internalFilters,
     schemaForReportBuilderState,
     sourceReport?.columnInternal,
     sourceReport?.columns,
@@ -65409,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
@@ -66066,6 +66091,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
@@ -68368,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. */

package/package.json

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