amenpunk 1 год назад
Родитель
Сommit
e082d63bcd
1 измененных файлов с 14 добавлено и 5 удалено
  1. 14 5
      src/Components/Password/Steps/TypePwd.jsx

+ 14 - 5
src/Components/Password/Steps/TypePwd.jsx

7
 } from '@mui/material'
7
 } from '@mui/material'
8
 import toast, { Toaster } from 'react-hot-toast';
8
 import toast, { Toaster } from 'react-hot-toast';
9
 
9
 
10
-import { Simple as Loading } from '../../Generics/loading.jsx'
10
+// import { Simple as Loading } from '../../Generics/loading.jsx'
11
 
11
 
12
 const ROLE = {
12
 const ROLE = {
13
   ADMIN: 1,
13
   ADMIN: 1,
67
 function PermisosList(props) {
67
 function PermisosList(props) {
68
 
68
 
69
   let { recursos, selectedRole, setSelectedRole } = props
69
   let { recursos, selectedRole, setSelectedRole } = props
70
+  console.log("recursos len", recursos.data.length)
71
+  if(recursos.data.length === 0) return (<></>);
70
 
72
 
71
   return (
73
   return (
72
     <FormControl className="rolelist" >
74
     <FormControl className="rolelist" >
78
       >
80
       >
79
         {
81
         {
80
 
82
 
81
-          recursos.data.length === 0 ? <Loading /> :
83
+
84
+            recursos.data &&
82
             recursos.data.map((r) => {
85
             recursos.data.map((r) => {
83
               return (
86
               return (
84
                 <FormControlLabel
87
                 <FormControlLabel
223
       return rest.getQuery(auth.token);
226
       return rest.getQuery(auth.token);
224
     }
227
     }
225
     const groupRecursos = (recursos) => {
228
     const groupRecursos = (recursos) => {
229
+      console.log("resource:",recursos)
226
       let groups = {};
230
       let groups = {};
227
       recursos.forEach((r) => {
231
       recursos.forEach((r) => {
228
         if (groups[r.grupo]) {
232
         if (groups[r.grupo]) {
231
           groups[r.grupo] = [r]
235
           groups[r.grupo] = [r]
232
         }
236
         }
233
       })
237
       })
238
+      console.log('grupos: ', groups)
234
 
239
 
235
       assignRecursos(groups)
240
       assignRecursos(groups)
236
     }
241
     }
239
       let templete = {
244
       let templete = {
240
         1: { "label": 'Puestos', data: [] },
245
         1: { "label": 'Puestos', data: [] },
241
         2: { "label": 'Varios', data: [] },
246
         2: { "label": 'Varios', data: [] },
242
-        3: { "label": 'General', data: [] }
247
+        3: { "label": 'General', data: [] },
248
+        4: { "label": 'Contraseñas', data: [] },
249
+        5: { "label": 'Reportes', data: [] }
243
       }
250
       }
244
 
251
 
245
       Object.keys(recursos_api)
252
       Object.keys(recursos_api)
246
         .forEach((k) => {
253
         .forEach((k) => {
247
-          templete[k].data = recursos_api[k];
254
+          if(templete[k]){
255
+            templete[k].data = recursos_api[k];
256
+          }
248
         })
257
         })
249
 
258
 
250
       setRecursos(templete)
259
       setRecursos(templete)
257
   }, [auth.token])
266
   }, [auth.token])
258
 
267
 
259
   return (
268
   return (
260
-    <div class="gapwdrole">
269
+    <div className="gapwdrole">
261
 
270
 
262
       <div className="typepwdlist control_flow_role">
271
       <div className="typepwdlist control_flow_role">
263
         <TipoUsuarios type={userType} setType={setUserType} />
272
         <TipoUsuarios type={userType} setType={setUserType} />