From 76c4d4afe72549639fbe72acef68f6f622597043 Mon Sep 17 00:00:00 2001
From: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
Date: Mon, 21 Aug 2023 18:46:42 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20chore(Makefile):=20remove=20unne?=
 =?UTF-8?q?cessary=20semicolon=20in=20'install=5Ffrontend'=20and=20'instal?=
 =?UTF-8?q?l=5Ffrontendc'=20targets=20=F0=9F=94=A7=20chore(Makefile):=20re?=
 =?UTF-8?q?move=20unnecessary=20'rm'=20command=20in=20'install=5Ffrontendc?=
 =?UTF-8?q?'=20target=20=E2=9C=A8=20feat(App.tsx):=20set=20user=20data=20i?=
 =?UTF-8?q?n=20state=20when=20auto-login=20is=20triggered=20to=20ensure=20?=
 =?UTF-8?q?consistent=20user=20experience=20=F0=9F=94=A7=20chore(UserManag?=
 =?UTF-8?q?ementModal/index.tsx):=20rename=20'isDisabled'=20state=20variab?=
 =?UTF-8?q?le=20to=20'isActive'=20for=20clarity=20=F0=9F=94=A7=20chore(Use?=
 =?UTF-8?q?rManagementModal/index.tsx):=20rename=20'isDisabled'=20prop=20a?=
 =?UTF-8?q?nd=20label=20to=20'Active'=20for=20clarity=20=F0=9F=94=A7=20cho?=
 =?UTF-8?q?re(UserManagementModal/index.tsx):=20rename=20'isDisabled'=20st?=
 =?UTF-8?q?ate=20variable=20to=20'isActive'=20in=20handleInput=20function?=
 =?UTF-8?q?=20=F0=9F=94=A7=20chore(AdminPage/index.tsx):=20rename=20'confi?=
 =?UTF-8?q?rmationText'=20prop=20from=20'Edit'=20to=20'Save'=20for=20clari?=
 =?UTF-8?q?ty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                             |  4 ++--
 src/frontend/src/App.tsx                             |  1 +
 .../src/modals/UserManagementModal/index.tsx         | 12 ++++++------
 src/frontend/src/pages/AdminPage/index.tsx           |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index b1d42ff4e..e2d90d0a5 100644
--- a/Makefile
+++ b/Makefile
@@ -32,10 +32,10 @@ lint:
 	poetry run ruff . --fix
 
 install_frontend:
-	cd src/frontend && npm install;
+	cd src/frontend && npm install
 
 install_frontendc:
-	cd src/frontend && rm -rf node_modules package-lock.json && npm install;
+	cd src/frontend && rm -rf node_modules package-lock.json && npm install
 
 run_frontend:
 	cd src/frontend && npm start
diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index a5bac422d..057a16fff 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -143,6 +143,7 @@ export default function App() {
         if(user && user['access_token']){
           user['refresh_token'] = "auto";
           login(user['access_token'], user['refresh_token']);
+          setUserData(user);
           setAutoLogin(true);
           setLoading(false);
         }
diff --git a/src/frontend/src/modals/UserManagementModal/index.tsx b/src/frontend/src/modals/UserManagementModal/index.tsx
index 993ffb944..5372b6354 100644
--- a/src/frontend/src/modals/UserManagementModal/index.tsx
+++ b/src/frontend/src/modals/UserManagementModal/index.tsx
@@ -31,7 +31,7 @@ export default function UserManagementModal({
   const [password, setPassword] = useState(data?.password ?? "");
   const [username, setUserName] = useState(data?.username ?? "");
   const [confirmPassword, setConfirmPassword] = useState(data?.password ?? "");
-  const [isDisabled, setIsDisabled] = useState(data?.is_active ?? false);
+  const [isActive, setIsActive] = useState(data?.is_active ?? false);
   const [isSuperUser, setIsSuperUser] = useState(data?.is_superuser ?? false);
   const [inputState, setInputState] = useState<UserInputType>(CONTROL_NEW_USER);
   const { userData } = useContext(AuthContext);
@@ -47,7 +47,7 @@ export default function UserManagementModal({
       resetForm();
     } else {
       handleInput({ target: { name: "username", value: username } });
-      handleInput({ target: { name: "is_active", value: isDisabled } });
+      handleInput({ target: { name: "is_active", value: isActive } });
       handleInput({ target: { name: "is_superuser", value: isSuperUser } });
     }
   }, [open]);
@@ -230,17 +230,17 @@ export default function UserManagementModal({
               <Form.Field name="is_active">
                 <div>
                   <Form.Label className="data-[invalid]:label-invalid mr-3">
-                    Disabled
+                    Active
                   </Form.Label>
                   <Form.Control asChild>
                     <Checkbox
-                      value={isDisabled}
-                      checked={isDisabled}
+                      value={isActive}
+                      checked={isActive}
                       id="is_active"
                       className="relative top-0.5"
                       onCheckedChange={(value) => {
                         handleInput({ target: { name: "is_active", value } });
-                        setIsDisabled(value);
+                        setIsActive(value);
                       }}
                     />
                   </Form.Control>
diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx
index 0e9830cb8..334aca90c 100644
--- a/src/frontend/src/pages/AdminPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/index.tsx
@@ -362,7 +362,7 @@ export default function AdminPage() {
                                     title="Edit"
                                     titleHeader={`${user.id}`}
                                     cancelText="Cancel"
-                                    confirmationText="Edit"
+                                    confirmationText="Save"
                                     icon={"UserPlus2"}
                                     data={user}
                                     index={index}