diff --git a/scripts/check-env.js b/scripts/check-env.js index c73bed54..79c0984d 100644 --- a/scripts/check-env.js +++ b/scripts/check-env.js @@ -23,12 +23,5 @@ if (!process.env.SKIP_DB_CHECK && !process.env.DATABASE_TYPE) { } if (process.env.CLOUD_URL) { - checkMissing([ - 'CLOUD_URL', - 'CLICKHOUSE_URL', - 'REDIS_URL', - 'KAFKA_BROKER', - 'KAFKA_URL', - 'KAFKA_SASL_MECHANISM', - ]); + checkMissing(['CLOUD_URL', 'CLICKHOUSE_URL', 'REDIS_URL']); } diff --git a/src/lib/date.ts b/src/lib/date.ts index 410a8acf..02931834 100644 --- a/src/lib/date.ts +++ b/src/lib/date.ts @@ -122,9 +122,8 @@ export function parseDateValue(value: string) { if (!match) return null; 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 { @@ -158,7 +157,12 @@ export function parseDateRange(value: string, locale = 'en-US'): DateRange { const now = new Date(); 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) { case 'hour':