mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 04:37:11 +01:00
fix "Last X unit" minDate cutoff
This commit is contained in:
parent
89d3cd4f5a
commit
55c8a6f7cc
1 changed files with 3 additions and 7 deletions
|
|
@ -122,8 +122,9 @@ export function parseDateValue(value: string) {
|
||||||
if (!match) return null;
|
if (!match) return null;
|
||||||
|
|
||||||
const { num, unit } = match.groups;
|
const { num, unit } = match.groups;
|
||||||
|
const formattedNum = +num > 0 ? +num - 1 : +num;
|
||||||
|
|
||||||
return { num: +num, unit };
|
return { num: formattedNum, unit };
|
||||||
}
|
}
|
||||||
|
|
||||||
export function parseDateRange(value: string, locale = 'en-US'): DateRange {
|
export function parseDateRange(value: string, locale = 'en-US'): DateRange {
|
||||||
|
|
@ -157,12 +158,7 @@ export function parseDateRange(value: string, locale = 'en-US'): DateRange {
|
||||||
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const dateLocale = getDateLocale(locale);
|
const dateLocale = getDateLocale(locale);
|
||||||
const { unit } = parseDateValue(value);
|
const { num = 1, unit } = parseDateValue(value);
|
||||||
let { num = 1 } = parseDateValue(value);
|
|
||||||
|
|
||||||
if (value === '7day') {
|
|
||||||
num--;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (unit) {
|
switch (unit) {
|
||||||
case 'hour':
|
case 'hour':
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue