Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
update date range parser and date picker
Maxime-J9b501d03e9b6
diff --git a/src/components/metrics/DatePickerForm.js b/src/components/metrics/DatePickerForm.jsindex fa45b64ac..9eb3c52e9 100644--- a/src/components/metrics/DatePickerForm.js+++ b/src/components/metrics/DatePickerForm.js@@ -1,6 +1,6 @@import { useState } from 'react';import { Button, ButtonGroup, Calendar } from 'react-basics';-import { isAfter, isBefore, isSameDay } from 'date-fns';+import { isAfter, isBefore, isSameDay, startOfDay, endOfDay } from 'date-fns';import useLocale from 'components/hooks/useLocale';import { getDateLocale } from 'lib/lang';import { FILTER_DAY, FILTER_RANGE } from 'lib/constants';@@ -31,9 +31,9 @@ export function DatePickerForm({const handleSave = () => {if (selected === FILTER_DAY) {- onChange(`range:${singleDate.getTime()}:${singleDate.getTime()}`);+ onChange(`range:${startOfDay(singleDate).getTime()}:${endOfDay(singleDate).getTime()}`);} else {- onChange(`range:${startDate.getTime()}:${endDate.getTime()}`);+ onChange(`range:${startOfDay(startDate).getTime()}:${endOfDay(endDate).getTime()}`);}};diff --git a/src/lib/date.ts b/src/lib/date.tsindex 14f0e13ce..bfbfc0b91 100644--- a/src/lib/date.ts+++ b/src/lib/date.ts@@ -78,7 +78,9 @@ export function parseDateRange(value, locale = 'en-US') {const endDate = new Date(+endTime);return {- ...getDateRangeValues(startDate, endDate),+ startDate,+ endDate,+ unit: getMinimumUnit(startDate, endDate),value,};}@@ -255,14 +257,6 @@ export function getMinimumUnit(startDate, endDate) {return 'year';}-export function getDateRangeValues(startDate, endDate) {- return {- startDate: startOfDay(startDate),- endDate: endOfDay(endDate),- unit: getMinimumUnit(startDate, endDate),- };-}-export function getDateFromString(str) {const [ymd, hms] = str.split(' ');const [year, month, day] = ymd.split('-');