fga-eps-mds · lipeaaraujo · Dec 11, 2023 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "jest --coverage --passWithNoTests --no-cache --runInBand",
+    "test": "jest --passWithNoTests --no-cache --runInBand --bail",
     "test:all": "CI=true npm run test -- --coverage",
     "test:watch": "react-scripts test",
     "eject": "react-scripts eject",

diff --git a/public/Log.png b/public/Log.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <div id="root"></div>
@@ -28,7 +28,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>PrintGO</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/public/logo--.png b/public/logo--.png
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/src/App.js b/src/App.js
@@ -3,6 +3,7 @@ import { BrowserRouter, Routes, Route } from "react-router-dom";
 import Home from "./pages/Home";
 import CreateUserPage from "./pages/CreateUser";
 import EditUserPage from "./pages/EditUser";
+import UsersList from "./pages/UsersList";
 import Login from "./pages/Login";
 import Contact from "./pages/Contact";
 import AboutUs from "./pages/AboutUs";
@@ -18,22 +19,27 @@ import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import RecoverPasswordPage from "./pages/RecoverPassword";
 import PrivateRoutes from "./components/utils/PrivateRoutes";
+import AdminRoutes from "./components/utils/AdminRoutes";
 
 function App() {
   return (
     <>
       <BrowserRouter>
         <Routes>
           <Route element={<PrivateRoutes />}>
-            <Route path="/cadastro" element={<CreateUserPage />} />
-            <Route path="/editarusuario" element={<EditUserPage/>}/>
+            <Route path="/editarusuario/:id" element={<EditUserPage/>}/>
             <Route path="/mudarsenha" element={<ChangePassword />} />
             <Route path="/cadastroimpressora" element={<RegisterPrinter />} />
             <Route path="/editarimpressora" element={<EditPrinter />} />
             <Route path="/padraoimpressora" element={<PatternPrinter />} />
             <Route path="/editarpadrao" element={<EditPattern />} />
             <Route path="/impressorascadastradas" element={<PrintersList />} />
             <Route path="/listapadroes" element={<PatternList />} />
+            <Route element={<AdminRoutes/>}>
+              <Route path="/listausuarios" element={<UsersList />} />
+              <Route path="/cadastro" element={<CreateUserPage />} />
+            </Route>
+
           </Route>
           <Route path="/login" element={<Login />} />
           <Route path="/" element={<Home />} />

diff --git a/src/assets/Profile.svg b/src/assets/Profile.svg
diff --git a/src/components/forms/EditUserForm.js b/src/components/forms/EditUserForm.js
@@ -3,36 +3,37 @@
 import { useForm } from "react-hook-form";
 import { ToastContainer, toast } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
-import * as yup from "yup";
 import { getUnidades } from "../../services/unidadeService";
 import { getUserById, updateUser } from "../../services/userService";
 import "../../style/components/editUserForms.css";
 import { ReloadIcon } from "@radix-ui/react-icons";
-import { Link, useNavigate } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import { decodeToken } from "react-jwt";
-import '@testing-library/jest-dom/extend-expect';
-
-
-const editUserSchema = yup.object().shape({
-  nome: yup.string().required('Nome é obrigatório'),
-  email: yup
-    .string()
-    .email('Email inválido')
-    .required('Email é obrigatório'),
-  emailConfirmar: yup
-    .string()
-    .oneOf([yup.ref('email'), null], 'Os emails devem coincidir')
-    .required('Email é obrigatória'),
-  documento: yup.string()
-  .matches(/^(\d{11}|\d{14})$/, 'CPF ou CNPJ inválido')
-  .test('cpfOrCnpj', 'CPF ou CNPJ inválido', value => {
-      return value.length === 11 || value.length === 14;
-  }),
-  unidade_id: yup.string().required('Lotação é obrigatória'),
-  unidade_pai: yup.string().strip(),
-});
+import { getEditUserSchema } from "../utils/YupSchema";
+
+const fieldLabels = {
+  nome: 'Nome',
+  documento: 'CPF',
+  email: 'Email',
+  emailConfirmar: 'Email',
+  unidade_id: "Unidade",
+};
+
+const testObject = {
+  nome: 'Fulano',
+  documento: '01234567890',
+  email: 'email@email.com',
+  emailConfirmar: 'email@email.com',
+};
 
 export default function EditUserForm(){
+  const { id } = useParams();
+
+  const editUserSchema = getEditUserSchema(fieldLabels);
+  const { register, setValue, handleSubmit, formState: { errors, isValid, isSubmitting  } } = useForm({
+    resolver: yupResolver(editUserSchema),
+    mode: "onChange"
+  });
 
   let loggedUser = null;
   const token = localStorage.getItem("jwt");
@@ -41,42 +42,68 @@
   }
 
   const [unidadeList, setUnidadeList] = useState();
+  const [isEditingAnotherAdmin, setIsEditingAnotherAdmin] = useState(); //verifica se o usuario que esta sendo editado eh admin
+  const [isLocadora, setIsLocadora] = useState(); //verifica se o usuario que esta sendo editado eh da locadora
   const [displayLotacoes,setDisplayLotacoes] = useState ('');
   const [unidadeFilhoList, setUnidadeFilhoList] = useState ();
   const [userData, setUserData] = useState(null);
+  const [displayUserRole, setDisplayUserRole] = useState(true);
 
   const memoUserData = useMemo(() => userData, [userData]);
   const memoUnidadeList = useMemo(() => unidadeList, [unidadeList]);
 
-  const navigate = useNavigate();
-
+  const handleCheckboxLocadoraChange = (event) => {
+    setIsLocadora(event.target.checked);
+  };
 
-  const {
-    register,
-    setValue,
-    handleSubmit,
-    formState: { errors, isValid, isSubmitting }, 
-    reset
-  } = useForm({resolver: yupResolver(editUserSchema), mode: "onChange"})
+  const handleCheckboxAdminChange = (event) =>{
+    setIsEditingAnotherAdmin(event.target.checked);
+  }
 
+  const navigate = useNavigate();
 
   // Puxe os dados do usuário logado.
   useEffect(() => {
     const fetchUserData = async () => {
       try {
-        const data = await getUserById(loggedUser.id);
+        const data = await getUserById(id);
 
-        console.log(data);
         if (data) {
           setUserData(data);
+          if(data.cargos.includes("ADMIN")){
+            setIsEditingAnotherAdmin(true);
+          }
+          if(data.cargos.includes("LOCADORA")){
+            setIsLocadora(true);
+          }
         }
       } catch(error) {
         console.log('Erro ao buscar dados do usuário:', error);
       }
     }
-    if(loggedUser && !userData) {
-      fetchUserData();
+
+    const verifyUser = async () =>{
+      if(loggedUser && !userData) {
+        await fetchUserData();
+
+        if(loggedUser.cargos.includes("ADMIN")) {
+          if(loggedUser.id === id){ 
+            setDisplayUserRole(false);
+          }
+          else{
+            return;
+          }
+        } else if(loggedUser.id != id) {
+            navigate("/"); // Um usuário comum não pode editar outro usuário além dele mesmo.
+          } else {
+            setDisplayUserRole(false);
+          }
+
+      }
     }
+
+    verifyUser();
+
   }, [loggedUser])
 
   // Puxe os dados das unidades policiais.
@@ -99,11 +126,14 @@
 
   useEffect(() => {
     if (memoUserData && memoUnidadeList && unidadeList) {
-      console.log(unidadeList);
-
-      Object.keys(userData).forEach((key) => {
-        setValue(key, userData[key] || "");
+      Object.keys(editUserSchema.fields).forEach((key) => {
+        if (userData[key]) {
+          setValue(key, userData[key]);
+        }
       })
+
+      isEditingAnotherAdmin ? setValue("isAdmin", true) : setValue("isAdmin", false);
+      isLocadora ? setValue("isLocadora", true) : setValue("isLocadora", false);
 
       const unidadeFilha = unidadeList.find(unidade => unidade.id === userData.unidade_id);
 
@@ -119,19 +149,34 @@
   }, [memoUserData, memoUnidadeList, setValue]);
 
   const onSubmit = async (data) =>  {
+    data.id = id;
+
+    data.cargos = ["USER"]
+
+    if (data.isAdmin) {
+      data.cargos = data.cargos || [];
+      data.cargos.push("ADMIN")
+    }
+
+    if (data.isLocadora) {
+      data.cargos = data.cargos || [];
+      data.cargos.push("LOCADORA")
+    }
+
+    delete data["isAdmin"];
+    delete data["isLocadora"];
+    delete data["emailConfirmar"];
+    delete data["unidade_pai"];
+
     console.log(data);
 
     setTimeout(() => {
       console.log("3 segundos se passaram.");
     }, 3000);  // 3000 milissegundos = 3 segundos
-
-    delete data["emailConfirmar"];
-    delete data["unidade_pai"];
 
     const response = await updateUser(data, data.id);
     if(response.type === 'success'){
       toast.success("Usuario atualizado com sucesso!");
-      reset()
     } else {
       toast.error("Erro ao atualizar usuário");
     }
@@ -153,7 +198,8 @@
   };
 
   return(
-    <div id="edit-user-card" data-testid="edit-user-card">
+    <div id="edit-user-card">
+      <Link id="link-back" to="/listausuarios">Voltar</Link>
       <header id="edit-user-form-header">
         Editar usuário
       </header>
@@ -228,12 +274,40 @@
           </div>
 
         </div>
+        {displayUserRole && (
+          <div id="edit-user-input-line">
+            <div id="edit-user-input-box">
+                <div id="edit-user-input-checkbox" data-testid="admin-checkbox">
+                    <input
+                        id="checkbox"
+                        type="checkbox"
+                        {...register("isAdmin")}
+                        onChange={handleCheckboxAdminChange}
+                    />
+
+                    <label htmlFor="label-checkbox" id="label-checkbox">Usuário é administrador?</label>
+                </div>
+            </div>
+            <div id="edit-user-input-box">
+                <div id="edit-user-input-checkbox" data-testid="locadora-checkbox">
+                    <input
+                        id="checkbox"
+                        type="checkbox"
+                        {...register("isLocadora")}
+                        onChange={handleCheckboxLocadoraChange}
+                    />
+                    <label htmlFor="label-checkbox" id="label-checkbox">Usuário é da Locadora?</label>
+                </div>
+            </div>
+          </div>
+        )}
+
 
         <div id="edit-user-buttons">
           <button className="edit-user-form-button" type="button" id="edit-user-cancel-bnt">
-            <Link to="/">CANCELAR</Link>
+            <Link to="#">CANCELAR</Link>
           </button>
-          <button className="edit-user-form-button" type="submit" id="edit-user-register-bnt" disabled={!isValid || isSubmitting}>
+          <button className="edit-user-form-button" type="submit" id="edit-user-register-bnt" disabled={isSubmitting || !isValid}>
             {isSubmitting && (
               <ReloadIcon id="animate-spin" data-testid="animate-spin"/>
             )}
@@ -246,3 +320,5 @@
     </div>
   );
 }
+
+export { fieldLabels, testObject };