From e69715fbec9d3a52969b6cfda69ef1ba8bcf5f6e Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Sun, 8 Jan 2023 20:21:13 +0900 Subject: [PATCH] Fixing some lint errors with the new admin features --- website/src/components/UsersCell.tsx | 2 +- website/src/lib/auth.ts | 2 +- website/src/pages/admin/index.tsx | 2 +- website/src/pages/admin/manage_user/[id].tsx | 4 ++-- website/src/pages/api/admin/update_user.ts | 1 - website/src/pages/api/admin/users.ts | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/website/src/components/UsersCell.tsx b/website/src/components/UsersCell.tsx index fc93215f..5354ee5c 100644 --- a/website/src/components/UsersCell.tsx +++ b/website/src/components/UsersCell.tsx @@ -27,7 +27,7 @@ const UsersCell = () => { // Fetch and save the users. // This follows useSWR's recommendation for simple pagination: // https://swr.vercel.app/docs/pagination#when-to-use-useswr - const { isLoading } = useSWR(`/api/admin/users?pageIndex=${pageIndex}`, fetcher, { + useSWR(`/api/admin/users?pageIndex=${pageIndex}`, fetcher, { onSuccess: setUsers, }); diff --git a/website/src/lib/auth.ts b/website/src/lib/auth.ts index 1a0387f9..5fa20f48 100644 --- a/website/src/lib/auth.ts +++ b/website/src/lib/auth.ts @@ -5,7 +5,7 @@ import { getToken } from "next-auth/jwt"; * Wraps any API Route handler and verifies that the user has the appropriate * role before running the handler. Returns a 403 otherwise. */ -const withRole = (role: string, handler: (arg0: NextApiRequest, arg1: NextApiResponse) => any) => { +const withRole = (role: string, handler: (arg0: NextApiRequest, arg1: NextApiResponse) => void) => { return async (req: NextApiRequest, res: NextApiResponse) => { const token = await getToken({ req }); if (!token || token.role !== role) { diff --git a/website/src/pages/admin/index.tsx b/website/src/pages/admin/index.tsx index 705a188b..9cbea222 100644 --- a/website/src/pages/admin/index.tsx +++ b/website/src/pages/admin/index.tsx @@ -26,7 +26,7 @@ const AdminIndex = () => { return; } router.push("/"); - }, [session, status]); + }, [router, session, status]); return ( <> diff --git a/website/src/pages/admin/manage_user/[id].tsx b/website/src/pages/admin/manage_user/[id].tsx index ead55224..cdd4746e 100644 --- a/website/src/pages/admin/manage_user/[id].tsx +++ b/website/src/pages/admin/manage_user/[id].tsx @@ -1,4 +1,4 @@ -import { Box, Button, Container, Flex, FormControl, FormLabel, Input, Select, useToast } from "@chakra-ui/react"; +import { Button, Container, FormControl, FormLabel, Input, Select, useToast } from "@chakra-ui/react"; import { Field, Form, Formik } from "formik"; import Head from "next/head"; import { useRouter } from "next/router"; @@ -27,7 +27,7 @@ const ManageUser = ({ user }) => { return; } router.push("/"); - }, [session, status]); + }, [router, session, status]); // Trigger to let us update the user's role. Triggers a toast when complete. const { trigger } = useSWRMutation("/api/admin/update_user", poster, { diff --git a/website/src/pages/api/admin/update_user.ts b/website/src/pages/api/admin/update_user.ts index d29fce7c..a717e3d8 100644 --- a/website/src/pages/api/admin/update_user.ts +++ b/website/src/pages/api/admin/update_user.ts @@ -1,4 +1,3 @@ -import { getToken } from "next-auth/jwt"; import withRole from "src/lib/auth"; import prisma from "src/lib/prismadb"; diff --git a/website/src/pages/api/admin/users.ts b/website/src/pages/api/admin/users.ts index 3418e5e1..ea8d59d9 100644 --- a/website/src/pages/api/admin/users.ts +++ b/website/src/pages/api/admin/users.ts @@ -1,4 +1,3 @@ -import { getToken } from "next-auth/jwt"; import withRole from "src/lib/auth"; import prisma from "src/lib/prismadb"; @@ -15,7 +14,7 @@ const handler = withRole("admin", async (req, res) => { // Note: with Prisma this isn't the most efficient but it's the only possible // option with cuid based User IDs. const { pageIndex } = req.query; - const skip = pageIndex * PAGE_SIZE; + const skip = parseInt(pageIndex as string) * PAGE_SIZE || 0; // Fetch 20 users. const users = await prisma.user.findMany({