From 7001e21e7d5bbbf30a3abc34f92200763148ff0c Mon Sep 17 00:00:00 2001 From: Eric Wang Date: Mon, 11 Mar 2024 14:11:51 +0800 Subject: [PATCH] overview: fix filter today calc start & end (#2777) --- .../(appDetailLayout)/[appId]/overview/chartView.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chartView.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chartView.tsx index cd55faf8e1..93141dd86e 100644 --- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chartView.tsx +++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/chartView.tsx @@ -29,7 +29,17 @@ export default function ChartView({ appId }: IChartViewProps) { const [period, setPeriod] = useState({ name: t('appLog.filter.period.last7days'), query: { start: today.subtract(7, 'day').format(queryDateFormat), end: today.format(queryDateFormat) } }) const onSelect = (item: Item) => { - setPeriod({ name: item.name, query: item.value === 'all' ? undefined : { start: today.subtract(item.value as number, 'day').format(queryDateFormat), end: today.format(queryDateFormat) } }) + if (item.value === 'all') { + setPeriod({ name: item.name, query: undefined }) + } + else if (item.value === 0) { + const startOfToday = today.startOf('day').format(queryDateFormat) + const endOfToday = today.endOf('day').format(queryDateFormat) + setPeriod({ name: item.name, query: { start: startOfToday, end: endOfToday } }) + } + else { + setPeriod({ name: item.name, query: { start: today.subtract(item.value as number, 'day').format(queryDateFormat), end: today.format(queryDateFormat) } }) + } } if (!response)