@quillsql/react 2.16.92 → 2.16.94

package/dist/index.cjs

@@ -103,7 +103,7 @@ function formatIdentifierLabel(str) {
   if (hasUnderscore || hasCamelCaseBoundary) {
     return snakeAndCamelCaseToTitleCase(str);
   }
-  return str;
+  return str.split(/\s+/).map((word) => word === "id" ? "ID" : capitalize(word)).join(" ");
 }
 function removeDoubleQuotes(str) {
   if (!str) {
@@ -137,13 +137,14 @@ function getValidDate(dateString) {
   const dates = FORMATS.map((fmt) => (0, import_date_fns.parse)(dateString, fmt, /* @__PURE__ */ new Date()));
   return dates.find((date) => (0, import_date_fns.isValid)(date));
 }
-var import_date_fns, import_date_fns_tz, DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES, valueFormatter, quillFormat, quillAutoFormat, formatString, formatterDollar, formatDollarAmount, formatterCentsDollar, formatDollarCents, wholeNumberFormatter, formatWholeNumber, formatOneDecimalPlace, formatterTwoDecimalPlaces, formatTwoDecimalPlaces, formatterPercent, formatPercent, _getUTCDateHelper, format_YYYY, format_MMM_yyyy, format_hh_ap_pm, format_MMM_d, format_MMM_dd_yyyy, format_MMM_d_MMM_d, format_MMM_dd_hh_mm_ap_pm, format_wo_yyyy, localeFormatter, FORMATS, compareValues;
+var import_date_fns, import_date_fns_tz, DATE_OUTSIDE_RANGE, DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES, valueFormatter, quillFormat, quillAutoFormat, formatString, formatterDollar, formatDollarAmount, formatterCentsDollar, formatDollarCents, wholeNumberFormatter, formatWholeNumber, formatOneDecimalPlace, formatterTwoDecimalPlaces, formatTwoDecimalPlaces, formatterPercent, formatPercent, _getUTCDateHelper, format_YYYY, format_MMM_yyyy, format_hh_ap_pm, format_MMM_d, format_MMM_dd_yyyy, format_MMM_d_MMM_d, format_MMM_dd_hh_mm_ap_pm, format_wo_yyyy, localeFormatter, FORMATS, compareValues;
 var init_valueFormatter = __esm({
   "src/utils/valueFormatter.ts"() {
     "use strict";
     import_date_fns = require("date-fns");
     import_date_fns_tz = require("date-fns-tz");
     init_textProcessing();
+    DATE_OUTSIDE_RANGE = "Date outside range";
     DATE_FORMAT_TYPES = [
       "yyyy",
       "MMM_yyyy",
@@ -392,7 +393,7 @@ var init_valueFormatter = __esm({
             weekEnd = utcEnd;
           }
           if ((0, import_date_fns.isAfter)(weekStart, utcEnd) || (0, import_date_fns.isBefore)(weekEnd, utcStart)) {
-            return "Date outside range";
+            return DATE_OUTSIDE_RANGE;
           }
         }
       }
@@ -17287,7 +17288,7 @@ async function generatePivotWithSQL({
   );
   const responseRows = queryResponseRows;
   const responseFields = queryResponseFields;
-  const rows = resultRowField ? responseRows.map(
+  let rows = resultRowField ? responseRows.map(
     (row) => !row[resultRowField] ? { ...row, [resultRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
@@ -17326,24 +17327,21 @@ async function generatePivotWithSQL({
     return 0;
   });
   if (resultRowField && !isStringType(pivot.rowFieldType || "")) {
-    rows.forEach((row) => {
-      row.__quillRawDate = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
-      let value = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
-      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
-        const rowDate = new Date(value);
-        if (rowDate < dateFilter.startDate) {
-          value = dateFilter.startDate.toISOString();
-        } else if (rowDate > dateFilter.endDate) {
-          value = dateFilter.endDate.toISOString();
-        }
-      }
+    const dateRange = dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0;
+    rows = rows.filter((row) => {
+      const rawValue = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
+      row.__quillRawDate = rawValue;
       const dateString = getDateString(
-        value,
-        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        rawValue,
+        dateRange,
         dateBucket,
         databaseType
       );
+      if (dateBucket === "week" && dateRange && dateString === DATE_OUTSIDE_RANGE) {
+        return false;
+      }
       row[resultRowField] = dateString;
+      return true;
     });
     if (resultRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
       const dateSet = new Set(rows.map((row) => row[resultRowField]));
@@ -17508,7 +17506,7 @@ function processPivotData({
   const pivotRowField = processColumnName(
     String(resultRowField ?? pivot.rowField ?? "")
   );
-  const rows = pivotRowField ? responseRows.map(
+  let rows = pivotRowField ? responseRows.map(
     (row) => !row[pivotRowField] ? { ...row, [pivotRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
@@ -17547,24 +17545,21 @@ function processPivotData({
     return 0;
   });
   if (pivotRowField && !isStringType(pivot.rowFieldType || "")) {
-    rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
-      let value = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
-      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
-        const rowDate = new Date(value);
-        if (rowDate < dateFilter.startDate) {
-          value = dateFilter.startDate.toISOString();
-        } else if (rowDate > dateFilter.endDate) {
-          value = dateFilter.endDate.toISOString();
-        }
-      }
+    const dateRange = dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0;
+    rows = rows.filter((row) => {
+      const rawValue = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
+      row.__quillRawDate = rawValue;
       const dateString = getDateString(
-        value,
-        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        rawValue,
+        dateRange,
         dateBucket,
         databaseType
       );
+      if (dateBucket === "week" && dateRange && dateString === DATE_OUTSIDE_RANGE) {
+        return false;
+      }
       row[pivotRowField] = dateString;
+      return true;
     });
     if (pivotRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
       const dateSet = new Set(rows.map((row) => row[pivotRowField]));
@@ -17628,6 +17623,7 @@ var init_pivotConstructor = __esm({
     init_dataProcessing();
     init_dates();
     init_textProcessing();
+    init_valueFormatter();
   }
 });
 
@@ -22802,6 +22798,7 @@ init_columnProcessing();
 init_dataFetcher();
 init_dataProcessing();
 init_dates();
+init_columnType();
 init_paginationProcessing();
 init_pivotProcessing();
 init_tableProcessing();
@@ -23727,6 +23724,15 @@ function hasPreformattedDateBucketLabels(report) {
   if (report.chartType?.toLowerCase() === "table") return false;
   return report.xAxisField?.trim() === pivot.rowField?.trim();
 }
+function resolvePivotBucketXAxisFormat(report) {
+  const pivot = report.pivot;
+  if (!pivot?.dateBucket) return null;
+  if (report.chartType?.toLowerCase() === "table") return null;
+  const rowField = pivot.rowField?.trim();
+  if (!rowField || report.xAxisField?.trim() !== rowField) return null;
+  if (!isDateType(String(pivot.rowFieldType ?? ""))) return null;
+  return getDateFormatFromBucket(pivot.dateBucket);
+}
 function applySavedPivotColumnLabels(report, pivotColumns) {
   return pivotColumns?.map((column) => {
     const savedColumn = report.columns?.find(
@@ -23802,6 +23808,10 @@ function convertInternalReportToReport(report, dashboardFilters, eventTracking,
         ...extractAllReportValuesFromQuillInternalReport(formattedReport),
         ...pivotFormatted
       };
+      const bucketXAxisFormat = resolvePivotBucketXAxisFormat(pivotReport);
+      if (bucketXAxisFormat) {
+        pivotReport.xAxisFormat = bucketXAxisFormat;
+      }
       pivotReport.formattedBaseRows = formattedBaseRows;
       return applyChartSort(pivotReport);
     }
@@ -34074,9 +34084,8 @@ function RadarChart({
                         fields: [{ field: xAxisField, format: xAxisFormat }]
                       }),
                       valueFormatter: (value, name2) => {
-                        const field = payloadItems.find(
-                          (p) => p.dataKey === name2
-                        )?.dataKey;
+                        const payloadItem = payloadItems.find((p) => p.dataKey === name2) ?? payloadItems.find((p) => p.name === name2);
+                        const field = payloadItem?.dataKey;
                         if (!field) return value;
                         return valueFormatter({
                           value,
@@ -37573,7 +37582,8 @@ var useDashboards = () => {
         reports: Object.values(dashboard.config.sections ?? {}).flat(),
         tenantKeys: dashboard.config.tenantKeys,
         createdAt: dashboard.config.createdAt,
-        sectionOrder: dashboard.config.sectionOrder
+        sectionOrder: dashboard.config.sectionOrder,
+        hidden: dashboard.config.hidden
       };
     }).sort(
       (a, b) => (a.createdAt?.getTime() ?? 0) - (b.createdAt?.getTime() ?? 0)
@@ -46216,6 +46226,7 @@ var QuillProvider = ({
       isAdmin,
       getAuthorizationToken,
       eventTracking,
+      onChangelogs,
       children
     }
   ) });
@@ -63339,9 +63350,21 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   const firstPivotRow = (withResolvedXAxis.rows ?? []).find(
     (row) => Object.keys(row).length > 0
   );
-  const pivotRowFields = firstPivotRow ? Object.keys(firstPivotRow).filter(
-    (field) => !INTERNAL_PIVOT_ROW_FIELDS.has(field)
-  ) : [];
+  const pivotRowFieldName = String(
+    withResolvedXAxis.pivot?.rowField ?? ""
+  ).trim();
+  const pivotRowFields = firstPivotRow ? (() => {
+    const keys = Object.keys(firstPivotRow).filter(
+      (field) => !INTERNAL_PIVOT_ROW_FIELDS.has(field)
+    );
+    if (pivotRowFieldName && keys.includes(pivotRowFieldName)) {
+      return [
+        pivotRowFieldName,
+        ...keys.filter((field) => field !== pivotRowFieldName)
+      ];
+    }
+    return keys;
+  })() : [];
   const pivotValueFields = pivotRowFields.filter(
     (field) => field !== withResolvedXAxis.pivot?.rowField
   );
@@ -63354,6 +63377,10 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   );
   const resolveYAxisFormat = (field, aggregation) => {
     if (aggregation?.aggregationType === "count") {
+      const savedFormat = yAxisFormatByField.get(field) ?? yAxisFormatByField.get("count") ?? withResolvedXAxis.yAxisFields?.find(
+        (axis) => String(axis.field ?? "").trim() === field
+      )?.format ?? withResolvedXAxis.yAxisFields?.[0]?.format;
+      if (savedFormat) return savedFormat;
       return "whole_number";
     }
     if (aggregation?.aggregationType === "percentage") {
@@ -69338,6 +69365,15 @@ function useReport(reportIdArg, options = {}) {
     }
     for (const yAxis2 of chartAxesBaseChart.yAxisFields ?? []) {
       registerOption(yAxis2.field, yAxis2.label, yAxis2.format);
+      if (yAxis2.format) {
+        const existing = optionsByField.get(yAxis2.field);
+        if (existing) {
+          optionsByField.set(yAxis2.field, {
+            ...existing,
+            format: toAxisFormat(yAxis2.format, existing.format)
+          });
+        }
+      }
     }
     if (chartAxesBaseChart.pivot?.columnField) {
       for (const aggregationAxis of buildPivotAggregationAxisFields(
@@ -69351,11 +69387,22 @@ function useReport(reportIdArg, options = {}) {
         );
       }
     }
+    const xField = String(chartAxesBaseChart.xAxisField ?? "").trim();
+    const savedXFormat = String(chartAxesBaseChart.xAxisFormat ?? "").trim();
     registerOption(
-      chartAxesBaseChart.xAxisField,
+      xField,
       chartAxesBaseChart.xAxisLabel || chartAxesBaseChart.xAxisField,
       chartAxesBaseChart.xAxisFormat
     );
+    if (xField && savedXFormat) {
+      const existing = optionsByField.get(xField);
+      if (existing) {
+        optionsByField.set(xField, {
+          ...existing,
+          format: toAxisFormat(savedXFormat, existing.format)
+        });
+      }
+    }
     return Array.from(optionsByField.values());
   }, [chartAxesBaseChart, resolveTableDisplayLabel]);
   const chartAxisOptionByField = (0, import_react63.useMemo)(() => {

package/dist/index.d.cts

@@ -1201,6 +1201,7 @@ declare function Dashboard({ name, onClickReport, containerStyle, EmptyDashboard
 type DashboardConfig = {
     dashboardId: string;
     name: string;
+    hidden?: boolean;
     filters: InternalDashboardStringFilter[];
     allTenantFilters?: InternalDashboardTenantFilter[];
     tenantFilters?: InternalDashboardTenantFilter[];
@@ -3747,6 +3748,7 @@ declare const useDashboards: () => {
             section: string;
             reportOrder: string[];
         }[] | undefined;
+        hidden: boolean | undefined;
     }[] | null;
     isLoading: boolean;
     createDashboard: ({ name, tenantFilters, filters, dateFilter, dashboardOwners, clientId, }: {

package/dist/index.d.ts

@@ -1201,6 +1201,7 @@ declare function Dashboard({ name, onClickReport, containerStyle, EmptyDashboard
 type DashboardConfig = {
     dashboardId: string;
     name: string;
+    hidden?: boolean;
     filters: InternalDashboardStringFilter[];
     allTenantFilters?: InternalDashboardTenantFilter[];
     tenantFilters?: InternalDashboardTenantFilter[];
@@ -3747,6 +3748,7 @@ declare const useDashboards: () => {
             section: string;
             reportOrder: string[];
         }[] | undefined;
+        hidden: boolean | undefined;
     }[] | null;
     isLoading: boolean;
     createDashboard: ({ name, tenantFilters, filters, dateFilter, dashboardOwners, clientId, }: {

package/dist/index.js

@@ -107,7 +107,7 @@ function formatIdentifierLabel(str) {
   if (hasUnderscore || hasCamelCaseBoundary) {
     return snakeAndCamelCaseToTitleCase(str);
   }
-  return str;
+  return str.split(/\s+/).map((word) => word === "id" ? "ID" : capitalize(word)).join(" ");
 }
 function removeDoubleQuotes(str) {
   if (!str) {
@@ -153,11 +153,12 @@ function getValidDate(dateString) {
   const dates = FORMATS.map((fmt) => parse(dateString, fmt, /* @__PURE__ */ new Date()));
   return dates.find((date) => isValid(date));
 }
-var DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES, valueFormatter, quillFormat, quillAutoFormat, formatString, formatterDollar, formatDollarAmount, formatterCentsDollar, formatDollarCents, wholeNumberFormatter, formatWholeNumber, formatOneDecimalPlace, formatterTwoDecimalPlaces, formatTwoDecimalPlaces, formatterPercent, formatPercent, _getUTCDateHelper, format_YYYY, format_MMM_yyyy, format_hh_ap_pm, format_MMM_d, format_MMM_dd_yyyy, format_MMM_d_MMM_d, format_MMM_dd_hh_mm_ap_pm, format_wo_yyyy, localeFormatter, FORMATS, compareValues;
+var DATE_OUTSIDE_RANGE, DATE_FORMAT_TYPES, NUMBER_FORMAT_TYPES, valueFormatter, quillFormat, quillAutoFormat, formatString, formatterDollar, formatDollarAmount, formatterCentsDollar, formatDollarCents, wholeNumberFormatter, formatWholeNumber, formatOneDecimalPlace, formatterTwoDecimalPlaces, formatTwoDecimalPlaces, formatterPercent, formatPercent, _getUTCDateHelper, format_YYYY, format_MMM_yyyy, format_hh_ap_pm, format_MMM_d, format_MMM_dd_yyyy, format_MMM_d_MMM_d, format_MMM_dd_hh_mm_ap_pm, format_wo_yyyy, localeFormatter, FORMATS, compareValues;
 var init_valueFormatter = __esm({
   "src/utils/valueFormatter.ts"() {
     "use strict";
     init_textProcessing();
+    DATE_OUTSIDE_RANGE = "Date outside range";
     DATE_FORMAT_TYPES = [
       "yyyy",
       "MMM_yyyy",
@@ -406,7 +407,7 @@ var init_valueFormatter = __esm({
             weekEnd = utcEnd;
           }
           if (isAfter(weekStart, utcEnd) || isBefore(weekEnd, utcStart)) {
-            return "Date outside range";
+            return DATE_OUTSIDE_RANGE;
           }
         }
       }
@@ -17334,7 +17335,7 @@ async function generatePivotWithSQL({
   );
   const responseRows = queryResponseRows;
   const responseFields = queryResponseFields;
-  const rows = resultRowField ? responseRows.map(
+  let rows = resultRowField ? responseRows.map(
     (row) => !row[resultRowField] ? { ...row, [resultRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
@@ -17373,24 +17374,21 @@ async function generatePivotWithSQL({
     return 0;
   });
   if (resultRowField && !isStringType(pivot.rowFieldType || "")) {
-    rows.forEach((row) => {
-      row.__quillRawDate = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
-      let value = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
-      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
-        const rowDate = new Date(value);
-        if (rowDate < dateFilter.startDate) {
-          value = dateFilter.startDate.toISOString();
-        } else if (rowDate > dateFilter.endDate) {
-          value = dateFilter.endDate.toISOString();
-        }
-      }
+    const dateRange = dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0;
+    rows = rows.filter((row) => {
+      const rawValue = typeof row[resultRowField] === "object" ? row[resultRowField].value : row[resultRowField];
+      row.__quillRawDate = rawValue;
       const dateString = getDateString(
-        value,
-        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        rawValue,
+        dateRange,
         dateBucket,
         databaseType
       );
+      if (dateBucket === "week" && dateRange && dateString === DATE_OUTSIDE_RANGE) {
+        return false;
+      }
       row[resultRowField] = dateString;
+      return true;
     });
     if (resultRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
       const dateSet = new Set(rows.map((row) => row[resultRowField]));
@@ -17555,7 +17553,7 @@ function processPivotData({
   const pivotRowField = processColumnName(
     String(resultRowField ?? pivot.rowField ?? "")
   );
-  const rows = pivotRowField ? responseRows.map(
+  let rows = pivotRowField ? responseRows.map(
     (row) => !row[pivotRowField] ? { ...row, [pivotRowField]: "-" } : row
   ) : responseRows;
   if (pivot.columnField && client.databaseType?.toLowerCase() === "bigquery") {
@@ -17594,24 +17592,21 @@ function processPivotData({
     return 0;
   });
   if (pivotRowField && !isStringType(pivot.rowFieldType || "")) {
-    rows.forEach((row) => {
-      row.__quillRawDate = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
-      let value = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
-      if (dateBucket === "week" && dateFilter?.startDate && dateFilter?.endDate) {
-        const rowDate = new Date(value);
-        if (rowDate < dateFilter.startDate) {
-          value = dateFilter.startDate.toISOString();
-        } else if (rowDate > dateFilter.endDate) {
-          value = dateFilter.endDate.toISOString();
-        }
-      }
+    const dateRange = dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0;
+    rows = rows.filter((row) => {
+      const rawValue = typeof row[pivotRowField] === "object" ? row[pivotRowField].value : row[pivotRowField];
+      row.__quillRawDate = rawValue;
       const dateString = getDateString(
-        value,
-        dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
+        rawValue,
+        dateRange,
         dateBucket,
         databaseType
       );
+      if (dateBucket === "week" && dateRange && dateString === DATE_OUTSIDE_RANGE) {
+        return false;
+      }
       row[pivotRowField] = dateString;
+      return true;
     });
     if (pivotRowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
       const dateSet = new Set(rows.map((row) => row[pivotRowField]));
@@ -17675,6 +17670,7 @@ var init_pivotConstructor = __esm({
     init_dataProcessing();
     init_dates();
     init_textProcessing();
+    init_valueFormatter();
   }
 });
 
@@ -22784,6 +22780,7 @@ init_columnProcessing();
 init_dataFetcher();
 init_dataProcessing();
 init_dates();
+init_columnType();
 init_paginationProcessing();
 init_pivotProcessing();
 init_tableProcessing();
@@ -23709,6 +23706,15 @@ function hasPreformattedDateBucketLabels(report) {
   if (report.chartType?.toLowerCase() === "table") return false;
   return report.xAxisField?.trim() === pivot.rowField?.trim();
 }
+function resolvePivotBucketXAxisFormat(report) {
+  const pivot = report.pivot;
+  if (!pivot?.dateBucket) return null;
+  if (report.chartType?.toLowerCase() === "table") return null;
+  const rowField = pivot.rowField?.trim();
+  if (!rowField || report.xAxisField?.trim() !== rowField) return null;
+  if (!isDateType(String(pivot.rowFieldType ?? ""))) return null;
+  return getDateFormatFromBucket(pivot.dateBucket);
+}
 function applySavedPivotColumnLabels(report, pivotColumns) {
   return pivotColumns?.map((column) => {
     const savedColumn = report.columns?.find(
@@ -23784,6 +23790,10 @@ function convertInternalReportToReport(report, dashboardFilters, eventTracking,
         ...extractAllReportValuesFromQuillInternalReport(formattedReport),
         ...pivotFormatted
       };
+      const bucketXAxisFormat = resolvePivotBucketXAxisFormat(pivotReport);
+      if (bucketXAxisFormat) {
+        pivotReport.xAxisFormat = bucketXAxisFormat;
+      }
       pivotReport.formattedBaseRows = formattedBaseRows;
       return applyChartSort(pivotReport);
     }
@@ -34109,9 +34119,8 @@ function RadarChart({
                         fields: [{ field: xAxisField, format: xAxisFormat }]
                       }),
                       valueFormatter: (value, name2) => {
-                        const field = payloadItems.find(
-                          (p) => p.dataKey === name2
-                        )?.dataKey;
+                        const payloadItem = payloadItems.find((p) => p.dataKey === name2) ?? payloadItems.find((p) => p.name === name2);
+                        const field = payloadItem?.dataKey;
                         if (!field) return value;
                         return valueFormatter({
                           value,
@@ -37660,7 +37669,8 @@ var useDashboards = () => {
         reports: Object.values(dashboard.config.sections ?? {}).flat(),
         tenantKeys: dashboard.config.tenantKeys,
         createdAt: dashboard.config.createdAt,
-        sectionOrder: dashboard.config.sectionOrder
+        sectionOrder: dashboard.config.sectionOrder,
+        hidden: dashboard.config.hidden
       };
     }).sort(
       (a, b) => (a.createdAt?.getTime() ?? 0) - (b.createdAt?.getTime() ?? 0)
@@ -46310,6 +46320,7 @@ var QuillProvider = ({
       isAdmin,
       getAuthorizationToken,
       eventTracking,
+      onChangelogs,
       children
     }
   ) });
@@ -63547,9 +63558,21 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   const firstPivotRow = (withResolvedXAxis.rows ?? []).find(
     (row) => Object.keys(row).length > 0
   );
-  const pivotRowFields = firstPivotRow ? Object.keys(firstPivotRow).filter(
-    (field) => !INTERNAL_PIVOT_ROW_FIELDS.has(field)
-  ) : [];
+  const pivotRowFieldName = String(
+    withResolvedXAxis.pivot?.rowField ?? ""
+  ).trim();
+  const pivotRowFields = firstPivotRow ? (() => {
+    const keys = Object.keys(firstPivotRow).filter(
+      (field) => !INTERNAL_PIVOT_ROW_FIELDS.has(field)
+    );
+    if (pivotRowFieldName && keys.includes(pivotRowFieldName)) {
+      return [
+        pivotRowFieldName,
+        ...keys.filter((field) => field !== pivotRowFieldName)
+      ];
+    }
+    return keys;
+  })() : [];
   const pivotValueFields = pivotRowFields.filter(
     (field) => field !== withResolvedXAxis.pivot?.rowField
   );
@@ -63562,6 +63585,10 @@ function normalizePivotChartForDisplay(chart, resolveTableLabel) {
   );
   const resolveYAxisFormat = (field, aggregation) => {
     if (aggregation?.aggregationType === "count") {
+      const savedFormat = yAxisFormatByField.get(field) ?? yAxisFormatByField.get("count") ?? withResolvedXAxis.yAxisFields?.find(
+        (axis) => String(axis.field ?? "").trim() === field
+      )?.format ?? withResolvedXAxis.yAxisFields?.[0]?.format;
+      if (savedFormat) return savedFormat;
       return "whole_number";
     }
     if (aggregation?.aggregationType === "percentage") {
@@ -69546,6 +69573,15 @@ function useReport(reportIdArg, options = {}) {
     }
     for (const yAxis2 of chartAxesBaseChart.yAxisFields ?? []) {
       registerOption(yAxis2.field, yAxis2.label, yAxis2.format);
+      if (yAxis2.format) {
+        const existing = optionsByField.get(yAxis2.field);
+        if (existing) {
+          optionsByField.set(yAxis2.field, {
+            ...existing,
+            format: toAxisFormat(yAxis2.format, existing.format)
+          });
+        }
+      }
     }
     if (chartAxesBaseChart.pivot?.columnField) {
       for (const aggregationAxis of buildPivotAggregationAxisFields(
@@ -69559,11 +69595,22 @@ function useReport(reportIdArg, options = {}) {
         );
       }
     }
+    const xField = String(chartAxesBaseChart.xAxisField ?? "").trim();
+    const savedXFormat = String(chartAxesBaseChart.xAxisFormat ?? "").trim();
     registerOption(
-      chartAxesBaseChart.xAxisField,
+      xField,
       chartAxesBaseChart.xAxisLabel || chartAxesBaseChart.xAxisField,
       chartAxesBaseChart.xAxisFormat
     );
+    if (xField && savedXFormat) {
+      const existing = optionsByField.get(xField);
+      if (existing) {
+        optionsByField.set(xField, {
+          ...existing,
+          format: toAxisFormat(savedXFormat, existing.format)
+        });
+      }
+    }
     return Array.from(optionsByField.values());
   }, [chartAxesBaseChart, resolveTableDisplayLabel]);
   const chartAxisOptionByField = useMemo33(() => {

package/package.json

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