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

Added useFilterQuery. Converted websites and reports pages.

Browse source
This commit is contained in:
Mike Cao 2023-09-26 23:20:29 -07:00
parent 6846355c63
commit 7e626dcd52
29 changed files with 373 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pages/api/teams/[id]/users/index.ts
View file

@ -1,11 +1,11 @@
import { canViewTeam } from 'lib/auth';
import { useAuth } 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';
export interface TeamUserRequestQuery extends SearchFilter<TeamSearchFilterType> {
export interface TeamUserRequestQuery extends SearchFilter {
id: string;
}
@ -27,12 +27,11 @@ export default async (
return unauthorized(res);
}
const { page, filter, pageSize } = req.query;
const { query, page } = req.query;
const users = await getUsersByTeamId(teamId, {
query,
page,
filter,
pageSize: +pageSize || undefined,
});
return ok(res, users);

12
src/pages/api/teams/[id]/websites/index.ts
View file

@ -1,14 +1,14 @@
import * as yup from 'yup';
import { canViewTeam } from 'lib/auth';
import { useAuth, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getWebsitesByTeamId } from 'queries';
import { createTeamWebsites } from 'queries/admin/teamWebsite';
export interface TeamWebsiteRequestQuery extends SearchFilter<WebsiteSearchFilterType> {
export interface TeamWebsiteRequestQuery extends SearchFilter {
id: string;
}
@ -43,13 +43,7 @@ export default async (
return unauthorized(res);
}
const { page, filter, pageSize } = req.query;
const websites = await getWebsitesByTeamId(teamId, {
page,
filter,
pageSize: +pageSize || undefined,
});
const websites = await getWebsitesByTeamId(teamId, { ...req.query });
return ok(res, websites);
}

6
src/pages/api/teams/index.ts
View file

@ -2,19 +2,19 @@ import { Team } from '@prisma/client';
import { canCreateTeam } from 'lib/auth';
import { uuid } from 'lib/crypto';
import { useAuth, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter, TeamSearchFilterType } from 'lib/types';
import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createTeam, getTeamsByUserId } from 'queries';
import * as yup from 'yup';
export interface TeamsRequestQuery extends SearchFilter<TeamSearchFilterType> {}
export interface TeamsRequestQuery extends SearchFilter {}
export interface TeamsRequestBody {
name: string;
}
export interface MyTeamsRequestQuery extends SearchFilter<TeamSearchFilterType> {}
export interface MyTeamsRequestQuery extends SearchFilter {}
const schema = {
GET: yup.object().shape({