@quillsql/react 2.16.26 → 2.16.28

package/dist/index.js

@@ -42,8 +42,6 @@ import {
   endOfWeek,
   format,
   getWeek,
-  isAfter,
-  isBefore,
   isValid,
   parse,
   parseISO,
@@ -304,28 +302,10 @@ var init_valueFormatter = __esm({
       }
       let weekStart = startOfWeek(utcDate, { weekStartsOn });
       let weekEnd = endOfWeek(utcDate, { weekStartsOn });
-      if (dateRange && dateRange.start && dateRange.end) {
-        const utcStartString = dateRange.start.toISOString().split("T")[0];
-        const utcEndString = dateRange.end.toISOString().split("T")[0];
-        if (utcStartString && utcEndString) {
-          const utcStart = parseISO(utcStartString);
-          const utcEnd = parseISO(utcEndString);
-          if (isBefore(weekStart, utcStart)) {
-            weekStart = utcStart;
-          }
-          if (isAfter(weekEnd, utcEnd)) {
-            weekEnd = utcEnd;
-          }
-          if (isAfter(weekStart, utcEnd) || isBefore(weekEnd, utcStart)) {
-            return "Date outside range";
-          }
-        }
-      }
       if (format(weekStart, "MMM") === format(weekEnd, "MMM")) {
         return `${format(weekStart, "MMM d")} - ${format(weekEnd, "d")}`;
-      } else {
-        return `${format(weekStart, "MMM d")} - ${format(weekEnd, "MMM d")}`;
       }
+      return `${format(weekStart, "MMM d")} - ${format(weekEnd, "MMM d")}`;
     };
     format_MMM_dd_hh_mm_ap_pm = (value) => {
       const utcDate = utcToZonedTime(new Date(value), "UTC");
@@ -1298,7 +1278,6 @@ import {
   endOfMonth,
   endOfQuarter,
   endOfYear,
-  endOfToday,
   format as format2,
   isEqual,
   isToday,
@@ -1309,18 +1288,23 @@ import {
   startOfMonth,
   startOfQuarter,
   startOfYear,
-  startOfToday,
   startOfWeek as startOfWeek2,
   sub,
   subMonths,
   subQuarters,
   subYears
 } from "date-fns";
-var primaryRangeCustomIntervals, adjustForLeapYear, convertCustomIntervalToDateRange, getLabelForCustomInterval, convertPresetOptionsToSelectableList, PRIMARY_RANGE, COMPARISON_OPTIONS, COMPARISON_RANGE, defaultOptionsV2, reportBuilderOptions, getRangeFromPresetOptions;
+import { utcToZonedTime as utcToZonedTime2, zonedTimeToUtc } from "date-fns-tz";
+var PRESET_TIME_ZONE, getPresetNow, fromPresetTimeToUtc, startOfToday, endOfToday, primaryRangeCustomIntervals, adjustForLeapYear, convertCustomIntervalToDateRange, getLabelForCustomInterval, convertPresetOptionsToSelectableList, PRIMARY_RANGE, COMPARISON_OPTIONS, COMPARISON_RANGE, defaultOptionsV2, reportBuilderOptions, getRangeFromPresetOptions;
 var init_dateRangePickerUtils = __esm({
   "src/DateRangePicker/dateRangePickerUtils.ts"() {
     "use strict";
     init_chart();
+    PRESET_TIME_ZONE = "America/Los_Angeles";
+    getPresetNow = () => utcToZonedTime2(/* @__PURE__ */ new Date(), PRESET_TIME_ZONE);
+    fromPresetTimeToUtc = (date) => zonedTimeToUtc(date, PRESET_TIME_ZONE);
+    startOfToday = () => startOfDay(getPresetNow());
+    endOfToday = () => endOfDay(getPresetNow());
     primaryRangeCustomIntervals = [
       {
         type: "week"
@@ -1453,7 +1437,7 @@ var init_dateRangePickerUtils = __esm({
     ];
     adjustForLeapYear = (date) => {
       if (date.month === 2 && date.day === 29) {
-        const year = (/* @__PURE__ */ new Date()).getFullYear();
+        const year = getPresetNow().getFullYear();
         if (!(year % 4 === 0 && year % 100 !== 0 || year % 400 === 0)) {
           date.day = 28;
         }
@@ -1461,68 +1445,60 @@ var init_dateRangePickerUtils = __esm({
       return date;
     };
     convertCustomIntervalToDateRange = (interval) => {
+      const toUtcRange = (startDate, endDate) => ({
+        startDate: fromPresetTimeToUtc(startDate),
+        endDate: fromPresetTimeToUtc(endDate)
+      });
       switch (interval.type) {
         case "week":
-          return { startDate: startOfWeek2(startOfToday()), endDate: endOfToday() };
+          return toUtcRange(startOfWeek2(startOfToday()), endOfToday());
         case "static": {
           const startDate = adjustForLeapYear(interval.startDate);
           const endDate = adjustForLeapYear(interval.endDate);
-          return {
-            startDate: set(/* @__PURE__ */ new Date(), {
+          return toUtcRange(
+            set(getPresetNow(), {
               month: startDate.month - 1,
               date: startDate.day,
               minutes: 0,
               hours: 0,
               seconds: 0
             }),
-            endDate: set(/* @__PURE__ */ new Date(), {
+            set(getPresetNow(), {
               month: endDate.month - 1,
               date: endDate.day,
               minutes: 59,
               hours: 23,
               seconds: 59
             })
-          };
+          );
         }
         case "relative": {
           if (interval.unit === "months" && interval.value === 1 && (!interval.label || interval.label === "Last month")) {
             const lastMonth = subMonths(startOfToday(), 1);
-            return {
-              startDate: startOfMonth(lastMonth),
-              endDate: endOfMonth(lastMonth)
-            };
+            return toUtcRange(startOfMonth(lastMonth), endOfMonth(lastMonth));
           }
-          return {
-            startDate: sub(startOfToday(), { [interval.unit]: interval.value }),
-            endDate: endOfToday()
-          };
+          return toUtcRange(
+            sub(startOfToday(), { [interval.unit]: interval.value }),
+            endOfToday()
+          );
         }
         case "previous_month": {
           const lastMonth = subMonths(startOfToday(), 1);
-          return {
-            startDate: startOfMonth(lastMonth),
-            endDate: endOfMonth(lastMonth)
-          };
+          return toUtcRange(startOfMonth(lastMonth), endOfMonth(lastMonth));
         }
         case "previous_quarter": {
           const lastQuarter = subQuarters(startOfToday(), 1);
-          return {
-            startDate: startOfQuarter(lastQuarter),
-            endDate: endOfQuarter(lastQuarter)
-          };
+          return toUtcRange(startOfQuarter(lastQuarter), endOfQuarter(lastQuarter));
         }
         case "previous_year": {
           const lastYear = subYears(startOfToday(), 1);
-          return {
-            startDate: startOfYear(lastYear),
-            endDate: endOfYear(lastYear)
-          };
+          return toUtcRange(startOfYear(lastYear), endOfYear(lastYear));
         }
         case "repeating": {
-          const currentDate = /* @__PURE__ */ new Date();
+          const currentDate = getPresetNow();
           const currentYear = currentDate.getFullYear();
           const currentSubInterval = interval.subIntervals.find((subInterval) => {
-            const intervalStart = set(/* @__PURE__ */ new Date(), {
+            const intervalStart = set(getPresetNow(), {
               year: currentYear,
               month: subInterval.startDate.month - 1,
               // convert 1-index to 0-index
@@ -1531,7 +1507,7 @@ var init_dateRangePickerUtils = __esm({
               minutes: 0,
               seconds: 0
             });
-            const intervalEnd = set(/* @__PURE__ */ new Date(), {
+            const intervalEnd = set(getPresetNow(), {
               year: currentYear,
               month: subInterval.endDate.month - 1,
               // convert 1-index to 0-index
@@ -1546,16 +1522,16 @@ var init_dateRangePickerUtils = __esm({
             throw new Error("Date is not valid in this interval");
           }
           const startDate = adjustForLeapYear(currentSubInterval.startDate);
-          return {
-            startDate: set(/* @__PURE__ */ new Date(), {
+          return toUtcRange(
+            set(getPresetNow(), {
               month: startDate.month - 1,
               date: startDate.day,
               minutes: 0,
               hours: 0,
               seconds: 0
             }),
-            endDate: /* @__PURE__ */ new Date()
-          };
+            endOfToday()
+          );
         }
       }
     };
@@ -1746,7 +1722,7 @@ var init_dateRangePickerUtils = __esm({
               unit: "months"
             }
           ];
-        } else if (normalizedLabel === "last month") {
+        } else if (normalizedLabel === "last month" || normalizedLabel === "previous month") {
           createdIntervals = [
             {
               type: "previous_month",
@@ -1780,12 +1756,12 @@ var init_dateRangePickerUtils = __esm({
       const selectableOptions = (defaultCustomIntervals ?? []).concat(customIntervals ?? []).flatMap((option) => {
         if (option.type === "repeating" && option.loopStart) {
           const presets = [];
-          let currentDate = endOfDay(option.loopEnd ?? /* @__PURE__ */ new Date());
+          let currentDate = endOfDay(option.loopEnd ?? getPresetNow());
           const cutoffDate = option.loopStart;
           while (currentDate > cutoffDate) {
             const loopCurrentYear = currentDate.getFullYear();
             const currentSubInterval = option.subIntervals.find((subInterval) => {
-              const intervalStart2 = set(/* @__PURE__ */ new Date(), {
+              const intervalStart2 = set(getPresetNow(), {
                 year: loopCurrentYear,
                 month: subInterval.startDate.month - 1,
                 // convert 1-index to 0-index
@@ -1794,7 +1770,7 @@ var init_dateRangePickerUtils = __esm({
                 minutes: 0,
                 seconds: 0
               });
-              const intervalEnd = set(/* @__PURE__ */ new Date(), {
+              const intervalEnd = set(getPresetNow(), {
                 year: loopCurrentYear,
                 month: subInterval.endDate.month - 1,
                 // convert 1-index to 0-index
@@ -1830,26 +1806,30 @@ var init_dateRangePickerUtils = __esm({
             presets.push({
               label: customLabel2 || baseLabel,
               value: getLabelForSubInterval(currentSubInterval).toUpperCase().replace(/ /g, "_") ?? "",
-              startDate: set(/* @__PURE__ */ new Date(), {
-                year: currentYear,
-                month: currentSubInterval.startDate.month - 1,
-                // convert 1-index to 0-index
-                date: currentSubInterval.startDate.day,
-                minutes: 0,
-                hours: 0,
-                seconds: 0
-              }),
-              endDate: set(/* @__PURE__ */ new Date(), {
-                year: currentYear,
-                month: currentSubInterval.endDate.month - 1,
-                // convert 1-index to 0-index
-                date: currentSubInterval.endDate.day,
-                minutes: 59,
-                hours: 23,
-                seconds: 59
-              })
+              startDate: fromPresetTimeToUtc(
+                set(getPresetNow(), {
+                  year: currentYear,
+                  month: currentSubInterval.startDate.month - 1,
+                  // convert 1-index to 0-index
+                  date: currentSubInterval.startDate.day,
+                  minutes: 0,
+                  hours: 0,
+                  seconds: 0
+                })
+              ),
+              endDate: fromPresetTimeToUtc(
+                set(getPresetNow(), {
+                  year: currentYear,
+                  month: currentSubInterval.endDate.month - 1,
+                  // convert 1-index to 0-index
+                  date: currentSubInterval.endDate.day,
+                  minutes: 59,
+                  hours: 23,
+                  seconds: 59
+                })
+              )
             });
-            const intervalStart = set(/* @__PURE__ */ new Date(), {
+            const intervalStart = set(getPresetNow(), {
               year: currentYear,
               month: currentSubInterval.startDate.month - 1,
               // convert 1-index to 0-index
@@ -1934,6 +1914,10 @@ var init_dateRangePickerUtils = __esm({
         primaryRangeCustomIntervals[7]
       ),
       LAST_MONTH: convertCustomIntervalToDateRange(primaryRangeCustomIntervals[8]),
+      // Backward-compatible alias used by some environments.
+      PREVIOUS_MONTH: convertCustomIntervalToDateRange(
+        primaryRangeCustomIntervals[8]
+      ),
       ALL_TIME: { startDate: void 0, endDate: void 0 }
     };
     COMPARISON_OPTIONS = [
@@ -16250,14 +16234,6 @@ async function generatePivotWithSQL({
     rows.forEach((row) => {
       row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
       let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      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 dateString = getDateString(
         value,
         dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
@@ -16266,26 +16242,6 @@ async function generatePivotWithSQL({
       );
       row[pivot.rowField || ""] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
-      for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
-        const formattedDate = getDateString(
-          date.toISOString(),
-          { start: dateFilter.startDate, end: dateFilter.endDate },
-          dateBucket,
-          databaseType
-        );
-        if (!dateSet.has(formattedDate)) {
-          const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
-          newRow.__quillRawDate = date.toISOString();
-          rows.push(newRow);
-          dateSet.add(formattedDate);
-        }
-      }
-    }
     if (!pivot.sort || pivot.sortField === pivot.rowField) {
       rows.sort((a, b) => {
         const direction = pivot.sort && pivot.sortDirection === "DESC" ? -1 : 1;
@@ -16463,14 +16419,6 @@ function processPivotData({
     rows.forEach((row) => {
       row.__quillRawDate = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
       let value = typeof row[pivot.rowField || ""] === "object" ? row[pivot.rowField || ""].value : row[pivot.rowField || ""];
-      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 dateString = getDateString(
         value,
         dateFilter?.startDate && dateFilter?.endDate ? { start: dateFilter.startDate, end: dateFilter.endDate } : void 0,
@@ -16479,26 +16427,6 @@ function processPivotData({
       );
       row[pivot.rowField || ""] = dateString;
     });
-    if (pivot.rowField && pivot.rowFieldType && !isStringType(pivot.rowFieldType) && dateFilter?.startDate && dateFilter?.endDate) {
-      const dateSet = new Set(
-        rows.map((row) => row[pivot.rowField || ""])
-      );
-      for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1e3)) {
-        const formattedDate = getDateString(
-          date.toISOString(),
-          { start: dateFilter.startDate, end: dateFilter.endDate },
-          dateBucket,
-          databaseType
-        );
-        if (!dateSet.has(formattedDate)) {
-          const newRow = {};
-          newRow[pivot.rowField] = formattedDate;
-          newRow.__quillRawDate = date.toISOString();
-          rows.push(newRow);
-          dateSet.add(formattedDate);
-        }
-      }
-    }
     if (!pivot.sort || pivot.sortField === pivot.rowField) {
       rows.sort((a, b) => {
         const direction = pivot.sort && pivot.sortDirection === "DESC" ? -1 : 1;
@@ -19969,6 +19897,8 @@ async function cleanDashboardItem({
     columnInternal,
     columnsWithCustomFields,
     chartType: item.chartType,
+    isCacheable: item.isCacheable,
+    isCacheableReason: item.isCacheableReason,
     dateField: item.dateField,
     pivot: pivotError ? void 0 : item.pivot ? {
       ...item.pivot,
@@ -22381,12 +22311,16 @@ function generateBucketKeys(start, end, bucket) {
   }
   return Array.from(keys).sort((a, b) => parseInt(a) - parseInt(b));
 }
+function getDisambiguationSuffix(aggregationType, multiAgg) {
+  if (!multiAgg || aggregationType === "count") return "";
+  return `_${aggregationType}`;
+}
 function buildEmptyAggRow(aggregations) {
   const multiAgg = aggregations.length > 1;
   const empty = {};
   aggregations.forEach((agg) => {
     const { aggregationType: type, valueField } = agg;
-    const key = !valueField ? `${type}` + (multiAgg ? `_${type}` : "") : `${valueField}` + (multiAgg ? `_${type}` : "");
+    const key = `${valueField ?? type}` + getDisambiguationSuffix(type, multiAgg);
     empty[key] = 0;
   });
   return empty;
@@ -22465,8 +22399,9 @@ function getDateKey(date, bucket) {
 }
 function sortRows(rows, pivot) {
   try {
-    const { sort, sortField, sortFieldType, sortDirection } = pivot;
-    if (!sort || sortField == null || sortFieldType == null) return rows;
+    const { sort, sortField, sortDirection } = pivot;
+    if (!sort || sortField == null || !rows[0]) return rows;
+    const sortFieldType = pivot.sortFieldType ?? typeof rows[0][sortField];
     const sortFunc = isBoolType(sortFieldType) ? (a, b) => a === b ? 0 : a ? 1 : -1 : isDateType(sortFieldType) ? (a, b) => {
       const ta = new Date(a), tb = new Date(b);
       const aValid = isValidDate3(ta), bValid = isValidDate3(tb);
@@ -22611,11 +22546,12 @@ function getFinalAggregationValue({
   } else {
     switch (type) {
       case "sum":
-        final = acc.sum;
+        final = +acc.sum.toFixed(2);
         break;
       case "average":
       case "avg":
-        final = acc.count ? acc.sum / acc.count : 0;
+        const temp = acc.count ? acc.sum / acc.count : 0;
+        final = temp;
         break;
       case "min":
         final = acc.hasVal ? acc.min : 0;
@@ -22694,6 +22630,7 @@ function aggregateWithColumn(rows, colKey, aggregations, getGroupKey) {
     rows.forEach((row) => {
       const groupKey = getGroupKey(row);
       const colVal = row[colKey];
+      if (colVal === null || colVal === void 0) return;
       if (!accs[groupKey]) accs[groupKey] = {};
       if (!accs[groupKey][colVal]) {
         accs[groupKey][colVal] = {
@@ -22724,7 +22661,7 @@ function aggregateWithColumn(rows, colKey, aggregations, getGroupKey) {
       );
       Object.keys(accs[groupKey]).forEach((colVal) => {
         const acc = accs[groupKey][colVal];
-        const finalKey = `${colVal}` + (multiAgg ? `_${type}` : "");
+        const finalKey = `${colVal}` + getDisambiguationSuffix(type, multiAgg);
         seen[groupKey][finalKey] = getFinalAggregationValue({
           type,
           valueFieldType,
@@ -22753,7 +22690,7 @@ function aggregateWithoutColumn(rows, aggregations, getGroupKey) {
     if (!valueField) {
       if (type !== "count" && type !== "percentage") return;
     }
-    const finalKey = !valueField ? `${type}` + (multiAgg ? `_${type}` : "") : `${valueField}` + (multiAgg ? `_${type}` : "");
+    const finalKey = `${valueField ?? type}` + getDisambiguationSuffix(type, multiAgg);
     const distinctDenom = !!valueField2 && !!valueField2Type && valueField !== valueField2;
     const accs = {};
     rows.forEach((row) => {
@@ -22814,7 +22751,10 @@ function applyPivotInMemory(rows, pivot, filters) {
     const rawDateFromQuill = row.__quillRawDate;
     const rawDateValue = rawDateFromQuill ?? (rawValue !== null && typeof rawValue === "object" && rawValue.value ? rawValue.value : rawValue);
     return getDateKey(new Date(rawDateValue), dateBucket);
-  } : (row) => row[rowField];
+  } : (row) => {
+    const value = row[rowField];
+    return value === null ? "-" : value;
+  };
   const aggregated = columnField ? aggregateWithColumn(rows, columnField, aggregations, getRowKey) : aggregateWithoutColumn(rows, aggregations, getRowKey);
   const aggregatedRows = aggregated || {};
   if (rows.length === 0 && dateBucket && dateRange && !columnField) {
@@ -22899,24 +22839,65 @@ function generatePivotColumnsInMemory({
 // src/utils/cacheCab.ts
 import { openDB } from "idb";
 import { endOfDay as endOfDay3, max as maxDate, subMonths as subMonths4, min as minDate, startOfDay as startOfDay4 } from "date-fns";
-import { utcToZonedTime as utcToZonedTime2, zonedTimeToUtc } from "date-fns-tz";
+import { utcToZonedTime as utcToZonedTime3, zonedTimeToUtc as zonedTimeToUtc2 } from "date-fns-tz";
 var TZ = "America/Los_Angeles";
+var DEFAULT_MAX_ROWS = 1e5;
 var CacheCab = class {
   fetchedRange = {};
   cachedReportIds = [];
   uncacheableReportIDs = [];
   uncacheableInFlight = /* @__PURE__ */ new Map();
   storage;
+  maxRows = {};
+  cacheableLoaded;
   META_KEY = "cachecab:meta";
   DATA_PREFIX = "cachecab:data:";
   UNCACHEABLE_PREFIX = "cachecab:uncacheable:";
   constructor({
-    storageType = "memory"
-  } = {}) {
-    this.storage = storageType !== "idb" ? new MemoryStorage() : new IdbStorage();
-    void this.loadMetaFromStorage();
+    storageType = "memory",
+    client,
+    tenants,
+    dashboards = [],
+    getToken
+  }) {
+    this.storage = storageType !== "indexedDB" ? new MemoryStorage() : new IdbStorage();
+    this.cacheableLoaded = (async () => {
+      await this.loadMetaFromStorage();
+      try {
+        const result = await quillFetch({
+          client,
+          task: "get-dashboards-and-reports",
+          method: "POST",
+          metadata: {
+            tenants
+          },
+          getToken
+        });
+        const tasks = result?.data?.tasks ?? [];
+        const uncacheable = tasks?.filter((x) => x.isCacheable !== true && x.useReport).map((y) => y.reportId) ?? [];
+        this.uncacheableReportIDs = uncacheable;
+        const temp = tasks.map((x) => {
+          return { name: x.dashboard.name, id: x.reportId };
+        });
+        temp.forEach((r) => {
+          if (!this.maxRows[r.id]) {
+            const d = dashboards.find((x) => x.name === r.name);
+            this.maxRows[r.id] = d.totalCachedRows ?? DEFAULT_MAX_ROWS;
+          }
+        });
+      } catch {
+      }
+    })();
+  }
+  async ensureReady() {
+    await this.cacheableLoaded;
   }
   async get(reportId, dashboardFilters, customFilters, pivot, client, tenants, flags, pageSize, getToken, eventTracking, forceRefresh) {
+    await this.ensureReady();
+    if (!this.isCacheable(reportId)) {
+      return EMPTY_INTERNAL_REPORT;
+    }
+    ;
     if (this.isCached(reportId, tenants) && !forceRefresh) {
       return this.getFromCache(reportId, dashboardFilters, customFilters, pivot, client, tenants, flags, getToken, eventTracking);
     } else {
@@ -22929,39 +22910,8 @@ var CacheCab = class {
   isCacheable(reportId) {
     return !this.uncacheableReportIDs.includes(reportId);
   }
-  async getUncacheableResult(reportId, client, tenants, flags, filters, additionalProcessing, pivot) {
-    const key = this.getUncacheableRequestKey(
-      reportId,
-      client,
-      tenants,
-      flags,
-      filters,
-      additionalProcessing,
-      pivot
-    );
-    try {
-      const raw = await this.storage.getItem(key);
-      return raw ? JSON.parse(raw) : null;
-    } catch {
-      return null;
-    }
-  }
-  async setUncacheableResult(reportId, client, tenants, flags, filters, additionalProcessing, pivot, report) {
-    const key = this.getUncacheableRequestKey(
-      reportId,
-      client,
-      tenants,
-      flags,
-      filters,
-      additionalProcessing,
-      pivot
-    );
-    try {
-      await this.storage.setItem(key, JSON.stringify(report));
-    } catch {
-    }
-  }
   async getOrFetchUncacheableResult(reportId, client, tenants, flags, filters, additionalProcessing, pivot, fetcher, forceRefresh = false) {
+    await this.ensureReady();
     const key = this.getUncacheableRequestKey(
       reportId,
       client,
@@ -23231,7 +23181,7 @@ var CacheCab = class {
           clientId: client.publicKey,
           databaseType: client.databaseType,
           filters: adjusted,
-          additionalProcessing: { page: { rowsPerPage: 1e3, rowsPerRequest: 1e5 } },
+          additionalProcessing: { page: { rowsPerPage: Math.min(this.maxRows[reportId] ?? 1e3, 1e3), rowsPerRequest: this.maxRows[reportId] ?? DEFAULT_MAX_ROWS } },
           useNewNodeSql: true,
           tenants,
           flags,
@@ -23239,6 +23189,10 @@ var CacheCab = class {
         },
         getToken
       });
+      if (!fetchResp.data?.isCacheable) {
+        this.uncacheableReportIDs.push(reportId);
+        return EMPTY_INTERNAL_REPORT;
+      }
       const resp = await parseFetchResponse(
         client,
         "report",
@@ -23246,12 +23200,16 @@ var CacheCab = class {
         getToken,
         true
       );
+      if (resp.rowCount > (this.maxRows[reportId] ?? DEFAULT_MAX_ROWS)) {
+        this.uncacheableReportIDs.push(reportId);
+        return EMPTY_INTERNAL_REPORT;
+      }
       reportInfo = await processReportResponse({
         resp,
         client,
         filters: adjusted,
         dateBucket: resp?.dateBucket,
-        additionalProcessing: { page: { rowsPerPage: 1e3, rowsPerRequest: 1e5 } },
+        additionalProcessing: { page: { rowsPerPage: Math.min(this.maxRows[reportId] ?? 1e3, 1e3), rowsPerRequest: this.maxRows[reportId] ?? DEFAULT_MAX_ROWS } },
         getToken,
         eventTracking,
         tenants,
@@ -23260,8 +23218,16 @@ var CacheCab = class {
         overwriteCache: forceRefresh ?? false
       });
       const dateField = reportInfo.dateField?.field;
+      const dateTable = removeQuotes(reportInfo.dateField?.table ?? "");
       if (!isAllTime && dateField !== void 0 && reportInfo.rows.length > 0) {
         const cleanedDateField = removeQuotes(dateField);
+        if (reportInfo.referencedColumns && dateTable) {
+          const refs = reportInfo.referencedColumns[dateTable];
+          if (refs && !refs.some((x) => x && removeQuotes(x) == cleanedDateField)) {
+            this.uncacheableReportIDs.push(reportId);
+            return EMPTY_INTERNAL_REPORT;
+          }
+        }
         const missingDateFieldCount = reportInfo.rows.some((row) => row[cleanedDateField] === void 0);
         if (missingDateFieldCount) {
           this.uncacheableReportIDs.push(reportId);
@@ -23335,12 +23301,12 @@ var CacheCab = class {
         return [];
       }
       const dbDateFilter = dashboardFilters.find((x) => x.filterType === "date_range");
-      if (report.dateField && dbDateFilter?.startDate) {
-        const { start: startDate, end: endDate } = normalizePSTRanges(
-          new Date(dbDateFilter.startDate),
-          dbDateFilter.endDate ? new Date(dbDateFilter.endDate) : void 0
-        );
+      if (report.dateField && dbDateFilter?.startDate && dbDateFilter?.endDate) {
         const fieldToUse = report.rows[0] && report.rows[0]["__quillRawDate"] ? "__quillRawDate" : removeQuotes(report.dateField.field);
+        const useDateOnly = report.columnInternal.find((x) => x.field === fieldToUse)?.dataTypeID === 1082;
+        const rawStart = new Date(dbDateFilter.startDate);
+        const startDate = useDateOnly ? new Date(Date.UTC(rawStart.getUTCFullYear(), rawStart.getUTCMonth(), rawStart.getUTCDate(), 0, 0, 0, 0)) : rawStart;
+        const endDate = new Date(dbDateFilter.endDate);
         const dateFilteredRows = report.rows.filter((x) => {
           const rowDate = new Date(x[fieldToUse]);
           return startDate <= rowDate && (endDate ? rowDate <= endDate : true);
@@ -23383,7 +23349,6 @@ var CacheCab = class {
     try {
       const parsed = JSON.parse(meta);
       this.cachedReportIds = parsed.cached || [];
-      this.uncacheableReportIDs = parsed.cannotBeCached;
       this.fetchedRange = Object.fromEntries(
         Object.entries(parsed.fetchedRange || {}).map(([id, range]) => [
           id,
@@ -23405,8 +23370,7 @@ var CacheCab = class {
       this.META_KEY,
       JSON.stringify({
         fetchedRange: serializableRange,
-        cached: this.cachedReportIds,
-        cannotBeCached: this.uncacheableReportIDs
+        cached: this.cachedReportIds
       })
     );
   }
@@ -23530,14 +23494,14 @@ function canonicalizeFilterForUncacheableKey(filter) {
   return canonicalizeForKey(base);
 }
 function startOfDayPST(date) {
-  const pstDate = utcToZonedTime2(date, TZ);
+  const pstDate = utcToZonedTime3(date, TZ);
   const startPst = startOfDay4(pstDate);
-  return zonedTimeToUtc(startPst, TZ);
+  return zonedTimeToUtc2(startPst, TZ);
 }
 function endOfDayPST(date) {
-  const pstDate = utcToZonedTime2(date, TZ);
+  const pstDate = utcToZonedTime3(date, TZ);
   const endPst = endOfDay3(pstDate);
-  return zonedTimeToUtc(endPst, TZ);
+  return zonedTimeToUtc2(endPst, TZ);
 }
 function normalizePSTRanges(start, end) {
   return {
@@ -23971,7 +23935,18 @@ var EventTrackingContext = createContext({
   eventTracking: null
 });
 var CacheCabContext = createContext({
-  getCacheCab: (storageType) => new CacheCab({ storageType })
+  getCacheCab: (storageType) => new CacheCab({
+    storageType,
+    client: {
+      clientId: "",
+      queryEndpoint: "",
+      queryHeaders: void 0,
+      withCredentials: false
+    },
+    tenants: [],
+    dashboards: [],
+    getToken: async () => ""
+  })
 });
 var ContextProvider = ({
   children,
@@ -23986,14 +23961,6 @@ var ContextProvider = ({
   getAuthorizationToken = async () => "",
   eventTracking = null
 }) => {
-  const cacheCabByTypeRef = useRef({});
-  const getCacheCab = useCallback((storageType) => {
-    const key = storageType === "idb" ? "idb" : "memory";
-    if (!cacheCabByTypeRef.current[key]) {
-      cacheCabByTypeRef.current[key] = new CacheCab({ storageType: key });
-    }
-    return cacheCabByTypeRef.current[key];
-  }, []);
   const [client, setClient] = useState(
     typeof window !== "undefined" && sessionStorage ? JSON.parse(sessionStorage.getItem("quill-client") ?? "null") : null
   );
@@ -24022,6 +23989,7 @@ var ContextProvider = ({
   const [isClientLoading, setIsClientLoading] = useState(false);
   const [isDashboardsLoading, setIsDashboardsLoading] = useState(true);
   const [theme, setTheme] = useState(null);
+  const [rawDashboards, setRawDashboards] = useState(void 0);
   const [schemaData, setSchemaData] = useState({
     schema: [],
     customFields: null,
@@ -24896,14 +24864,12 @@ var ContextProvider = ({
           }
           acc[dashboard2.name] = {};
           if (dashboard2.dateFilter) {
+            const primaryRangeValue = dashboard2.dateFilter.primaryRange?.value;
+            const selectedPresetRange = presetOptions.find((elem) => elem.value === primaryRangeValue) ?? PRIMARY_RANGE[primaryRangeValue ?? "LAST_30_DAYS"];
             dashboard2.dateFilter = {
               ...dashboard2.dateFilter,
-              startDate: presetOptions.find(
-                (elem) => elem.value === dashboard2.dateFilter.primaryRange?.value
-              )?.startDate,
-              endDate: presetOptions.find(
-                (elem) => elem.value === dashboard2.dateFilter.primaryRange?.value
-              )?.endDate,
+              startDate: selectedPresetRange?.startDate,
+              endDate: selectedPresetRange?.endDate,
               filterType: "date_range",
               presetOptions: dashboard2.dateFilter.presetOptions?.map(
                 (preset) => ({
@@ -25239,15 +25205,13 @@ var ContextProvider = ({
         }
         acc[dashboard2.name] = {};
         if (dashboard2.dateFilter) {
+          const primaryRangeValue = dashboard2.dateFilter.primaryRange?.value;
+          const selectedPresetRange = presetOptions.find((elem) => elem.value === primaryRangeValue) ?? PRIMARY_RANGE[primaryRangeValue ?? "LAST_30_DAYS"];
           dashboard2.dateFilter = {
             ...dashboard2.dateFilter,
             initialCacheDateRange: dashboard2.initialCacheDateRange ? { ...dashboard2.initialCacheDateRange } : void 0,
-            startDate: presetOptions.find(
-              (elem) => elem.value === dashboard2.dateFilter.primaryRange?.value
-            )?.startDate,
-            endDate: presetOptions.find(
-              (elem) => elem.value === dashboard2.dateFilter.primaryRange?.value
-            )?.endDate,
+            startDate: selectedPresetRange?.startDate,
+            endDate: selectedPresetRange?.endDate,
             filterType: "date_range",
             presetOptions: dashboard2.dateFilter.presetOptions?.map(
               (preset) => ({
@@ -25317,6 +25281,33 @@ var ContextProvider = ({
       });
     });
   }
+  const cacheCabByTypeRef = useRef({});
+  const getCacheCab = useCallback((storageType) => {
+    const key = storageType === "indexedDB" ? "indexedDB" : "memory";
+    if (!cacheCabByTypeRef.current[key]) {
+      cacheCabByTypeRef.current[key] = new CacheCab({
+        storageType: key,
+        client: {
+          clientId: publicKey,
+          queryEndpoint,
+          queryHeaders,
+          withCredentials: !!withCredentials
+        },
+        tenants,
+        dashboards: rawDashboards,
+        getToken: getAuthorizationToken
+      });
+    }
+    return cacheCabByTypeRef.current[key];
+  }, [
+    publicKey,
+    queryEndpoint,
+    queryHeaders,
+    withCredentials,
+    tenants,
+    getAuthorizationToken,
+    rawDashboards
+  ]);
   useEffect(() => {
     async function fetchEnvironment(publicKey2) {
       if (!publicKey2) return;
@@ -25381,6 +25372,8 @@ var ContextProvider = ({
           });
         }
         if (envData) {
+          const dashboardsFromEnv = envData.dashboards ?? envData.data?.dashboards ?? envData.environment?.dashboards ?? envData.dashboardsResponse ?? [];
+          setRawDashboards(dashboardsFromEnv);
           const normalizeSchema = (schema2) => {
             if (!schema2) return [];
             const tables = Array.isArray(schema2) ? schema2 : schema2?.tables && Array.isArray(schema2.tables) ? schema2.tables : [];
@@ -25425,9 +25418,7 @@ var ContextProvider = ({
           reportFiltersDispatch({ type: "CLEAR_REPORT_FILTERS" });
           reportsDispatch({ type: "CLEAR_REPORTS" });
           backfilledDashboards.current.clear();
-          hydrateDashboardsFromResponse(
-            envData.dashboards ?? envData.data?.dashboards ?? envData.environment?.dashboards ?? envData.dashboardsResponse ?? []
-          );
+          hydrateDashboardsFromResponse(dashboardsFromEnv);
           environmentHydratedRef.current = true;
         }
       } catch (error) {
@@ -25620,7 +25611,7 @@ import {
   startOfWeek as startOfWeek4,
   startOfYear as startOfYear3
 } from "date-fns";
-import { utcToZonedTime as utcToZonedTime3 } from "date-fns-tz";
+import { utcToZonedTime as utcToZonedTime4 } from "date-fns-tz";
 function mergeComparisonRange(resp) {
   if (resp.chartType === "table") return resp;
   const compRows = resp.compareRows;
@@ -26296,7 +26287,7 @@ var useDashboards = () => {
   };
 };
 var useDashboard = (dashboardName, config) => {
-  const logCacheStatistics = config?.showCacheLogs || false;
+  const logCacheStatistics = config?.frontendCacheConfig?.showCacheLogs || false;
   const { data, dashboardFilters, reload, isLoading } = useDashboardInternal(dashboardName);
   const [lastUpdated, setLastUpdated] = useState2(0);
   const { customFilterDispatch } = useContext(DashboardFiltersContext);
@@ -26315,10 +26306,10 @@ var useDashboard = (dashboardName, config) => {
   const pendingNameChangeReload = useRef2(false);
   const [loadedDashes, setLoadedDashes] = useState2([]);
   const [lastUpdatedDict, setLastUpdatedDict] = useState2({});
-  const cacheEnabled = config?.cacheEnabled ?? false;
+  const cacheEnabled = config?.frontendCacheConfig?.cacheType !== void 0;
   const cacheCab = useMemo2(
-    () => getCacheCab(config?.cacheType),
-    [getCacheCab, config?.cacheType]
+    () => getCacheCab(config?.frontendCacheConfig?.cacheType),
+    [getCacheCab, config?.frontendCacheConfig?.cacheType]
   );
   useEffect2(() => {
     const nameChanged = dashboardName !== lastDashboardName.current;
@@ -26384,13 +26375,13 @@ var useDashboard = (dashboardName, config) => {
   useEffect2(() => {
     if (!fetchedInitialReports.current && data && dashboardFilters !== null) {
       fetchedInitialReports.current = true;
-      fetchReports([], dashboardFilters ?? [], config?.pageSize);
+      fetchReports([], dashboardFilters ?? [], config?.pageSize, config?.disableBackendCache ?? true);
     }
   }, [fetchedInitialReports, data, dashboardFilters, customFiltersLoaded]);
   useEffect2(() => {
     if (customFiltersLoaded && data && dashboardFilters !== null) {
       fetchedInitialReports.current = true;
-      fetchReports([], dashboardFilters ?? [], config?.pageSize);
+      fetchReports([], dashboardFilters ?? [], config?.pageSize, config?.disableBackendCache ?? true);
     }
   }, [customFiltersLoaded]);
   const applyDashboardFilters = (filtersToUpdate) => {
@@ -26501,13 +26492,13 @@ var useDashboard = (dashboardName, config) => {
     const customFilters = filters2.filter(isFilter2);
     const newCustomFilters = applyCustomFilters(customFilters);
     const newDashboardFilters = applyDashboardFilters(dashboardFilters2);
-    fetchReports(newCustomFilters, newDashboardFilters);
+    fetchReports(newCustomFilters, newDashboardFilters, void 0, config?.disableBackendCache ?? true);
   };
   const forceCacheRefresh = () => {
     if (!cacheEnabled) return;
-    fetchReports([], dashboardFilters ?? [], config?.pageSize, true);
+    fetchReports([], dashboardFilters ?? [], config?.pageSize, false);
   };
-  const fetchReports = async (customFilters, dashboardFilters2, pageSize, forceCacheToRefresh = false) => {
+  const fetchReports = async (customFilters, dashboardFilters2, pageSize, useBackendCache = true) => {
     if (!client || !sections) return;
     const allReports = Object.values(sections).flat();
     const fetchStartTime = Date.now();
@@ -26534,7 +26525,7 @@ var useDashboard = (dashboardName, config) => {
         const additionalProcessing = {
           page: pagination
         };
-        const usePivotTask = !cacheEnabled && !!reportInfo.pivot;
+        const usePivotTask = !!reportInfo.pivot;
         const allFilters = dashboardFilters2.concat(customFilters).concat(customReportFiltersArray);
         const applyInMemoryPivotIfNeeded = (report2) => {
           const pivotToApply = reportInfo.pivot ?? report2.pivot;
@@ -26559,31 +26550,32 @@ var useDashboard = (dashboardName, config) => {
             pivotRowCount: pivotRows.length
           };
         };
-        if (cacheEnabled && cacheCab.isCacheable(reportId)) {
-          const report2 = await cacheCab.get(reportId, dashboardFilters2, customFilters.concat(customReportFiltersArray), reportInfo.pivot, client, tenants, flags, pageSize, getToken, eventTracking, forceCacheToRefresh);
-          if (reportRequestIds.current[reportId] !== requestId) {
-            return null;
-          }
+        if (cacheEnabled) {
+          await cacheCab.ensureReady();
           if (cacheCab.isCacheable(reportId)) {
-            reportsDispatch({
-              type: "UPDATE_REPORT",
-              id: reportId,
-              data: {
-                ...report2,
-                pagination,
-                triggerReload: false
-              }
-            });
-            reportsLoadingStateDispatch({
-              type: "SET_REPORT_LOADING",
-              id: reportId,
-              data: false
-            });
-            totalCached += 1;
-            return report2;
+            const report2 = await cacheCab.get(reportId, dashboardFilters2, customFilters.concat(customReportFiltersArray), reportInfo.pivot, client, tenants, flags, pageSize, getToken, eventTracking, !useBackendCache);
+            if (reportRequestIds.current[reportId] !== requestId) {
+              return null;
+            }
+            if (cacheCab.isCacheable(reportId)) {
+              reportsDispatch({
+                type: "UPDATE_REPORT",
+                id: reportId,
+                data: {
+                  ...report2,
+                  pagination,
+                  triggerReload: false
+                }
+              });
+              reportsLoadingStateDispatch({
+                type: "SET_REPORT_LOADING",
+                id: reportId,
+                data: false
+              });
+              totalCached += 1;
+              return report2;
+            }
           }
-        }
-        if (cacheEnabled && !cacheCab.isCacheable(reportId)) {
           try {
             const { report: uncacheableReport, fromCache } = await cacheCab.getOrFetchUncacheableResult(
               reportId,
@@ -26599,19 +26591,20 @@ var useDashboard = (dashboardName, config) => {
                   client,
                   tenants,
                   flags,
-                  additionalProcessing,
+                  additionalProcessing: usePivotTask ? additionalProcessing : { page: { rowsPerPage: 1e3, rowsPerRequest: 1e5 } },
+                  // TODO wire maxRows from cacheCab state into here
                   filters: allFilters,
                   getToken,
                   eventTracking,
                   usePivotTask,
-                  overwriteCache: forceCacheToRefresh
+                  overwriteCache: !useBackendCache
                 });
                 if (error2 || !report2) {
                   throw error2 ?? new Error("Failed to fetch uncacheable report");
                 }
                 return report2;
               },
-              forceCacheToRefresh
+              !useBackendCache
             );
             if (reportRequestIds.current[reportId] !== requestId) {
               return null;
@@ -26643,7 +26636,7 @@ var useDashboard = (dashboardName, config) => {
                 filters: allFilters,
                 getToken,
                 additionalProcessing,
-                overwriteCache: forceCacheToRefresh
+                overwriteCache: !useBackendCache
               }).then(({ rows, rowCount, columns, fields }) => {
                 if (reportRequestIds.current[reportId] !== requestId) {
                   return;
@@ -26676,7 +26669,7 @@ var useDashboard = (dashboardName, config) => {
             return uncacheableReportWithPivot;
           } catch (error2) {
             console.error(error2);
-            const errorMessage = error2 instanceof Error ? error2.message : "Failed to fetch report";
+            const errorMessage = error2 instanceof Error ? error2.message : typeof error2 == "string" ? error2 : "Failed to fetch report";
             reportsDispatch({
               type: "UPDATE_REPORT",
               id: reportId,
@@ -26704,7 +26697,7 @@ var useDashboard = (dashboardName, config) => {
           getToken,
           eventTracking,
           usePivotTask,
-          overwriteCache: forceCacheToRefresh
+          overwriteCache: !useBackendCache
           // usePivotTask: false,
         });
         if (reportRequestIds.current[reportId] !== requestId) {
@@ -26739,7 +26732,7 @@ var useDashboard = (dashboardName, config) => {
             filters: allFilters,
             getToken,
             additionalProcessing,
-            overwriteCache: forceCacheToRefresh
+            overwriteCache: !useBackendCache
           }).then(({ rows, rowCount, columns, fields }) => {
             if (reportRequestIds.current[reportId] !== requestId) {
               return;
@@ -26772,12 +26765,12 @@ var useDashboard = (dashboardName, config) => {
         return report;
       })
     );
-    if (!loadedDashes.includes(dashboardName) || !cacheEnabled || forceCacheToRefresh) {
+    if (!loadedDashes.includes(dashboardName) || !cacheEnabled || !useBackendCache) {
       setLoadedDashes((prev) => prev.includes(dashboardName) ? prev : [...prev, dashboardName]);
       setLastUpdatedDict((prev) => ({ ...prev, [dashboardName]: Date.now() }));
     }
     if (logCacheStatistics) {
-      console.log(`Dashboard "${dashboardName}": Cache Rate: ${(100 * totalCached / allReports.length).toFixed(1)}%, load time: ${((Date.now() - fetchStartTime) / 1e3).toFixed(2)} secs`);
+      console.log(`Dashboard "${dashboardName}": Cache Rate: ${(100 * totalCached / Math.max(1, allReports.length)).toFixed(1)}%, load time: ${((Date.now() - fetchStartTime) / 1e3).toFixed(2)} secs`);
     }
   };
   return {
@@ -31353,7 +31346,7 @@ import {
 
 // src/utils/axisFormatter.ts
 import { endOfWeek as endOfWeek2, format as format5, getWeek as getWeek2, isValid as isValid5, startOfWeek as startOfWeek5 } from "date-fns";
-import { utcToZonedTime as utcToZonedTime4 } from "date-fns-tz";
+import { utcToZonedTime as utcToZonedTime5 } from "date-fns-tz";
 var axisFormatter = ({ value, field, fields }) => {
   if (field === void 0 || field === null) return "";
   if (value === void 0 || value === null) return "";
@@ -31469,7 +31462,7 @@ var formatPercent2 = (value) => {
   return formatter.format(Number(value));
 };
 var _getUTCDateHelper2 = (value, fmt) => {
-  const utcDate = utcToZonedTime4(new Date(value), "UTC");
+  const utcDate = utcToZonedTime5(new Date(value), "UTC");
   if (!isValid5(utcDate)) return "Invalid date";
   return format5(utcDate, fmt);
 };
@@ -31479,7 +31472,7 @@ var format_MMM_yyyy2 = (value) => _getUTCDateHelper2(value, "MMM yyyy");
 var format_hh_ap_pm2 = (value) => _getUTCDateHelper2(value, "hh:mm aa");
 var format_MMM_dd_yyyy2 = (value) => _getUTCDateHelper2(value, "dd MMM yyyy");
 var format_MMM_dd_MMM_dd = (value) => {
-  const utcDate = utcToZonedTime4(new Date(value), "UTC");
+  const utcDate = utcToZonedTime5(new Date(value), "UTC");
   if (!isValid5(utcDate)) return "Invalid date";
   const monday = startOfWeek5(utcDate, { weekStartsOn: 1 });
   const sunday = endOfWeek2(utcDate, { weekStartsOn: 1 });
@@ -31490,14 +31483,14 @@ var format_MMM_dd_MMM_dd = (value) => {
   }
 };
 var format_MMM_dd_hh_mm_ap_pm2 = (value) => {
-  const utcDate = utcToZonedTime4(new Date(value), "UTC");
+  const utcDate = utcToZonedTime5(new Date(value), "UTC");
   if (!isValid5(utcDate)) return "Invalid date";
   const formatStr = utcDate.getMinutes() === 0 ? "MMM do h a" : "MMM do h:mm a";
   const res = format5(utcDate, formatStr);
   return res.slice(0, -2) + res.slice(-2).toLowerCase();
 };
 var format_wo_yyyy2 = (value) => {
-  const utcDate = utcToZonedTime4(new Date(value), "UTC");
+  const utcDate = utcToZonedTime5(new Date(value), "UTC");
   if (!isValid5(utcDate)) return "Invalid date";
   return `${getWeek2(utcDate)},${utcDate.getFullYear()}`;
 };
@@ -32826,8 +32819,8 @@ import {
   differenceInDays as differenceInDays3,
   startOfDay as startOfDay6,
   addMonths as addMonths2,
-  isBefore as isBefore2,
-  isAfter as isAfter2
+  isBefore,
+  isAfter
 } from "date-fns";
 
 // src/components/QuillSelect.tsx
@@ -33619,7 +33612,7 @@ function DayPicker({
 }) {
   const isStartDate = differenceInDays3(startOfDay6(date), startOfDay6(localStartDate || 0)) === 0;
   const isEndDate = differenceInDays3(startOfDay6(date), startOfDay6(localEndDate || 0)) === 0;
-  const isBetweenStartAndEnd = isBefore2(date, localEndDate || 0) && isAfter2(date, localStartDate || 0);
+  const isBetweenStartAndEnd = isBefore(date, localEndDate || 0) && isAfter(date, localStartDate || 0);
   const isBeginningOfWeek = differenceInDays3(startOfWeek6(date), date) === 0;
   const isEndOfWeek = differenceInDays3(endOfWeek3(date), date) === 0;
   return /* @__PURE__ */ jsx40(
@@ -33653,7 +33646,7 @@ function DayPicker({
           });
           setLocalPreset("");
         }
-        if (localStartDate && localEndDate && isAfter2(date, localStartDate)) {
+        if (localStartDate && localEndDate && isAfter(date, localStartDate)) {
           setLocalEndDate(date);
           updateDateFilter({
             startDate: startOfDay6(localStartDate),
@@ -33661,7 +33654,7 @@ function DayPicker({
           });
           setLocalPreset("");
         }
-        if (localStartDate && localEndDate && isBefore2(date, localStartDate)) {
+        if (localStartDate && localEndDate && isBefore(date, localStartDate)) {
           setLocalStartDate(date);
           updateDateFilter({
             startDate: startOfDay6(date),
@@ -37915,6 +37908,10 @@ function Chart({
     if (!shouldShowCloudCacheValidationErrors) return false;
     return reportUsesLimitClause(report);
   }, [report, shouldShowCloudCacheValidationErrors]);
+  const hasUncacheableReason = useMemo14(() => {
+    if (!shouldShowCloudCacheValidationErrors) return false;
+    return !!(report?.isCacheableReason && !report.isCacheable);
+  }, [report, shouldShowCloudCacheValidationErrors]);
   const missingDashboardFilterFields = useMemo14(() => {
     if (!shouldShowCloudCacheValidationErrors || !report) return [];
     return getMissingDashboardFilterFields({
@@ -38062,6 +38059,14 @@ function Chart({
   if (report?.error || error) {
     return /* @__PURE__ */ jsx49("div", { style: containerStyle, className, children: /* @__PURE__ */ jsx49(ChartError, { errorMessage: report?.error ?? error }) });
   }
+  if (hasUncacheableReason) {
+    return /* @__PURE__ */ jsx49("div", { style: containerStyle, className, children: /* @__PURE__ */ jsx49(
+      ChartError,
+      {
+        errorMessage: `The query for this report cannot be cached: ${report?.isCacheableReason}.`
+      }
+    ) });
+  }
   if (isMissingDateField) {
     return /* @__PURE__ */ jsx49("div", { style: containerStyle, className, children: /* @__PURE__ */ jsx49(
       ChartError,
@@ -41874,7 +41879,6 @@ var styles = {
     gridTemplateColumns: "repeat(auto-fill,minmax(400px, 1fr))",
     gridTemplateRows: `repeat(${170}px)`
   },
-  chartColumn: { display: "contents" },
   emptyCard: {
     backgroundColor: "#ffffff",
     padding: 24,
@@ -41931,9 +41935,6 @@ var styles = {
     minHeight: 300,
     boxSizing: "content-box"
   },
-  metricGrid: {
-    display: "contents"
-  },
   metricEmpty: {
     backgroundColor: "#ffffff",
     padding: 24,
@@ -42346,8 +42347,8 @@ function DashboardContent({
       return aIndex - bIndex;
     });
   }, [sections, sectionOrder]);
-  return /* @__PURE__ */ jsx60("div", { style: styles.contentWrap, children: /* @__PURE__ */ jsxs43("div", { style: styles.splitGrid, children: [
-    metricReports.length === 0 ? null : /* @__PURE__ */ jsx60("section", { style: styles.metricGrid, children: metricReports.map((report) => /* @__PURE__ */ jsxs43(
+  return /* @__PURE__ */ jsxs43("div", { style: styles.contentWrap, children: [
+    metricReports.length === 0 ? null : /* @__PURE__ */ jsx60("div", { style: styles.splitGrid, children: /* @__PURE__ */ jsx60("section", { children: metricReports.map((report) => /* @__PURE__ */ jsxs43(
       "div",
       {
         onClick: () => onClickReport(report),
@@ -42364,8 +42365,8 @@ function DashboardContent({
         ]
       },
       report.id
-    )) }),
-    chartReports.length === 0 ? null : /* @__PURE__ */ jsx60("section", { style: styles.chartColumn, children: chartReports.map((report) => /* @__PURE__ */ jsxs43(
+    )) }) }),
+    chartReports.length === 0 ? null : /* @__PURE__ */ jsx60("div", { style: styles.splitGrid, children: /* @__PURE__ */ jsx60("section", { children: chartReports.map((report) => /* @__PURE__ */ jsxs43(
       "div",
       {
         onClick: () => onClickReport(report),
@@ -42382,69 +42383,71 @@ function DashboardContent({
         ]
       },
       report.id
-    )) }),
-    tableReports.length === 0 ? null : /* @__PURE__ */ jsx60("section", { style: styles.tableColumn, children: tableReports.map((report) => /* @__PURE__ */ jsxs43(
-      "div",
-      {
-        onClick: () => onClickReport(report),
-        style: styles.tableCard,
-        children: [
-          /* @__PURE__ */ jsx60("div", { style: styles.tableCardHeader, children: /* @__PURE__ */ jsx60("h3", { style: styles.tableTitle, children: report.name }) }),
-          /* @__PURE__ */ jsx60("div", { style: styles.tableContainer, children: /* @__PURE__ */ jsx60(
-            StaticChart,
+    )) }) }),
+    tableReports.length === 0 && orderedNonRootSectionEntries.length === 0 ? null : /* @__PURE__ */ jsxs43("div", { style: styles.splitGrid, children: [
+      tableReports.length === 0 ? null : /* @__PURE__ */ jsx60("section", { style: styles.tableColumn, children: tableReports.map((report) => /* @__PURE__ */ jsxs43(
+        "div",
+        {
+          onClick: () => onClickReport(report),
+          style: styles.tableCard,
+          children: [
+            /* @__PURE__ */ jsx60("div", { style: styles.tableCardHeader, children: /* @__PURE__ */ jsx60("h3", { style: styles.tableTitle, children: report.name }) }),
+            /* @__PURE__ */ jsx60("div", { style: styles.tableContainer, children: /* @__PURE__ */ jsx60(
+              StaticChart,
+              {
+                reportId: report.id,
+                containerStyle: { height: "100%", width: "100%" }
+              }
+            ) })
+          ]
+        },
+        report.id
+      )) }),
+      orderedNonRootSectionEntries.length === 0 ? null : /* @__PURE__ */ jsx60("section", { style: styles.tableColumn, children: orderedNonRootSectionEntries.map(([sectionName, sectionReports]) => /* @__PURE__ */ jsxs43("div", { style: styles.tableSectionCard, children: [
+        /* @__PURE__ */ jsx60("h1", { style: styles.tableSectionTitle, children: sectionName }),
+        /* @__PURE__ */ jsx60("div", { style: styles.tableSectionGrid, children: sectionReports.map((report) => {
+          const isMetric = report.chartType === "metric";
+          const isTable = report.chartType === "table";
+          return /* @__PURE__ */ jsxs43(
+            "div",
             {
-              reportId: report.id,
-              containerStyle: { height: "100%", width: "100%" }
-            }
-          ) })
-        ]
-      },
-      report.id
-    )) }),
-    orderedNonRootSectionEntries.length === 0 ? null : /* @__PURE__ */ jsx60("section", { style: styles.tableColumn, children: orderedNonRootSectionEntries.map(([sectionName, sectionReports]) => /* @__PURE__ */ jsxs43("div", { style: styles.tableSectionCard, children: [
-      /* @__PURE__ */ jsx60("h1", { style: styles.tableSectionTitle, children: sectionName }),
-      /* @__PURE__ */ jsx60("div", { style: styles.tableSectionGrid, children: sectionReports.map((report) => {
-        const isMetric = report.chartType === "metric";
-        const isTable = report.chartType === "table";
-        return /* @__PURE__ */ jsxs43(
-          "div",
-          {
-            onClick: () => onClickReport(report),
-            style: isMetric ? styles.metricCard : isTable ? styles.tableCard : styles.chartCard,
-            children: [
-              /* @__PURE__ */ jsx60(
-                "div",
-                {
-                  style: isMetric ? styles.metricHeader : isTable ? styles.tableCardHeader : styles.chartCardHeader,
-                  children: /* @__PURE__ */ jsx60(
-                    "h3",
-                    {
-                      style: isMetric ? styles.metricTitle : isTable ? styles.tableTitle : styles.chartTitle,
-                      children: report.name
-                    }
-                  )
-                }
-              ),
-              /* @__PURE__ */ jsx60(
-                "div",
-                {
-                  style: isMetric ? styles.metricChartWrap : isTable ? styles.tableContainer : styles.chartContainer,
-                  children: /* @__PURE__ */ jsx60(
-                    StaticChart,
-                    {
-                      reportId: report.id,
-                      containerStyle: isMetric ? { height: 100, width: "100%" } : isTable ? { height: "100%", width: "100%" } : { height: 300, width: "100%" }
-                    }
-                  )
-                }
-              )
-            ]
-          },
-          report.id
-        );
-      }) })
-    ] }, sectionName)) })
-  ] }) });
+              onClick: () => onClickReport(report),
+              style: isMetric ? styles.metricCard : isTable ? styles.tableCard : styles.chartCard,
+              children: [
+                /* @__PURE__ */ jsx60(
+                  "div",
+                  {
+                    style: isMetric ? styles.metricHeader : isTable ? styles.tableCardHeader : styles.chartCardHeader,
+                    children: /* @__PURE__ */ jsx60(
+                      "h3",
+                      {
+                        style: isMetric ? styles.metricTitle : isTable ? styles.tableTitle : styles.chartTitle,
+                        children: report.name
+                      }
+                    )
+                  }
+                ),
+                /* @__PURE__ */ jsx60(
+                  "div",
+                  {
+                    style: isMetric ? styles.metricChartWrap : isTable ? styles.tableContainer : styles.chartContainer,
+                    children: /* @__PURE__ */ jsx60(
+                      StaticChart,
+                      {
+                        reportId: report.id,
+                        containerStyle: isMetric ? { height: 100, width: "100%" } : isTable ? { height: "100%", width: "100%" } : { height: 300, width: "100%" }
+                      }
+                    )
+                  }
+                )
+              ]
+            },
+            report.id
+          );
+        }) })
+      ] }, sectionName)) })
+    ] })
+  ] });
 }
 
 // src/QuillProvider.tsx