watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 15:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
# Conflicts:
#	src/components/common/Pager.module.css
#	src/lib/constants.ts
#	src/lib/yup.ts
#	src/pages/api/teams/[id]/users/index.ts
#	src/pages/api/websites/[id]/reports.ts
This commit is contained in:
Mike Cao 2023-09-26 23:27:55 -07:00
commit 40cfcd41e9
19 changed files with 135 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/yup.ts Normal file
View file

@ -0,0 +1,15 @@
import moment from 'moment';
import * as yup from 'yup';
import { UNIT_TYPES } from './constants';
export const TimezoneTest = yup.string().test(
'timezone',
() => `Invalid timezone`,
value => moment.tz.zone(value) !== null,
);
export const UnitTypeTest = yup.string().test(
'unit',
() => `Invalid unit`,
value => UNIT_TYPES.includes(value),
);