From bf81507447bb29d4d2b25a5b024112b0b0e76cb1 Mon Sep 17 00:00:00 2001
From: anovazzi1 <otavio2204@gmail.com>
Date: Mon, 28 Aug 2023 20:07:52 -0300
Subject: [PATCH 1/2] feat(AdminPage): add support for displaying user ID,
 creation date, and update date in the user table fix(AdminPage): add type
 annotations to user variables in filter and map functions to improve type
 safety

---
 src/frontend/src/pages/AdminPage/index.tsx | 5 +++--
 src/frontend/src/types/components/index.ts | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx
index e52cb863d..fef3cbb39 100644
--- a/src/frontend/src/pages/AdminPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/index.tsx
@@ -27,6 +27,7 @@ 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);
@@ -276,7 +277,7 @@ export default function AdminPage() {
                       </TableHeader>
                       {!loadingUsers && (
                         <TableBody>
-                          {filterUserList.map((user, index) => (
+                          {filterUserList.map((user:UserInputType, index) => (
                             <TableRow key={index}>
                               <TableCell className="truncate py-2 font-medium">
                                 <ShadTooltip content={user.id}>
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index aec1f373f..ecb90c8d3 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 = {

From 166cd7e9f05718fa43e9b5c2249524252a3b99f5 Mon Sep 17 00:00:00 2001
From: anovazzi1 <otavio2204@gmail.com>
Date: Mon, 28 Aug 2023 20:33:39 -0300
Subject: [PATCH 2/2] added flex to avoid scroll bug on admin page

---
 src/frontend/src/pages/AdminPage/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx
index fef3cbb39..bbe2ba2a2 100644
--- a/src/frontend/src/pages/AdminPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/index.tsx
@@ -183,6 +183,7 @@ export default function AdminPage() {
 
   return (
     <>
+    <div className="flex flex-col">
       <Header />
       {userData && (
         <div className="main-page-panel">
@@ -423,6 +424,7 @@ export default function AdminPage() {
           </div>
         </div>
       )}
+      </div>
     </>
   );
 }