Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Added yesterday option in date range selector.

Guillermo Graub5c9690780b0
diff --git a/components/common/DateFilter.js b/components/common/DateFilter.js
index 8e50e95a6..d568a889e 100644
--- a/components/common/DateFilter.js
+++ b/components/common/DateFilter.js
@@ -18,6 +18,10 @@ export const filterOptions = [
),
value: '24hour',
},
+ {
+ label: <FormattedMessage id="label.yesterday" defaultMessage="Yesterday" />,
+ value: '-1day',
+ },
{
label: <FormattedMessage id="label.this-week" defaultMessage="This week" />,
value: '1week',
diff --git a/lib/date.js b/lib/date.js
index 6897df213..cae39ce41 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -7,6 +7,8 @@ import {
addYears,
subHours,
subDays,
+ subMonths,
+ subYears,
startOfMinute,
startOfHour,
startOfDay,
@@ -39,7 +41,7 @@ export function getDateRange(value, locale = 'en-US') {
const now = new Date();
const dateLocale = getDateLocale(locale);
- const match = value.match(/^(?<num>[0-9]+)(?<unit>hour|day|week|month|year)$/);
+ const match = value.match(/^(?<num>[0-9-]+)(?<unit>hour|day|week|month|year)$/);
if (!match) return;
@@ -78,6 +80,39 @@ export function getDateRange(value, locale = 'en-US') {
}
}
+ if (+num === -1) {
+ switch (unit) {
+ case 'day':
+ return {
+ startDate: subDays(startOfDay(now), 1),
+ endDate: subDays(endOfDay(now), 1),
+ unit: 'hour',
+ value,
+ };
+ case 'week':
+ return {
+ startDate: subDays(startOfWeek(now, { locale: dateLocale }), 7),
+ endDate: subDays(endOfWeek(now, { locale: dateLocale }), 1),
+ unit: 'day',
+ value,
+ };
+ case 'month':
+ return {
+ startDate: subMonths(startOfMonth(now), 1),
+ endDate: subMonths(endOfMonth(now), 1),
+ unit: 'day',
+ value,
+ };
+ case 'year':
+ return {
+ startDate: subYears(startOfYear(now), 1),
+ endDate: subYears(endOfYear(now), 1),
+ unit: 'month',
+ value,
+ };
+ }
+ }
+
switch (unit) {
case 'day':
return {