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

DataTable refactor.

Browse source
This commit is contained in:
Mike Cao 2023-09-22 00:59:00 -07:00
parent 92ccc64e47
commit 6846355c63
17 changed files with 94 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,8 @@
import * as yup from 'yup';
import { canViewTeam } from 'lib/auth';
import { useAuth, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
import { getFilterValidation } from 'lib/yup';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getWebsitesByTeamId } from 'queries';
@ -15,12 +16,10 @@ export interface TeamWebsiteRequestBody {
websiteIds?: string[];
}
import * as yup from 'yup';
const schema = {
GET: yup.object().shape({
id: yup.string().uuid().required(),
...getFilterValidation(/All|Name|Domain/i),
...pageInfo,
}),
POST: yup.object().shape({
id: yup.string().uuid().required(),

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

@ -3,7 +3,7 @@ import { canCreateTeam } from 'lib/auth';
import { uuid } from 'lib/crypto';
import { useAuth, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, SearchFilter, TeamSearchFilterType } from 'lib/types';
import { getFilterValidation } from 'lib/yup';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createTeam, getTeamsByUserId } from 'queries';
@ -18,7 +18,7 @@ export interface MyTeamsRequestQuery extends SearchFilter<TeamSearchFilterType>
const schema = {
GET: yup.object().shape({
...getFilterValidation(/All|Name|Owner/i),
...pageInfo,
}),
POST: yup.object().shape({
name: yup.string().max(50).required(),
@ -39,12 +39,11 @@ export default async (
} = req.auth;
if (req.method === 'GET') {
const { page, filter, pageSize } = req.query;
const { page, query } = req.query;
const results = await getTeamsByUserId(userId, {
page,
filter,
pageSize: +pageSize || undefined,
query,
});
return ok(res, results);