Merge pull request #38 from fga-eps-mds/fixes_relase

updated sidebar permissions visualization
fga-eps-mds · Jan 27, 2025 · 5953c4c · 5953c4c
2 parents 36daeaa + 40ec549
commit 5953c4c
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 69 deletions.
diff --git a/src/Components/SideBar/index.jsx b/src/Components/SideBar/index.jsx
@@ -79,33 +79,39 @@ export default function SideBar() {
                 setIsSideBarOpen(false);
               }}
             />
-            <SideButton
-              // hidden={checkModule(permissions, "users") ? "flex" : "none"}
-              key="filiacao"
-              text="CADASTROS"
-              onClick={() => {
-                navigate("/usuarios/hub");
-                setIsSideBarOpen(false);
-              }}
-            />
-            <SideButton
-              // hidden={checkModule(permissions, "finance") ? "flex" : "none"}
-              key="financeiro"
-              text="FINANCEIRO"
-              onClick={() => {
-                navigate("/finance/hub");
-                setIsSideBarOpen(false);
-              }}
-            />
-            <SideButton
-              // hidden={checkModule(permissions, "benefits") ? "flex" : "none"}
-              key="beneficios"
-              text="BENEFÍCIOS"
-              onClick={() => {
-                navigate("/beneficios");
-                setIsSideBarOpen(false);
-              }}
-            />
+            {(checkAction("filiados_cadastrar") || checkAction("usuarios_visualizar") || checkAction("perfis_visualizar") || checkAction("filiados_cadastrar") || checkAction("orgaos_visualizar") || checkAction("associados_visualizar"))&& (
+              <SideButton
+                // hidden={checkModule(permissions, "users") ? "flex" : "none"}
+                key="filiacao"
+                text="CADASTROS"
+                onClick={() => {
+                  navigate("/usuarios/hub");
+                  setIsSideBarOpen(false);
+                }}
+              />
+            )}
+            {(checkAction("filiados_cadastrar") || checkAction("beneficios_criar") || checkAction("beneficios_visualizar") || checkAction("beneficios_editar")) && (
+              <SideButton
+                // hidden={checkModule(permissions, "finance") ? "flex" : "none"}
+                key="financeiro"
+                text="FINANCEIRO"
+                onClick={() => {
+                  navigate("/finance/hub");
+                  setIsSideBarOpen(false);
+                }}
+              />
+            )}
+            {(checkAction("beneficios_visualizar") || checkAction("beneficios_criar") || checkAction("beneficios_editar") ) && (
+              <SideButton
+                // hidden={checkModule(permissions, "benefits") ? "flex" : "none"}
+                key="beneficios"
+                text="BENEFÍCIOS"
+                onClick={() => {
+                  navigate("/beneficios");
+                  setIsSideBarOpen(false);
+                }}
+              />
+            )}
             <SideButton
               hidden={user ? "none" : "flex"}
               key="login"
@@ -136,15 +142,6 @@ export default function SideBar() {
                 }}
               />
             )}
-            <SideButton
-              hidden={user ? "none" : "flex"}
-              key="Verificarsindicalizado"
-              text="VERIFICAR SINDICALIZADO"
-              onClick={() => {
-                navigate("/verificar-membro");
-                setIsSideBarOpen(false);
-              }}
-            />
             {checkAction("sindicalizado_visualizar_status") && (
               <SideButton
                 // hidden={checkModule(permissions, "users") ? "flex" : "none"}

diff --git a/src/Pages/Protected/Carteirinha/index.jsx b/src/Pages/Protected/Carteirinha/index.jsx
@@ -28,7 +28,6 @@ const Carteirinha = () => {
         });
         const data = await response.json();
         setMembershipData(data[0]);
-        console.log("alohaa", data);
       } catch (error) {
         console.error("Erro ao buscar os dados do membership:", error);
       }
