npm - @quillsql/react - Versions diffs - 2.16.49 → 2.16.51 - Mend

@quillsql/react 2.16.49 → 2.16.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.cjs CHANGED Viewed

@@ -33,6 +33,89 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// src/utils/textProcessing.ts
+function capitalize(text) {
+  return text.charAt(0).toUpperCase() + text.slice(1);
+}
+function matchCasing(text, template) {
+  if (!text || !template) {
+    return text ?? "";
+  }
+  const isTitleCase = (str) => /^[A-Z][a-z]*([A-Z][a-z]*)*$/.test(str);
+  const isCamelCase = (str) => /^[a-z]+([A-Z][a-z]*)*$/.test(str);
+  const isSnakeCase = (str) => /^[a-z0-9]+(_[a-z0-9]+)*$/.test(str);
+  const isAllLowerCase = (str) => /^[a-z]+$/.test(str);
+  const isAllUpperCase = (str) => /^[A-Z]+$/.test(str);
+  const isCapitalized = (str) => /^[A-Z][a-z]*$/.test(str);
+  const isScreamingSnakeCase = (str) => /^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$/.test(str);
+  const toTitleCase = (str) => str.toLowerCase().replace(/\b\w/g, (char) => char.toUpperCase());
+  const toCamelCase = (str) => str.replace(/_./g, (match) => match.charAt(1).toUpperCase()).toLowerCase();
+  const toSnakeCase = (str) => str.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
+  const toLowerCase = (str) => str.toLowerCase();
+  const toUpperCase = (str) => str.toUpperCase();
+  const toCapitalized = (str) => str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+  const toScreamingSnakeCase = (str) => str.replace(/([A-Z])/g, "_$1").replace(/^_/, "").toUpperCase();
+  if (isTitleCase(template)) {
+    return toTitleCase(text);
+  } else if (isCamelCase(template)) {
+    return toCamelCase(text);
+  } else if (isSnakeCase(template)) {
+    return toSnakeCase(text);
+  } else if (isAllLowerCase(template)) {
+    return toLowerCase(text);
+  } else if (isAllUpperCase(template)) {
+    return toUpperCase(text);
+  } else if (isCapitalized(template)) {
+    return toCapitalized(text);
+  } else if (isScreamingSnakeCase(template)) {
+    return toScreamingSnakeCase(text);
+  } else {
+    return text;
+  }
+}
+function snakeCaseToTitleCase(str) {
+  if (!str) {
+    return str;
+  }
+  return str.toString().split(/_| /).map(
+    (word) => word === "id" ? "ID" : word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
+  ).join(" ");
+}
+function snakeAndCamelCaseToTitleCase(str) {
+  if (!str || typeof str !== "string") {
+    return str;
+  }
+  if (str.includes("_")) {
+    return str.split(/_| /).map((word) => word === "id" ? "ID" : capitalize(word)).join(" ");
+  } else {
+    const text = str.replace(/([a-z])([A-Z])/g, "$1 $2");
+    const newText = text.split(" ").map((word) => word === "Id" || word === "id" ? "ID" : capitalize(word)).join(" ");
+    return newText;
+  }
+}
+function formatIdentifierLabel(str) {
+  if (!str || typeof str !== "string") {
+    return str;
+  }
+  const hasUnderscore = str.includes("_");
+  const hasCamelCaseBoundary = /[a-z0-9][A-Z]/.test(str);
+  if (hasUnderscore || hasCamelCaseBoundary) {
+    return snakeAndCamelCaseToTitleCase(str);
+  }
+  return str;
+}
+function removeDoubleQuotes(str) {
+  if (!str) {
+    return str;
+  }
+  return str.replace(/"/g, "");
+}
+var init_textProcessing = __esm({
+  "src/utils/textProcessing.ts"() {
+    "use strict";
+  }
+});
 // src/utils/valueFormatter.ts
 function parseNumber(value) {
   if (typeof value === "number") return value;
@@ -59,6 +142,7 @@ var init_valueFormatter = __esm({
     "use strict";
     import_date_fns = require("date-fns");
     import_date_fns_tz = require("date-fns-tz");
+    init_textProcessing();
     DATE_FORMAT_TYPES = [
       "yyyy",
       "MMM_yyyy",
@@ -221,7 +305,7 @@ var init_valueFormatter = __esm({
       if (typeof value === "object") {
         return JSON.stringify(value);
       }
-      return value.toString();
+      return formatIdentifierLabel(value.toString());
     };
     formatterDollar = new Intl.NumberFormat("en-US", {
       style: "currency",
@@ -494,78 +578,6 @@ var init_ast = __esm({
   }
 });
-// src/utils/textProcessing.ts
-function capitalize(text) {
-  return text.charAt(0).toUpperCase() + text.slice(1);
-}
-function matchCasing(text, template) {
-  if (!text || !template) {
-    return text ?? "";
-  }
-  const isTitleCase = (str) => /^[A-Z][a-z]*([A-Z][a-z]*)*$/.test(str);
-  const isCamelCase = (str) => /^[a-z]+([A-Z][a-z]*)*$/.test(str);
-  const isSnakeCase = (str) => /^[a-z0-9]+(_[a-z0-9]+)*$/.test(str);
-  const isAllLowerCase = (str) => /^[a-z]+$/.test(str);
-  const isAllUpperCase = (str) => /^[A-Z]+$/.test(str);
-  const isCapitalized = (str) => /^[A-Z][a-z]*$/.test(str);
-  const isScreamingSnakeCase = (str) => /^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$/.test(str);
-  const toTitleCase = (str) => str.toLowerCase().replace(/\b\w/g, (char) => char.toUpperCase());
-  const toCamelCase = (str) => str.replace(/_./g, (match) => match.charAt(1).toUpperCase()).toLowerCase();
-  const toSnakeCase = (str) => str.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
-  const toLowerCase = (str) => str.toLowerCase();
-  const toUpperCase = (str) => str.toUpperCase();
-  const toCapitalized = (str) => str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
-  const toScreamingSnakeCase = (str) => str.replace(/([A-Z])/g, "_$1").replace(/^_/, "").toUpperCase();
-  if (isTitleCase(template)) {
-    return toTitleCase(text);
-  } else if (isCamelCase(template)) {
-    return toCamelCase(text);
-  } else if (isSnakeCase(template)) {
-    return toSnakeCase(text);
-  } else if (isAllLowerCase(template)) {
-    return toLowerCase(text);
-  } else if (isAllUpperCase(template)) {
-    return toUpperCase(text);
-  } else if (isCapitalized(template)) {
-    return toCapitalized(text);
-  } else if (isScreamingSnakeCase(template)) {
-    return toScreamingSnakeCase(text);
-  } else {
-    return text;
-  }
-}
-function snakeCaseToTitleCase(str) {
-  if (!str) {
-    return str;
-  }
-  return str.toString().split(/_| /).map(
-    (word) => word === "id" ? "ID" : word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
-  ).join(" ");
-}
-function snakeAndCamelCaseToTitleCase(str) {
-  if (!str || typeof str !== "string") {
-    return str;
-  }
-  if (str.includes("_")) {
-    return str.split(/_| /).map((word) => word === "id" ? "ID" : capitalize(word)).join(" ");
-  } else {
-    const text = str.replace(/([a-z])([A-Z])/g, "$1 $2");
-    const newText = text.split(" ").map((word) => word === "Id" || word === "id" ? "ID" : capitalize(word)).join(" ");
-    return newText;
-  }
-}
-function removeDoubleQuotes(str) {
-  if (!str) {
-    return str;
-  }
-  return str.replace(/"/g, "");
-}
-var init_textProcessing = __esm({
-  "src/utils/textProcessing.ts"() {
-    "use strict";
-  }
-});
 // src/components/ReportBuilder/bigDateMap.ts
 function cleanDateFieldName(fieldName) {
   if (!fieldName) return void 0;
@@ -15085,6 +15097,63 @@ function getDateString(value, dateRange, dateBucket, databaseType) {
 function isDateField(fieldType) {
   return fieldType === "date" || fieldType === "datetime" || fieldType === "timestamp" || fieldType === "timestamptz" || fieldType === "yyyy" || fieldType === "MMM_yyyy" || fieldType === "MMM_dd" || fieldType === "MMM_dd_yyyy" || fieldType === "MMM_dd_hh:mm_ap_pm" || fieldType === "hh_ap_pm";
 }
+function getExclusiveDateBucketRange(startInput, bucket) {
+  const parsed = startInput instanceof Date ? startInput : new Date(startInput);
+  if (Number.isNaN(parsed.getTime())) {
+    throw new Error(`Invalid bucket start date: ${String(startInput)}`);
+  }
+  let start;
+  let endExclusive;
+  switch (bucket) {
+    case "day": {
+      start = new Date(
+        Date.UTC(
+          parsed.getUTCFullYear(),
+          parsed.getUTCMonth(),
+          parsed.getUTCDate()
+        )
+      );
+      endExclusive = new Date(start);
+      endExclusive.setUTCDate(endExclusive.getUTCDate() + 1);
+      break;
+    }
+    case "week": {
+      const day = parsed.getUTCDay();
+      start = new Date(
+        Date.UTC(
+          parsed.getUTCFullYear(),
+          parsed.getUTCMonth(),
+          parsed.getUTCDate() - (day + 6) % 7
+        )
+      );
+      endExclusive = new Date(start);
+      endExclusive.setUTCDate(endExclusive.getUTCDate() + 7);
+      break;
+    }
+    case "month": {
+      start = new Date(
+        Date.UTC(parsed.getUTCFullYear(), parsed.getUTCMonth(), 1)
+      );
+      endExclusive = new Date(
+        Date.UTC(parsed.getUTCFullYear(), parsed.getUTCMonth() + 1, 1)
+      );
+      break;
+    }
+    case "year": {
+      start = new Date(Date.UTC(parsed.getUTCFullYear(), 0, 1));
+      endExclusive = new Date(Date.UTC(parsed.getUTCFullYear() + 1, 0, 1));
+      break;
+    }
+    default: {
+      const _exhaustive = bucket;
+      throw new Error(`Unsupported date bucket: ${String(_exhaustive)}`);
+    }
+  }
+  return {
+    start: start.toISOString(),
+    endExclusive: endExclusive.toISOString()
+  };
+}
 var import_date_fns5;
 var init_dates = __esm({
   "src/utils/dates.ts"() {
@@ -17206,7 +17275,7 @@ async function generatePivotWithSQL({
     client,
     task: "pivot-template",
     metadata: {
-      clientId: client.clientId,
+      clientId: client.id,
       pivot: pivotConfig,
       reportId: report?.id !== "__quillTempReport" ? report?.id : void 0,
       itemQuery: reportBuilderState ? void 0 : report?.queryString,
@@ -19032,7 +19101,7 @@ var init_tableProcessing = __esm({
           metadata: {
             reportBuilderState,
             stringColumns: stringColumns.map((col) => col.field),
-            clientId: client.clientId,
+            clientId: client.id,
             databaseType: client.databaseType?.toLowerCase() || "postgresql",
             customFields,
             filters: void 0,
@@ -19223,7 +19292,7 @@ var init_tableProcessing = __esm({
             metadata: {
               reportBuilderState,
               columns: stringNames,
-              clientId: client.publicKey,
+              clientId: client.id,
               databaseType: client.databaseType,
               customFieldsByTable: customFields,
               useNewNodeSql: true,
@@ -19238,7 +19307,7 @@ var init_tableProcessing = __esm({
             task: "query",
             metadata: {
               query: countQuery,
-              clientId: client.publicKey,
+              clientId: client.id,
               databaseType: client.databaseType,
               customFieldsByTable: customFields,
               useNewNodeSql: true,
@@ -19298,7 +19367,7 @@ var init_tableProcessing = __esm({
             metadata: {
               reportBuilderState,
               stringColumns: columns,
-              clientId: client.clientId,
+              clientId: client.id,
               databaseType: client.databaseType?.toLowerCase() || "postgresql",
               customFields,
               filters,
@@ -19348,7 +19417,7 @@ var init_tableProcessing = __esm({
           task: "query",
           metadata: {
             query,
-            clientId: client.publicKey,
+            clientId: client.id,
             databaseType: client.databaseType,
             customFieldsByTable: customFields,
             useNewNodeSql: true,
@@ -19460,7 +19529,7 @@ var init_tableProcessing = __esm({
           task: "query",
           metadata: {
             query,
-            clientId: client.publicKey,
+            clientId: client.id,
             databaseType: client.databaseType,
             customFieldsByTable: customFields,
             useNewNodeSql: true,
@@ -19589,7 +19658,7 @@ var init_tableProcessing = __esm({
             metadata: {
               query,
               filterMap,
-              clientId: client.publicKey,
+              clientId: client.id,
               databaseType: client?.databaseType,
               customFieldsByTable: customFields,
               additionalProcessing: processing,
@@ -19624,7 +19693,7 @@ var init_tableProcessing = __esm({
               task: "log-broken-query",
               metadata: {
                 query,
-                clientId: client.clientId,
+                clientId: client.id,
                 error: parsingError
               },
               getToken
@@ -19735,7 +19804,7 @@ var init_tableProcessing = __esm({
           metadata: {
             dashboardItemId: reportId,
             filters: minimalFilters,
-            clientId: client?.publicKey,
+            clientId: client?.id,
             databaseType: client?.databaseType,
             additionalProcessing: updatedProcessing,
             forcePagination: true,
@@ -19808,7 +19877,7 @@ var init_tableProcessing = __esm({
           rowCountOnly,
           customFields,
           tenants,
-          clientId: client.clientId,
+          clientId: client.id,
           databaseType: client.databaseType?.toLowerCase() || "postgresql",
           dashboardName,
           ...reportId ? {
@@ -19946,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(
@@ -19979,7 +20027,7 @@ async function testSqlViewState(client, referencedTables, getToken) {
         task: "test-view",
         metadata: {
           tables: [table],
-          clientId: client.clientId
+          clientId: client.id
         },
         getToken
       });
@@ -19988,7 +20036,7 @@ async function testSqlViewState(client, referencedTables, getToken) {
           metadata: {
             table,
             task: "set-broken-view",
-            clientId: client.clientId
+            clientId: client.id
           }
         };
         quillFetch({
@@ -20098,7 +20146,7 @@ async function* quillStream({
       body: JSON.stringify({
         metadata: {
           task,
-          clientId: client.clientId,
+          clientId: client.id,
           ...metadata
         }
       }),
@@ -20327,7 +20375,7 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
           body: method === "POST" ? JSON.stringify({
             ...cloudRequestBody,
             ...{
-              publicKey: client?.publicKey
+              publicKey: client?.id
             }
           }) : null,
           signal: abortSignal
@@ -20356,7 +20404,7 @@ async function fetchSqlQuery(ast, client, getToken, formData) {
       client,
       task: "sqlify",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         useNewNodeSql: true,
         ast: { ...ast, where }
       },
@@ -20377,7 +20425,7 @@ async function fetchSqlQueryFromState(reportBuilderState, client, getToken, data
       client,
       task: "sqlify",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         useNewNodeSql: true,
         ast
       },
@@ -20394,7 +20442,7 @@ async function fetchQueryDateRangesFromState(reportBuilderState, columns, client
       client,
       task: "report-builder-date-ranges",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         reportBuilderState,
         dateColumns: columns,
         databaseType: databaseType || "postgresql",
@@ -20452,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";
@@ -20461,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,
@@ -20481,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 {
@@ -20512,7 +20533,7 @@ var init_dataFetcher = __esm({
           body: JSON.stringify({
             metadata: {
               task,
-              clientId: client.clientId,
+              clientId: client.id ?? client.clientId,
               ...metadata
             }
           }),
@@ -20530,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,
@@ -20549,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);
         }
@@ -21030,6 +21029,7 @@ __export(index_exports, {
   isQueryBuilderDisplayRule: () => isQueryBuilderDisplayRule,
   normalizeRelativeDateRules: () => normalizeRelativeDateRules,
   prepareQueryBuilderFiltersForSet: () => prepareQueryBuilderFiltersForSet,
+  queryBuilderFiltersForEditor: () => queryBuilderFiltersForEditor,
   quillFetch: () => quillFetch,
   stripQueryBuilderTransientFields: () => stripQueryBuilderTransientFields,
   tableColumnFormatFromUiSelection: () => tableColumnFormatFromUiSelection,
@@ -21530,7 +21530,7 @@ async function getDashboard(dashboardName, client, getToken, tenants, flags) {
     task: "dashboard",
     metadata: {
       name: dashboardName,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client.databaseType,
       useNewNodeSql: true,
       tenants,
@@ -21905,7 +21905,7 @@ function createPivotTemplateMetadata({
     reportId,
     dashboardItemId: reportId,
     ...draftSessionId ? { draftSessionId: String(draftSessionId).trim() } : {},
-    clientId: client.publicKey,
+    clientId: client.id,
     databaseType: client.databaseType,
     filters: removeFilterOptions(filters),
     additionalProcessing: normalizedAdditionalProcessing,
@@ -22222,7 +22222,7 @@ async function fetchReportRows({
     task: "report",
     metadata: {
       reportId,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client.databaseType,
       filters: filters.map((filter) => ({ ...filter, options: void 0 })),
       useNewNodeSql: true,
@@ -22292,7 +22292,7 @@ async function fetchReport({
         reportId,
         dashboardItemId: reportId,
         ...draftSessionId ? { draftSessionId: String(draftSessionId).trim() } : {},
-        clientId: client.publicKey,
+        clientId: client.id,
         databaseType: client.databaseType,
         filters: filters.map((filter) => ({ ...filter, options: void 0 })),
         customFields,
@@ -22429,7 +22429,7 @@ async function fetchReportName({
     task: "report-name",
     metadata: {
       reportId,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client.databaseType,
       tenants
     },
@@ -22453,7 +22453,7 @@ async function fetchReportRowCount(reportId, client, getToken, tenants, flags, u
     metadata: {
       reportId,
       dashboardItemId: reportId,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client.databaseType,
       filters: filters.map((filter) => ({ ...filter, options: void 0 })),
       customFields,
@@ -22483,7 +22483,7 @@ async function saveReport({
   tenants,
   draftSessionId
 }) {
-  const { publicKey, databaseType } = client;
+  const { id, databaseType } = client;
   const {
     reportBuilderState,
     queryString,
@@ -22523,7 +22523,7 @@ async function saveReport({
       ...dashboardItemId ? { reportId: dashboardItemId } : {},
       ...draftSessionId ? { draftSessionId: String(draftSessionId).trim() } : {},
       // Remove useNewNodeSql since backend will handle conversion
-      clientId: publicKey,
+      clientId: id,
       tenants,
       // Only include adminMode for 'create' task, not 'create-report'
       ...isCreateTask && { adminMode },
@@ -23337,7 +23337,6 @@ var getSchemaInfo = async ({
   getToken,
   eventTracking
 }) => {
-  const { publicKey } = client;
   let customFieldsByTableUnique = null;
   if (client.featureFlags?.customFieldsEnabled && tenants && tenants[0] !== "QUILL_ALL_TENANTS" && tenants.length === 1 && (typeof tenants[0] !== "object" || tenants[0].tenantIds?.[0] !== "QUILL_ALL_TENANTS" && tenants[0].tenantIds?.length === 1)) {
     try {
@@ -23356,13 +23355,13 @@ var getSchemaInfo = async ({
     client,
     task: "schema",
     metadata: {
-      clientId: publicKey,
+      clientId: client.id,
       removeCustomerField: true,
       removeCustomFieldRef: true,
       tableIds,
       customFieldsByTable: customFieldsByTableUnique,
       useNewCustomFields: true,
-      gatherSchemaData: "665610862cf7a3000be66453" === publicKey ? true : false,
+      gatherSchemaData: "665610862cf7a3000be66453" === client.id ? true : false,
       // TODO: this should be a feature flag on the client
       tenants
     },
@@ -24461,7 +24460,7 @@ var CacheCab = class {
         task: "report",
         metadata: {
           reportId,
-          clientId: client.publicKey,
+          clientId: client.id,
           databaseType: client.databaseType,
           filters: adjusted,
           additionalProcessing: { page: { rowsPerPage: 1e3, rowsPerRequest: 1e5 } },
@@ -24600,7 +24599,7 @@ var CacheCab = class {
     );
     const keyParts = [
       reportId,
-      client.publicKey,
+      client.id,
       client.databaseType,
       hashString(stableStringify(canonicalizeForKey(tenants ?? null))),
       hashString(stableStringify(canonicalizeForKey(flags ?? null))),
@@ -25238,12 +25237,11 @@ var ContextProvider = ({
     typeof window !== "undefined" && sessionStorage ? JSON.parse(sessionStorage.getItem("quill-client") ?? "null") : null
   );
   const populatedClient = (0, import_react.useMemo)(() => {
-    if (!client || client.clientId !== publicKey) return null;
+    if (!client || client.id !== publicKey) return null;
     return {
       ...client,
-      publicKey,
-      _id: publicKey,
       id: publicKey,
+      clientId: publicKey,
       queryHeaders,
       queryEndpoint,
       streamEndpoint,
@@ -25406,7 +25404,7 @@ var ContextProvider = ({
           try {
             const result = await quillFetch({
               client: {
-                clientId: publicKey,
+                id: publicKey,
                 queryEndpoint,
                 queryHeaders,
                 withCredentials: !!withCredentials
@@ -25528,7 +25526,7 @@ var ContextProvider = ({
     try {
       const resp = await quillFetch({
         client: {
-          clientId: publicKey,
+          id: publicKey,
           queryEndpoint,
           queryHeaders,
           withCredentials: !!withCredentials
@@ -25536,7 +25534,7 @@ var ContextProvider = ({
         task: fetchRows ? "report" : "report-info",
         metadata: {
           reportId,
-          clientId: populatedClient.publicKey,
+          clientId: populatedClient.id,
           useNewNodeSql: true,
           filters: filters?.map((f) => ({ ...f, options: void 0 })),
           additionalProcessing,
@@ -25719,7 +25717,7 @@ var ContextProvider = ({
           try {
             const result = await quillFetch({
               client: {
-                clientId: publicKey,
+                id: publicKey,
                 queryEndpoint,
                 queryHeaders,
                 withCredentials: !!withCredentials
@@ -25939,7 +25937,7 @@ var ContextProvider = ({
       });
       return curDashboardConfig;
     }
-    if (!populatedClient || !populatedClient.publicKey) {
+    if (!populatedClient || !populatedClient.id) {
       return curDashboardConfig;
     }
     if (dashboardName === null || dashboardName === void 0)
@@ -26093,7 +26091,7 @@ var ContextProvider = ({
     try {
       const result = await quillFetch({
         client: {
-          clientId: publicKey2,
+          id: publicKey2,
           queryEndpoint,
           queryHeaders,
           withCredentials: !!withCredentials
@@ -26636,8 +26634,7 @@ var ContextProvider = ({
             withCredentials: withCredentials ?? false,
             databaseType: envClient.databaseType,
             name: envClient.name,
-            clientId: publicKey2,
-            publicKey: publicKey2,
+            id: publicKey2,
             featureFlags: envClient.featureFlags,
             clerkOrgId: envClient.clerkOrgId,
             allTenantTypes: hydratedTenantTypes
@@ -26709,16 +26706,16 @@ var ContextProvider = ({
   }, [publicKey]);
   (0, import_react.useEffect)(() => {
     if (!hasHandledInitialPopulatedClient.current) {
-      if (!populatedClient?.publicKey && !populatedClient?.currentTenants) {
+      if (!populatedClient?.id && !populatedClient?.currentTenants) {
         return;
       }
       hasHandledInitialPopulatedClient.current = true;
-      currentPublicKey.current = populatedClient?.publicKey ?? null;
+      currentPublicKey.current = populatedClient?.id ?? null;
       currentTenant.current = populatedClient?.currentTenants ?? null;
       return;
     }
     let publicKeyChanged = false;
-    if (populatedClient?.publicKey && currentPublicKey.current !== populatedClient?.publicKey) {
+    if (populatedClient?.id && currentPublicKey.current !== populatedClient?.id) {
       publicKeyChanged = true;
       dispatch({ type: "CLEAR_DASHBOARDS" });
       dashboardFiltersDispatch({ type: "CLEAR_DASHBOARD_FILTERS" });
@@ -26727,7 +26724,7 @@ var ContextProvider = ({
       backfilledDashboards.current.clear();
       if (isAdmin) {
         setIsDashboardsLoading(true);
-        fetchDashboards(populatedClient?.publicKey);
+        fetchDashboards(populatedClient?.id);
       } else {
         setIsDashboardsLoading(false);
       }
@@ -26759,17 +26756,17 @@ var ContextProvider = ({
         })
       );
     }
-    if (populatedClient?.currentTenants && populatedClient?.publicKey) {
+    if (populatedClient?.currentTenants && populatedClient?.id) {
       const tenant = typeof populatedClient?.currentTenants[0] === "object" ? populatedClient?.currentTenants[0]?.tenantField : void 0;
       const tenantIds = tenant && typeof populatedClient?.currentTenants[0] === "object" ? populatedClient?.currentTenants[0]?.tenantIds : populatedClient?.currentTenants;
       eventTracking?.setUser?.({
-        clientId: populatedClient.publicKey,
+        clientId: populatedClient.id,
         clerkOrgId: populatedClient.clerkOrgId,
         tenant,
         tenantIds
       });
     }
-  }, [populatedClient?.currentTenants, populatedClient?.publicKey]);
+  }, [populatedClient?.currentTenants, populatedClient?.id]);
   if (!theme) {
     return null;
   }
@@ -27078,7 +27075,7 @@ var useDashboardInternal = (dashboardName, customFilters) => {
       });
       const body = {
         task: "set-section-order",
-        clientId: client.clientId,
+        clientId: client.id,
         dashboardName,
         sectionOrder
       };
@@ -27306,7 +27303,7 @@ var useDashboards = () => {
       dateFilter,
       name: name2.trim(),
       task: "edit-dashboard",
-      clientId: clientId ?? client.clientId,
+      clientId: clientId ?? client.id,
       tenantKeys: dashboardOwners
     };
     try {
@@ -27381,7 +27378,7 @@ var useDashboards = () => {
       initialCacheDateRange,
       name: name2.trim(),
       task: "edit-dashboard",
-      clientId: clientId ?? client.clientId,
+      clientId: clientId ?? client.id,
       tenantKeys
     };
     try {
@@ -27559,7 +27556,7 @@ var useDashboards = () => {
       client,
       task: "delete-dashboard",
       metadata: {
-        clientId: client.clientId,
+        clientId: client.id,
         databaseType: client.databaseType,
         name: name2
       }
@@ -28404,7 +28401,7 @@ async function getExportData(client, dashboardFilters, reportId, getToken, event
     metadata: {
       reportId,
       dashboardItemId: reportId,
-      clientId: client.publicKey,
+      clientId: client.id,
       databaseType: client?.databaseType,
       filters: minimalFilters,
       useNewNodeSql: true,
@@ -29177,6 +29174,13 @@ function linspace(start, end, num) {
   }
   return result;
 }
+function stableColorIndex(field) {
+  let hash = 0;
+  for (const character of field.replace("comparison_", "")) {
+    hash = Math.imul(hash, 31) + character.charCodeAt(0) >>> 0;
+  }
+  return hash;
+}
 function selectColor(element, colors, index) {
   if (!element?.field) return "gray";
   const isComparison = element.field.includes("comparison_");
@@ -31461,15 +31465,19 @@ var QuillPortal = ({
 };
 // src/components/Chart/CustomLegend.tsx
+init_textProcessing();
 var import_jsx_runtime27 = require("react/jsx-runtime");
 var getLegendLabel = (entry) => {
   const label = entry?.payload?.name ?? entry?.value ?? entry?.dataKey ?? "";
-  return typeof label === "string" ? label : String(label ?? "");
+  return snakeAndCamelCaseToTitleCase(
+    typeof label === "string" ? label : String(label ?? "")
+  );
 };
 var LegendItem = ({
   entry,
   index,
-  theme
+  theme,
+  onClick
 }) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
   "div",
   {
@@ -31478,30 +31486,37 @@ var LegendItem = ({
       alignItems: "baseline",
       marginRight: "1rem"
     },
-    children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { style: { display: "flex", flexDirection: "row", alignItems: "center" }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
-        "svg",
-        {
-          style: { marginRight: "0.5rem" },
-          width: "16",
-          height: "16",
-          viewBox: "0 0 16 16",
-          children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("rect", { width: "16", height: "16", rx: "3", fill: entry?.color })
-        }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
-        "span",
-        {
-          style: {
-            color: theme?.secondaryTextColor,
-            fontFamily: theme?.fontFamily,
-            fontSize: theme?.fontSizeMedium || "14px",
-            whiteSpace: "nowrap"
-          },
-          children: getLegendLabel(entry)
-        }
-      )
-    ] })
+    onClick: () => onClick ? onClick(entry) : void 0,
+    children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
+      "div",
+      {
+        style: { display: "flex", flexDirection: "row", alignItems: "center" },
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+            "svg",
+            {
+              style: { marginRight: "0.5rem" },
+              width: "16",
+              height: "16",
+              viewBox: "0 0 16 16",
+              children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("rect", { width: "16", height: "16", rx: "3", fill: entry?.color })
+            }
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+            "span",
+            {
+              style: {
+                color: theme?.secondaryTextColor,
+                fontFamily: theme?.fontFamily,
+                fontSize: theme?.fontSizeMedium || "14px",
+                whiteSpace: "nowrap"
+              },
+              children: getLegendLabel(entry)
+            }
+          )
+        ]
+      }
+    )
   },
   `legend-${index}`
 );
@@ -31515,7 +31530,8 @@ var getOuterWidth = (element) => {
 };
 var RenderLegend = ({
   payload,
-  limit
+  limit,
+  onClickLegendElement
 }) => {
   const [theme] = (0, import_react12.useContext)(ThemeContext);
   const [isOpen, setIsOpen] = (0, import_react12.useState)(false);
@@ -31528,7 +31544,10 @@ var RenderLegend = ({
   const safePayload = payload ?? [];
   const maxItems = limit ?? safePayload.length;
   const measuredLimit = visibleCount ?? maxItems;
-  const visiblePayload = safePayload.slice(0, Math.min(maxItems, measuredLimit));
+  const visiblePayload = safePayload.slice(
+    0,
+    Math.min(maxItems, measuredLimit)
+  );
   const handleOpen = () => setIsOpen(true);
   const handleClose = () => setIsOpen(false);
   (0, import_react12.useLayoutEffect)(() => {
@@ -31589,7 +31608,6 @@ var RenderLegend = ({
               visibility: "hidden",
               height: 0,
               overflow: "hidden",
-              pointerEvents: "none",
               display: "flex",
               alignItems: "center",
               flexWrap: "nowrap",
@@ -31613,7 +31631,15 @@ var RenderLegend = ({
                       ref: (element) => {
                         itemRefs.current[index] = element;
                       },
-                      children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(LegendItem, { entry, index, theme })
+                      children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+                        LegendItem,
+                        {
+                          entry,
+                          index,
+                          theme,
+                          onClick: onClickLegendElement
+                        }
+                      )
                     },
                     `legend-measure-${index}`
                   ))
@@ -31654,7 +31680,8 @@ var RenderLegend = ({
               {
                 entry,
                 index,
-                theme
+                theme,
+                onClick: onClickLegendElement
               },
               `legend-${index}`
             ))
@@ -31701,7 +31728,8 @@ var RenderLegend = ({
                   {
                     entry,
                     index,
-                    theme
+                    theme,
+                    onClick: onClickLegendElement
                   },
                   `legend-popover-${index}`
                 ))
@@ -31973,6 +32001,7 @@ var PieChartWrapper = import_react13.default.forwardRef(
       containerStyle,
       theme,
       onClickChartElement,
+      onClickLegendElement,
       yAxisFields,
       showLegend = false,
       ...other
@@ -32069,7 +32098,13 @@ var PieChartWrapper = import_react13.default.forwardRef(
                     paddingBottom: 20,
                     fontFamily: theme?.fontFamily
                   },
-                  content: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(RenderLegend, { limit: 5 })
+                  content: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+                    RenderLegend,
+                    {
+                      limit: 5,
+                      onClickLegendElement
+                    }
+                  )
                 }
               ),
               /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
@@ -32704,6 +32739,7 @@ init_valueFormatter();
 // src/utils/axisFormatter.ts
 var import_date_fns11 = require("date-fns");
 var import_date_fns_tz4 = require("date-fns-tz");
+init_textProcessing();
 var axisFormatter = ({ value, field, fields }) => {
   if (field === void 0 || field === null) return "";
   if (value === void 0 || value === null) return "";
@@ -32753,7 +32789,7 @@ var formatString2 = (value) => {
   if (typeof value === "object") {
     return JSON.stringify(value);
   }
-  return value.toString();
+  return formatIdentifierLabel(value.toString());
 };
 var formatterDecimal2 = new Intl.NumberFormat("en-US", {
   style: "decimal",
@@ -32960,6 +32996,7 @@ function ChartTooltipRow2({
 }
 // src/components/Chart/ChartTooltipGroup.tsx
+init_textProcessing();
 var import_jsx_runtime32 = require("react/jsx-runtime");
 function ChartTooltipGroup({
   name: name2,
@@ -32994,7 +33031,7 @@ function ChartTooltipGroup({
               paddingBottom: 2,
               textTransform: "capitalize"
             },
-            children: name2.replaceAll("_", " ").toLowerCase()
+            children: formatIdentifierLabel(name2)
           }
         ),
         items.map(({ color, value, name: name3 }, idx) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
@@ -33015,6 +33052,7 @@ function ChartTooltipGroup({
 // src/components/Chart/ChartTooltip.tsx
 init_dates();
+init_textProcessing();
 var import_jsx_runtime33 = require("react/jsx-runtime");
 var ChartTooltipPrimary = (props) => /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(ChartTooltipFrame2, { theme: props.theme, children: [
   /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
@@ -33049,7 +33087,7 @@ var ChartTooltipPrimary = (props) => /* @__PURE__ */ (0, import_jsx_runtime33.js
             paddingTop: 2,
             paddingBottom: 2
           },
-          children: !isNaN(new Date(props.label)) && props.dateFormatter ? props.dateFormatter(props.label) : !isNaN(new Date(props.label)) ? (0, import_date_fns12.format)(new Date(props.label), "MMM yyyy") : props.label
+          children: !isNaN(new Date(props.label)) && props.dateFormatter ? props.dateFormatter(props.label) : !isNaN(new Date(props.label)) ? (0, import_date_fns12.format)(new Date(props.label), "MMM yyyy") : formatIdentifierLabel(props.label)
         }
       )
     }
@@ -33132,7 +33170,7 @@ function reformatComparisonPayload(props, primaryLabel, comparisonLabel) {
   return columnsByKey;
 }
 function getTooltipLabel(props, altTooltipLabel, isDateXAxis) {
-  return props.payload.length <= 2 && altTooltipLabel && isDateXAxis ? !isNaN(new Date(altTooltipLabel)) && props.dateFormatter ? props.dateFormatter(altTooltipLabel) : !isNaN(new Date(altTooltipLabel)) ? (0, import_date_fns12.format)(new Date(altTooltipLabel), "MMM yyyy") : altTooltipLabel : !isNaN(new Date(props.label)) && props.dateFormatter ? props.dateFormatter(props.label) : !isNaN(new Date(props.label)) ? (0, import_date_fns12.format)(new Date(props.label), "MMM yyyy") : props.label;
+  return props.payload.length <= 2 && altTooltipLabel && isDateXAxis ? !isNaN(new Date(altTooltipLabel)) && props.dateFormatter ? props.dateFormatter(altTooltipLabel) : !isNaN(new Date(altTooltipLabel)) ? (0, import_date_fns12.format)(new Date(altTooltipLabel), "MMM yyyy") : formatIdentifierLabel(altTooltipLabel) : !isNaN(new Date(props.label)) && props.dateFormatter ? props.dateFormatter(props.label) : !isNaN(new Date(props.label)) ? (0, import_date_fns12.format)(new Date(props.label), "MMM yyyy") : formatIdentifierLabel(props.label);
 }
 function ChartTooltipComparison(props) {
   const isDateXAxis = isDateFormat2(props.xAxisFormat);
@@ -33388,6 +33426,7 @@ function CustomReferenceLine({
 // src/components/Chart/LineChart.tsx
 init_columnProcessing();
+init_textProcessing();
 var import_jsx_runtime35 = require("react/jsx-runtime");
 function createLineForEmptyChart(yAxisFields, dateFilter, xAxisField, xAxisFormat) {
   let lineChartData = [];
@@ -33424,6 +33463,8 @@ function LineChart({
   cartesianGridLineColor,
   onClickChartElement = () => {
   },
+  onClickLegendElement = () => {
+  },
   dateFilter,
   referenceLines,
   showLegend = false
@@ -33520,7 +33561,7 @@ function LineChart({
                   paddingBottom: 20,
                   fontFamily: theme?.fontFamily
                 },
-                content: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderLegend, {})
+                content: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderLegend, { onClickLegendElement })
               }
             ),
             /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
@@ -33608,7 +33649,9 @@ function LineChart({
                       color: p.color || "black",
                       chartType: "line",
                       dataKey: p.dataKey?.toLocaleString() || "",
-                      name: name2 || p.name?.toString() || "",
+                      name: snakeAndCamelCaseToTitleCase(
+                        name2 || p.name?.toString() || ""
+                      ),
                       payload: p.payload || {},
                       type: p.type || "none",
                       unit: "string",
@@ -33701,6 +33744,7 @@ function LineChart({
                 import_recharts2.Area,
                 {
                   type: "linear",
+                  name: elem.label || elem.field,
                   dataKey: elem.field,
                   stroke: getCustomColor(index, elem.field) ?? selectColor(elem, colors, index - numComparisons),
                   fill: `url(#${uniqueId})`,
@@ -33723,6 +33767,7 @@ function LineChart({
 var import_recharts3 = require("recharts");
 var import_react16 = require("react");
 init_valueFormatter();
+init_textProcessing();
 var import_jsx_runtime36 = require("react/jsx-runtime");
 function RadarChart({
   colors,
@@ -33738,6 +33783,8 @@ function RadarChart({
   isAnimationActive = true,
   onClickChartElement = () => {
   },
+  onClickLegendElement = () => {
+  },
   dateFilter,
   showLegend = false
 }) {
@@ -33831,7 +33878,7 @@ function RadarChart({
                   paddingBottom: 20,
                   fontFamily: theme?.fontFamily
                 },
-                content: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(RenderLegend, {})
+                content: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(RenderLegend, { onClickLegendElement })
               }
             ),
             /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
@@ -33866,7 +33913,9 @@ function RadarChart({
                       color: p.color || "black",
                       chartType: "radar",
                       dataKey: p.dataKey?.toLocaleString() || "",
-                      name: name2 || p.name?.toString() || "",
+                      name: snakeAndCamelCaseToTitleCase(
+                        name2 || p.name?.toString() || ""
+                      ),
                       payload: p.payload || {},
                       type: p.type || "none",
                       unit: "string",
@@ -33973,6 +34022,10 @@ var CustomBar = (0, import_react17.memo)((props) => {
     width: rawWidth,
     height: rawHeight,
     fill,
+    fillOpacity,
+    stroke,
+    strokeWidth,
+    style,
     yAxisFields = [],
     dataKey,
     payload = {},
@@ -34030,7 +34083,17 @@ var CustomBar = (0, import_react17.memo)((props) => {
     rawY,
     radius
   ]);
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("path", { d: path, fill });
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+    "path",
+    {
+      d: path,
+      fill,
+      fillOpacity,
+      stroke,
+      strokeWidth,
+      style
+    }
+  );
 });
 CustomBar.displayName = "CustomBar";
 var CustomBar_default = CustomBar;
@@ -34038,10 +34101,25 @@ var CustomBar_default = CustomBar;
 // src/components/Chart/BarChart.tsx
 var import_react18 = require("react");
 init_columnProcessing();
+init_textProcessing();
 var import_jsx_runtime38 = require("react/jsx-runtime");
 var CATEGORY_AXIS_WIDTH = 120;
 var VALUE_AXIS_WIDTH = 44;
 var STACKED_DOMAIN_HEADROOM = 1.05;
+function rowValueFromPivotRow(row, xAxisField, fallbackLabel) {
+  const rawDate = row?.__quillRawDate;
+  if (rawDate != null && rawDate !== "") {
+    return String(rawDate);
+  }
+  const category = row?.[xAxisField];
+  if (category != null && category !== "") {
+    return String(category);
+  }
+  if (fallbackLabel != null && fallbackLabel !== "") {
+    return String(fallbackLabel);
+  }
+  return null;
+}
 function getStackedDomain(data, fields, comparison) {
   const fieldsArray = fields.filter((field) => comparison || !field.field.startsWith("comparison_")).map((field) => field.field);
   if (fieldsArray.length === 0 || data.length === 0) {
@@ -34063,14 +34141,16 @@ function getStackedDomain(data, fields, comparison) {
   }
   return [0, maxStack * STACKED_DOMAIN_HEADROOM];
 }
-var createCustomBar = (yAxisFields, theme, layout) => {
+var createCustomBar = (yAxisFields, theme, layout, active = false) => {
   return (props) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
     CustomBar_default,
     {
       ...props,
       yAxisFields,
       theme,
-      layout
+      layout,
+      stroke: active ? theme?.primaryTextColor ?? "#111827" : props.stroke,
+      strokeWidth: active ? 1.5 : props.strokeWidth
     }
   );
 };
@@ -34091,6 +34171,7 @@ function BarChart({
   hideYAxis = false,
   hideCartesianGrid = false,
   onClickChartElement,
+  onClickLegendElement,
   dateFilter,
   referenceLines,
   showLegend = false,
@@ -34143,6 +34224,16 @@ function BarChart({
       return void 0;
     return createCustomBar(sortYAxisFields([...yAxisFields]), theme, layout);
   }, [isStacked, yAxisFields, theme, layout]);
+  const customActiveBarShape = (0, import_react18.useMemo)(() => {
+    if (!theme?.barChartCornerRadius && !theme?.barChartCornerRadiusRatio)
+      return void 0;
+    return createCustomBar(
+      sortYAxisFields([...yAxisFields]),
+      theme,
+      layout,
+      true
+    );
+  }, [isStacked, yAxisFields, theme, layout]);
   if (!data || data.length === 0) {
     return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       "div",
@@ -34184,9 +34275,28 @@ function BarChart({
             {
               data: data ?? [],
               layout,
-              onClick: (event) => onClickChartElement ? onClickChartElement(
-                event?.activePayload ? event.activePayload[0].payload : void 0
-              ) : void 0,
+              onClick: (event) => {
+                if (!onClickChartElement || event?.activeLabel === void 0 || event?.activeTooltipIndex === void 0) {
+                  return;
+                }
+                const index = Number(event.activeTooltipIndex);
+                const row = event.activePayload?.[0]?.payload ?? data[index] ?? {};
+                onClickChartElement({
+                  ...row,
+                  interactionType: "bucket",
+                  activeLabel: event.activeLabel,
+                  rowValue: rowValueFromPivotRow(row, xAxisField, event.activeLabel),
+                  columnValue: void 0,
+                  activeDataKey: void 0,
+                  activeValue: void 0,
+                  activePayload: event.activePayload ?? [],
+                  category: event.activeLabel,
+                  series: void 0,
+                  value: void 0,
+                  row,
+                  index
+                });
+              },
               children: [
                 !hideCartesianGrid && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
                   import_recharts4.CartesianGrid,
@@ -34206,7 +34316,7 @@ function BarChart({
                     wrapperStyle: {
                       paddingBottom: 20
                     },
-                    content: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(RenderLegend, {})
+                    content: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(RenderLegend, { onClickLegendElement })
                   }
                 ),
                 isHorizontalBars ? /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(import_jsx_runtime38.Fragment, { children: [
@@ -34285,11 +34395,13 @@ function BarChart({
                   {
                     wrapperStyle: { outline: "none", zIndex: 2 },
                     isAnimationActive: false,
-                    cursor: { fill: "#d1d5db", opacity: "0.15" },
+                    cursor: false,
+                    shared: false,
                     content: ({ active, payload, label }) => {
                       if (!payload || payload.length === 0) {
                         return null;
                       }
+                      const activeLabel = label ?? payload[0]?.payload?.[xAxisField] ?? "";
                       const payloadItems = payload.map((p) => {
                         const rawName = yAxisFields?.find(
                           (f) => f.field === p.name?.toString()
@@ -34300,7 +34412,9 @@ function BarChart({
                           color: p.color || "black",
                           chartType: "line",
                           dataKey: p.dataKey?.toLocaleString() || "",
-                          name: name2 || p.name?.toString() || "",
+                          name: snakeAndCamelCaseToTitleCase(
+                            name2 || p.name?.toString() || ""
+                          ),
                           payload: p.payload || {},
                           type: p.type || "none",
                           unit: "string",
@@ -34313,7 +34427,7 @@ function BarChart({
                           theme,
                           active,
                           payload: payloadItems,
-                          label,
+                          label: `${activeLabel}`,
                           dateFormatter: (value) => valueFormatter({
                             value,
                             field: xAxisField,
@@ -34345,21 +34459,47 @@ function BarChart({
                   return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
                     import_recharts4.Bar,
                     {
+                      name: elem.label || elem.field,
                       dataKey: elem.field,
                       stackId: stackedMode ? "same_id" : isStacked ? elem.field.replace("comparison_", "") : void 0,
                       type: "linear",
-                      fill: getCustomColor(elem.field) ?? selectColor(
-                        elem,
-                        colors.length >= yAxisFields.length / (comparison ? 2 : 1) ? colors : generateArrayFromColor(
-                          colors.slice(0, 2),
-                          yAxisFields.length
-                        ),
-                        yAxisFields.findIndex(
-                          (field) => field.field === elem.field?.replace("comparison_", "")
-                        )
-                      ),
+                      fill: getCustomColor(elem.field) ?? selectColor(elem, colors, stableColorIndex(elem.field)),
                       isAnimationActive,
-                      shape: customBarShape
+                      shape: customBarShape,
+                      activeBar: customActiveBarShape ?? {
+                        fillOpacity: 1,
+                        stroke: theme?.primaryTextColor ?? "#111827",
+                        strokeWidth: 1.5
+                      },
+                      style: {
+                        cursor: onClickChartElement ? "pointer" : void 0
+                      },
+                      onClick: (bar, index, event) => {
+                        event?.stopPropagation();
+                        const payload = bar.payload ?? data[index] ?? {};
+                        onClickChartElement?.({
+                          ...payload,
+                          interactionType: "bar",
+                          activeLabel: payload[xAxisField],
+                          rowValue: rowValueFromPivotRow(payload, xAxisField),
+                          columnValue: elem.field,
+                          activeDataKey: elem.field,
+                          activeValue: payload[elem.field] ?? bar.value,
+                          activePayload: [
+                            {
+                              dataKey: elem.field,
+                              name: elem.label || elem.field,
+                              payload,
+                              value: payload[elem.field] ?? bar.value
+                            }
+                          ],
+                          category: payload[xAxisField],
+                          series: elem.field,
+                          value: payload[elem.field] ?? bar.value,
+                          row: payload,
+                          index
+                        });
+                      }
                     },
                     elem.field
                   );
@@ -39917,6 +40057,7 @@ var ChartDisplay = ({
   onPageChange,
   onSortChange,
   onClickChartElement,
+  onClickLegendElement,
   overrideTheme,
   referenceLines,
   showLegend,
@@ -40001,6 +40142,7 @@ var ChartDisplay = ({
         theme: overrideTheme ?? theme,
         colorMap,
         onClickChartElement,
+        onClickLegendElement,
         yAxisFields: config?.yAxisFields,
         showLegend: resolvedShowLegend
       }
@@ -40077,6 +40219,7 @@ var ChartDisplay = ({
         hideCartesianGrid,
         colorMap,
         onClickChartElement,
+        onClickLegendElement,
         dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
         referenceLines,
         showLegend: resolvedShowLegend
@@ -40104,6 +40247,7 @@ var ChartDisplay = ({
         hideCartesianGrid,
         colorMap,
         onClickChartElement,
+        onClickLegendElement,
         dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
         referenceLines,
         showLegend: resolvedShowLegend,
@@ -40260,6 +40404,7 @@ var ChartDisplay = ({
         className,
         isAnimationActive,
         onClickChartElement,
+        onClickLegendElement,
         dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
         showLegend: resolvedShowLegend
       }
@@ -40290,6 +40435,7 @@ var ChartDisplay = ({
       comparisonLineStyle: comparisonLineStyle ?? "solid",
       cartesianGridLineColor,
       onClickChartElement,
+      onClickLegendElement,
       dateFilter: !hideDateRangeFilter ? dateFilter : void 0,
       referenceLines,
       showLegend: resolvedShowLegend
@@ -42348,7 +42494,7 @@ function DashboardLegacy({
   const [filterValues, setFilterValues] = (0, import_react40.useState)({});
   const prevNameRef = (0, import_react40.useRef)(name2);
   const prevFlagsRef = (0, import_react40.useRef)(flags);
-  const prevClientRef = (0, import_react40.useRef)(client?.publicKey ?? "");
+  const prevClientRef = (0, import_react40.useRef)(client?.id ?? "");
   const addFilterPopoverButtonRef = (0, import_react40.useRef)(null);
   const viewFiltersPopoverButtonRef = (0, import_react40.useRef)(null);
   const previousFilters = (0, import_react40.useRef)(filters);
@@ -42404,15 +42550,15 @@ function DashboardLegacy({
     });
   }, [flags]);
   (0, import_react40.useEffect)(() => {
-    if (prevClientRef.current === client?.publicKey) {
+    if (prevClientRef.current === client?.id) {
       return;
     }
-    const isInitialKeySet = !prevClientRef.current && client?.publicKey;
+    const isInitialKeySet = !prevClientRef.current && client?.id;
     if (isInitialKeySet && Object.values(data?.sections ?? {}).flat().length) {
-      prevClientRef.current = client?.publicKey ?? "";
+      prevClientRef.current = client?.id ?? "";
       return;
     }
-    prevClientRef.current = client?.publicKey ?? "";
+    prevClientRef.current = client?.id ?? "";
     if (isClientLoading) {
       return;
     }
@@ -42424,7 +42570,7 @@ function DashboardLegacy({
       prevFlagsRef.current = flags;
       isInitialLoadOfDashboardRef.current = false;
     });
-  }, [client?.publicKey]);
+  }, [client?.id]);
   (0, import_react40.useEffect)(() => {
     setFilterValues(
       Object.values(populatedDashboardFilters ?? {}).reduce((acc, f) => {
@@ -43407,6 +43553,7 @@ function StaticChart(props) {
   const {
     reportId,
     onClickChartElement,
+    onClickLegendElement,
     containerStyle,
     showLegend,
     className
@@ -43459,6 +43606,7 @@ function StaticChart(props) {
       reportId,
       config,
       onClickChartElement,
+      onClickLegendElement,
       loading,
       className,
       containerStyle: safeContainerStyle,
@@ -48501,7 +48649,7 @@ function ChartBuilder({
       task: "dashboard",
       metadata: {
         name: dashboardName,
-        clientId: client.clientId,
+        clientId: client.id,
         databaseType: client.databaseType,
         useNewNodeSql: true,
         tenants
@@ -48561,11 +48709,11 @@ function ChartBuilder({
   const getReferencedTables = async (client2, dbTables, sqlQuery, reportBuilderState2, skipStar) => {
     const metadata = reportBuilderState2 ? {
       reportBuilderState: reportBuilderState2,
-      clientId: client2.clientId,
+      clientId: client2.id,
       useNewNodeSql: true
     } : {
       query: sqlQuery,
-      clientId: client2.clientId,
+      clientId: client2.id,
       useNewNodeSql: true
     };
     try {
@@ -48791,7 +48939,7 @@ function ChartBuilder({
           client,
           task: "dashnames",
           metadata: {
-            clientId: client.clientId
+            clientId: client.id
           }
         });
         dashNames = resp.dashboardNames;
@@ -52336,7 +52484,7 @@ function SQLEditor({
       setColumns([]);
       setDisplayTable(false);
     }
-  }, [client?.publicKey]);
+  }, [client?.id]);
   (0, import_react51.useEffect)(() => {
     if (isChartBuilderOpen === false) {
       onCloseChartBuilder && onCloseChartBuilder();
@@ -52595,7 +52743,7 @@ function SQLEditor({
       task: "astify",
       metadata: {
         query: sqlQuery,
-        clientId: client2.clientId,
+        clientId: client2.id,
         useNewNodeSql: true
       }
     });
@@ -52788,7 +52936,7 @@ function SQLEditor({
                                         query: query || "",
                                         schema: filteredSchema,
                                         databaseType: client?.databaseType ?? "postgresql",
-                                        clientName: client?.publicKey || "",
+                                        clientName: client?.id || "",
                                         setQuery,
                                         handleRunQuery: () => {
                                           handleRunQuery(currentProcessing, true);
@@ -54942,7 +55090,7 @@ var useReportBuilderInternal = ({
         !client.featureFlags?.["recommendedPivotsDisabled"]
       );
     }
-    if (!initialTableName && !reportId && client.publicKey) {
+    if (!initialTableName && !reportId && client.id) {
       clearAllState();
     }
   }, [client]);
@@ -58457,6 +58605,7 @@ init_valueFormatter();
 // src/utils/queryBuilderFilters.ts
 init_Filter();
 init_reportBuilder();
+init_dates();
 var buildOperatorOption = (value, label, arity) => ({
   name: value,
   value,
@@ -58625,6 +58774,26 @@ var DATE_UNIT_BY_KEY = {
   day: TimeUnit.Day,
   hour: TimeUnit.Hour
 };
+var DATE_BUCKETS = /* @__PURE__ */ new Set(["day", "week", "month", "year"]);
+var parseInBucketValue = (value) => {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error(
+      'inBucket value must be `{ start: string, bucket: "day"|"week"|"month"|"year" }`'
+    );
+  }
+  const record = value;
+  const start = String(record.start ?? "").trim();
+  const bucket = String(record.bucket ?? "").trim().toLowerCase();
+  if (!start) {
+    throw new Error("inBucket value.start is required");
+  }
+  if (!DATE_BUCKETS.has(bucket)) {
+    throw new Error(
+      `inBucket value.bucket must be day|week|month|year (got "${String(record.bucket)}")`
+    );
+  }
+  return { start, bucket };
+};
 var EMPTY_QUERY_GROUP = {
   combinator: "and",
   rules: []
@@ -58844,6 +59013,17 @@ var internalFilterToRule = (filter) => {
     }
     case "date-custom-filter" /* DateCustomFilter */: {
       const customDate = filter.value;
+      const dateCustom = filter;
+      if (dateCustom.fromInBucket && dateCustom.dateBucket) {
+        return {
+          field,
+          operator: "inBucket",
+          value: {
+            start: customDate.startDate,
+            bucket: dateCustom.dateBucket
+          }
+        };
+      }
       return {
         field,
         operator: "between",
@@ -59028,6 +59208,24 @@ var queryRuleToInternalFilter = (rule, fieldConfigByName) => {
       }
     };
   }
+  if (compactOperatorKey === "inbucket") {
+    const { start, bucket } = parseInBucketValue(rule.value);
+    const range = getExclusiveDateBucketRange(start, bucket);
+    const endInclusive = new Date(Date.parse(range.endExclusive) - 1).toISOString();
+    return {
+      filterType: "date-custom-filter" /* DateCustomFilter */,
+      fieldType: FieldType.Date,
+      operator: DateOperator.Custom,
+      field,
+      table,
+      value: {
+        startDate: range.start,
+        endDate: endInclusive
+      },
+      dateBucket: bucket,
+      fromInBucket: true
+    };
+  }
   const dateComparisonOperator = QUERY_TO_DATE_COMPARISON_OPERATOR[compactOperatorKey] ?? QUERY_TO_DATE_COMPARISON_OPERATOR[operatorKey];
   if (!dateComparisonOperator) {
     throw new Error(`Unsupported date operator "${String(rule.operator)}"`);
@@ -59214,6 +59412,31 @@ var filterStackToQueryBuilderFilters = (filterStack, fieldConfigByName, qualifyA
   ) : base;
   return qualified;
 };
+var queryBuilderFiltersForEditor = (group) => {
+  const mapEntry = (entry) => {
+    if (isCombinator(entry)) return entry;
+    if (isRuleGroup(entry)) {
+      return queryBuilderFiltersForEditor(entry);
+    }
+    if (!isRule(entry)) return entry;
+    const operator = String(entry.operator ?? "").trim().toLowerCase().replace(/[_\s]+/g, "");
+    if (operator !== "inbucket") return entry;
+    const { start, bucket } = parseInBucketValue(entry.value);
+    const range = getExclusiveDateBucketRange(start, bucket);
+    const endInclusive = new Date(
+      Date.parse(range.endExclusive) - 1
+    ).toISOString();
+    return {
+      ...entry,
+      operator: "between",
+      value: [range.start, endInclusive]
+    };
+  };
+  return {
+    combinator: normalizeCombinator(group.combinator, "and"),
+    rules: (group.rules ?? []).map(mapEntry)
+  };
+};
 var queryBuilderFiltersToFilterStack = (query, fieldConfigByName) => {
   if (!isRuleGroup(query)) {
     throw new Error("Query must be a rule group");
@@ -59552,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__";
@@ -59729,52 +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 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 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" }
@@ -60242,6 +60445,8 @@ function normalizePivotForRefreshComparison(pivot) {
   const {
     rowFieldTable: _pivotRowTable,
     columnFieldTable: _pivotColumnTable,
+    rowFilter: _rowFilter,
+    columnFilter: _columnFilter,
     aggregations,
     ...pivotRest
   } = record;
@@ -60664,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(
@@ -61851,16 +62050,6 @@ function mergeDisplayAndSourceForTableFormats(args) {
   });
   return { columns, formatByColumnOptionId };
 }
-var USE_FORM_AXIS_SERIES_COLORS = [
-  "#6366f1",
-  "#f59e0b",
-  "#10b981",
-  "#ef4444",
-  "#8b5cf6",
-  "#06b6d4",
-  "#f97316",
-  "#84cc16"
-];
 function axisFormatToSelectLabel(format9) {
   const raw = String(format9 ?? "").trim();
   const exact = AXIS_FORMAT_OPTIONS.find((option) => option.value === raw);
@@ -62917,7 +63106,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;
     }
@@ -62963,7 +63152,6 @@ async function loadReportForUseForm({
       return normalizedBootstrapResult;
     }
     const shouldUseReportTaskForReload = internalFilters.length > 0;
-    const resolvedTask = shouldUseReportTaskForReload ? "report" : "item";
     return loadViaInMemoryEngines({
       reportId,
       client,
@@ -63209,8 +63397,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);
@@ -63759,26 +63945,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",
@@ -63882,22 +64048,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);
@@ -64660,19 +64810,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;
     };
   }, [
@@ -65064,8 +65201,7 @@ function useReport(reportIdArg, options = {}) {
   }, [
     effectiveReportId,
     tableRefreshQuery.data,
-    tableRefreshQueryEnabled,
-    useFormRefreshDebugEnabled
+    tableRefreshQueryEnabled
   ]);
   const chartTypes = (0, import_react61.useMemo)(() => {
     return getChartTypeOptions2({ pivot: pivotState });
@@ -65787,6 +65923,9 @@ function useReport(reportIdArg, options = {}) {
       return {
         ...previousReport,
         ...report,
+        xAxisFormat: previousReport.xAxisFormat,
+        columns: previousReport.columns,
+        yAxisFields: previousReport.yAxisFields,
         pivot: previousReport.pivot,
         pivotRows: previousReport.pivotRows,
         pivotColumns: previousReport.pivotColumns,
@@ -65803,8 +65942,7 @@ function useReport(reportIdArg, options = {}) {
     pivotTableDataRefreshQuery.data,
     pivotTableDataRefreshQuery.status,
     pivotTableDataRefreshQueryEnabled,
-    effectiveReportId,
-    useFormRefreshDebugEnabled
+    effectiveReportId
   ]);
   (0, import_react61.useEffect)(() => {
     if (!pivotRefreshQueryEnabled) return;
@@ -65856,8 +65994,7 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQuery.data,
     pivotRefreshQuery.status,
     pivotRefreshQueryEnabled,
-    effectiveReportId,
-    useFormRefreshDebugEnabled
+    effectiveReportId
   ]);
   const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
@@ -65865,8 +66002,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,
@@ -65877,15 +66014,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,
@@ -65923,8 +66053,8 @@ function useReport(reportIdArg, options = {}) {
     for (const column of chartAxesBaseChart.columns ?? []) {
       registerOption(column.field, column.label, column.format);
     }
-    for (const yAxis of chartAxesBaseChart.yAxisFields ?? []) {
-      registerOption(yAxis.field, yAxis.label, yAxis.format);
+    for (const yAxis2 of chartAxesBaseChart.yAxisFields ?? []) {
+      registerOption(yAxis2.field, yAxis2.label, yAxis2.format);
     }
     if (chartAxesBaseChart.pivot?.columnField) {
       for (const aggregationAxis of buildPivotAggregationAxisFields(
@@ -66147,48 +66277,35 @@ function useReport(reportIdArg, options = {}) {
     }),
     [baseChart?.showLegend, chartVisibilityOverrides]
   );
-  const axisConfig = (0, import_react61.useMemo)(() => {
+  const xAxis = (0, import_react61.useMemo)(() => {
     const pivotBucketXAxis = isPivotTableDateBucketRowAxis(
       chartAxesBaseChart,
       resolvedXAxisField
     );
     const xFormatLabel = pivotBucketXAxis && String(resolvedXAxisFormat ?? "").trim() === "string" ? "date" : axisFormatToSelectLabel(resolvedXAxisFormat);
     return {
-      xAxis: {
-        field: resolvedXAxisField,
-        label: resolvedXAxisLabel,
-        format: xFormatLabel,
-        show: true,
-        rotation: 0,
-        fontSize: 12
-      },
-      yAxis: {
-        fields: resolvedYAxisFields.map((yAxisField, index) => ({
-          field: yAxisField.field,
-          label: String(yAxisField.label ?? "").trim(),
-          format: axisFormatToSelectLabel(
-            toAxisFormat(yAxisField.format, "string")
-          ),
-          color: USE_FORM_AXIS_SERIES_COLORS[index % USE_FORM_AXIS_SERIES_COLORS.length]
-        })),
-        label: "",
-        show: true,
-        min: "",
-        max: "",
-        fontSize: 12
-      },
-      legend: {
-        show: chartVisibility.showLegend
-      }
+      field: resolvedXAxisField,
+      label: resolvedXAxisLabel,
+      format: xFormatLabel
     };
   }, [
     chartAxesBaseChart,
     resolvedXAxisLabel,
     resolvedXAxisField,
-    resolvedXAxisFormat,
-    resolvedYAxisFields,
-    chartVisibility.showLegend
+    resolvedXAxisFormat
   ]);
+  const yAxis = (0, import_react61.useMemo)(
+    () => ({
+      fields: resolvedYAxisFields.map((yAxisField) => ({
+        field: yAxisField.field,
+        label: String(yAxisField.label ?? "").trim(),
+        format: axisFormatToSelectLabel(
+          toAxisFormat(yAxisField.format, "string")
+        )
+      }))
+    }),
+    [resolvedYAxisFields]
+  );
   const resolvedYAxisFieldsForDisplay = (0, import_react61.useMemo)(() => {
     if (!baseChart) return resolvedYAxisFields;
     return mapResolvedPivotYAxisFieldsForDisplay({
@@ -66210,26 +66327,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,
@@ -66245,6 +66342,144 @@ 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) {
+      out.push({
+        field,
+        fieldType: "string",
+        operator: "in",
+        options: values.map(({ label, value }) => ({ label, value }))
+      });
+    }
+    const pivot = chart?.pivot;
+    const rowField = String(pivot?.rowField ?? "").trim();
+    if (rowField && isDateType(String(pivot?.rowFieldType ?? ""))) {
+      const field = pivot?.rowFieldTable ? `${pivot.rowFieldTable}.${rowField}` : rowField;
+      const bucket = dateBucket || pivot?.dateBucket || "month";
+      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);
+        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: options2
+      });
+    }
+    return out;
+  }, [
+    chart?.pivot,
+    chart?.rows,
+    dateBucket,
+    effectiveReportId,
+    filterValueOptionsByFieldName
+  ]);
+  const chartForUi = (0, import_react61.useMemo)(() => {
+    if (!chart?.pivot) return chart;
+    const pivot = chart.pivot;
+    const qualify = (field, table2) => table2 ? `${table2}.${field}` : field;
+    const labelFor = (field) => chart.columns?.find((column) => column.field === field)?.label ?? field.split(".").pop().replace(/[_-]+/g, " ").replace(/\b\w/g, (char) => char.toUpperCase());
+    const matchField = (entryField, field, table2) => {
+      const qualified = qualify(field, table2);
+      return entryField === qualified || entryField === field || entryField.endsWith(`.${field}`);
+    };
+    const selectedValue = (field, operator, options2) => {
+      const rule = filtersForQueryBuilder.rules.find(
+        (entry) => typeof entry === "object" && entry !== null && "field" in entry && entry.field === field && entry.operator === operator
+      );
+      if (!rule) return null;
+      const raw = operator === "inBucket" ? rule.value?.start : Array.isArray(rule.value) ? rule.value[0] : void 0;
+      if (raw == null) return null;
+      const value = String(raw);
+      return options2.some((option) => option.value === value) ? value : null;
+    };
+    let rowFilter = null;
+    const rowField = String(pivot.rowField ?? "").trim();
+    if (rowField) {
+      if (isDateType(String(pivot.rowFieldType ?? ""))) {
+        const entry = filterOptions.find(
+          (option) => option.operator === "inBucket" && matchField(option.field, rowField, pivot.rowFieldTable)
+        );
+        if (entry) {
+          const field = qualify(rowField, pivot.rowFieldTable);
+          rowFilter = {
+            ...entry,
+            field,
+            label: labelFor(rowField),
+            value: selectedValue(field, entry.operator, entry.options)
+          };
+        }
+      } else {
+        const entry = filterOptions.find(
+          (option) => option.operator === "in" && matchField(option.field, rowField, pivot.rowFieldTable)
+        );
+        if (entry) {
+          const field = qualify(rowField, pivot.rowFieldTable);
+          rowFilter = {
+            ...entry,
+            field,
+            label: labelFor(rowField),
+            value: selectedValue(field, entry.operator, entry.options)
+          };
+        }
+      }
+    }
+    let columnFilter = null;
+    const columnField = String(pivot.columnField ?? "").trim();
+    if (columnField) {
+      const entry = filterOptions.find(
+        (option) => option.operator === "in" && matchField(option.field, columnField, pivot.columnFieldTable)
+      );
+      if (entry) {
+        const field = qualify(columnField, pivot.columnFieldTable);
+        columnFilter = {
+          ...entry,
+          field,
+          label: labelFor(columnField),
+          value: selectedValue(field, entry.operator, entry.options)
+        };
+      }
+    }
+    return {
+      ...chart,
+      pivot: {
+        ...pivot,
+        rowFilter,
+        columnFilter
+      }
+    };
+  }, [chart, filterOptions, filtersForQueryBuilder]);
   const isPivotTableChart = String(chartType ?? "").toLowerCase() === "table" && Boolean(
     chart && chart.pivot && Array.isArray(chart.columns) && chart.columns.length > 0
   );
@@ -66575,14 +66810,6 @@ function useReport(reportIdArg, options = {}) {
     schemaColumnOptions,
     table.columns
   ]);
-  const availableFields = (0, import_react61.useMemo)(
-    () => tableColumnPickerPoolOptions.map((option) => ({
-      id: option.value,
-      label: option.label,
-      type: option.type
-    })),
-    [tableColumnPickerPoolOptions]
-  );
   const axisSelectFormatLabels = (0, import_react61.useMemo)(
     () => AXIS_FORMAT_OPTIONS.map((option) => option.label),
     []
@@ -67028,8 +67255,12 @@ function useReport(reportIdArg, options = {}) {
         showLegend: Boolean(effectiveNextState.showLegend)
       }));
     }
-    if (effectiveNextState.chartAxes !== void 0) {
-      const cx = effectiveNextState.chartAxes;
+    if (effectiveNextState.xAxis !== void 0 || effectiveNextState.yAxis !== void 0 || effectiveNextState.chartAxes !== void 0) {
+      const cx = {
+        ...effectiveNextState.chartAxes,
+        ...effectiveNextState.xAxis !== void 0 ? { xAxis: effectiveNextState.xAxis } : {},
+        ...effectiveNextState.yAxis !== void 0 ? { yAxis: effectiveNextState.yAxis } : {}
+      };
       setChartAxisEdits((previousEdits) => {
         const nextEdits = { ...previousEdits };
         if (cx.xAxis) {
@@ -67549,8 +67780,9 @@ function useReport(reportIdArg, options = {}) {
     }
   };
   const setFilters = (nextFilters) => {
+    const resolved = typeof nextFilters === "function" ? nextFilters(filtersForQueryBuilder) : nextFilters;
     const preparedForStack = prepareQueryBuilderFiltersForSet(
-      nextFilters,
+      resolved,
       queryFilters
     );
     const nextFiltersNormalizedForConfig = normalizeQueryBuilderFiltersForConfig(preparedForStack);
@@ -67591,17 +67823,17 @@ function useReport(reportIdArg, options = {}) {
         });
       }
     } catch (error) {
-      if (isUseFormFiltersDebugEnabled()) {
-        console.error("[useForm-debug] setFilters swallowed error", {
-          error: error instanceof Error ? error.message : String(error),
-          requestedRules: (nextFilters?.rules ?? []).map((rule) => ({
-            table: rule?.table,
-            field: rule?.field,
-            operator: rule?.operator
-          })),
-          fieldConfigKeys: Object.keys(queryBuilderFieldConfigByName ?? {})
-        });
-      }
+      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,
+          operator: rule?.operator,
+          value: rule?.value
+        })),
+        fieldConfigKeys: Object.keys(queryBuilderFieldConfigByName ?? {})
+      });
     }
   };
   const saveChanges = (0, import_react61.useCallback)(async () => {
@@ -67663,7 +67895,7 @@ function useReport(reportIdArg, options = {}) {
   ]);
   return {
     /* ── Chart & table (exceptions: not value/options pairs) ── */
-    chart,
+    chart: chartForUi,
     chartLoading,
     table,
     tableLoading,
@@ -67701,9 +67933,9 @@ function useReport(reportIdArg, options = {}) {
     columnActions,
     /** Schema columns for current datasources — pool for the table column picker. */
     columnOptions: tableColumnPickerPoolOptions,
-    xAxis: chartAxes.xAxis,
+    xAxis,
     xAxisOptions: normalizedChartXAxisOptions,
-    yAxis: chartAxes.yAxis,
+    yAxis,
     yAxisOptions: normalizedChartYAxisOptions,
     /** Same strings as `axisSelectFormatLabels` (X/Y share chart format presets). */
     xAxisFormatOptions: xAxisFormatOptionLabels,
@@ -67711,8 +67943,6 @@ function useReport(reportIdArg, options = {}) {
     /** Table column format dropdown labels (same set as chart axis formats). */
     tableFormatOptions: axisSelectFormatLabels,
     showLegend: chartVisibility.showLegend,
-    axisConfig,
-    availableFields,
     axisSelectFormatLabels,
     /** @deprecated Prefer top-level `xAxis`, `yAxis`, and `showLegend`. */
     chartAxes,
@@ -67725,6 +67955,12 @@ function useReport(reportIdArg, options = {}) {
     hasTableDrivenColumnOrder,
     filters: filtersForQueryBuilder,
     filterQueryBuilderProps,
+    /**
+     * Filter value pick lists for custom UIs (string unique values + pivot date
+     * buckets). Same string data as `filterQueryBuilderProps.getValues`; not
+     * wired into react-querybuilder unless you use it yourself.
+     */
+    filterOptions,
     /** True while `report-builder-unique-values` runs for filter value options (not chart/table load). */
     filterUniqueValuesLoading,
     limit,
@@ -68105,11 +68341,11 @@ function Chat({
     setIsLoading(false);
   };
   const submitDefaultMessage = async (nextMessages, abortController) => {
-    const clientId = client.clientId ?? client.publicKey;
+    const clientId = client.id;
     let responseBuffer = "";
     for await (const chunk of quillStream({
       client: {
-        clientId,
+        id: clientId,
         queryEndpoint: client.queryEndpoint,
         streamEndpoint: client.streamEndpoint,
         queryHeaders: client.queryHeaders,
@@ -68193,12 +68429,12 @@ function Chat({
     }
   };
   const submitAgentMessage = async (nextMessages, abortController) => {
-    const clientId = client.clientId ?? client.publicKey;
+    const clientId = client.id;
     let updatedMessages = [...nextMessages];
     for await (const event of quillAgentStream({
       endpoint: `${agentEndpoint}/agent/chat`,
       messages: updatedMessages,
-      sourceClientId: clientId,
+      sourceClientId: clientId ?? "<unknown>",
       getToken,
       abortSignal: abortController.signal
     })) {
@@ -68266,7 +68502,7 @@ function Chat({
     setIsLoading(true);
     const abortController = new AbortController();
     abortControllerRef.current = abortController;
-    const clientId = client.clientId ?? client.publicKey;
+    const clientId = client.id;
     if (!clientId) {
       setInputError("No client selected.");
       setIsLoading(false);
@@ -68563,7 +68799,9 @@ var committedFiltersSignature = (committed) => {
 };
 function useReportFilterDraft(args) {
   const { reportId, committedFilters, queryBuilderProps, setFilters } = args;
-  const committed = isQueryBuilderDisplayGroup(committedFilters) ? committedFilters : EMPTY_COMMITTED_FILTERS;
+  const committed = queryBuilderFiltersForEditor(
+    isQueryBuilderDisplayGroup(committedFilters) ? committedFilters : EMPTY_COMMITTED_FILTERS
+  );
   const committedRef = (0, import_react64.useRef)(committed);
   committedRef.current = committed;
   const setFiltersRef = (0, import_react64.useRef)(setFilters);
@@ -68618,6 +68856,12 @@ function useReportFilterDraft(args) {
     setHasUnappliedFilterChanges(false);
     setResetEpoch((epoch) => epoch + 1);
   }, []);
+  const getDefaultField = (0, import_react64.useCallback)((fields) => {
+    const stringField = fields.find(
+      (field) => field.quillFieldType === "string" && String(field.name ?? "").trim()
+    );
+    return stringField?.name ?? fields[0]?.name ?? "";
+  }, []);
   const getDefaultValue = (0, import_react64.useCallback)(
     (rule) => defaultFilterRuleValueForOperator(rule?.operator),
     []
@@ -68628,9 +68872,12 @@ function useReportFilterDraft(args) {
       fields: effectiveFields,
       // Uncontrolled: react-querybuilder owns the draft; only read at mount,
       // while state keeps the next mount hydrated from the latest edits.
-      defaultQuery: draftQuery,
+      // Empty draft: omit defaultQuery so addRuleToNewGroups seeds a root rule
+      // (RQB ignores auto-add when defaultQuery.rules is []).
+      ...draftQuery.rules.length > 0 ? { defaultQuery: draftQuery } : {},
       onQueryChange: handleQueryChange,
       addRuleToNewGroups: true,
+      getDefaultField,
       getDefaultValue
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps -- filterDraftKey covers draftRef resets
@@ -68639,6 +68886,7 @@ function useReportFilterDraft(args) {
       effectiveFields,
       draftQuery,
       handleQueryChange,
+      getDefaultField,
       getDefaultValue,
       filterDraftKey
     ]
@@ -69522,7 +69770,7 @@ var useVirtualTables = () => {
     };
   };
   const handleRefreshSome = async (client, tables) => {
-    if (!client.clientId) return schemaData;
+    if (!client.id) return schemaData;
     setLoadingTables({
       ...loadingTables,
       ...tables.reduce((acc, table) => {
@@ -69540,7 +69788,7 @@ var useVirtualTables = () => {
             name: table.name,
             customFieldInfo: table.customFieldInfo,
             id: table._id,
-            clientId: client.clientId,
+            clientId: client.id,
             runQueryConfig: { getColumns: true },
             databaseType: client.databaseType,
             useNewNodeSql: true
@@ -69688,11 +69936,12 @@ var useChangelogRefresh = () => {
       reportsDispatch({ type: "DELETE_REPORT", id: reportId });
       dashboardDispatch({ type: "REMOVE_DASHBOARD_ITEM", id: reportId });
     }
-    const finalDashboardSet = reloadAllDashboards ? new Set(
-      Object.keys(dashboardConfig).filter(
+    const finalDashboardSet = reloadAllDashboards ? /* @__PURE__ */ new Set([
+      ...Object.keys(dashboardConfig).filter(
         (d) => !dashboardsToRemove.has(d)
-      )
-    ) : dashboardsToReload;
+      ),
+      ...dashboardsToReload
+    ]) : dashboardsToReload;
     const tasks = [];
     const schemaIdsToReload = schemaIds.filter(
       (id) => !schemaIdsToRemove.has(id)
@@ -69808,6 +70057,7 @@ init_constants();
   isQueryBuilderDisplayRule,
   normalizeRelativeDateRules,
   prepareQueryBuilderFiltersForSet,
+  queryBuilderFiltersForEditor,
   quillFetch,
   stripQueryBuilderTransientFields,
   tableColumnFormatFromUiSelection,