diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx index 7a1c10a28..ca2b0ec82 100644 --- a/src/frontend/src/pages/AdminPage/index.tsx +++ b/src/frontend/src/pages/AdminPage/index.tsx @@ -4,7 +4,6 @@ import { useContext, useEffect, useRef, useState } from "react"; import PaginatorComponent from "../../components/PaginatorComponent"; import ShadTooltip from "../../components/ShadTooltipComponent"; import IconComponent from "../../components/genericIconComponent"; -import Header from "../../components/headerComponent"; import { Button } from "../../components/ui/button"; import { Checkbox } from "../../components/ui/checkbox"; import { Input } from "../../components/ui/input"; @@ -27,6 +26,8 @@ import { import ConfirmationModal from "../../modals/ConfirmationModal"; import UserManagementModal from "../../modals/UserManagementModal"; import { UserInputType } from "../../types/components"; +import Header from "../../components/headerComponent"; +import { Users } from "../../types/api"; export default function AdminPage() { const [inputValue, setInputValue] = useState(""); @@ -88,7 +89,7 @@ export default function AdminPage() { if (input === "") { setFilterUserList(userList.current); } else { - const filteredList = userList.current.filter((user) => + const filteredList = userList.current.filter((user:Users) => user.username.toLowerCase().includes(input.toLowerCase()) ); setFilterUserList(filteredList); @@ -182,6 +183,7 @@ export default function AdminPage() { return ( <> +
{userData && (
@@ -278,7 +280,7 @@ export default function AdminPage() { {!loadingUsers && ( - {filterUserList.map((user, index) => ( + {filterUserList.map((user:UserInputType, index) => ( @@ -424,6 +426,7 @@ export default function AdminPage() {
)} + ); } diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts index b9f537637..9a0108e70 100644 --- a/src/frontend/src/types/components/index.ts +++ b/src/frontend/src/types/components/index.ts @@ -266,6 +266,9 @@ export type UserInputType = { password: string; is_active?: boolean; is_superuser?: boolean; + id: string; + create_at: string; + updated_at:string; }; export type ApiKeyType = {