Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix(dashboard): ensure we only pass dates to formatdate

Carl-Gerhard Lindesvärd1784a48bfcb6
diff --git a/apps/dashboard/src/components/report-chart/common/axis.tsx b/apps/dashboard/src/components/report-chart/common/axis.tsx
index ce0c8c3b6..fbb597b90 100644
--- a/apps/dashboard/src/components/report-chart/common/axis.tsx
+++ b/apps/dashboard/src/components/report-chart/common/axis.tsx
@@ -72,7 +72,15 @@ export const useXAxisProps = (
scale: 'utc',
domain: ['dataMin', 'dataMax'] as AxisDomain,
tickFormatter:
- interval === 'auto' ? undefined : (m: string) => formatDate(new Date(m)),
+ interval === 'auto'
+ ? undefined
+ : (m: string) => {
+ if (['dataMin', 'dataMax'].includes(m)) {
+ return m;
+ }
+
+ return formatDate(new Date(m));
+ },
type: 'number' as const,
tickLine: false,
minTickGap: 20,
diff --git a/apps/dashboard/src/hooks/useFormatDateInterval.ts b/apps/dashboard/src/hooks/useFormatDateInterval.ts
index e57022116..1e3030547 100644
--- a/apps/dashboard/src/hooks/useFormatDateInterval.ts
+++ b/apps/dashboard/src/hooks/useFormatDateInterval.ts
@@ -1,26 +1,30 @@
import type { IInterval } from '@openpanel/validation';
export function formatDateInterval(interval: IInterval, date: Date): string {
- if (interval === 'hour' || interval === 'minute') {
- return new Intl.DateTimeFormat('en-GB', {
- hour: '2-digit',
- minute: '2-digit',
- }).format(date);
- }
+ try {
+ if (interval === 'hour' || interval === 'minute') {
+ return new Intl.DateTimeFormat('en-GB', {
+ hour: '2-digit',
+ minute: '2-digit',
+ }).format(date);
+ }
- if (interval === 'month') {
- return new Intl.DateTimeFormat('en-GB', { month: 'short' }).format(date);
- }
+ if (interval === 'month') {
+ return new Intl.DateTimeFormat('en-GB', { month: 'short' }).format(date);
+ }
- if (interval === 'day') {
- return new Intl.DateTimeFormat('en-GB', {
- weekday: 'short',
- day: '2-digit',
- month: '2-digit',
- }).format(date);
- }
+ if (interval === 'day') {
+ return new Intl.DateTimeFormat('en-GB', {
+ weekday: 'short',
+ day: '2-digit',
+ month: '2-digit',
+ }).format(date);
+ }
- return date.toISOString();
+ return date.toISOString();
+ } catch (e) {
+ return '';
+ }
}
export function useFormatDateInterval(interval: IInterval) {