@@ -80,7 +79,6 @@ const Carteirinha = () => {
   const { name, birthDate, cpf, expeditionDate, hiringDate } = membershipData;
 
   return (
-    checkAction("beneficios_criar") && (
       <div className="carteirinha-container" ref={cardRef}>
         <div className="carteirinha">
           <header className="carteirinha-header">
@@ -95,7 +93,6 @@ const Carteirinha = () => {
                 <div className="info-block">
                   <strong>TITULAR:</strong>
                   <br />
-                  <p className="info-color-titular"></p>
                   <p className="info-color-titular">
                     <span>{name}</span>
                   </p>
@@ -105,7 +102,6 @@ const Carteirinha = () => {
                 <div className="info-block">
                   <strong>DATA DE NASCIMENTO:</strong>
                   <br />
-                  <p className="info-color" />
 
                   <p className="info-color">
                     <span>{new Date(birthDate).toLocaleDateString()}</span>
@@ -114,7 +110,6 @@ const Carteirinha = () => {
                 <div className="info-block">
                   <strong>DATA DE EXPEDIÇÃO:</strong>
                   <br />
-                  <p className="info-color" />
                   <p className="info-color">
                     <span>{new Date(expeditionDate).toLocaleDateString()}</span>
                   </p>
@@ -124,15 +119,13 @@ const Carteirinha = () => {
                 <div className="info-block">
                   <strong>CPF:</strong>
                   <br />
-                  <p className="info-color" />
                   <p className="info-color">
                     <span>{cpf}</span>
                   </p>
                 </div>
                 <div className="info-block">
                   <strong>CONTRATAÇÃO:</strong>
                   <br />
-                  <p className="info-color" />
                   <p className="info-color">
                     <span>{new Date(hiringDate).toLocaleDateString()}</span>
                   </p>
@@ -192,7 +185,6 @@ const Carteirinha = () => {
           BAIXAR CARTEIRINHA
         </button>
       </div>
-    )
   );
 };
 

diff --git a/src/Pages/Protected/Organ/ListOrgan/index.jsx b/src/Pages/Protected/Organ/ListOrgan/index.jsx
@@ -17,7 +17,6 @@ export default function OrganList() {
   const [organs, setOrgans] = useState([]);
   const navigate = useNavigate();
 
-  const canCreate = checkAction(permissions, "orgaos_criar");
   useEffect(() => {
     const getOrgansInfo = async () => {
       const response = await listOrgans();
@@ -46,9 +45,9 @@ export default function OrganList() {
       <div className="forms-container-list-organs">
         <div className="double-box-list-organs">
           <h1 className="title-center"> Lista de órgãos</h1>
-          {canCreate && (
+          {checkAction("orgaos_criar") && (
             <PrimaryButton text="Cadastrar órgão" onClick={handleSubmit} />
-          )}
+          )} 
         </div>
         <div className="search-box-organs">
           <FieldText

diff --git a/src/Pages/Protected/Users/userListPage/index.jsx b/src/Pages/Protected/Users/userListPage/index.jsx
@@ -74,12 +74,22 @@ export default function UserListPage() {
       <div className="forms-container-userlist">
         <div className="double-box-userlist">
           <h1>Lista de Usuários</h1>
+          <br />
           {hasPermission && (
             <PrimaryButton
               text="Cadastrar Usuário"
               onClick={handleRegisterClick}
             />
           )}
+          {hasPermission && (
+            <PrimaryButton
+              text="Cadastrar Sindicalizado"
+              onClick={() => {
+                navigate("/filiacao");
+                setIsSideBarOpen(false);
+              }}
+            />
+          )}
         </div>
         <FieldText
           label="Pesquisar Usuário"

diff --git a/src/Pages/Public/MemberShip/index.jsx b/src/Pages/Public/MemberShip/index.jsx
@@ -60,7 +60,6 @@ const MemberShip = () => {
   const [unfilledDependent, setUnfilledDependent] = useState(false);
   const [orgaosList, setOrgaosList] = useState([]);
   const [lotacaoList, setLotacaoList] = useState([]);
-  const [senha, setSenha] = useState([]);
 
   const navigate = useNavigate();
   // Function to validate a field
@@ -155,7 +154,6 @@ const MemberShip = () => {
     postoDeTrabalho: "Posto de Trabalho",
     orgaoExpedidor: "Órgão Expedidor",
     religiao: "Religião",
-    senha: "Senha",
   };
 
   //const situacaoAtualList = ["Ativo", "Inativo"];
@@ -383,7 +381,6 @@ const MemberShip = () => {
       shipperOrganization: orgaoExpedidor,
       religion: religiao,
       dependents: dependentes,
-      senha,
     };
 
     const message = await createMemberShip(formData);
@@ -559,15 +556,6 @@ const MemberShip = () => {
           erro={erro("email")}
         />
 
-        <FieldText
-          label="Senha *"
-          type="password"
-          value={senha}
-          onChange={(e) => setSenha(e.target.value)}
-          onBlur={(e) => handleBlur(e, "senha")}
-          erro={erro("senha")}
-        />
-
         <h3> Dados de Contato </h3>
 
         <div className="section-form-benefits">

diff --git a/src/Routes/protectedRoutes.jsx b/src/Routes/protectedRoutes.jsx
@@ -204,18 +204,21 @@ const ProtectedRoutes = () => {
           />
         }
       />
-      {checkAction("filiado_visualizar_carteirinha") && (
         <Route
           path="/carteirinha"
           element={
+            // <PermissionProtect
+            //   element={<CarteirinhaPage />}
+            //   moduleName="users"
+            //   actions={["read", "create"]}
+            // />
             <PermissionProtect
-              element={<CarteirinhaPage />}
-              moduleName="users"
-              actions={["read", "create"]}
-            />
+            element={<CarteirinhaPage />}
+            moduleName="benefits"
+            actions={["read", "create", "update", "delete"]}
+          />
           }
         />
-      )}
       <Route
         path="/beneficios/editar/:id"
         element={

diff --git a/src/Utils/permission.jsx b/src/Utils/permission.jsx
@@ -18,10 +18,13 @@ export const checkAction = (action) => {
   const permissionsString = localStorage.getItem("@App:permissions");
   const permissions = JSON.parse(permissionsString);
 
-  const modulePermissions = permissions.find(
-    (permission) => permission === action
-  );
-
+  let modulePermissions = false; 
+  if(permissions){
+    modulePermissions = permissions.find(
+      (permission) => permission === action
+    );
+  }
+
   return modulePermissions ? true : false;
 };