@quillsql/react 2.16.89 → 2.16.91

package/dist/index.cjs

@@ -18641,6 +18641,19 @@ function replaceBigQuerySpecialCharacters(column) {
 function processColumnReference(column, databaseType, fallbackOnNull, isColumnFieldAlias, isValueFieldAlias) {
   switch (databaseType.toLowerCase()) {
     case "postgresql":
+    case "redshift": {
+      if (column === "") {
+        return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
+      }
+      if (isColumnFieldAlias) {
+        return `"${column.replaceAll('"', "")}"`;
+      }
+      const columnParts = column.split(".");
+      if (columnParts.length > 1) {
+        return `"` + columnParts.map((part) => part.replaceAll('"', "")).join('"."') + `"`;
+      }
+      return `"${column.replaceAll('"', "")}"`;
+    }
     case "clickhouse": {
       if (column === "") {
         return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
@@ -18755,6 +18768,8 @@ function generateDistinctQuery(stringFields, query, databaseType) {
       return generateDistinctQueryBigQuery(stringFields, query);
     case "postgresql":
       return generateDistinctQueryPostgres(stringFields, query);
+    case "redshift":
+      return generateDistinctQueryRedshift(stringFields, query);
     case "snowflake":
       return generateDistinctQuerySnowflake(stringFields, query);
     case "mssql":
@@ -18801,6 +18816,13 @@ function generateDistinctQueryPostgres(stringFields, query) {
   const distinctQuery = distinctQueries.join(" UNION ALL ");
   return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
 }
+function generateDistinctQueryRedshift(stringFields, query) {
+  const distinctQueries = stringFields.map((field) => {
+    return `SELECT '${field}' AS "field", LISTAGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
+  });
+  const distinctQuery = distinctQueries.join(" UNION ALL ");
+  return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
+}
 function generateDistinctQuerySnowflake(stringFields, query) {
   const distinctQueries = stringFields.map((field) => {
     return `SELECT '${field}' AS "field", ARRAY_AGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
@@ -18842,7 +18864,7 @@ function generateMinMaxDateRangeQueries(columnFields, query, databaseType) {
   const min2 = "MIN";
   const cast = databaseType.toLowerCase() === "snowflake" ? "::TIMESTAMP_TZ" : "";
   const distinctQueries = columnFields.map((field) => {
-    const wrappedField = ["postgresql", "clickhouse"].includes(
+    const wrappedField = ["postgresql", "redshift", "clickhouse"].includes(
       databaseType.toLowerCase()
     ) ? processColumnReference(field, databaseType) : field;
     return `SELECT '${field}' AS ${processColumnReference("field", databaseType)}, ${min2}(${wrappedField})${cast} AS ${processColumnReference("min_range", databaseType)}, ${max2}(${wrappedField})${cast} AS ${processColumnReference("max_range", databaseType)} FROM querytable`;
@@ -53707,6 +53729,7 @@ function generateSuggestionsByDatasource(monaco, range, databaseType) {
   switch (databaseType.toLowerCase()) {
     case "snowflake":
     case "postgresql":
+    case "redshift":
       return [
         ...POSTGRES_DATASOURCE_SUGGESTIONS(monaco, range),
         ...GENERIC_DATASOURCE_SUGGESTIONS(monaco, range)
@@ -64337,6 +64360,20 @@ function resolveTableColumnLabel(fieldRaw, labelRaw) {
   const label = String(labelRaw ?? "").trim();
   return !label || label === field ? toTitleCaseLabel(field) : label;
 }
+function reportColumnsContainPivotOutputFields(report) {
+  if (!report?.pivot || String(report.chartType ?? "").toLowerCase() !== "table" || !Array.isArray(report.columns) || report.columns.length === 0) {
+    return false;
+  }
+  const detailFields = new Set(
+    [
+      ...report.reportBuilderState?.columns ?? [],
+      ...report.columnInternal ?? []
+    ].flatMap((column) => [column.field, column.alias]).map((field) => String(field ?? "").trim()).filter(Boolean)
+  );
+  return report.columns.some(
+    (column) => !detailFields.has(String(column.field ?? "").trim())
+  );
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -64346,7 +64383,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
-  const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
+  const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+  const persistedReportColumns = !savedColumnsArePivotDisplayColumns && Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
   const pivotTableColumnsFromSchema = sourceReport?.pivot && !persistedReportColumns && scopedSchemaColumns.length > 0 && selectedTableNames.size > 0 ? scopedSchemaColumns.filter(
     (column) => selectedTableNames.has(String(column.table ?? "").trim())
   ) : [];
@@ -66519,9 +66557,8 @@ function useReport(reportIdArg, options = {}) {
   }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = (0, import_react63.useMemo)(() => {
-    const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
-    if (fromPicker.length > 0) {
-      return fromPicker;
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((id) => String(id ?? "").trim()).filter(Boolean);
     }
     return (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean);
   }, [schemaDatasourceIdsKey, reportBuilderBaseTableNamesKey]);
@@ -67730,7 +67767,8 @@ function useReport(reportIdArg, options = {}) {
             table: String(column.table ?? "").trim() || resolveColumnTableFromReportMetadata(sourceReport, column.field)
           }))
         );
-        const sourceDisplayColumns = savedDisplayColumns.length > 0 ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
+        const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+        const sourceDisplayColumns = savedDisplayColumns.length > 0 && !savedColumnsArePivotDisplayColumns ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
         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;
@@ -67870,7 +67908,7 @@ function useReport(reportIdArg, options = {}) {
     prevPivotStateForColumnExpansionRef.current = pivotState;
   }, [pivotState]);
   const effectiveReportBuilderTables = (0, import_react63.useMemo)(() => {
-    const explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) && schemaDatasourceIds.length > 0 ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
+    const explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
     const baseTablesForMerge = explicitBaseFromSchemaPicker ?? baseReportBuilderTables;
     return mergeReportBuilderTables(
       baseTablesForMerge,
@@ -67904,6 +67942,12 @@ function useReport(reportIdArg, options = {}) {
     () => baseReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [baseReportBuilderTables]
   );
+  const datasourcePickerValues = (0, import_react63.useMemo)(() => {
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter((name2) => Boolean(name2));
+    }
+    return baseReportBuilderTableNames;
+  }, [baseReportBuilderTableNames, schemaDatasourceIdsKey]);
   const normalizeQueryBuilderFieldNameForConfig = (0, import_react63.useMemo)(() => {
     const configEntries = Object.entries(queryBuilderFieldConfigByName);
     const preferredTableNames = /* @__PURE__ */ new Set([
@@ -70700,7 +70744,7 @@ function useReport(reportIdArg, options = {}) {
         }
         if (effectiveNextState.datasources !== void 0) {
           const nextIds = effectiveNextState.datasources.map((tableName) => String(tableName ?? "").trim()).filter(Boolean);
-          next.schemaDatasourceIds = nextIds.length > 0 ? nextIds : void 0;
+          next.schemaDatasourceIds = nextIds;
           if (nextIds.length > 0) {
             pruneFormStateToExplicitDatasourceTables(next, nextIds, {
               sourceReport,
@@ -70753,6 +70797,15 @@ function useReport(reportIdArg, options = {}) {
                 }
               }
             }
+          } else {
+            next.queryColumns = [];
+            next.groupRowsBy = void 0;
+            next.groupColumnsBy = void 0;
+            next.aggregationState = [];
+            next.aggregationTablesByIndex = [];
+            next.pivotSort = void 0;
+            next.regularSort = void 0;
+            next.queryFilters = { combinator: "and", rules: [] };
           }
         }
         if (effectiveNextState.columns !== void 0) {
@@ -70773,6 +70826,8 @@ function useReport(reportIdArg, options = {}) {
           if (replacesDatasourceTableScope) {
             next.queryColumns = normalizedDisplayColumns;
             next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (effectiveNextState.datasources !== void 0 && normalizedDisplayColumns.length === 0) {
+            next.queryColumns = [];
           } else {
             next.queryColumns = mergeReportBuilderColumns(
               next.queryColumns,
@@ -71158,6 +71213,28 @@ function useReport(reportIdArg, options = {}) {
       const hasReportFlagsOverride = overrides?.reportFlags !== void 0;
       const isFlatTable = String(resolvedChartType).toLowerCase() === "table" && !effectiveReportBuilderState.pivot;
       const isPivotTable = String(resolvedChartType).toLowerCase() === "table" && Boolean(effectiveReportBuilderState.pivot);
+      const fallbackDetailColumns = effectiveReportBuilderState.columns.map(
+        (column) => {
+          const field = String(column.alias ?? "").trim() || String(column.field ?? "").trim();
+          const tableName = String(column.table ?? "").trim();
+          const metadata = [
+            ...sourceReport.columnInternal ?? [],
+            ...sourceReport.columns ?? []
+          ].find((candidate) => {
+            const candidateField = String(candidate.field ?? "").trim();
+            const candidateTable = String(
+              candidate.table ?? ""
+            ).trim();
+            return (candidateField === field || candidateField === String(column.field ?? "").trim()) && (!tableName || !candidateTable || candidateTable === tableName);
+          });
+          return {
+            field,
+            label: String(metadata?.label ?? "").trim() || toTitleCaseLabel(field),
+            format: String(metadata?.format ?? "").trim() || "string"
+          };
+        }
+      );
+      const columnsSelectedForSave = table.columns.length > 0 ? table.columns : fallbackDetailColumns;
       const resp = await saveReport({
         report: {
           ...EMPTY_INTERNAL_REPORT,
@@ -71169,7 +71246,7 @@ function useReport(reportIdArg, options = {}) {
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
           ...hasSectionOverride ? { section: overrides.section } : {},
-          columns: isPivotTable ? chart?.columns ?? sourceReport.columns : table.columns,
+          columns: columnsSelectedForSave,
           ...isFlatTable ? {
             sort: effectiveReportBuilderState.sort?.[0] ?? null
           } : {},
@@ -71258,6 +71335,7 @@ function useReport(reportIdArg, options = {}) {
     reportId: effectiveReportId || void 0,
     /* ── Selected value + pick list (same naming pattern throughout) ── */
     datasources,
+    datasourcePickerValues,
     datasourceOptions,
     groupRowsBy,
     groupRowsByOptions,

package/dist/index.d.cts

@@ -3275,7 +3275,8 @@ interface SetReportBuilderInput {
     chartAxes?: SetReportChartAxesInput;
     /**
      * Schema table names for datasource / multi-table picker UIs.
-     * Empty array clears the override (report base tables apply again).
+     * An empty array clears the picker selection; omit or pass `undefined` via
+     * report switches to fall back to saved report base tables.
      */
     datasources?: string[];
 }
@@ -3451,6 +3452,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
      */
     reportId: string | undefined;
     datasources: string[];
+    datasourcePickerValues: string[];
     datasourceOptions: DatasourceOption[];
     groupRowsBy: string | undefined;
     groupRowsByOptions: SelectOption[];

package/dist/index.d.ts

@@ -3275,7 +3275,8 @@ interface SetReportBuilderInput {
     chartAxes?: SetReportChartAxesInput;
     /**
      * Schema table names for datasource / multi-table picker UIs.
-     * Empty array clears the override (report base tables apply again).
+     * An empty array clears the picker selection; omit or pass `undefined` via
+     * report switches to fall back to saved report base tables.
      */
     datasources?: string[];
 }
@@ -3451,6 +3452,7 @@ declare function useReport(reportIdArg?: string, options?: UseReportOptions): {
      */
     reportId: string | undefined;
     datasources: string[];
+    datasourcePickerValues: string[];
     datasourceOptions: DatasourceOption[];
     groupRowsBy: string | undefined;
     groupRowsByOptions: SelectOption[];

package/dist/index.js

@@ -18687,6 +18687,19 @@ function replaceBigQuerySpecialCharacters(column) {
 function processColumnReference(column, databaseType, fallbackOnNull, isColumnFieldAlias, isValueFieldAlias) {
   switch (databaseType.toLowerCase()) {
     case "postgresql":
+    case "redshift": {
+      if (column === "") {
+        return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
+      }
+      if (isColumnFieldAlias) {
+        return `"${column.replaceAll('"', "")}"`;
+      }
+      const columnParts = column.split(".");
+      if (columnParts.length > 1) {
+        return `"` + columnParts.map((part) => part.replaceAll('"', "")).join('"."') + `"`;
+      }
+      return `"${column.replaceAll('"', "")}"`;
+    }
     case "clickhouse": {
       if (column === "") {
         return fallbackOnNull ? `"${fallbackOnNull}"` : `"_"`;
@@ -18801,6 +18814,8 @@ function generateDistinctQuery(stringFields, query, databaseType) {
       return generateDistinctQueryBigQuery(stringFields, query);
     case "postgresql":
       return generateDistinctQueryPostgres(stringFields, query);
+    case "redshift":
+      return generateDistinctQueryRedshift(stringFields, query);
     case "snowflake":
       return generateDistinctQuerySnowflake(stringFields, query);
     case "mssql":
@@ -18847,6 +18862,13 @@ function generateDistinctQueryPostgres(stringFields, query) {
   const distinctQuery = distinctQueries.join(" UNION ALL ");
   return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
 }
+function generateDistinctQueryRedshift(stringFields, query) {
+  const distinctQueries = stringFields.map((field) => {
+    return `SELECT '${field}' AS "field", LISTAGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
+  });
+  const distinctQuery = distinctQueries.join(" UNION ALL ");
+  return `WITH querytable AS (${query.replace(";", "")}) ` + distinctQuery;
+}
 function generateDistinctQuerySnowflake(stringFields, query) {
   const distinctQueries = stringFields.map((field) => {
     return `SELECT '${field}' AS "field", ARRAY_AGG(DISTINCT "${field}") AS "string_values" FROM querytable`;
@@ -18888,7 +18910,7 @@ function generateMinMaxDateRangeQueries(columnFields, query, databaseType) {
   const min2 = "MIN";
   const cast = databaseType.toLowerCase() === "snowflake" ? "::TIMESTAMP_TZ" : "";
   const distinctQueries = columnFields.map((field) => {
-    const wrappedField = ["postgresql", "clickhouse"].includes(
+    const wrappedField = ["postgresql", "redshift", "clickhouse"].includes(
       databaseType.toLowerCase()
     ) ? processColumnReference(field, databaseType) : field;
     return `SELECT '${field}' AS ${processColumnReference("field", databaseType)}, ${min2}(${wrappedField})${cast} AS ${processColumnReference("min_range", databaseType)}, ${max2}(${wrappedField})${cast} AS ${processColumnReference("max_range", databaseType)} FROM querytable`;
@@ -53860,6 +53882,7 @@ function generateSuggestionsByDatasource(monaco, range, databaseType) {
   switch (databaseType.toLowerCase()) {
     case "snowflake":
     case "postgresql":
+    case "redshift":
       return [
         ...POSTGRES_DATASOURCE_SUGGESTIONS(monaco, range),
         ...GENERIC_DATASOURCE_SUGGESTIONS(monaco, range)
@@ -64545,6 +64568,20 @@ function resolveTableColumnLabel(fieldRaw, labelRaw) {
   const label = String(labelRaw ?? "").trim();
   return !label || label === field ? toTitleCaseLabel(field) : label;
 }
+function reportColumnsContainPivotOutputFields(report) {
+  if (!report?.pivot || String(report.chartType ?? "").toLowerCase() !== "table" || !Array.isArray(report.columns) || report.columns.length === 0) {
+    return false;
+  }
+  const detailFields = new Set(
+    [
+      ...report.reportBuilderState?.columns ?? [],
+      ...report.columnInternal ?? []
+    ].flatMap((column) => [column.field, column.alias]).map((field) => String(field ?? "").trim()).filter(Boolean)
+  );
+  return report.columns.some(
+    (column) => !detailFields.has(String(column.field ?? "").trim())
+  );
+}
 function mergeDisplayAndSourceForTableFormats(args) {
   const {
     effectiveReportBuilderTableNames,
@@ -64554,7 +64591,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
-  const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
+  const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+  const persistedReportColumns = !savedColumnsArePivotDisplayColumns && Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
   const pivotTableColumnsFromSchema = sourceReport?.pivot && !persistedReportColumns && scopedSchemaColumns.length > 0 && selectedTableNames.size > 0 ? scopedSchemaColumns.filter(
     (column) => selectedTableNames.has(String(column.table ?? "").trim())
   ) : [];
@@ -66727,9 +66765,8 @@ function useReport(reportIdArg, options = {}) {
   }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = useMemo33(() => {
-    const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
-    if (fromPicker.length > 0) {
-      return fromPicker;
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((id) => String(id ?? "").trim()).filter(Boolean);
     }
     return (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean);
   }, [schemaDatasourceIdsKey, reportBuilderBaseTableNamesKey]);
@@ -67938,7 +67975,8 @@ function useReport(reportIdArg, options = {}) {
             table: String(column.table ?? "").trim() || resolveColumnTableFromReportMetadata(sourceReport, column.field)
           }))
         );
-        const sourceDisplayColumns = savedDisplayColumns.length > 0 ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
+        const savedColumnsArePivotDisplayColumns = reportColumnsContainPivotOutputFields(sourceReport);
+        const sourceDisplayColumns = savedDisplayColumns.length > 0 && !savedColumnsArePivotDisplayColumns ? savedDisplayColumns : sourceDisplayColumnsFromSchema.length > 0 ? sourceDisplayColumnsFromSchema : sourceQueryColumns;
         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;
@@ -68078,7 +68116,7 @@ function useReport(reportIdArg, options = {}) {
     prevPivotStateForColumnExpansionRef.current = pivotState;
   }, [pivotState]);
   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 explicitBaseFromSchemaPicker = Array.isArray(schemaDatasourceIds) ? schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter(Boolean).map((name2) => ({ name: name2 })) : null;
     const baseTablesForMerge = explicitBaseFromSchemaPicker ?? baseReportBuilderTables;
     return mergeReportBuilderTables(
       baseTablesForMerge,
@@ -68112,6 +68150,12 @@ function useReport(reportIdArg, options = {}) {
     () => baseReportBuilderTables.map((table2) => String(table2.name ?? "").trim()).filter((name2) => Boolean(name2)),
     [baseReportBuilderTables]
   );
+  const datasourcePickerValues = useMemo33(() => {
+    if (Array.isArray(schemaDatasourceIds)) {
+      return schemaDatasourceIds.map((tableName) => String(tableName ?? "").trim()).filter((name2) => Boolean(name2));
+    }
+    return baseReportBuilderTableNames;
+  }, [baseReportBuilderTableNames, schemaDatasourceIdsKey]);
   const normalizeQueryBuilderFieldNameForConfig = useMemo33(() => {
     const configEntries = Object.entries(queryBuilderFieldConfigByName);
     const preferredTableNames = /* @__PURE__ */ new Set([
@@ -70908,7 +70952,7 @@ function useReport(reportIdArg, options = {}) {
         }
         if (effectiveNextState.datasources !== void 0) {
           const nextIds = effectiveNextState.datasources.map((tableName) => String(tableName ?? "").trim()).filter(Boolean);
-          next.schemaDatasourceIds = nextIds.length > 0 ? nextIds : void 0;
+          next.schemaDatasourceIds = nextIds;
           if (nextIds.length > 0) {
             pruneFormStateToExplicitDatasourceTables(next, nextIds, {
               sourceReport,
@@ -70961,6 +71005,15 @@ function useReport(reportIdArg, options = {}) {
                 }
               }
             }
+          } else {
+            next.queryColumns = [];
+            next.groupRowsBy = void 0;
+            next.groupColumnsBy = void 0;
+            next.aggregationState = [];
+            next.aggregationTablesByIndex = [];
+            next.pivotSort = void 0;
+            next.regularSort = void 0;
+            next.queryFilters = { combinator: "and", rules: [] };
           }
         }
         if (effectiveNextState.columns !== void 0) {
@@ -70981,6 +71034,8 @@ function useReport(reportIdArg, options = {}) {
           if (replacesDatasourceTableScope) {
             next.queryColumns = normalizedDisplayColumns;
             next.schemaDatasourceIds = [...requestedDisplayTableNames];
+          } else if (effectiveNextState.datasources !== void 0 && normalizedDisplayColumns.length === 0) {
+            next.queryColumns = [];
           } else {
             next.queryColumns = mergeReportBuilderColumns(
               next.queryColumns,
@@ -71366,6 +71421,28 @@ function useReport(reportIdArg, options = {}) {
       const hasReportFlagsOverride = overrides?.reportFlags !== void 0;
       const isFlatTable = String(resolvedChartType).toLowerCase() === "table" && !effectiveReportBuilderState.pivot;
       const isPivotTable = String(resolvedChartType).toLowerCase() === "table" && Boolean(effectiveReportBuilderState.pivot);
+      const fallbackDetailColumns = effectiveReportBuilderState.columns.map(
+        (column) => {
+          const field = String(column.alias ?? "").trim() || String(column.field ?? "").trim();
+          const tableName = String(column.table ?? "").trim();
+          const metadata = [
+            ...sourceReport.columnInternal ?? [],
+            ...sourceReport.columns ?? []
+          ].find((candidate) => {
+            const candidateField = String(candidate.field ?? "").trim();
+            const candidateTable = String(
+              candidate.table ?? ""
+            ).trim();
+            return (candidateField === field || candidateField === String(column.field ?? "").trim()) && (!tableName || !candidateTable || candidateTable === tableName);
+          });
+          return {
+            field,
+            label: String(metadata?.label ?? "").trim() || toTitleCaseLabel(field),
+            format: String(metadata?.format ?? "").trim() || "string"
+          };
+        }
+      );
+      const columnsSelectedForSave = table.columns.length > 0 ? table.columns : fallbackDetailColumns;
       const resp = await saveReport({
         report: {
           ...EMPTY_INTERNAL_REPORT,
@@ -71377,7 +71454,7 @@ function useReport(reportIdArg, options = {}) {
           dashboardName: resolvedDashboardName,
           ...isAdmin ? { adminMode: true } : {},
           ...hasSectionOverride ? { section: overrides.section } : {},
-          columns: isPivotTable ? chart?.columns ?? sourceReport.columns : table.columns,
+          columns: columnsSelectedForSave,
           ...isFlatTable ? {
             sort: effectiveReportBuilderState.sort?.[0] ?? null
           } : {},
@@ -71466,6 +71543,7 @@ function useReport(reportIdArg, options = {}) {
     reportId: effectiveReportId || void 0,
     /* ── Selected value + pick list (same naming pattern throughout) ── */
     datasources,
+    datasourcePickerValues,
     datasourceOptions,
     groupRowsBy,
     groupRowsByOptions,

package/package.json

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