m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add back pageSize.

Browse Source
This commit is contained in:
Brian Cao 2023-10-15 17:59:19 -07:00
parent d5c4202ee4
commit 9732d0e6ef
8 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pages/api/reports/index.ts
View File

@ -50,10 +50,11 @@ export default async (
} = req.auth; } = req.auth;
if (req.method === 'GET') { if (req.method === 'GET') {
const { page, query } = req.query; const { page, query, pageSize } = req.query;
const data = await getReportsByUserId(userId, { const data = await getReportsByUserId(userId, {
page, page,
pageSize: +pageSize || undefined,
query, query,
includeTeams: true, includeTeams: true,
}); });

5
src/pages/api/teams/[id]/users/index.ts
View File

@ -5,6 +5,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { NextApiResponse } from 'next'; import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics'; import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getUsersByTeamId } from 'queries'; import { getUsersByTeamId } from 'queries';
import { pageInfo } from 'lib/schema';
export interface TeamUserRequestQuery extends SearchFilter { export interface TeamUserRequestQuery extends SearchFilter {
id: string; id: string;
@ -13,6 +14,7 @@ export interface TeamUserRequestQuery extends SearchFilter {
const schema = { const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
id: yup.string().uuid().required(), id: yup.string().uuid().required(),
...pageInfo,
}), }),
}; };
@ -30,11 +32,12 @@ export default async (
return unauthorized(res); return unauthorized(res);
} }
const { query, page } = req.query; const { query, page, pageSize } = req.query;
const users = await getUsersByTeamId(teamId, { const users = await getUsersByTeamId(teamId, {
query, query,
page, page,
pageSize: +pageSize || undefined,
}); });
return ok(res, users); return ok(res, users);

8
src/pages/api/teams/[id]/websites/index.ts
View File

@ -41,7 +41,13 @@ export default async (
return unauthorized(res); return unauthorized(res);
} }
const websites = await getWebsitesByTeamId(teamId, { ...req.query }); const { page, query, pageSize } = req.query;
const websites = await getWebsitesByTeamId(teamId, {
page,
query,
pageSize: +pageSize || undefined,
});
return ok(res, websites); return ok(res, websites);
} }

3
src/pages/api/teams/index.ts
View File

@ -35,11 +35,12 @@ export default async (
} = req.auth; } = req.auth;
if (req.method === 'GET') { if (req.method === 'GET') {
const { page, query } = req.query; const { page, query, pageSize } = req.query;
const results = await getTeamsByUserId(userId, { const results = await getTeamsByUserId(userId, {
page, page,
query, query,
pageSize: +pageSize || undefined,
}); });
return ok(res, results); return ok(res, results);

2
src/pages/api/users/[id]/teams.ts
View File

@ -44,7 +44,7 @@ export default async (
const teams = await getTeamsByUserId(userId, { const teams = await getTeamsByUserId(userId, {
query, query,
page, page,
pageSize, pageSize: +pageSize || undefined,
}); });
return ok(res, teams); return ok(res, teams);

2
src/pages/api/users/[id]/websites.ts
View File

@ -47,7 +47,7 @@ export default async (
const websites = await getWebsitesByUserId(userId, { const websites = await getWebsitesByUserId(userId, {
page, page,
pageSize, pageSize: +pageSize || undefined,
query, query,
orderBy, orderBy,
includeTeams, includeTeams,

4
src/pages/api/users/index.ts
View File

@ -44,9 +44,9 @@ export default async (
return unauthorized(res); return unauthorized(res);
} }
const { page, query } = req.query; const { page, query, pageSize } = req.query;
const users = await getUsers({ page, query }); const users = await getUsers({ page, query, pageSize: +pageSize || undefined });
return ok(res, users); return ok(res, users);
} }

7
src/pages/api/websites/[id]/reports.ts
View File

@ -5,6 +5,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { NextApiResponse } from 'next'; import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics'; import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getReportsByWebsiteId } from 'queries'; import { getReportsByWebsiteId } from 'queries';
import { pageInfo } from 'lib/schema';
export interface ReportsRequestQuery extends SearchFilter { export interface ReportsRequestQuery extends SearchFilter {
id: string; id: string;
@ -13,6 +14,7 @@ export interface ReportsRequestQuery extends SearchFilter {
const schema = { const schema = {
GET: yup.object().shape({ GET: yup.object().shape({
id: yup.string().uuid().required(), id: yup.string().uuid().required(),
...pageInfo,
}), }),
}; };
@ -27,14 +29,15 @@ export default async (
const { id: websiteId } = req.query; const { id: websiteId } = req.query;
if (req.method === 'GET') { if (req.method === 'GET') {
if (!(websiteId && (await canViewWebsite(req.auth, websiteId)))) { if (!(await canViewWebsite(req.auth, websiteId))) {
return unauthorized(res); return unauthorized(res);
} }
const { page, query } = req.query; const { page, query, pageSize } = req.query;
const data = await getReportsByWebsiteId(websiteId, { const data = await getReportsByWebsiteId(websiteId, {
page, page,
pageSize: +pageSize || undefined,
query, query,
}); });