@quillsql/react 2.16.57 → 2.16.58

package/dist/index.cjs

@@ -60837,7 +60837,12 @@ function isPivotTableDateBucketRowAxis(chart, xAxisField) {
   if (!rowField || xf !== rowField) return false;
   return isDateType(String(chart.pivot.rowFieldType ?? ""));
 }
-var RESOLVABLE_X_AXIS_DATE_BUCKETS = /* @__PURE__ */ new Set(["year", "month", "day"]);
+var RESOLVABLE_X_AXIS_DATE_BUCKETS = /* @__PURE__ */ new Set([
+  "year",
+  "month",
+  "week",
+  "day"
+]);
 function resolvePivotDateBucketXAxisFormat(chart, xAxisField) {
   if (String(chart?.chartType ?? "").toLowerCase() === "table") return null;
   const dateBucket = String(chart?.pivot?.dateBucket ?? "").trim().toLowerCase();
@@ -63400,6 +63405,7 @@ function useReport(reportIdArg, options = {}) {
   ].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   const initialFormState = (0, import_react61.useMemo)(
     () => ({
+      reportName: void 0,
       columns: [],
       queryColumns: [],
       filterStack: [],
@@ -63430,6 +63436,7 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshVersion
   } = formRuntimeState;
   const {
+    reportName: formReportName,
     columns: displayColumns,
     queryColumns,
     filterStack,
@@ -64474,6 +64481,7 @@ function useReport(reportIdArg, options = {}) {
       updater: (previous) => {
         return {
           ...previous,
+          reportName: void 0,
           schemaDatasourceIds: void 0,
           filterStack: [],
           queryFilters: { combinator: "and", rules: [] },
@@ -64566,6 +64574,7 @@ function useReport(reportIdArg, options = {}) {
   const sourceReportNameForTitle = String(sourceReport?.name ?? "").trim();
   const reportTitleFromTask = String(reportNameQuery.data?.name ?? "").trim();
   const resolvedReportName = reportNameQueryReportId && sourceReportIdForTitle === reportNameQueryReportId && sourceReportNameForTitle ? sourceReportNameForTitle : reportTitleFromTask || sourceReportNameForTitle || "";
+  const displayReportName = formReportName !== void 0 ? formReportName : resolvedReportName;
   (0, import_react61.useEffect)(() => {
     if (reportOverride) return;
     const report = initialLoadQuery.data?.report ?? null;
@@ -64669,12 +64678,15 @@ function useReport(reportIdArg, options = {}) {
           schemaTables: schemaForReportBuilderState
         });
         const sourceDisplayColumns = sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
-        const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
-        const nextGroupColumnsBy = shouldTakePivotGroupsFromSource ? groupColumnsBySetViaSetReportRef.current ? prev.groupColumnsBy : sourceColumnGroupOption : prev.groupColumnsBy !== void 0 ? prev.groupColumnsBy : prev.groupRowsBy !== void 0 ? prev.groupColumnsBy : sourceColumnGroupOption;
+        const shouldKeepLocalRowGroup = groupRowsBySetViaSetReportRef.current || groupColumnsBySetViaSetReportRef.current && prev.groupRowsBy !== void 0;
+        const shouldKeepLocalColumnGroup = groupColumnsBySetViaSetReportRef.current || groupRowsBySetViaSetReportRef.current && prev.groupColumnsBy !== void 0;
+        const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalRowGroup ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
+        const nextGroupColumnsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalColumnGroup ? prev.groupColumnsBy : sourceColumnGroupOption : prev.groupColumnsBy !== void 0 ? prev.groupColumnsBy : prev.groupRowsBy !== void 0 ? prev.groupColumnsBy : sourceColumnGroupOption;
         const sourceDateBucket = sourceReport.pivot?.dateBucket ?? sourceReport.reportBuilderState?.pivot?.dateBucket;
         const nextDateBucket = dateBucketSetViaSetReportRef.current ? prev.dateBucket : sourceDateBucket;
         const nextFromSource = {
           ...prev,
+          reportName: prev.reportName !== void 0 ? prev.reportName : String(sourceReport.name ?? "").trim() || void 0,
           queryColumns: prev.queryColumns.length ? prev.queryColumns : sourceQueryColumns,
           columns: prev.columns.length ? prev.columns : sourceDisplayColumns,
           filterStack: nextFilterStack.length > 0 ? nextFilterStack : prev.filterStack,
@@ -65261,11 +65273,7 @@ function useReport(reportIdArg, options = {}) {
     const report = tableRefreshQuery.data?.report;
     if (tableRefreshQuery.data?.error || !report) return;
     setSourceReport(report);
-  }, [
-    effectiveReportId,
-    tableRefreshQuery.data,
-    tableRefreshQueryEnabled
-  ]);
+  }, [effectiveReportId, tableRefreshQuery.data, tableRefreshQueryEnabled]);
   const chartTypes = (0, import_react61.useMemo)(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
@@ -66304,14 +66312,12 @@ function useReport(reportIdArg, options = {}) {
       chartAxisOptionByField.get(resolvedXAxisField)?.format ?? chartAxesBaseChart.xAxisFormat ?? resolvedYAxisFields[0]?.format,
       "string"
     );
-    if (defaultFormat === "string") {
-      const bucketFormat = resolvePivotDateBucketXAxisFormat(
-        chartAxesBaseChart,
-        resolvedXAxisField
-      );
-      if (bucketFormat) {
-        defaultFormat = bucketFormat;
-      }
+    const bucketFormat = resolvePivotDateBucketXAxisFormat(
+      chartAxesBaseChart,
+      resolvedXAxisField
+    );
+    if (bucketFormat && (defaultFormat === "string" || chartAxesBaseChart.pivot?.dateBucket === "week")) {
+      defaultFormat = bucketFormat;
     }
     if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && chartAxisEdits.xAxisFormat === void 0) {
       defaultFormat = "string";
@@ -67434,6 +67440,9 @@ function useReport(reportIdArg, options = {}) {
           columns: normalizeReportBuilderColumns(prev.columns ?? []),
           queryColumns: normalizeReportBuilderColumns(prev.queryColumns ?? [])
         };
+        if (effectiveNextState.name !== void 0) {
+          next.reportName = String(effectiveNextState.name);
+        }
         if (effectiveNextState.datasources !== void 0) {
           const nextIds = effectiveNextState.datasources.map((tableName) => String(tableName ?? "").trim()).filter(Boolean);
           next.schemaDatasourceIds = nextIds.length > 0 ? nextIds : void 0;
@@ -67923,7 +67932,7 @@ function useReport(reportIdArg, options = {}) {
       report: {
         ...EMPTY_INTERNAL_REPORT,
         ...sourceRest,
-        name: String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
+        name: String(formReportName ?? "").trim() ? formReportName : String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
           String(effectiveReportBuilderState.tables[0].name)
         ) : "New report",
         // Match chart rendering (`chartData`): form `chartType` wins over stale `sourceReport`.
@@ -67959,6 +67968,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportBuilderState,
     effectiveReportId,
     eventTracking,
+    formReportName,
     getToken,
     resolvedXAxisField,
     resolvedXAxisFormat,
@@ -67977,8 +67987,8 @@ function useReport(reportIdArg, options = {}) {
     table,
     tableLoading,
     loading,
-    /** Report title: matching `sourceReport.name`, else `report-name` task, else empty. */
-    name: resolvedReportName,
+    /** Report title: form override, then `sourceReport.name`, else `report-name` task. */
+    name: displayReportName,
     /**
      * Resolved report id: the `reportId` argument when provided, otherwise the id
      * returned from `create-report` after the first datasource selection.

package/dist/index.d.cts

@@ -3004,6 +3004,8 @@ type SetReportChartAxesInput = {
     };
 };
 interface SetReportBuilderInput {
+    /** Report display name, persisted by `saveChanges`. */
+    name?: string;
     /** Complete selected column list in display order. */
     columns?: ReportColumnValue[];
     filters?: Filter[];
@@ -3186,7 +3188,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
     table: UseFormTable;
     tableLoading: boolean;
     loading: boolean;
-    /** Report title: matching `sourceReport.name`, else `report-name` task, else empty. */
+    /** Report title: form override, then `sourceReport.name`, else `report-name` task. */
     name: string;
     /**
      * Resolved report id: the `reportId` argument when provided, otherwise the id

package/dist/index.d.ts

@@ -3004,6 +3004,8 @@ type SetReportChartAxesInput = {
     };
 };
 interface SetReportBuilderInput {
+    /** Report display name, persisted by `saveChanges`. */
+    name?: string;
     /** Complete selected column list in display order. */
     columns?: ReportColumnValue[];
     filters?: Filter[];
@@ -3186,7 +3188,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
     table: UseFormTable;
     tableLoading: boolean;
     loading: boolean;
-    /** Report title: matching `sourceReport.name`, else `report-name` task, else empty. */
+    /** Report title: form override, then `sourceReport.name`, else `report-name` task. */
     name: string;
     /**
      * Resolved report id: the `reportId` argument when provided, otherwise the id

package/dist/index.js

@@ -61049,7 +61049,12 @@ function isPivotTableDateBucketRowAxis(chart, xAxisField) {
   if (!rowField || xf !== rowField) return false;
   return isDateType(String(chart.pivot.rowFieldType ?? ""));
 }
-var RESOLVABLE_X_AXIS_DATE_BUCKETS = /* @__PURE__ */ new Set(["year", "month", "day"]);
+var RESOLVABLE_X_AXIS_DATE_BUCKETS = /* @__PURE__ */ new Set([
+  "year",
+  "month",
+  "week",
+  "day"
+]);
 function resolvePivotDateBucketXAxisFormat(chart, xAxisField) {
   if (String(chart?.chartType ?? "").toLowerCase() === "table") return null;
   const dateBucket = String(chart?.pivot?.dateBucket ?? "").trim().toLowerCase();
@@ -63612,6 +63617,7 @@ function useReport(reportIdArg, options = {}) {
   ].map((entry) => String(entry ?? "").trim()).find((entry) => entry.length > 0) ?? "";
   const initialFormState = useMemo32(
     () => ({
+      reportName: void 0,
       columns: [],
       queryColumns: [],
       filterStack: [],
@@ -63642,6 +63648,7 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshVersion
   } = formRuntimeState;
   const {
+    reportName: formReportName,
     columns: displayColumns,
     queryColumns,
     filterStack,
@@ -64686,6 +64693,7 @@ function useReport(reportIdArg, options = {}) {
       updater: (previous) => {
         return {
           ...previous,
+          reportName: void 0,
           schemaDatasourceIds: void 0,
           filterStack: [],
           queryFilters: { combinator: "and", rules: [] },
@@ -64778,6 +64786,7 @@ function useReport(reportIdArg, options = {}) {
   const sourceReportNameForTitle = String(sourceReport?.name ?? "").trim();
   const reportTitleFromTask = String(reportNameQuery.data?.name ?? "").trim();
   const resolvedReportName = reportNameQueryReportId && sourceReportIdForTitle === reportNameQueryReportId && sourceReportNameForTitle ? sourceReportNameForTitle : reportTitleFromTask || sourceReportNameForTitle || "";
+  const displayReportName = formReportName !== void 0 ? formReportName : resolvedReportName;
   useEffect31(() => {
     if (reportOverride) return;
     const report = initialLoadQuery.data?.report ?? null;
@@ -64881,12 +64890,15 @@ function useReport(reportIdArg, options = {}) {
           schemaTables: schemaForReportBuilderState
         });
         const sourceDisplayColumns = sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
-        const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
-        const nextGroupColumnsBy = shouldTakePivotGroupsFromSource ? groupColumnsBySetViaSetReportRef.current ? prev.groupColumnsBy : sourceColumnGroupOption : prev.groupColumnsBy !== void 0 ? prev.groupColumnsBy : prev.groupRowsBy !== void 0 ? prev.groupColumnsBy : sourceColumnGroupOption;
+        const shouldKeepLocalRowGroup = groupRowsBySetViaSetReportRef.current || groupColumnsBySetViaSetReportRef.current && prev.groupRowsBy !== void 0;
+        const shouldKeepLocalColumnGroup = groupColumnsBySetViaSetReportRef.current || groupRowsBySetViaSetReportRef.current && prev.groupColumnsBy !== void 0;
+        const nextGroupRowsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalRowGroup ? prev.groupRowsBy : sourceRowGroupOption : prev.groupRowsBy !== void 0 ? prev.groupRowsBy : groupRowsBySetViaSetReportRef.current ? prev.groupRowsBy : sourceRowGroupOption;
+        const nextGroupColumnsBy = shouldTakePivotGroupsFromSource ? shouldKeepLocalColumnGroup ? prev.groupColumnsBy : sourceColumnGroupOption : prev.groupColumnsBy !== void 0 ? prev.groupColumnsBy : prev.groupRowsBy !== void 0 ? prev.groupColumnsBy : sourceColumnGroupOption;
         const sourceDateBucket = sourceReport.pivot?.dateBucket ?? sourceReport.reportBuilderState?.pivot?.dateBucket;
         const nextDateBucket = dateBucketSetViaSetReportRef.current ? prev.dateBucket : sourceDateBucket;
         const nextFromSource = {
           ...prev,
+          reportName: prev.reportName !== void 0 ? prev.reportName : String(sourceReport.name ?? "").trim() || void 0,
           queryColumns: prev.queryColumns.length ? prev.queryColumns : sourceQueryColumns,
           columns: prev.columns.length ? prev.columns : sourceDisplayColumns,
           filterStack: nextFilterStack.length > 0 ? nextFilterStack : prev.filterStack,
@@ -65473,11 +65485,7 @@ function useReport(reportIdArg, options = {}) {
     const report = tableRefreshQuery.data?.report;
     if (tableRefreshQuery.data?.error || !report) return;
     setSourceReport(report);
-  }, [
-    effectiveReportId,
-    tableRefreshQuery.data,
-    tableRefreshQueryEnabled
-  ]);
+  }, [effectiveReportId, tableRefreshQuery.data, tableRefreshQueryEnabled]);
   const chartTypes = useMemo32(() => {
     return getChartTypeOptions2({ pivot: pivotState });
   }, [pivotState]);
@@ -66516,14 +66524,12 @@ function useReport(reportIdArg, options = {}) {
       chartAxisOptionByField.get(resolvedXAxisField)?.format ?? chartAxesBaseChart.xAxisFormat ?? resolvedYAxisFields[0]?.format,
       "string"
     );
-    if (defaultFormat === "string") {
-      const bucketFormat = resolvePivotDateBucketXAxisFormat(
-        chartAxesBaseChart,
-        resolvedXAxisField
-      );
-      if (bucketFormat) {
-        defaultFormat = bucketFormat;
-      }
+    const bucketFormat = resolvePivotDateBucketXAxisFormat(
+      chartAxesBaseChart,
+      resolvedXAxisField
+    );
+    if (bucketFormat && (defaultFormat === "string" || chartAxesBaseChart.pivot?.dateBucket === "week")) {
+      defaultFormat = bucketFormat;
     }
     if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && chartAxisEdits.xAxisFormat === void 0) {
       defaultFormat = "string";
@@ -67646,6 +67652,9 @@ function useReport(reportIdArg, options = {}) {
           columns: normalizeReportBuilderColumns(prev.columns ?? []),
           queryColumns: normalizeReportBuilderColumns(prev.queryColumns ?? [])
         };
+        if (effectiveNextState.name !== void 0) {
+          next.reportName = String(effectiveNextState.name);
+        }
         if (effectiveNextState.datasources !== void 0) {
           const nextIds = effectiveNextState.datasources.map((tableName) => String(tableName ?? "").trim()).filter(Boolean);
           next.schemaDatasourceIds = nextIds.length > 0 ? nextIds : void 0;
@@ -68135,7 +68144,7 @@ function useReport(reportIdArg, options = {}) {
       report: {
         ...EMPTY_INTERNAL_REPORT,
         ...sourceRest,
-        name: String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
+        name: String(formReportName ?? "").trim() ? formReportName : String(sourceRest.name ?? "").trim() ? sourceRest.name : effectiveReportBuilderState.tables[0]?.name ? snakeAndCamelCaseToTitleCase(
           String(effectiveReportBuilderState.tables[0].name)
         ) : "New report",
         // Match chart rendering (`chartData`): form `chartType` wins over stale `sourceReport`.
@@ -68171,6 +68180,7 @@ function useReport(reportIdArg, options = {}) {
     effectiveReportBuilderState,
     effectiveReportId,
     eventTracking,
+    formReportName,
     getToken,
     resolvedXAxisField,
     resolvedXAxisFormat,
@@ -68189,8 +68199,8 @@ function useReport(reportIdArg, options = {}) {
     table,
     tableLoading,
     loading,
-    /** Report title: matching `sourceReport.name`, else `report-name` task, else empty. */
-    name: resolvedReportName,
+    /** Report title: form override, then `sourceReport.name`, else `report-name` task. */
+    name: displayReportName,
     /**
      * Resolved report id: the `reportId` argument when provided, otherwise the id
      * returned from `create-report` after the first datasource selection.

package/package.json

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