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

add minute to UNIT_TYPES. Fix yup validations when all-time filter returne start date = end date

Browse source
This commit is contained in:
Francis Cao 2024-04-22 14:03:47 -07:00
parent 64d9a196cc
commit fde2be4900
7 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/constants.ts
View file

@ -30,7 +30,7 @@ export const FILTER_DAY = 'filter-day';
export const FILTER_RANGE = 'filter-range'; export const FILTER_RANGE = 'filter-range';
export const FILTER_REFERRERS = 'filter-referrers'; export const FILTER_REFERRERS = 'filter-referrers';
export const FILTER_PAGES = 'filter-pages'; export const FILTER_PAGES = 'filter-pages';
export const UNIT_TYPES = ['year', 'month', 'hour', 'day']; export const UNIT_TYPES = ['year', 'month', 'hour', 'day', 'minute'];
export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event']; export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
export const SESSION_COLUMNS = [ export const SESSION_COLUMNS = [

2
src/lib/schema.ts
View file

@ -2,7 +2,7 @@ import * as yup from 'yup';
export const dateRange = { export const dateRange = {
startAt: yup.number().integer().required(), startAt: yup.number().integer().required(),
endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(), endAt: yup.number().integer().min(yup.ref('startAt')).required(),
}; };
export const pageInfo = { export const pageInfo = {

2
src/pages/api/event-data/events.ts
View file

@ -17,7 +17,7 @@ const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
websiteId: yup.string().uuid().required(), websiteId: yup.string().uuid().required(),
startAt: yup.number().integer().required(), startAt: yup.number().integer().required(),
endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(), endAt: yup.number().integer().min(yup.ref('startAt')).required(),
event: yup.string(), event: yup.string(),
}), }),
}; };

2
src/pages/api/event-data/fields.ts
View file

@ -17,7 +17,7 @@ const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
websiteId: yup.string().uuid().required(), websiteId: yup.string().uuid().required(),
startAt: yup.number().integer().required(), startAt: yup.number().integer().required(),
endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(), endAt: yup.number().integer().min(yup.ref('startAt')).required(),
field: yup.string(), field: yup.string(),
}), }),
}; };

2
src/pages/api/event-data/stats.ts
View file

@ -16,7 +16,7 @@ const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
websiteId: yup.string().uuid().required(), websiteId: yup.string().uuid().required(),
startAt: yup.number().integer().required(), startAt: yup.number().integer().required(),
endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(), endAt: yup.number().integer().min(yup.ref('startAt')).required(),
}), }),
}; };

2
src/pages/api/users/[userId]/usage.ts
View file

@ -26,7 +26,7 @@ const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
id: yup.string().uuid().required(), id: yup.string().uuid().required(),
startAt: yup.number().integer().required(), startAt: yup.number().integer().required(),
endAt: yup.number().integer().moreThan(yup.ref<number>('startAt')).required(), endAt: yup.number().integer().min(yup.ref<number>('startAt')).required(),
}), }),
}; };

2
src/pages/api/websites/[websiteId]/events.ts
View file

@ -21,7 +21,7 @@ const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
websiteId: yup.string().uuid().required(), websiteId: yup.string().uuid().required(),
startAt: yup.number().integer().required(), startAt: yup.number().integer().required(),
endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(), endAt: yup.number().integer().min(yup.ref('startAt')).required(),
unit: UnitTypeTest, unit: UnitTypeTest,
timezone: TimezoneTest, timezone: TimezoneTest,
url: yup.string(), url: yup.string(),