watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-11 16:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Mike Cao 2025-10-01 10:33:28 -07:00
commit 8ca73268ba
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/check-env.js
View file

@ -23,12 +23,5 @@ if (!process.env.SKIP_DB_CHECK && !process.env.DATABASE_TYPE) {
} }
if (process.env.CLOUD_URL) { if (process.env.CLOUD_URL) {
checkMissing([ checkMissing(['CLOUD_URL', 'CLICKHOUSE_URL', 'REDIS_URL']);
'CLOUD_URL',
'CLICKHOUSE_URL',
'REDIS_URL',
'KAFKA_BROKER',
'KAFKA_URL',
'KAFKA_SASL_MECHANISM',
]);
} }

10
src/lib/date.ts
View file

@ -122,9 +122,8 @@ 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: formattedNum, unit }; return { num: +num, unit };
} }
export function parseDateRange(value: string, locale = 'en-US'): DateRange { export function parseDateRange(value: string, locale = 'en-US'): DateRange {
@ -158,7 +157,12 @@ 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 { num = 1, unit } = parseDateValue(value); const { unit } = parseDateValue(value);
let { num = 1 } = parseDateValue(value);
if (value === '7day') {
num--;
}
switch (unit) { switch (unit) {
case 'hour': case 'hour':