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.

Merge branch 'master' into dev

Mike Caod23ad5f2721f
diff --cc src/lib/date.ts
index fa87277f3,85f64f253..afbe07211
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@@ -94,20 -104,20 +94,29 @@@ export const DATE_FUNCTIONS =
},
};
+export const DATE_FORMATS = {
+ minute: 'yyyy-MM-dd HH:mm',
+ hour: 'yyyy-MM-dd HH',
+ day: 'yyyy-MM-dd',
+ week: "yyyy-'W'II",
+ month: 'yyyy-MM',
+ year: 'yyyy',
+};
+
+ const TIMEZONE_MAPPINGS: Record<string, string> = {
+ 'Asia/Calcutta': 'Asia/Kolkata',
+ };
+
+ export function normalizeTimezone(timezone: string): string {
+ return TIMEZONE_MAPPINGS[timezone] || timezone;
+ }
+
export function isValidTimezone(timezone: string) {
try {
- Intl.DateTimeFormat(undefined, { timeZone: timezone });
+ const normalizedTimezone = normalizeTimezone(timezone);
+ Intl.DateTimeFormat(undefined, { timeZone: normalizedTimezone });
return true;
- } catch (error) {
+ } catch {
return false;
}
}
diff --cc src/lib/schema.ts
index 965eae079,51a95748c..24ef99c3d
--- a/src/lib/schema.ts
+++ b/src/lib/schema.ts
@@@ -1,27 -1,9 +1,30 @@@
import { z } from 'zod';
- import { isValidTimezone } from '@/lib/date';
+ import { isValidTimezone, normalizeTimezone } from '@/lib/date';
import { UNIT_TYPES } from './constants';
- export const timezoneParam = z.string().refine(value => isValidTimezone(value), {
- message: 'Invalid timezone',
- });
++export const timezoneParam = z
++ .string()
++ .refine((value: string) => isValidTimezone(value), {
++ message: 'Invalid timezone',
++ })
++ .transform((value: string) => normalizeTimezone(value));
+
+export const unitParam = z.string().refine(value => UNIT_TYPES.includes(value), {
+ message: 'Invalid unit',
+});
+
+export const dateRangeParams = {
+ startAt: z.coerce.number().optional(),
+ endAt: z.coerce.number().optional(),
+ startDate: z.coerce.date().optional(),
+ endDate: z.coerce.date().optional(),
+ timezone: timezoneParam.optional(),
+ unit: unitParam.optional(),
+ compare: z.string().optional(),
+};
+
export const filterParams = {
- url: z.string().optional(),
+ path: z.string().optional(),
referrer: z.string().optional(),
title: z.string().optional(),
query: z.string().optional(),