@quillsql/react 2.16.45 → 2.16.47

package/dist/index.cjs

@@ -15083,7 +15083,7 @@ function getDateString(value, dateRange, dateBucket, databaseType) {
   });
 }
 function isDateField(fieldType) {
-  return fieldType === "date" || fieldType === "datetime" || fieldType === "timestamp" || fieldType === "timestamptz" || fieldType === "MMM_yyyy" || fieldType === "MMM_dd" || fieldType === "MMM_dd_yyyy" || fieldType === "MMM_dd_hh:mm_ap_pm" || fieldType === "hh_ap_pm";
+  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";
 }
 var import_date_fns5;
 var init_dates = __esm({
@@ -15116,11 +15116,11 @@ function isValidPivot(pivot) {
       reason: 'Value field cannot be empty when aggregation is not "count" or "percentage"'
     };
   } else if (pivot.aggregations?.some(
-    (a) => a.aggregationType === "percentage" && !a.valueField && (!pivot.rowField || pivot.columnField)
+    (a) => a.aggregationType === "percentage" && !a.valueField && !pivot.rowField
   )) {
     return {
       valid: false,
-      reason: "Empty percentage field only supported for pivot tables with a row field and no column field"
+      reason: "Empty percentage field only supported for pivot tables with a row field"
     };
   }
   return { valid: true, reason: "" };
@@ -16403,7 +16403,7 @@ function formatAggregationTypeForDisplay(aggregationType) {
     case "max":
       return "Max";
     case "percentage":
-      return "Percentage";
+      return "Percent";
     default:
       return aggregationType ? capitalize(String(aggregationType)) : "Value";
   }
@@ -16445,6 +16445,21 @@ function getDefaultPivotMeasureLabel(report) {
     return pivot.columnField ? "Count" : `Count ${snakeAndCamelCaseToTitleCase(tableNames[0] ?? "table")}`;
   }
   const target = valueField !== void 0 && String(valueField).trim() ? resolveValueFieldDisplayLabel(report, valueField) : tableNames.length > 0 ? tableNames.map((n) => snakeAndCamelCaseToTitleCase(n)).join(", ") : "table";
+  if (aggregationType.toLowerCase() === "percentage") {
+    const valueField2 = String(
+      fromAggregations?.valueField2 ?? ""
+    ).trim();
+    if (valueField && valueField2) {
+      return `Percent ${target} of ${resolveValueFieldDisplayLabel(report, valueField2)}`;
+    }
+    const valueFieldType = String(
+      fromAggregations?.valueFieldType ?? ""
+    ).trim().toLowerCase();
+    if (valueField && valueFieldType === "bool") {
+      return `Percent ${target}`;
+    }
+    return `Percent of Total ${target}`;
+  }
   return target ? `${aggWord} ${target}` : aggWord;
 }
 function humanizeLegacyPivotMeasureLabelFragment(text) {
@@ -16452,7 +16467,10 @@ function humanizeLegacyPivotMeasureLabelFragment(text) {
   if (!t) return t;
   const m = t.match(LEGACY_AGG_SNAKE_FIELD);
   if (!m) return t;
-  return `${formatAggregationTypeForDisplay(m[1])} ${snakeAndCamelCaseToTitleCase(m[2])}`;
+  if (String(m[1]).toLowerCase() === "percentage") {
+    return `Percent of Total ${snakeAndCamelCaseToTitleCase(m[2] ?? "")}`;
+  }
+  return `${formatAggregationTypeForDisplay(m[1])} ${snakeAndCamelCaseToTitleCase(m[2] ?? "")}`;
 }
 function humanizeChartSeriesTooltipLabel(label) {
   const s = String(label ?? "").trim();
@@ -19928,6 +19946,27 @@ 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(
@@ -20413,7 +20452,7 @@ async function fetchRelevantInfoFromState(reportBuilderState, tables, columns, a
     return { error: error.message };
   }
 }
-var quillFetch, parseFetchResponse;
+var QUILL_FETCH_DEBUG_FLAGS, quillFetchDebugSeq, logQuillFetchDebug, quillFetch, parseFetchResponse;
 var init_dataFetcher = __esm({
   "src/utils/dataFetcher.tsx"() {
     "use strict";
@@ -20422,6 +20461,16 @@ 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,
@@ -20432,7 +20481,24 @@ 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 {
@@ -20464,6 +20530,17 @@ 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,
@@ -20472,8 +20549,19 @@ 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);
         }
@@ -21498,6 +21586,7 @@ var numberFormatOptions = [
   "percentage"
 ];
 var dateFormatOptions = [
+  "yyyy",
   "MMM_yyyy",
   "MMM_dd",
   "MMM_dd_yyyy",
@@ -21515,6 +21604,7 @@ var NUMBER_OPTIONS = [
   { value: "percent", label: "percentage" }
 ];
 var DATE_OPTIONS = [
+  { value: "yyyy", label: "year" },
   { value: "MMM_yyyy", label: "month" },
   { value: "MMM_dd", label: "day" },
   { value: "MMM_dd_yyyy", label: "day and year" },
@@ -21902,6 +21992,7 @@ function buildPivotOnlyReportFromResponse({
       rows: rawPivotRows,
       fields: rawPivotFields,
       pivot: effectivePivot,
+      ...effectivePivot.dateBucket ? { dateBucket: effectivePivot.dateBucket } : {},
       client,
       rowCount: typeof response?.rowCount === "number" ? response.rowCount : void 0
     });
@@ -58804,7 +58895,9 @@ var filterTreeToQueryEntry = (node) => {
   };
 };
 var queryRuleToInternalFilter = (rule, fieldConfigByName) => {
-  const config = fieldConfigByName[rule.field];
+  const ruleTableName = String(rule.table ?? "").trim();
+  const tableQualifiedConfig = ruleTableName && rule.field && !rule.field.includes(".") ? fieldConfigByName[`${ruleTableName}.${rule.field}`] : void 0;
+  const config = tableQualifiedConfig ?? fieldConfigByName[rule.field];
   if (!config?.fieldType) {
     throw new Error(
       `Missing field type config for "${rule.field}". Add it to fieldConfigByName.`
@@ -59772,7 +59865,8 @@ var AGGREGATION_OPTION_TYPES = [
   "average",
   "count",
   "max",
-  "min"
+  "min",
+  "percentage"
 ];
 var QUERY_BUILDER_MULTI_VALUE_OPERATORS = /* @__PURE__ */ new Set(["in", "notin"]);
 var TABLE_FORMAT_CACHE_MAX_ENTRIES = 5e3;
@@ -60262,9 +60356,31 @@ function buildPivotAggregationsWithFieldTables({
       schemaTables,
       preferredTables
     }) || void 0;
+    const isPercentageAggregation = String(aggregation.aggregationType ?? "").toLowerCase() === "percentage";
+    const typeFallbackColumns = [
+      ...sourceReport?.columnInternal ?? sourceReport?.columns ?? []
+    ];
+    const valueFieldType = String(
+      aggregation.valueFieldType ?? ""
+    ).trim() || (isPercentageAggregation ? resolveFieldType({
+      field: aggregation.valueField,
+      table: valueFieldTable,
+      schemaTables,
+      fallbackColumns: typeFallbackColumns
+    }) : void 0);
+    const valueField2Type = String(
+      aggregation.valueField2Type ?? ""
+    ).trim() || (isPercentageAggregation ? resolveFieldType({
+      field: aggregation.valueField2,
+      table: valueFieldTable,
+      schemaTables,
+      fallbackColumns: typeFallbackColumns
+    }) : void 0);
     result.push({
       ...aggregationWithoutPivotTables,
       aggregationType: aggregation.aggregationType,
+      ...valueFieldType ? { valueFieldType } : {},
+      ...valueField2Type ? { valueField2Type } : {},
       ...valueFieldTable ? { valueFieldTable } : {}
     });
   }
@@ -60308,8 +60424,9 @@ function getPivotAggregationSortFields(aggregationState, resolvedColumnField) {
     const aggregationType = String(aggregation.aggregationType ?? "").trim();
     if (!aggregationType) continue;
     const valueField = String(aggregation.valueField ?? "").trim();
-    const canonicalBaseField = valueField || "count";
-    const sortField = hasMultipleAggregations && aggregationType.toLowerCase() !== "count" ? `${canonicalBaseField}_${aggregationType}` : canonicalBaseField;
+    const isValuelessPercentage = !valueField && aggregationType.toLowerCase() === "percentage";
+    const canonicalBaseField = valueField || (isValuelessPercentage ? "percentage" : "count");
+    const sortField = isValuelessPercentage ? "percentage" : hasMultipleAggregations && aggregationType.toLowerCase() !== "count" ? `${canonicalBaseField}_${aggregationType}` : canonicalBaseField;
     if (!seen.has(sortField)) {
       seen.add(sortField);
       fields.push(sortField);
@@ -60328,8 +60445,9 @@ function getPivotAggregationSortLabelOverrides(aggregationState, aggregationTabl
     const aggregationType = String(aggregation.aggregationType ?? "").trim();
     if (!aggregationType) continue;
     const valueField = String(aggregation.valueField ?? "").trim();
-    const canonicalBaseField = valueField || "count";
-    const sortField = hasMultipleAggregations && aggregationType.toLowerCase() !== "count" ? `${canonicalBaseField}_${aggregationType}` : canonicalBaseField;
+    const isValuelessPercentage = !valueField && aggregationType.toLowerCase() === "percentage";
+    const canonicalBaseField = valueField || (isValuelessPercentage ? "percentage" : "count");
+    const sortField = isValuelessPercentage ? "percentage" : hasMultipleAggregations && aggregationType.toLowerCase() !== "count" ? `${canonicalBaseField}_${aggregationType}` : canonicalBaseField;
     if (labelBySortField.has(sortField)) continue;
     if (valueField || aggregationType.toLowerCase() !== "count") continue;
     const tableHint = String(aggregationTablesByIndex[index] ?? "").trim();
@@ -60483,6 +60601,9 @@ function trimAggregationSuffix(value, aggregationType) {
 }
 function getAggregationFieldKey(aggregation, hasMultipleAggregations) {
   if (!aggregation.aggregationType) return null;
+  if (!aggregation.valueField && aggregation.aggregationType === "percentage") {
+    return "percentage";
+  }
   if (aggregation.valueField) {
     return hasMultipleAggregations ? `${aggregation.valueField}_${aggregation.aggregationType}` : aggregation.valueField;
   }
@@ -60603,6 +60724,22 @@ function buildAggregationLabel(aggregation, report) {
   }
   const rawTarget = aggregation.valueField ?? (tableNames.length > 0 ? tableNames.join(", ") : "table");
   const target = report ? aggregation.valueField ? resolveValueFieldDisplayLabel(report, aggregation.valueField) : rawTarget : rawTarget;
+  if (String(aggregationType).toLowerCase() === "percentage") {
+    const valueField2 = String(
+      aggregation.valueField2 ?? ""
+    ).trim();
+    if (aggregation.valueField && valueField2) {
+      const denominator = report ? resolveValueFieldDisplayLabel(report, valueField2) : valueField2;
+      return `Percent ${target} of ${denominator}`;
+    }
+    const valueFieldType = String(
+      aggregation.valueFieldType ?? ""
+    ).trim().toLowerCase();
+    if (aggregation.valueField && valueFieldType === "bool") {
+      return `Percent ${target}`;
+    }
+    return `Percent of Total ${target}`;
+  }
   return target ? `${aggWord} ${target}` : aggWord;
 }
 function normalizePivotColumnDisplayValue(value) {
@@ -60643,6 +60780,16 @@ function isPivotTableDateBucketRowAxis(chart, xAxisField) {
   if (!rowField || xf !== rowField) return false;
   return isDateType(String(chart.pivot.rowFieldType ?? ""));
 }
+var RESOLVABLE_X_AXIS_DATE_BUCKETS = /* @__PURE__ */ new Set(["year", "month", "day"]);
+function resolvePivotDateBucketXAxisFormat(chart, xAxisField) {
+  if (String(chart?.chartType ?? "").toLowerCase() === "table") return null;
+  const dateBucket = String(chart?.pivot?.dateBucket ?? "").trim().toLowerCase();
+  if (!RESOLVABLE_X_AXIS_DATE_BUCKETS.has(dateBucket)) return null;
+  const rowField = String(chart?.pivot?.rowField ?? "").trim();
+  if (!rowField || String(xAxisField ?? "").trim() !== rowField) return null;
+  if (!isDateType(String(chart?.pivot?.rowFieldType ?? ""))) return null;
+  return getDateFormatFromBucket(dateBucket);
+}
 function chartDetailRowsMissingPivotRowBucket(chart) {
   if (!chart?.pivot) return false;
   const rowField = String(chart.pivot.rowField ?? "").trim();
@@ -60863,6 +61010,9 @@ function normalizePivotChartForDisplay(chart) {
     withResolvedXAxis.pivot?.rowFieldType ?? ""
   ).trim();
   const pivotDateRowMonthLabelRe = /^[A-Z][a-z]{2} \d{4}$/;
+  const pivotDisplayDateFormat = getDateFormatFromBucket(
+    String(withResolvedXAxis.pivot?.dateBucket ?? "").trim()
+  );
   let displayRows = Array.isArray(
     withResolvedXAxis.rows
   ) ? withResolvedXAxis.rows : [];
@@ -60881,7 +61031,7 @@ function normalizePivotChartForDisplay(chart) {
       }
       const formatted = quillFormat({
         value: raw,
-        format: "MMM_yyyy"
+        format: pivotDisplayDateFormat
       });
       if (!formatted || !String(formatted).trim()) {
         return row;
@@ -61925,7 +62075,8 @@ function processPivotState(next, options = {}) {
   const {
     nextState,
     promoteColumnToRow = false,
-    fallbackColumnGroupBy
+    fallbackColumnGroupBy,
+    isBoolAggregationField
   } = options;
   const normalizedNext = { ...next };
   const isClearingRowGrouping = nextState?.groupRowsBy !== void 0 && String(nextState.groupRowsBy ?? "").trim().length === 0;
@@ -61968,6 +62119,29 @@ function processPivotState(next, options = {}) {
     normalizedNext.aggregationState = [{ aggregationType: "count" }];
     normalizedNext.aggregationTablesByIndex = [void 0];
   }
+  if (!resolvedRowField) {
+    normalizedNext.aggregationState = normalizedNext.aggregationState.map(
+      (aggregation, index) => {
+        if (String(aggregation.aggregationType ?? "").toLowerCase() !== "percentage") {
+          return aggregation;
+        }
+        const valueField = String(aggregation.valueField ?? "").trim();
+        if (!valueField) {
+          return { ...aggregation, aggregationType: "count" };
+        }
+        const valueField2 = String(aggregation.valueField2 ?? "").trim();
+        if (valueField2 && valueField2 !== valueField) {
+          return aggregation;
+        }
+        const table = String(aggregation.valueFieldTable ?? "").trim() || String(normalizedNext.aggregationTablesByIndex[index] ?? "").trim() || void 0;
+        const isBool = isBoolAggregationField?.(valueField, table);
+        if (isBool === false) {
+          return { ...aggregation, aggregationType: "sum" };
+        }
+        return aggregation;
+      }
+    );
+  }
   if (isSettingRowGrouping && normalizedNext.aggregationState.length > 0) {
     normalizedNext.aggregationState = [...normalizedNext.aggregationState];
   }
@@ -63222,6 +63396,19 @@ function useReport(reportIdArg, options = {}) {
   const customFieldsRef = (0, import_react62.useRef)(schemaData.customFields);
   schemaForReportBuilderStateRef.current = schemaForReportBuilderState;
   customFieldsRef.current = schemaData.customFields;
+  const isBoolAggregationField = (0, import_react62.useCallback)(
+    (field, table2) => {
+      const fieldType = resolveFieldType({
+        field,
+        table: table2,
+        schemaTables: schemaForReportBuilderStateRef.current
+      });
+      if (!fieldType) return void 0;
+      const normalized = String(fieldType).trim().toLowerCase();
+      return isBoolType(normalized) || normalized === "boolean";
+    },
+    []
+  );
   const schemaForeignKeyMap = (0, import_react62.useMemo)(
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
@@ -64129,9 +64316,10 @@ function useReport(reportIdArg, options = {}) {
     const explicitTable = getPivotGroupOptionTable(targetRaw);
     const field = explicitTable ? decodePivotGroupOptionValue(targetRaw) : targetRaw;
     if (!field) return {};
+    const fieldForTableResolution = field.includes(":") ? String(field.split(":")[0] ?? "").trim() : field;
     const table2 = explicitTable ?? optionTableLookup.get(rawValue) ?? resolveFieldTable({
       report: sourceReport,
-      field,
+      field: fieldForTableResolution,
       schemaTables: schemaForReportBuilderState,
       preferredTables
     }) ?? void 0;
@@ -64146,7 +64334,19 @@ function useReport(reportIdArg, options = {}) {
     if (target === "table") {
       return table2 ? { table: table2 } : preferredTables[0] ? { table: preferredTables[0] } : {};
     }
-    if (aggregationType !== "count") {
+    if (aggregationType === "percentage" && target.includes(":")) {
+      const [numeratorRaw, denominatorRaw] = target.split(":");
+      const numerator = String(numeratorRaw ?? "").trim();
+      const denominator = String(denominatorRaw ?? "").trim();
+      if (numerator && denominator) {
+        return {
+          valueField: numerator,
+          valueField2: denominator,
+          ...table2 ? { table: table2 } : {}
+        };
+      }
+    }
+    if (aggregationType !== "count" && aggregationType !== "percentage") {
       return {
         valueField: target,
         ...table2 ? { table: table2 } : {}
@@ -64330,7 +64530,9 @@ function useReport(reportIdArg, options = {}) {
         const pivotAggregationsFromSource = Array.isArray(sourceReport.pivot?.aggregations) ? sourceReport.pivot.aggregations : sourceReport.pivot?.aggregationType ? [
           {
             valueField: sourceReport.pivot?.valueField,
+            valueFieldType: sourceReport.pivot?.valueFieldType,
             valueField2: sourceReport.pivot?.valueField2,
+            valueField2Type: sourceReport.pivot?.valueField2Type,
             aggregationType: sourceReport.pivot?.aggregationType
           }
         ] : [];
@@ -64415,7 +64617,8 @@ function useReport(reportIdArg, options = {}) {
           chartType: prev.chartType ?? sourceReport.chartType
         };
         const normalized = processPivotState(nextFromSource, {
-          promoteColumnToRow: shouldPromoteColumnToRowFromPendingFlag
+          promoteColumnToRow: shouldPromoteColumnToRowFromPendingFlag,
+          isBoolAggregationField
         });
         return normalized;
       }
@@ -64598,6 +64801,19 @@ 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;
     };
   }, [
@@ -64617,7 +64833,9 @@ function useReport(reportIdArg, options = {}) {
         }
         if (entry && typeof entry === "object" && "field" in entry) {
           const previousFieldName = String(entry.field ?? "").trim();
-          const nextFieldName = normalizeQueryBuilderFieldNameForConfig(previousFieldName);
+          const ruleTableName = String(entry.table ?? "").trim();
+          const tableQualifiedKey = ruleTableName && previousFieldName && !previousFieldName.includes(".") ? `${ruleTableName}.${previousFieldName}` : "";
+          const nextFieldName = tableQualifiedKey && queryBuilderFieldConfigByName[tableQualifiedKey] ? tableQualifiedKey : normalizeQueryBuilderFieldNameForConfig(previousFieldName);
           if (!nextFieldName || nextFieldName === previousFieldName) {
             return entry;
           }
@@ -64639,7 +64857,7 @@ function useReport(reportIdArg, options = {}) {
       }
       return normalizeGroup(group);
     };
-  }, [normalizeQueryBuilderFieldNameForConfig]);
+  }, [normalizeQueryBuilderFieldNameForConfig, queryBuilderFieldConfigByName]);
   const refreshSelectionTables = (0, import_react62.useMemo)(() => {
     return [
       getPivotGroupOptionTable(groupRowsBy),
@@ -64740,6 +64958,10 @@ function useReport(reportIdArg, options = {}) {
         aggregation.valueField,
         aggregationTablesByIndex[index]
       );
+      appendPivotColumn(
+        aggregation.valueField2,
+        aggregationTablesByIndex[index]
+      );
     });
     const joinColumns = getJoinColumnsFromTables(effectiveReportBuilderTables);
     const useWideTableColumns = expandReportBuilderColumnsForFlatTable && !pivotState && String(chartType ?? "").toLowerCase() === "table";
@@ -65069,9 +65291,13 @@ function useReport(reportIdArg, options = {}) {
       const aggregationType = String(aggregation.aggregationType);
       const normalizedAggregationType = aggregationType.toLowerCase();
       const tableHint = String(aggregationTablesByIndex[index] ?? "").trim();
-      const target = aggregation.valueField && aggregation.valueField.trim().length > 0 ? aggregation.valueField : normalizedAggregationType === "count" ? tableHint || aggregationFallbackTableName : aggregationFallbackTarget;
+      const valueField = String(aggregation.valueField ?? "").trim();
+      const valueField2 = String(aggregation.valueField2 ?? "").trim();
+      const isPercentageRatio = normalizedAggregationType === "percentage" && Boolean(valueField) && Boolean(valueField2);
+      const target = isPercentageRatio ? `${valueField}:${valueField2}` : valueField ? valueField : normalizedAggregationType === "count" || normalizedAggregationType === "percentage" ? tableHint || aggregationFallbackTableName : aggregationFallbackTarget;
+      const isBoolPercentage = normalizedAggregationType === "percentage" && Boolean(valueField) && isBoolAggregationField(valueField, tableHint || void 0) === true;
       return {
-        label: `${formatAggregationTypeForDisplay(aggregationType)} ${toTitleCaseLabel(target)}`,
+        label: isPercentageRatio ? `Percent ${toTitleCaseLabel(valueField)} of ${toTitleCaseLabel(valueField2)}` : normalizedAggregationType === "percentage" ? isBoolPercentage ? `Percent ${toTitleCaseLabel(target)}` : `Percent of Total ${toTitleCaseLabel(target)}` : `${formatAggregationTypeForDisplay(aggregationType)} ${toTitleCaseLabel(target)}`,
         value: `${aggregationType}:${target}`
       };
     });
@@ -65079,7 +65305,8 @@ function useReport(reportIdArg, options = {}) {
     aggregationFallbackTableName,
     aggregationFallbackTarget,
     aggregationState,
-    aggregationTablesByIndex
+    aggregationTablesByIndex,
+    isBoolAggregationField
   ]);
   const { aggregationBaseOptions, aggregationOptionTableLookup } = (0, import_react62.useMemo)(() => {
     const joinScoped = fieldOptionsAllowedTableNames ? joinCompatibleSchemaTableNames.filter(
@@ -65105,17 +65332,34 @@ function useReport(reportIdArg, options = {}) {
       if (tableName && !tableLookup.has(countValue)) {
         tableLookup.set(countValue, tableName);
       }
+      if (resolvedGroupRowsBy) {
+        const percentageValue = `percentage:${countTarget}`;
+        if (!seen.has(percentageValue)) {
+          options2.push({
+            value: percentageValue,
+            label: `Percent of Total ${toTitleCaseLabel(countTarget)}`
+          });
+          seen.add(percentageValue);
+        }
+        if (tableName && !tableLookup.has(percentageValue)) {
+          tableLookup.set(percentageValue, tableName);
+        }
+      }
       for (const column of table2.columns ?? []) {
         const fieldName = String(column.field ?? "").trim();
         if (!fieldName) continue;
+        const isBoolColumn = isBoolType(String(column.fieldType ?? "").toLowerCase()) || String(column.jsType ?? "").toLowerCase() === "boolean";
         for (const aggregationType of AGGREGATION_OPTION_TYPES) {
           if (aggregationType === "count") continue;
           if (!canAggregateColumn(column, aggregationType)) continue;
+          const isNumberSharePercentage = aggregationType === "percentage" && !isBoolColumn;
+          if (isNumberSharePercentage && !resolvedGroupRowsBy) continue;
           const value = `${aggregationType}:${fieldName}`;
           if (seen.has(value)) continue;
+          const aggregationWord = aggregationType === "percentage" ? isBoolColumn ? "Percent" : "Percent of Total" : formatAggregationTypeForDisplay(aggregationType);
           options2.push({
             value,
-            label: tableName ? `${formatAggregationTypeForDisplay(aggregationType)} ${toTitleCaseLabel(tableName)} ${toTitleCaseLabel(fieldName)}` : `${formatAggregationTypeForDisplay(aggregationType)} ${toTitleCaseLabel(fieldName)}`
+            label: tableName ? `${aggregationWord} ${toTitleCaseLabel(tableName)} ${toTitleCaseLabel(fieldName)}` : `${aggregationWord} ${toTitleCaseLabel(fieldName)}`
           });
           seen.add(value);
           if (tableName && !tableLookup.has(value)) {
@@ -65138,6 +65382,7 @@ function useReport(reportIdArg, options = {}) {
     cleanedAggregations,
     fieldOptionsAllowedTableNames,
     joinCompatibleSchemaTableNames,
+    resolvedGroupRowsBy,
     schemaForReportBuilderState
   ]);
   const { schemaColumnOptions, columnIdentifierLookup } = (0, import_react62.useMemo)(() => {
@@ -65380,9 +65625,13 @@ function useReport(reportIdArg, options = {}) {
         aggregation.aggregationType ?? ""
       ).toLowerCase();
       const tableHint = String(aggregationTablesByIndex[index] ?? "").trim();
-      const currentTarget = aggregation.valueField && aggregation.valueField.trim().length > 0 ? aggregation.valueField : normalizedAggregationType === "count" ? tableHint || aggregationFallbackTableName : aggregationFallbackTarget;
+      const currentValueField = String(aggregation.valueField ?? "").trim();
+      const currentValueField2 = String(aggregation.valueField2 ?? "").trim();
+      const isPercentageRatio = normalizedAggregationType === "percentage" && Boolean(currentValueField) && Boolean(currentValueField2);
+      const currentTarget = isPercentageRatio ? `${currentValueField}:${currentValueField2}` : currentValueField ? currentValueField : normalizedAggregationType === "count" || normalizedAggregationType === "percentage" ? tableHint || aggregationFallbackTableName : aggregationFallbackTarget;
       const currentValue = aggregation.aggregationType ? `${aggregation.aggregationType}:${currentTarget}` : void 0;
-      const currentLabel = aggregation.aggregationType ? `${formatAggregationTypeForDisplay(aggregation.aggregationType)} ${toTitleCaseLabel(currentTarget)}` : "Select aggregation";
+      const isBoolPercentage = normalizedAggregationType === "percentage" && Boolean(currentValueField) && isBoolAggregationField(currentValueField, tableHint || void 0) === true;
+      const currentLabel = aggregation.aggregationType ? isPercentageRatio ? `Percent ${toTitleCaseLabel(currentValueField)} of ${toTitleCaseLabel(currentValueField2)}` : normalizedAggregationType === "percentage" ? isBoolPercentage ? `Percent ${toTitleCaseLabel(currentTarget)}` : `Percent of Total ${toTitleCaseLabel(currentTarget)}` : `${formatAggregationTypeForDisplay(aggregation.aggregationType)} ${toTitleCaseLabel(currentTarget)}` : "Select aggregation";
       const options2 = currentValue ? baseOptions.some((option) => option.value === currentValue) ? baseOptions : [{ value: currentValue, label: currentLabel }, ...baseOptions] : baseOptions;
       return {
         key: `aggregation-${index}`,
@@ -65396,7 +65645,8 @@ function useReport(reportIdArg, options = {}) {
     aggregationFallbackTarget,
     aggregationState,
     aggregationBaseOptions,
-    aggregationTablesByIndex
+    aggregationTablesByIndex,
+    isBoolAggregationField
   ]);
   const nextPivot = (0, import_react62.useMemo)(() => {
     if (!sourceReport) return null;
@@ -65981,6 +66231,15 @@ function useReport(reportIdArg, options = {}) {
       chartAxisOptionByField.get(resolvedXAxisField)?.format ?? chartAxesBaseChart.xAxisFormat ?? resolvedYAxisFields[0]?.format,
       "string"
     );
+    if (defaultFormat === "string") {
+      const bucketFormat = resolvePivotDateBucketXAxisFormat(
+        chartAxesBaseChart,
+        resolvedXAxisField
+      );
+      if (bucketFormat) {
+        defaultFormat = bucketFormat;
+      }
+    }
     if (isPivotTableDateBucketRowAxis(chartAxesBaseChart, resolvedXAxisField) && chartAxisEdits.xAxisFormat === void 0) {
       defaultFormat = "string";
     }
@@ -67160,10 +67419,12 @@ function useReport(reportIdArg, options = {}) {
                   preferredTables
                 );
                 const existing = next.aggregationState[index];
+                const preservedValueField2 = aggregationType !== "percentage" && existing?.valueField2 ? { valueField2: existing.valueField2 } : {};
                 const nextAggregation = {
-                  ...existing?.valueField2 ? { valueField2: existing.valueField2 } : {},
+                  ...preservedValueField2,
                   aggregationType,
                   ...normalizedSelection.valueField ? { valueField: normalizedSelection.valueField } : {},
+                  ...normalizedSelection.valueField2 ? { valueField2: normalizedSelection.valueField2 } : {},
                   ...normalizedSelection.table ? { valueFieldTable: normalizedSelection.table } : {}
                 };
                 if (index === next.aggregationState.length) {
@@ -67200,6 +67461,7 @@ function useReport(reportIdArg, options = {}) {
                 {
                   aggregationType,
                   ...normalizedSelection.valueField ? { valueField: normalizedSelection.valueField } : {},
+                  ...normalizedSelection.valueField2 ? { valueField2: normalizedSelection.valueField2 } : {},
                   ...normalizedSelection.table ? { valueFieldTable: normalizedSelection.table } : {}
                 }
               ];
@@ -67324,7 +67586,8 @@ function useReport(reportIdArg, options = {}) {
           next.chartType = effectiveNextState.chartType || void 0;
         const normalizedNext = processPivotState(next, {
           nextState: effectiveNextState,
-          promoteColumnToRow: false
+          promoteColumnToRow: false,
+          isBoolAggregationField
         });
         return normalizedNext;
       }
@@ -67475,6 +67738,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 ?? {})
+        });
+      }
     }
   };
   const filterDraft = useReportFilterDraft({