diff --git a/js/src/__mock__/admin/index.ts b/js/src/__mock__/admin/index.ts index fae7f0d19..7bbd5a50e 100644 --- a/js/src/__mock__/admin/index.ts +++ b/js/src/__mock__/admin/index.ts @@ -143,3 +143,43 @@ export const createDiscordAnnouncementServerErrorHandler = http.post( ); }, ); + +const toggleAdmin = ApiURL.create("/api/admin/user/admin/toggle", { + method: "POST", +}); + +const TOGGLE_ADMIN_SUCCESS_MESSAGE = + "User with Discord name of discord-4 is no longer an admin"; + +const TOGGLE_ADMIN_FAILURE_MESSAGE = "Failed to update admin status"; + +export const createToggleAdminSuccessHandler = http.post( + toggleAdmin.url.toString(), + () => { + return HttpResponse.json({ + success: true, + payload: { + id: "user-4", + discordId: "discord-4", + discordName: "persephone", + leetcodeUsername: "persephone_lc", + nickname: "Verified Persephone", + admin: false, + profileUrl: null, + tags: [], + achievements: [], + }, + message: TOGGLE_ADMIN_SUCCESS_MESSAGE, + } satisfies ReturnType); + }, +); + +export const createToggleAdminFailureHandler = http.post( + toggleAdmin.url.toString(), + () => { + return HttpResponse.json({ + success: false, + message: TOGGLE_ADMIN_FAILURE_MESSAGE, + } satisfies ReturnType); + }, +); diff --git a/js/src/__mock__/user/index.ts b/js/src/__mock__/user/index.ts index b40386d92..ca8aa5fde 100644 --- a/js/src/__mock__/user/index.ts +++ b/js/src/__mock__/user/index.ts @@ -47,6 +47,17 @@ export const MOCK_USERS = [ tags: [], achievements: [], }, + { + id: "user-4", + discordId: "discord-4", + discordName: "persephone", + leetcodeUsername: "persephone_lc", + nickname: "Verified Persephone", + admin: true, + profileUrl: null, + tags: [], + achievements: [], + }, ]; export const getAllUsersHandler = http.get( @@ -54,16 +65,21 @@ export const getAllUsersHandler = http.get( ({ request }) => { const url = new URL(request.url); const query = url.searchParams.get("query") || ""; + const adminFilter = url.searchParams.get("adminFilter") === "true" || false; const q = query.toLowerCase(); - const filteredUsers = - query ? - MOCK_USERS.filter( - (user) => - user.discordName.toLowerCase().includes(q) || - (user.leetcodeUsername ?? "").toLowerCase().includes(q), - ) - : MOCK_USERS; + const filteredUsers = MOCK_USERS.filter( + (user) => + (!query || + user.discordName.toLowerCase().includes(q) || + (user.leetcodeUsername ?? "").toLowerCase().includes(q)) && + (user.admin || !adminFilter), + ); + + filteredUsers.sort((user1, user2) => { + if (user1.admin == user2.admin) return user1.id < user2.id ? -1 : 1; + return user1.admin ? -1 : 1; + }); return HttpResponse.json({ success: true, diff --git a/js/src/app/admin/_components/users/UserAdminList.test.tsx b/js/src/app/admin/_components/users/UserAdminList.test.tsx new file mode 100644 index 000000000..e9806e47f --- /dev/null +++ b/js/src/app/admin/_components/users/UserAdminList.test.tsx @@ -0,0 +1,213 @@ +import { + createToggleAdminSuccessHandler, + createToggleAdminFailureHandler, +} from "@/__mock__/admin"; +import { + getAllUsersErrorHandler, + getAllUsersFailedHandler, + getAllUsersHandler, +} from "@/__mock__/user"; +import UserAdminList from "@/app/admin/_components/users/UserAdminList.tsx"; +import { TestUtils, TestUtilTypes } from "@/lib/test"; +import { screen, waitFor } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; +import { setupServer } from "msw/node"; + +describe("UserAdminList API Succeeded", () => { + const server = setupServer(getAllUsersHandler); + + beforeAll(() => server.listen()); + afterEach(() => { + server.resetHandlers(); + }); + afterAll(() => server.close()); + + let renderProviderFn: TestUtilTypes.RenderWithAllProvidersFn | null = null; + beforeEach(() => { + renderProviderFn = TestUtils.getRenderWithAllProvidersFn(); + }); + + it("should initially render a loading state", () => { + renderProviderFn?.(); + + const element = screen.getByTestId("user-admin-list-skeleton-board"); + expect(element).toBeInTheDocument(); + expect(element).toBeVisible(); + }); + + it("should render user admin list board and filter button eventually", async () => { + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByTestId("user-admin-list-board")).toBeInTheDocument(); + }); + + await waitFor(() => { + expect(screen.getByTestId("user-admin-list-filter")).toBeInTheDocument(); + }); + + await waitFor(() => { + expect(screen.getByText("aphrodite_lc")).toBeInTheDocument(); + }); + }); + + it("should show only usernames that match the search query", async () => { + const user = userEvent.setup(); + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByRole("textbox")).toBeInTheDocument(); + }); + + await user.type(screen.getByRole("textbox"), "aphrodite"); + + await waitFor(() => { + expect(screen.getByText("aphrodite_lc")).toBeInTheDocument(); + }); + + await waitFor(() => { + expect(screen.queryByText("poseidon_lc")).not.toBeInTheDocument(); + }); + }); + + it("should render admin badge colors correctly", async () => { + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByTestId("aphrodite_lc-button")).toBeInTheDocument(); + }); + + await waitFor(() => { + expect(screen.getByTestId("persephone_lc-button")).toBeInTheDocument(); + }); + + expect(screen.getByTestId("aphrodite_lc-button")).toHaveStyle( + "--button-bg: var(--mantine-color-gray-filled)", + ); + + expect(screen.getByTestId("persephone_lc-button")).not.toHaveStyle( + "--button-bg: var(--mantine-color-gray-filled)", + ); + }); + + it("should switch admin status from chosen user upon click", async () => { + const user = userEvent.setup(); + server.use(createToggleAdminSuccessHandler); + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByTestId("persephone_lc-button")).toBeInTheDocument(); + }); + + await user.click(screen.getByTestId("persephone_lc-button")); + + await waitFor(() => { + expect( + screen.getByText( + /User with Discord name of discord-4 is no longer an admin/i, + ), + ).toBeInTheDocument(); + }); + }); + + it("should show admins first", async () => { + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByText("aphrodite_lc")).toBeInTheDocument(); + }); + + await waitFor(() => { + expect(screen.getByText("persephone_lc")).toBeInTheDocument(); + }); + + expect( + screen + .getByText("persephone_lc") + .compareDocumentPosition(screen.getByText("aphrodite_lc")), + ).toBe(Node.DOCUMENT_POSITION_FOLLOWING); + }); + + it("should show non-admins too if filter is off but only admins if filter is on", async () => { + const user = userEvent.setup(); + renderProviderFn?.(); + + await waitFor(() => { + expect( + screen.getByRole("button", { name: "Filters" }), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: "Filters" })); + + await waitFor(() => { + expect( + screen.getByTestId("user-admin-list-filter-switch"), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByTestId("user-admin-list-filter-switch")); + + await waitFor(() => { + expect(screen.getByText("persephone_lc")).toBeInTheDocument(); + }); + + await waitFor(() => { + expect(screen.queryByText("aphrodite_lc")).not.toBeInTheDocument(); + }); + + await user.click(screen.getByRole("button", { name: "Filters" })); + + await waitFor(() => { + expect( + screen.getByTestId("user-admin-list-filter-switch"), + ).toBeInTheDocument(); + }); + + await user.click(screen.getByTestId("user-admin-list-filter-switch")); + + await waitFor(() => { + expect(screen.getByText("persephone_lc")).toBeInTheDocument(); + }); + + await waitFor(() => { + expect(screen.getByText("aphrodite_lc")).toBeInTheDocument(); + }); + }); + + it("should show error message when toggle API errors", async () => { + const user = userEvent.setup(); + server.use(createToggleAdminFailureHandler); + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByTestId("persephone_lc-button")).toBeInTheDocument(); + }); + + await user.click(screen.getByTestId("persephone_lc-button")); + + await waitFor(() => { + expect( + screen.getByText("Failed to update admin status"), + ).toBeInTheDocument(); + }); + }); + + it("should have error div when API errors", async () => { + server.use(getAllUsersErrorHandler); + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByText("Error")).toBeInTheDocument(); + }); + }); + + it("should have a fail message when API errors", async () => { + server.use(getAllUsersFailedHandler); + renderProviderFn?.(); + + await waitFor(() => { + expect(screen.getByText("No users to display")).toBeInTheDocument(); + }); + }); +}); diff --git a/js/src/app/admin/_components/users/UserAdminList.tsx b/js/src/app/admin/_components/users/UserAdminList.tsx index 6021acee0..5b405c2c1 100644 --- a/js/src/app/admin/_components/users/UserAdminList.tsx +++ b/js/src/app/admin/_components/users/UserAdminList.tsx @@ -1,10 +1,20 @@ import UserAdminListSkeleton from "@/app/admin/_components/users/UserAdminListSkeleton"; +import FilterDropdown from "@/components/ui/dropdown/FilterDropdown"; +import FilterDropdownItem from "@/components/ui/dropdown/FilterDropdownItem"; import Paginator from "@/components/ui/table/Paginator"; import SearchBox from "@/components/ui/table/SearchBox"; import { useToggleAdminMutation } from "@/lib/api/queries/admin"; import { useGetAllUsersQuery } from "@/lib/api/queries/user"; import { theme } from "@/lib/theme"; -import { Box, Button, Overlay, Table, Text, Tooltip } from "@mantine/core"; +import { + Box, + Button, + Flex, + Overlay, + Table, + Text, + Tooltip, +} from "@mantine/core"; import { notifications } from "@mantine/notifications"; import { IconCircleCheckFilled } from "@tabler/icons-react"; import { FaDiscord } from "react-icons/fa"; @@ -25,6 +35,8 @@ export default function UserAdminList() { searchQuery, setSearchQuery, debouncedQuery, + adminFilter, + toggleAdminFilter, } = useGetAllUsersQuery(); const { mutate } = useToggleAdminMutation(); @@ -43,6 +55,27 @@ export default function UserAdminList() { const pageData = data.payload; + const filterDropdown = ( + + + + Admin Status + + } + data-testId={"user-admin-list-filter-switch"} + /> + + + ); + const onToggle = (userId: string, currentAdminStatus: boolean) => { // Check the mutate function origin on why we // need this metadata object as well. @@ -53,6 +86,7 @@ export default function UserAdminList() { metadata: { page, debouncedQuery, + adminFilter, }, }, { @@ -75,6 +109,9 @@ export default function UserAdminList() { return ( <> + + {filterDropdown} + { @@ -82,9 +119,15 @@ export default function UserAdminList() { }} placeholder={"Search for user"} m={"lg"} + mt={0} mb={0} /> - + {user.leetcodeUsername}