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 remote-tracking branch 'origin/dev' into dev

Mike Cao40cfcd41e97f
diff --cc src/lib/constants.ts
index 9ea76d934,a548826ad..9d7a3da84
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@@ -30,7 -29,25 +30,7 @@@ export const FILTER_DAY = 'filter-day'
export const FILTER_RANGE = 'filter-range';
export const FILTER_REFERRERS = 'filter-referrers';
export const FILTER_PAGES = 'filter-pages';
--
+ export const UNIT_TYPES = ['year', 'month', 'hour', 'day'];
-
-export const USER_FILTER_TYPES = {
- all: 'All',
- username: 'Username',
-} as const;
-export const WEBSITE_FILTER_TYPES = { all: 'All', name: 'Name', domain: 'Domain' } as const;
-export const TEAM_FILTER_TYPES = { all: 'All', name: 'Name', 'user:username': 'Owner' } as const;
-export const REPORT_FILTER_TYPES = {
- all: 'All',
- name: 'Name',
- description: 'Description',
- type: 'Type',
- 'user:username': 'Username',
- 'website:name': 'Website Name',
- 'website:domain': 'Website Domain',
-} as const;
-
export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
export const SESSION_COLUMNS = [
diff --cc src/lib/yup.ts
index 000000000,6c19b0895..2407f7ad6
mode 000000,100644..100644
--- a/src/lib/yup.ts
+++ b/src/lib/yup.ts
@@@ -1,0 -1,31 +1,15 @@@
+ import moment from 'moment';
+ import * as yup from 'yup';
+ import { UNIT_TYPES } from './constants';
+
-export const DateRangeValidation = {
- startAt: yup.number().integer().required(),
- endAt: yup.number().integer().moreThan(yup.ref('startAt')).required(),
-};
-
-// ex: /funnel|insights|retention/i
-export function getFilterValidation(matchRegex) {
- return {
- filter: yup.string(),
- filterType: yup.string().matches(matchRegex),
- pageSize: yup.number().integer().positive().max(200),
- page: yup.number().integer().positive(),
- orderBy: yup.string(),
- };
-}
-
+ 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),
+ );
diff --cc src/pages/api/teams/[id]/users/index.ts
index 1c9e83520,36e9f3206..289181779
--- a/src/pages/api/teams/[id]/users/index.ts
+++ b/src/pages/api/teams/[id]/users/index.ts
@@@ -1,6 -1,6 +1,7 @@@
++import * as yup from 'yup';
import { canViewTeam } from 'lib/auth';
- import { useAuth } from 'lib/middleware';
+ import { useAuth, useValidate } from 'lib/middleware';
-import { NextApiRequestQueryBody, SearchFilter, TeamSearchFilterType } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getUsersByTeamId } from 'queries';
diff --cc src/queries/admin/user.ts
index ee6f778b0,ee6f778b0..b73199427
--- a/src/queries/admin/user.ts
+++ b/src/queries/admin/user.ts
@@@ -1,6 -1,6 +1,6 @@@
import { Prisma } from '@prisma/client';
import cache from 'lib/cache';
--import { ROLES, USER_FILTER_TYPES } from 'lib/constants';
++import { ROLES } from 'lib/constants';
import prisma from 'lib/prisma';
import { FilterResult, Role, User, UserSearchFilter } from 'lib/types';
import { getRandomChars } from 'next-basics';
@@@ -37,10 -37,10 +37,10 @@@ export async function getUserByUsername
}
export async function getUsers(
-- searchFilter: UserSearchFilter,
++ params: UserSearchFilter,
options?: { include?: Prisma.UserInclude },
): Promise<FilterResult<User[]>> {
-- const { teamId, filter, filterType = USER_FILTER_TYPES.all } = searchFilter;
++ const { teamId, query } = params;
const mode = prisma.getSearchMode();
const where: Prisma.UserWhereInput = {
@@@ -51,17 -51,17 +51,14 @@@
},
},
}),
-- ...(filter && {
++ ...(query && {
AND: {
OR: [
{
-- ...((filterType === USER_FILTER_TYPES.all ||
-- filterType === USER_FILTER_TYPES.username) && {
-- username: {
-- startsWith: filter,
-- ...mode,
-- },
-- }),
++ username: {
++ contains: query,
++ ...mode,
++ },
},
],
},
@@@ -70,7 -70,7 +67,7 @@@
const [pageFilters, getParameters] = prisma.getPageFilters({
orderBy: 'username',
-- ...searchFilter,
++ ...params,
});
const users = await prisma.client.user