From 91e004ebfba2ddbfdc0a813c983ab14139aeb8ae Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Wed, 20 Mar 2024 20:05:17 -0700 Subject: [PATCH 1/2] Null check. --- src/components/charts/Chart.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx index abaa6eb81..ba49796eb 100644 --- a/src/components/charts/Chart.tsx +++ b/src/components/charts/Chart.tsx @@ -111,7 +111,7 @@ export function Chart({ } else { const { index } = item; const meta = chart.current.getDatasetMeta(0); - const hidden = !!meta.data[index].hidden; + const hidden = !!meta?.data?.[index]?.hidden; meta.data[index].hidden = !hidden; chart.current.legend.legendItems[index].hidden = !hidden; From 58df502d43afddeb5e105bbb47f91d284f1cc1c7 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Wed, 20 Mar 2024 21:58:33 -0700 Subject: [PATCH 2/2] Fixed date filter display. --- src/lib/date.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/date.ts b/src/lib/date.ts index a71120293..19cd3d484 100644 --- a/src/lib/date.ts +++ b/src/lib/date.ts @@ -164,7 +164,7 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa case 'day': return { startDate: subDays(startOfDay(now), num), - endDate: endOfDay(now), + endDate: subDays(endOfDay(now), num ? 1 : 0), unit: num ? 'day' : 'hour', offset: 0, num: num || 1, @@ -181,8 +181,8 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa }; case 'month': return { - startDate: subMonths(startOfMonth(now), 1), - endDate: subMonths(endOfMonth(now), 1), + startDate: subMonths(startOfMonth(now), num), + endDate: subMonths(endOfMonth(now), num), unit: 'day', offset: 0, num: num || 1, @@ -190,8 +190,8 @@ export function parseDateRange(value: string | object, locale = 'en-US'): DateRa }; case 'year': return { - startDate: subYears(startOfYear(now), 1), - endDate: subYears(endOfYear(now), 1), + startDate: subYears(startOfYear(now), num), + endDate: subYears(endOfYear(now), num), unit: 'month', offset: 0, num: num || 1,