@quillsql/react 2.16.50 → 2.16.52

package/dist/index.cjs

@@ -20015,27 +20015,6 @@ function parseData(rows, queryType) {
       return rows;
   }
 }
-function isQuillFetchDebugEnabled() {
-  if (typeof globalThis !== "undefined") {
-    for (const debugFlag of QUILL_FETCH_DEBUG_FLAGS) {
-      if (globalThis?.[debugFlag] === true) {
-        return true;
-      }
-    }
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envCandidates = [
-      process?.env?.QUILL_DEBUG_USEFORM_HYDRATION,
-      process?.env?.QUILL_DEBUG_USEFORM_FILTERS,
-      process?.env?.QUILL_DEBUG_DATA_FETCHER
-    ];
-    return envCandidates.some((candidate) => {
-      const normalized = String(candidate ?? "").trim().toLowerCase();
-      return normalized === "1" || normalized === "true";
-    });
-  }
-  return false;
-}
 async function testSqlViewState(client, referencedTables, getToken) {
   let errorMessage = null;
   await Promise.all(
@@ -20521,7 +20500,7 @@ async function fetchRelevantInfoFromState(reportBuilderState, tables, columns, a
     return { error: error.message };
   }
 }
-var QUILL_FETCH_DEBUG_FLAGS, quillFetchDebugSeq, logQuillFetchDebug, quillFetch, parseFetchResponse;
+var quillFetch, parseFetchResponse;
 var init_dataFetcher = __esm({
   "src/utils/dataFetcher.tsx"() {
     "use strict";
@@ -20530,16 +20509,6 @@ var init_dataFetcher = __esm({
     init_tableProcessing();
     init_dates();
     init_changelogNotify();
-    QUILL_FETCH_DEBUG_FLAGS = [
-      "__QUILL_DEBUG_USEFORM_HYDRATION__",
-      "__QUILL_DEBUG_USEFORM_FILTERS__",
-      "__QUILL_DEBUG_DATA_FETCHER__"
-    ];
-    quillFetchDebugSeq = 0;
-    logQuillFetchDebug = (label, payload) => {
-      if (!isQuillFetchDebugEnabled()) return;
-      console.log(`[quillFetch-debug] ${label}`, payload);
-    };
     quillFetch = async ({
       client,
       task,
@@ -20550,24 +20519,7 @@ var init_dataFetcher = __esm({
       urlParameters,
       getToken
     }) => {
-      const debugSeq = ++quillFetchDebugSeq;
-      const debugStart = Date.now();
-      logQuillFetchDebug("request", {
-        seq: debugSeq,
-        task,
-        reportId: metadata?.reportId,
-        dashboardItemId: metadata?.dashboardItemId,
-        hasPivot: Boolean(metadata?.pivot),
-        hasReportBuilderState: Boolean(metadata?.reportBuilderState),
-        filtersLength: Array.isArray(metadata?.filters) ? metadata.filters.length : void 0
-      });
       const token = await getToken();
-      logQuillFetchDebug("token-acquired", {
-        seq: debugSeq,
-        task,
-        ms: Date.now() - debugStart,
-        hasToken: Boolean(token)
-      });
       const queryString = urlParameters ?? `task=${task}`;
       const endpoint = client.queryEndpoint ? `${client.queryEndpoint}?${queryString}` : `${QUILL_SERVER}${QUILL_QUERY_ENDPOINT}?${queryString}`;
       try {
@@ -20599,17 +20551,6 @@ var init_dataFetcher = __esm({
         if (task !== "fetch-changelog-list" && Array.isArray(normalizedData?.changelogs)) {
           notifyChangelogs(normalizedData.changelogs);
         }
-        logQuillFetchDebug("response", {
-          seq: debugSeq,
-          task,
-          ms: Date.now() - debugStart,
-          status: result.status,
-          error: result.error,
-          dataError: normalizedData?.error,
-          queryResultRowCounts: Array.isArray(result.queries?.queryResults) ? result.queries.queryResults.map(
-            (qr) => Array.isArray(qr?.rows) ? qr.rows.length : null
-          ) : void 0
-        });
         return {
           data: normalizedData,
           queries: result.queries,
@@ -20618,19 +20559,8 @@ var init_dataFetcher = __esm({
         };
       } catch (e) {
         if (e instanceof Error && e.name === "AbortError") {
-          logQuillFetchDebug("aborted", {
-            seq: debugSeq,
-            task,
-            ms: Date.now() - debugStart
-          });
           throw e;
         }
-        logQuillFetchDebug("threw", {
-          seq: debugSeq,
-          task,
-          ms: Date.now() - debugStart,
-          message: e instanceof Error ? e.message : String(e)
-        });
         if (task !== "set-section-order") {
           console.error("Failed to fetch:", e);
         }
@@ -29251,62 +29181,6 @@ function stableColorIndex(field) {
   }
   return hash;
 }
-function assignStableSeriesColors(fields, colors, knownFields = fields) {
-  const normalize2 = (values) => [
-    ...new Set(
-      values.filter((field) => typeof field === "string").map((field) => field.replace("comparison_", ""))
-    )
-  ];
-  const uniqueFields = normalize2(fields);
-  const universe = normalize2([...knownFields, ...fields]);
-  const result = /* @__PURE__ */ new Map();
-  if (universe.length === 0) {
-    return result;
-  }
-  if (!colors.length) {
-    for (const field of uniqueFields) {
-      result.set(field, "gray");
-    }
-    return result;
-  }
-  const palette = colors.length >= universe.length ? colors : generateArrayFromColor(colors, universe.length);
-  const ordered = [...universe].sort((a, b) => {
-    const diff = stableColorIndex(a) - stableColorIndex(b);
-    return diff !== 0 ? diff : a.localeCompare(b);
-  });
-  const usedIndices = /* @__PURE__ */ new Set();
-  const deferred = [];
-  const assigned = /* @__PURE__ */ new Map();
-  for (const field of ordered) {
-    const preferred = stableColorIndex(field) % palette.length;
-    if (!usedIndices.has(preferred)) {
-      usedIndices.add(preferred);
-      assigned.set(field, palette[preferred]);
-    } else {
-      deferred.push(field);
-    }
-  }
-  for (const field of deferred) {
-    const preferred = stableColorIndex(field) % palette.length;
-    let found = false;
-    for (let offset = 1; offset < palette.length; offset++) {
-      const idx = (preferred + offset) % palette.length;
-      if (!usedIndices.has(idx)) {
-        usedIndices.add(idx);
-        assigned.set(field, palette[idx]);
-        found = true;
-        break;
-      }
-    }
-    if (!found) {
-      assigned.set(field, palette[preferred]);
-    }
-  }
-  for (const field of uniqueFields) {
-    result.set(field, assigned.get(field));
-  }
-  return result;
-}
 function selectColor(element, colors, index) {
   if (!element?.field) return "gray";
   const isComparison = element.field.includes("comparison_");
@@ -34327,21 +34201,6 @@ function BarChart({
     () => stackedMode ? getStackedDomain(data, yAxisFields, comparison) : getDomain(data, yAxisFields, referenceLines),
     [stackedMode, data, yAxisFields, referenceLines, comparison]
   );
-  const knownSeriesFieldsRef = (0, import_react18.useRef)([]);
-  const knownColorsKeyRef = (0, import_react18.useRef)("");
-  const seriesColorByField = (0, import_react18.useMemo)(() => {
-    const visibleFields = yAxisFields.filter((field) => comparison || !field.field.startsWith("comparison_")).map((field) => field.field);
-    const colorsKey = colors.join("\0");
-    if (knownColorsKeyRef.current !== colorsKey) {
-      knownSeriesFieldsRef.current = [];
-      knownColorsKeyRef.current = colorsKey;
-    }
-    const knownFields = [
-      .../* @__PURE__ */ new Set([...knownSeriesFieldsRef.current, ...visibleFields])
-    ];
-    knownSeriesFieldsRef.current = knownFields;
-    return assignStableSeriesColors(visibleFields, colors, knownFields);
-  }, [yAxisFields, colors, comparison]);
   const allowDecimals = (0, import_react18.useMemo)(
     () => getAllowDecimals(data, yAxisFields, referenceLines),
     [data, yAxisFields, referenceLines]
@@ -34604,15 +34463,7 @@ function BarChart({
                       dataKey: elem.field,
                       stackId: stackedMode ? "same_id" : isStacked ? elem.field.replace("comparison_", "") : void 0,
                       type: "linear",
-                      fill: getCustomColor(elem.field) ?? selectColor(
-                        elem,
-                        [
-                          seriesColorByField.get(
-                            elem.field.replace("comparison_", "")
-                          ) ?? colors[0] ?? "gray"
-                        ],
-                        0
-                      ),
+                      fill: getCustomColor(elem.field) ?? selectColor(elem, colors, stableColorIndex(elem.field)),
                       isAnimationActive,
                       shape: customBarShape,
                       activeBar: customActiveBarShape ?? {
@@ -59924,6 +59775,32 @@ function useFormReducer(state, action) {
   }
 }
 
+// src/utils/pivotDateBuckets.ts
+var import_date_fns18 = require("date-fns");
+function buildPivotDateBucketStarts(range, bucket) {
+  const min2 = new Date(range.min);
+  const max2 = new Date(range.max);
+  if (Number.isNaN(min2.getTime()) || Number.isNaN(max2.getTime())) return [];
+  const start = min2 <= max2 ? min2 : max2;
+  const end = min2 <= max2 ? max2 : min2;
+  const asLocalCalendarDate = (date) => new Date(
+    date.getUTCFullYear(),
+    date.getUTCMonth(),
+    date.getUTCDate(),
+    12
+  );
+  const interval = {
+    start: asLocalCalendarDate(start),
+    end: asLocalCalendarDate(end)
+  };
+  const dates = bucket === "day" ? (0, import_date_fns18.eachDayOfInterval)(interval) : bucket === "week" ? (0, import_date_fns18.eachWeekOfInterval)(interval, { weekStartsOn: 1 }) : bucket === "year" ? (0, import_date_fns18.eachYearOfInterval)(interval) : (0, import_date_fns18.eachMonthOfInterval)(interval);
+  return dates.map(
+    (date) => new Date(
+      Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())
+    ).toISOString()
+  );
+}
+
 // src/hooks/useForm.queries.ts
 var QUERY_KEY_UNDEFINED = "__undefined__";
 var QUERY_KEY_FUNCTION = "__function__";
@@ -60101,70 +59978,6 @@ var AXIS_FORMAT_OPTIONS = [
   { value: "MMM_dd_hh:mm_ap_pm", label: "date and time" },
   { value: "hh_ap_pm", label: "hour" }
 ];
-var USEFORM_FILTERS_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_FILTERS__";
-var USEFORM_REFRESH_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_REFRESH__";
-var USEFORM_PIVOT_SHAPE_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_PIVOT_SHAPE__";
-var USEFORM_TASK_DEBUG_FLAG = "__QUILL_DEBUG_USEFORM_TASKS__";
-var isUseFormFiltersDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_FILTERS_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_FILTERS ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var isUseFormRefreshDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_REFRESH_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_REFRESH ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var isUseFormTaskDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_TASK_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_TASKS ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var logUseFormTaskDebug = (label, payload) => {
-  if (!isUseFormTaskDebugEnabled()) return;
-  console.log(`[useReport][task] ${label}`, payload);
-};
-var isUseFormPivotShapeDebugEnabled = () => {
-  const globalValue = typeof globalThis !== "undefined" ? globalThis?.[USEFORM_PIVOT_SHAPE_DEBUG_FLAG] : void 0;
-  if (globalValue === true) {
-    return true;
-  }
-  if (typeof process !== "undefined" && typeof process.env !== "undefined") {
-    const envValue = String(
-      process?.env?.QUILL_DEBUG_USEFORM_PIVOT_SHAPE ?? ""
-    ).trim().toLowerCase();
-    return envValue === "1" || envValue === "true";
-  }
-  return false;
-};
-var logUseFormPivotShapeDebug = (label, payload) => {
-  if (!isUseFormPivotShapeDebugEnabled()) return;
-  console.log(`[useReport][pivot-shape] ${label}`, payload);
-};
 var BOOLEAN_FILTER_VALUE_OPTIONS = [
   { name: "true", label: "True", value: "true" },
   { name: "false", label: "False", value: "false" }
@@ -61056,30 +60869,24 @@ function shouldUsePivotRowFieldAsXAxis(chartType, pivotRowField, rowColumnFormat
 function normalizePivotChartForDisplay(chart) {
   const swapPivotRowsForChartRows = Boolean(chart?.pivot) && Array.isArray(chart?.pivotRows) && chart.pivotRows.length > 0;
   const syntheticAggregationOnlyRows = chart && !swapPivotRowsForChartRows ? buildSyntheticAggregationOnlyDisplayRows(chart) : null;
+  const hasExplicitEmptyGroupedPivot = Boolean(
+    String(chart?.pivot?.rowField ?? "").trim() || String(chart?.pivot?.columnField ?? "").trim()
+  ) && Array.isArray(chart?.pivotRows) && chart.pivotRows.length === 0;
   const detailRowsAreNotPivotBuckets = Boolean(chart) && !swapPivotRowsForChartRows && !syntheticAggregationOnlyRows && chartDetailRowsMissingPivotRowBucket(chart);
-  logUseFormPivotShapeDebug("normalizePivotChartForDisplay:gate", {
-    hasPivot: Boolean(chart?.pivot),
-    pivotRowField: chart?.pivot?.rowField,
-    pivotRowsIsArray: Array.isArray(chart?.pivotRows),
-    pivotRowsLength: Array.isArray(chart?.pivotRows) ? chart.pivotRows.length : null,
-    incomingChartRowsLength: Array.isArray(chart?.rows) ? chart.rows.length : null,
-    swapPivotRowsForChartRows
-  });
   const config = swapPivotRowsForChartRows ? {
     ...chart,
     rows: chart.pivotRows
   } : syntheticAggregationOnlyRows ? {
     ...chart,
     rows: syntheticAggregationOnlyRows
+  } : hasExplicitEmptyGroupedPivot ? {
+    ...chart,
+    rows: []
   } : detailRowsAreNotPivotBuckets ? {
     ...chart,
     rows: []
   } : chart;
   if (!config) return config;
-  logUseFormPivotShapeDebug("normalizePivotChartForDisplay:postGateRows", {
-    effectiveRowsLength: Array.isArray(config.rows) ? config.rows.length : null,
-    stillUsingDetailRows: Boolean(config.pivot) && !swapPivotRowsForChartRows && Array.isArray(config.rows) && config.rows.length > 0
-  });
   if (!config.pivot) return config;
   const pivotRowFieldEarly = String(config.pivot?.rowField ?? "").trim();
   const rowColumn = (config.pivotColumns ?? config.columns ?? []).find(
@@ -62119,7 +61926,8 @@ function mergeDisplayAndSourceForTableFormats(args) {
     effectiveReportBuilderTableNames,
     scopedSchemaColumns,
     displayColumns,
-    sourceReport
+    sourceReport,
+    includeSelectedSchemaFallback
   } = args;
   const selectedTableNames = new Set(effectiveReportBuilderTableNames);
   const persistedReportColumns = Array.isArray(sourceReport?.columns) && sourceReport.columns.length > 0 ? sourceReport.columns : null;
@@ -62140,6 +61948,21 @@ function mergeDisplayAndSourceForTableFormats(args) {
       ...tableName ? { table: tableName } : {}
     };
   }).filter((column) => Boolean(column));
+  const normalizedSchemaColumns = includeSelectedSchemaFallback ? scopedSchemaColumns.filter(
+    (column) => selectedTableNames.has(String(column.table ?? "").trim())
+  ).map((column) => {
+    const field = String(column.field ?? "").trim();
+    if (!field) return null;
+    const label = String(column.label ?? "").trim() || field;
+    const format9 = String(column.format ?? "").trim() || "string";
+    const tableName = String(column.table ?? "").trim();
+    return {
+      label,
+      field,
+      format: format9,
+      ...tableName ? { table: tableName } : {}
+    };
+  }).filter((column) => Boolean(column)) : [];
   const normalizedDisplayColumns = (displayColumns ?? []).map((column) => {
     const field = String(column?.field ?? "").trim();
     if (!field) return null;
@@ -62164,7 +61987,10 @@ function mergeDisplayAndSourceForTableFormats(args) {
         sourceColumnsByKey.set(key, [column]);
       }
     };
-    for (const sourceColumn of normalizedSourceColumns) {
+    for (const sourceColumn of [
+      ...normalizedSourceColumns,
+      ...normalizedSchemaColumns
+    ]) {
       const tableName = String(sourceColumn.table ?? "").trim();
       addSourceColumnKey(sourceColumn.field, sourceColumn);
       addSourceColumnKey(sourceColumn.label, sourceColumn);
@@ -62722,9 +62548,6 @@ async function loadViaInMemoryEngines({
   pivot,
   reportBuilderState,
   allowReportTaskBootstrap = false,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
   const requestedTask = allowReportTaskBootstrap ? "report" : "item";
@@ -62734,17 +62557,6 @@ async function loadViaInMemoryEngines({
       rowsPerRequest: DEFAULT_USE_REPORT_ROWS_PER_REQUEST
     }
   } : {};
-  logUseFormTaskDebug("dispatch fetchReport", {
-    reportId,
-    task: requestedTask,
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    allowReportTaskBootstrap,
-    filterCount: internalFilters.length,
-    hasPivot: Boolean(pivot),
-    hasReportBuilderState: Boolean(reportBuilderState)
-  });
   const { report, error } = await fetchReport({
     reportId,
     client,
@@ -62824,9 +62636,6 @@ async function loadViaPivotTemplate({
   reportBuilderState,
   baseReport,
   schema,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
   const pivotForTemplate = enrichPivotRowFieldTypeForTemplate(
@@ -62834,16 +62643,6 @@ async function loadViaPivotTemplate({
     schema,
     baseReport
   );
-  logUseFormTaskDebug("dispatch fetchReport", {
-    reportId,
-    task: "pivot-template",
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    filterCount: internalFilters.length,
-    hasPivot: Boolean(pivotForTemplate),
-    hasReportBuilderState: Boolean(reportBuilderState)
-  });
   const { report, error } = await fetchPivotTemplateReportForUseForm({
     reportId,
     client,
@@ -63071,19 +62870,8 @@ async function loadPivotTemplateInParallelWithReportTask({
   customFields,
   dashboardName,
   pivotRefreshOnly = false,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
-  logUseFormTaskDebug("parallel loader route", {
-    reportId,
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    pivotRefreshOnly,
-    tasks: pivotRefreshOnly ? ["pivot-template"] : ["report", "pivot-template", "report-builder-state"]
-  });
   if (pivotRefreshOnly) {
     const pivotOnlyResult = await loadViaPivotTemplate({
       reportId,
@@ -63096,9 +62884,6 @@ async function loadPivotTemplateInParallelWithReportTask({
       reportBuilderState,
       baseReport,
       schema,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     });
     return pivotOnlyResult;
@@ -63114,9 +62899,6 @@ async function loadPivotTemplateInParallelWithReportTask({
       pivot,
       reportBuilderState,
       allowReportTaskBootstrap: true,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     }),
     loadViaPivotTemplate({
@@ -63130,9 +62912,6 @@ async function loadPivotTemplateInParallelWithReportTask({
       reportBuilderState,
       baseReport,
       schema,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     }),
     fetchReportBuilderStateByReportId({
@@ -63315,9 +63094,6 @@ async function loadReportForUseForm({
   customFields,
   dashboardName,
   useInMemoryEngines,
-  debugSource,
-  debugRunId,
-  debugLoadRequestId,
   draftSessionId
 }) {
   const effectivePivot = pivot ?? initialReportBuilderState?.pivot ?? void 0;
@@ -63326,18 +63102,6 @@ async function loadReportForUseForm({
     ...initialReportBuilderState,
     pivot: effectivePivot ?? initialReportBuilderState.pivot ?? null
   } : void 0;
-  logUseFormTaskDebug("resolve loader route", {
-    reportId,
-    source: debugSource ?? "unknown",
-    runId: debugRunId ?? null,
-    loadRequestId: debugLoadRequestId ?? null,
-    hasPivot,
-    hasReportBuilderState: Boolean(reportBuilderStateForLoad),
-    allowReportTaskBootstrap,
-    includeReportBuilderStateInPivotTask,
-    filterCount: internalFilters.length,
-    useInMemoryEngines
-  });
   if (hasPivot) {
     const pivotResult = await loadPivotTemplateInParallelWithReportTask({
       reportId,
@@ -63353,9 +63117,6 @@ async function loadReportForUseForm({
       customFields,
       dashboardName,
       pivotRefreshOnly: includeReportBuilderStateInPivotTask,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     });
     const pivotRows = pivotResult.report?.pivotRows;
@@ -63364,7 +63125,7 @@ async function loadReportForUseForm({
     const hasRowBucketKey = !rowFieldTrimmed || Array.isArray(pivotRows) && pivotRows.some(
       (row) => row && typeof row === "object" && Object.prototype.hasOwnProperty.call(row, rowFieldTrimmed)
     );
-    const hasMatchingPivotData = pivotResult.report && !pivotResult.error && Array.isArray(pivotRows) && pivotRows.length > 0 && hasRowBucketKey;
+    const hasMatchingPivotData = pivotResult.report && !pivotResult.error && Array.isArray(pivotRows) && (pivotRows.length === 0 || hasRowBucketKey);
     if (hasMatchingPivotData) {
       return pivotResult;
     }
@@ -63404,25 +63165,12 @@ async function loadReportForUseForm({
         schema,
         customFields,
         dashboardName,
-        debugSource,
-        debugRunId,
-        debugLoadRequestId,
         draftSessionId
       });
       const normalizedBootstrapResult = bootstrapResult.report?.pivot == null ? stripPivotFromResult(bootstrapResult) : bootstrapResult;
       return normalizedBootstrapResult;
     }
     const shouldUseReportTaskForReload = internalFilters.length > 0;
-    const resolvedTask = shouldUseReportTaskForReload ? "report" : "item";
-    logUseFormTaskDebug("non-bootstrap task route", {
-      reportId,
-      task: resolvedTask,
-      source: debugSource ?? "unknown",
-      runId: debugRunId ?? null,
-      loadRequestId: debugLoadRequestId ?? null,
-      reason: shouldUseReportTaskForReload ? "live internal filters are present" : "no live internal filters are present",
-      filterCount: internalFilters.length
-    });
     return loadViaInMemoryEngines({
       reportId,
       client,
@@ -63431,9 +63179,6 @@ async function loadReportForUseForm({
       tenants,
       flags,
       allowReportTaskBootstrap: shouldUseReportTaskForReload,
-      debugSource,
-      debugRunId,
-      debugLoadRequestId,
       draftSessionId
     });
   }
@@ -63452,18 +63197,12 @@ async function loadReportForUseForm({
 function generateDraftSessionId() {
   return typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID() : `draft-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
 }
-var nextUseReportDebugRunId = 0;
 function useReport(reportIdArg, options = {}) {
   const propReportId = String(reportIdArg ?? "").trim();
   const [createdReportId, setCreatedReportId] = (0, import_react61.useState)(null);
   const effectiveReportId = propReportId || createdReportId || "";
   const { eventTracking } = (0, import_react61.useContext)(EventTrackingContext);
   const [draftSessionId, setDraftSessionId] = (0, import_react61.useState)(generateDraftSessionId);
-  const [taskDebugRunId] = (0, import_react61.useState)(() => {
-    nextUseReportDebugRunId += 1;
-    return nextUseReportDebugRunId;
-  });
-  const taskDebugLoadRequestIdRef = (0, import_react61.useRef)(0);
   const useInMemoryEngines = options.useInMemoryEngines ?? false;
   const restrictFieldOptionsToSelectedDatasources = options.restrictFieldOptionsToSelectedDatasources ?? true;
   const reportOverride = options.reportOverride ?? null;
@@ -63602,6 +63341,9 @@ function useReport(reportIdArg, options = {}) {
   const [preserveSchemaWideOptions, setPreserveSchemaWideOptions] = (0, import_react61.useState)(false);
   const [initialSchemaScopedTableNames, setInitialSchemaScopedTableNames] = (0, import_react61.useState)(null);
   const [tableColumnsEditedSignature, setTableColumnsEditedSignature] = (0, import_react61.useState)(null);
+  (0, import_react61.useEffect)(() => {
+    setTableColumnsEditedSignature(null);
+  }, [effectiveReportId]);
   const [chartAxisEdits, setChartAxisEdits] = (0, import_react61.useState)({});
   const [chartVisibilityOverrides, setChartVisibilityOverrides] = (0, import_react61.useState)({});
   const [client] = (0, import_react61.useContext)(ClientContext);
@@ -63677,8 +63419,6 @@ function useReport(reportIdArg, options = {}) {
   filterStackRef.current = filterStack;
   const resolvedGroupRowsBy = decodePivotGroupOptionValue(groupRowsBy);
   const resolvedGroupColumnsBy = decodePivotGroupOptionValue(groupColumnsBy);
-  const useFormRefreshDebugEnabled = isUseFormRefreshDebugEnabled();
-  const useFormFiltersDebugEnabled = isUseFormFiltersDebugEnabled();
   (0, import_react61.useEffect)(() => {
     if (propReportId) {
       setCreatedReportId(null);
@@ -64227,26 +63967,6 @@ function useReport(reportIdArg, options = {}) {
   const filterUniqueValuesEnabled = Boolean(
     client && client?.queryEndpoint && filterUniqueValuesRequest && filterUniqueValuesRequest.stringColumns.length > 0
   );
-  (0, import_react61.useEffect)(() => {
-    if (!useFormFiltersDebugEnabled) return;
-    const hasClient = Boolean(client);
-    const hasQueryEndpoint = Boolean(client?.queryEndpoint);
-    const hasRequest = Boolean(filterUniqueValuesRequest);
-    const stringColumnsCount = filterUniqueValuesRequest?.stringColumns.length ?? 0;
-    const stringColumnsByTableCount = filterUniqueValuesRequest?.stringColumnsByTable.length ?? 0;
-    const missingReasons = [];
-    if (!hasClient) missingReasons.push("missing-client");
-    if (!hasQueryEndpoint) missingReasons.push("missing-query-endpoint");
-    if (!hasRequest) missingReasons.push("missing-filterUniqueValuesRequest");
-    if (stringColumnsCount === 0) missingReasons.push("no-string-columns");
-  }, [
-    client,
-    filterUniqueValuesEnabled,
-    filterUniqueValuesRequest,
-    filterUniqueValuesRequestHash,
-    effectiveReportId,
-    useFormFiltersDebugEnabled
-  ]);
   const filterUniqueValuesQuery = (0, import_react_query2.useQuery)({
     queryKey: [
       "useReport",
@@ -64350,22 +64070,6 @@ function useReport(reportIdArg, options = {}) {
     filterUniqueValuesQuery.data?.uniqueValuesByColumn,
     filterUniqueValuesRequest?.stringColumnsByTable
   ]);
-  (0, import_react61.useEffect)(() => {
-    if (!useFormFiltersDebugEnabled) return;
-    if (filterUniqueValuesQuery.status !== "success" && filterUniqueValuesQuery.status !== "error") {
-      return;
-    }
-    const uniqueValuesByColumn = filterUniqueValuesQuery.data?.uniqueValuesByColumn ?? {};
-    const uniqueValuesByColumnRecord = uniqueValuesByColumn && typeof uniqueValuesByColumn === "object" ? uniqueValuesByColumn : {};
-  }, [
-    backendUniqueValuesByFieldName,
-    filterUniqueValuesEnabled,
-    filterUniqueValuesQuery.data,
-    filterUniqueValuesQuery.status,
-    filterUniqueValuesRequest,
-    effectiveReportId,
-    useFormFiltersDebugEnabled
-  ]);
   const filterValueOptionsByFieldName = (0, import_react61.useMemo)(() => {
     const optionsByField = /* @__PURE__ */ new Map();
     const selectedMultiselectByField = collectSelectedStringMultiselectValuesByField(queryFilters);
@@ -64766,8 +64470,6 @@ function useReport(reportIdArg, options = {}) {
       clientHash
     }),
     queryFn: createUseFormQueryFn(async () => {
-      taskDebugLoadRequestIdRef.current += 1;
-      const debugLoadRequestId = taskDebugLoadRequestIdRef.current;
       const allowReportTaskBootstrap = !initialReportBuilderState && bootstrapReportTaskUsedForReportIdRef.current !== effectiveReportId;
       const loadTargetId = String(effectiveReportId ?? "").trim();
       const sourceReportIdentity = String(
@@ -64791,9 +64493,6 @@ function useReport(reportIdArg, options = {}) {
         customFields: customFieldsRef.current,
         dashboardName: resolvedSourceDashboardName,
         useInMemoryEngines,
-        debugSource: "initial-load",
-        debugRunId: taskDebugRunId,
-        debugLoadRequestId,
         draftSessionId: draftSessionId || void 0
       });
       return loadResult;
@@ -65133,19 +64832,6 @@ function useReport(reportIdArg, options = {}) {
         resolveCache.set(fieldName, resolved);
         return resolved;
       }
-      if (isUseFormFiltersDebugEnabled()) {
-        console.error(
-          "[useForm-debug] normalizeQueryBuilderFieldNameForConfig ambiguous",
-          {
-            fieldName,
-            candidateKeys: candidates.map(([key]) => key),
-            preferredTableNames: Array.from(preferredTableNames),
-            primaryTableName,
-            effectiveReportBuilderTableNames,
-            baseReportBuilderTableNames
-          }
-        );
-      }
       return fieldName;
     };
   }, [
@@ -65537,8 +65223,7 @@ function useReport(reportIdArg, options = {}) {
   }, [
     effectiveReportId,
     tableRefreshQuery.data,
-    tableRefreshQueryEnabled,
-    useFormRefreshDebugEnabled
+    tableRefreshQueryEnabled
   ]);
   const chartTypes = (0, import_react61.useMemo)(() => {
     return getChartTypeOptions2({ pivot: pivotState });
@@ -66101,7 +65786,6 @@ function useReport(reportIdArg, options = {}) {
         ...sourceReport,
         reportBuilderState: effectiveReportBuilderState
       };
-      taskDebugLoadRequestIdRef.current += 1;
       const pivotRefreshResult = await loadReportForUseForm({
         reportId: effectiveReportId,
         initialReportBuilderState: effectiveReportBuilderState,
@@ -66117,9 +65801,6 @@ function useReport(reportIdArg, options = {}) {
         customFields: schemaData.customFields,
         dashboardName: resolvedSourceDashboardName,
         useInMemoryEngines,
-        debugSource: "pivot-refresh",
-        debugRunId: taskDebugRunId,
-        debugLoadRequestId: taskDebugLoadRequestIdRef.current,
         draftSessionId: draftSessionId || void 0
       });
       return pivotRefreshResult;
@@ -66283,8 +65964,7 @@ function useReport(reportIdArg, options = {}) {
     pivotTableDataRefreshQuery.data,
     pivotTableDataRefreshQuery.status,
     pivotTableDataRefreshQueryEnabled,
-    effectiveReportId,
-    useFormRefreshDebugEnabled
+    effectiveReportId
   ]);
   (0, import_react61.useEffect)(() => {
     if (!pivotRefreshQueryEnabled) return;
@@ -66336,8 +66016,7 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQuery.data,
     pivotRefreshQuery.status,
     pivotRefreshQueryEnabled,
-    effectiveReportId,
-    useFormRefreshDebugEnabled
+    effectiveReportId
   ]);
   const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
@@ -66345,8 +66024,8 @@ function useReport(reportIdArg, options = {}) {
     const chartPivotForDisplay = nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     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.length > 0 ? sourceReport.pivotRows : [];
-    const rowCountForChartResolved = chartPivotForDisplay ? pivotRowsForChart.length > 0 ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
+    const pivotRowsForChart = Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows : void 0;
+    const rowCountForChartResolved = chartPivotForDisplay ? Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : rowCountForChart : rowCountForChart;
     const chartDataPayload = {
       ...sourceReport,
       rows: rowsForChart,
@@ -66357,15 +66036,8 @@ function useReport(reportIdArg, options = {}) {
       referencedTables: referencedTablesForChart && referencedTablesForChart.length > 0 ? referencedTablesForChart : sourceReport.referencedTables,
       pivotRows: pivotRowsForChart,
       pivotColumns: sourceReport.pivotColumns,
-      pivotRowCount: pivotRowsForChart.length
+      pivotRowCount: Array.isArray(pivotRowsForChart) ? pivotRowsForChart.length : sourceReport.pivotRowCount
     };
-    logUseFormPivotShapeDebug("chartData:memo", {
-      reportId: sourceReport.id,
-      detailRowsLength: rowsForChart.length,
-      pivotRowsIsArray: Array.isArray(sourceReport.pivotRows),
-      pivotRowsLength: Array.isArray(sourceReport.pivotRows) ? sourceReport.pivotRows.length : null,
-      hasNextPivot: Boolean(nextPivot)
-    });
     return chartDataPayload;
   }, [
     sourceReport,
@@ -66677,26 +66349,6 @@ function useReport(reportIdArg, options = {}) {
         xAxisLabel: resolvedXAxisLabel
       });
     }
-    logUseFormPivotShapeDebug("chart:formatting(yAxis+pivotColumns)", {
-      chartType: baseChart.chartType,
-      pivotRowField: baseChart.pivot?.rowField,
-      xAxisField: resolvedXAxisField,
-      xAxisFormat: resolvedXAxisFormat,
-      yAxisFieldsForDisplay: (resolvedYAxisFieldsForDisplay ?? []).map((y) => ({
-        field: y.field,
-        format: y.format,
-        label: y.label
-      })),
-      pivotColumnsSample: (baseChart.pivotColumns ?? []).slice(0, 12).map((c) => ({
-        field: c.field,
-        format: c.format,
-        label: c.label
-      })),
-      mergedColumnFormatsSample: (columns2 ?? baseChart.columns ?? []).slice(0, 12).map((c) => ({
-        field: c.field,
-        format: c.format
-      }))
-    });
     return {
       ...baseChart,
       xAxisField: resolvedXAxisField,
@@ -66712,6 +66364,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedXAxisLabel,
     resolvedYAxisFieldsForDisplay
   ]);
+  const pivotDateFilterRangeCacheRef = (0, import_react61.useRef)({ key: "", min: null, max: null });
   const filterOptions = (0, import_react61.useMemo)(() => {
     const out = [];
     for (const [field, values] of filterValueOptionsByFieldName) {
@@ -66727,25 +66380,43 @@ function useReport(reportIdArg, options = {}) {
     if (rowField && isDateType(String(pivot?.rowFieldType ?? ""))) {
       const field = pivot?.rowFieldTable ? `${pivot.rowFieldTable}.${rowField}` : rowField;
       const bucket = dateBucket || pivot?.dateBucket || "month";
-      const byRaw = /* @__PURE__ */ new Map();
+      const labelsByRaw = /* @__PURE__ */ new Map();
+      const cacheKey = `${String(effectiveReportId ?? "")}\0${field}\0${bucket}`;
+      if (pivotDateFilterRangeCacheRef.current.key !== cacheKey) {
+        pivotDateFilterRangeCacheRef.current = {
+          key: cacheKey,
+          min: null,
+          max: null
+        };
+      }
       for (const row of chart?.rows ?? []) {
         const record = row;
         const raw = record.__quillRawDate;
         if (raw == null || raw === "") continue;
         const key = String(raw);
-        if (!byRaw.has(key)) {
-          byRaw.set(key, String(record[rowField] ?? key));
+        const timestamp = new Date(key).getTime();
+        if (Number.isNaN(timestamp)) continue;
+        labelsByRaw.set(key, String(record[rowField] ?? key));
+        const cachedMin = pivotDateFilterRangeCacheRef.current.min;
+        const cachedMax = pivotDateFilterRangeCacheRef.current.max;
+        if (cachedMin == null || timestamp < new Date(cachedMin).getTime()) {
+          pivotDateFilterRangeCacheRef.current.min = key;
+        }
+        if (cachedMax == null || timestamp > new Date(cachedMax).getTime()) {
+          pivotDateFilterRangeCacheRef.current.max = key;
         }
       }
+      const { min: min2, max: max2 } = pivotDateFilterRangeCacheRef.current;
+      const options2 = min2 && max2 ? buildPivotDateBucketStarts({ min: min2, max: max2 }, bucket).map((value) => ({
+        value,
+        label: labelsByRaw.get(value) ?? getDateString(value, void 0, bucket)
+      })) : [];
       out.push({
         field,
         fieldType: "date",
         operator: "inBucket",
         dateBucket: bucket,
-        options: [...byRaw.keys()].sort().map((value) => ({
-          value,
-          label: byRaw.get(value) ?? value
-        }))
+        options: options2
       });
     }
     return out;
@@ -66753,6 +66424,7 @@ function useReport(reportIdArg, options = {}) {
     chart?.pivot,
     chart?.rows,
     dateBucket,
+    effectiveReportId,
     filterValueOptionsByFieldName
   ]);
   const chartForUi = (0, import_react61.useMemo)(() => {
@@ -66988,13 +66660,15 @@ function useReport(reportIdArg, options = {}) {
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     }),
     [
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      tableColumnsEditedSignature
     ]
   );
   const table = (0, import_react61.useMemo)(() => {
@@ -67004,7 +66678,8 @@ function useReport(reportIdArg, options = {}) {
       effectiveReportBuilderTableNames,
       scopedSchemaColumns,
       displayColumns,
-      sourceReport
+      sourceReport,
+      includeSelectedSchemaFallback: tableColumnsEditedSignature !== null
     });
     const pivotRowFieldForTable = String(
       sourceReport?.pivot?.rowField ?? ""
@@ -67105,6 +66780,7 @@ function useReport(reportIdArg, options = {}) {
     resolvedYAxisFieldsForDisplay,
     scopedSchemaColumns,
     sourceReport,
+    tableColumnsEditedSignature,
     pagination,
     paginationActive,
     paginationPageCount,
@@ -67599,6 +67275,17 @@ function useReport(reportIdArg, options = {}) {
   };
   applyReportChange = (nextState) => {
     const effectiveNextState = nextState;
+    const normalizedRequestedDisplayColumns = effectiveNextState.columns === void 0 ? void 0 : normalizeColumnsInput(
+      effectiveNextState.columns,
+      columnIdentifierLookup
+    );
+    const visibleDisplayColumnKeys = new Set(
+      activeTableColumnIds.map((id) => columnIdentifierLookup.get(id)).filter((column) => Boolean(column)).map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
+    );
+    const addedRequestedDisplayColumns = (normalizedRequestedDisplayColumns ?? []).filter((column) => {
+      const key = toReportBuilderColumnKey(column);
+      return Boolean(key) && !visibleDisplayColumnKeys.has(key);
+    });
     if (effectiveNextState.showLegend !== void 0) {
       setChartVisibilityOverrides((previous) => ({
         ...previous,
@@ -67694,7 +67381,7 @@ function useReport(reportIdArg, options = {}) {
     dispatchFormRuntime({
       type: "APPLY_SET_REPORT",
       touchesPivotState: dispatchTouchesPivot,
-      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate,
+      shouldRefreshExpandedTableData: shouldRefreshExpandedTableData || isDatasourceUpdate || addedRequestedDisplayColumns.length > 0,
       queuePromoteColumnToRow,
       updater: (prev) => {
         const next = {
@@ -67760,19 +67447,8 @@ function useReport(reportIdArg, options = {}) {
           }
         }
         if (effectiveNextState.columns !== void 0) {
-          const normalizedDisplayColumns = normalizeColumnsInput(
-            effectiveNextState.columns,
-            columnIdentifierLookup
-          );
-          const previousDisplayColumnKeys = new Set(
-            next.columns.map((column) => toReportBuilderColumnKey(column)).filter(Boolean)
-          );
-          const addedDisplayColumns = normalizedDisplayColumns.filter(
-            (column) => {
-              const key = toReportBuilderColumnKey(column);
-              return Boolean(key) && !previousDisplayColumnKeys.has(key);
-            }
-          );
+          const normalizedDisplayColumns = normalizedRequestedDisplayColumns ?? [];
+          const addedDisplayColumns = addedRequestedDisplayColumns;
           next.columns = normalizedDisplayColumns;
           if (addedDisplayColumns.length > 0) {
             const queryTableNames = new Set(
@@ -68175,6 +67851,7 @@ function useReport(reportIdArg, options = {}) {
     } catch (error) {
       console.error("[useForm] setFilters swallowed error", {
         error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : void 0,
         requestedRules: (resolved?.rules ?? []).map((rule) => ({
           table: rule?.table,
           field: rule?.field,