github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

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

@@ -1,12 +1,12 @@
import * as yup from 'yup';
import { useAuth, useCors, 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 { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { getTeamsByUserId } from 'queries';
export interface UserTeamsRequestQuery extends SearchFilter<TeamSearchFilterType> {
export interface UserTeamsRequestQuery extends SearchFilter {
id: string;
}

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

@@ -1,12 +1,12 @@
import { useAuth, useCors, 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 { getWebsitesByUserId } from 'queries';
import * as yup from 'yup';
export interface UserWebsitesRequestQuery extends SearchFilter<WebsiteSearchFilterType> {
export interface UserWebsitesRequestQuery extends SearchFilter {
id: string;
includeTeams?: boolean;
onlyTeams?: boolean;
@@ -32,7 +32,7 @@ export default async (
await useValidate(req, res);
const { user } = req.auth;
const { id: userId, page, pageSize, query, includeTeams, onlyTeams } = req.query;
const { id: userId, page, query, includeTeams, onlyTeams } = req.query;
if (req.method === 'GET') {
if (!user.isAdmin && user.id !== userId) {
@@ -40,9 +40,8 @@ export default async (
}
const websites = await getWebsitesByUserId(userId, {
query,
page,
pageSize: +pageSize || undefined,
page: +page,
query: query as string,
includeTeams,
onlyTeams,
});

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

@@ -2,13 +2,13 @@ import { canCreateUser, canViewUsers } from 'lib/auth';
import { ROLES } from 'lib/constants';
import { uuid } from 'lib/crypto';
import { useAuth, useValidate } from 'lib/middleware';
import { NextApiRequestQueryBody, Role, SearchFilter, User, UserSearchFilterType } from 'lib/types';
import { NextApiRequestQueryBody, Role, SearchFilter, User } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createUser, getUserByUsername, getUsers } from 'queries';
export interface UsersRequestQuery extends SearchFilter<UserSearchFilterType> {}
export interface UsersRequestQuery extends SearchFilter {}
export interface UsersRequestBody {
username: string;
password: string;
@@ -46,9 +46,9 @@ export default async (
return unauthorized(res);
}
const { page, filter, pageSize } = req.query;
const { page, query } = req.query;
const users = await getUsers({ page, filter, pageSize: pageSize ? +pageSize : null });
const users = await getUsers({ page, query });
return ok(res, users);
}