Merge branch 'dev' of https://gitlab.com/kluppsoftware/smart-energia-web into dev

package.json

@@ -58,6 +58,7 @@
     "react-hook-form": "^7.32.2",
     "react-icons": "^4.3.1",
     "react-input-mask": "^2.0.4",
+    "react-loading": "^2.0.3",
     "react-pdf-thumbnail": "^0.1.0",
     "sharp": "^0.30.7",
     "styled-components": "^5.3.5",

src/components/administrativeTables/ClientsTable.tsx

@@ -28,6 +28,8 @@ import FaqButton1 from '../buttons/faqButton/FaqButton1';
 import FaqButton2 from '../buttons/faqButton/FaqButton2';
 import { StyledStatus, TableView } from './TableView';
 
+import ReactLoading from 'react-loading';
+
 const style = {
   position: 'absolute' as const,
   top: '50%',
@@ -284,7 +286,7 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface
 
   const formData = new FormData()
 
-  const [clientEdit, setClientEdit] = useState<any>({})
+  const [clientEdit, setClientEdit] = useState<any>()
   const [logo, setLogo] = useState(false)
   const [imageURLS, setImageURLs] = useState([])
   const [images, setImages] = useState([] as any)
@@ -309,31 +311,31 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface
   }
 
   const [openSnackSuccess, setOpenSnackSuccess] = useState<boolean>(false)
+  const [loading, setLoading] = useState<boolean>(false)
 
-  function handleUpdateClient({
+  async function handleUpdateClient(props, id) {
-    name,
+    logo && formData.append('file', logo)
-    email,
+    let new_profile_picture
-    password,
-    password_confirmation,
-    client_id
-  }, id) {
-    formData.append('name', name)
-    formData.append('email', email)
-    formData.append('password', password)
-    formData.append('password_confirmation', password_confirmation)
-    formData.append('client_id', client_id)
-    formData.append('profile_picture', logo)
-    formData.append('role', nivelAcess)
 
-    api.put(`/user/${id}`, formData)
+    try {
-      .then((res) => {
+      setLoading(true)
-        setOpenSnackSuccess(true)
+      if (logo) {
-        setOpenModalInativar(false)
+        const { data } = await api.post('/sendFile', formData)
-        // window.location.reload()
+        new_profile_picture = data.url
-      })
+      }
-      .catch((res) => {
+      await api.put(`/user/${id}`, {
-        setOpenSnackError(true)
+        ...props,
+        profile_picture: new_profile_picture
       })
+
+      setOpenSnackSuccess(true)
+      setOpenModalInativar(false)
+      // window.location.reload()
+    } catch (err) {
+      setOpenSnackError(true)
+    } finally {
+      setLoading(false)
+    }
   }
 
   return (
@@ -397,7 +399,7 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface
                       <TableCell align="left" style={{ cursor: 'pointer' }} onClick={() => {
                         setOpenEditUserModal(true)
                         setSelectedClient(row)
-                        setClientEdit(row)
+                        setClientEdit({ email: row.email, name: row.name, client_id: row.client_id, profile_picture: row.profile_picture })
                       }}>{row.name}</TableCell>
                       <TableCell align="left" style={{ cursor: 'pointer' }} onClick={() => {
                         setOpen(true)
@@ -457,12 +459,13 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface
                 name: value.target.value
               })
             }}
+            value={clientEdit?.name}
             variant="outlined"
           />
           <TextField
             id="outlined-basic"
             label="E-mail/Usuário"
-            value={clientEdit.email}
+            value={clientEdit?.email}
             sx={{ width: 350, ml: 8 }}
             onChange={(value) => {
               setClientEdit({
@@ -500,6 +503,7 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface
             id="outlined-basic"
             label="Codigo do Cliente Smart Energia"
             sx={{ width: 350, ml: 5, mt: 2 }}
+            value={clientEdit?.client_id}
             onChange={(value) => {
               setClientEdit({
                 ...clientEdit,
@@ -541,7 +545,6 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface
           </InputUploadView>
 
           <div className='select'>
-
             <FormControl sx={{ width: 350, ml: 5, mt: 2 }}>
               <InputLabel id="demo-select-small">Nivel de acesso</InputLabel>
               <Select
@@ -559,11 +562,14 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface
             </FormControl>
           </div>
 
-          <FaqButton1 title="Cancelar" onClick={() => setOpenEditUserModal(false)} />
+          {!loading && <FaqButton1 title="Cancelar" onClick={() => setOpenEditUserModal(false)} />}
-          <FaqButton2
+          {!loading
-            title="Salvar"
+            ? <FaqButton2
-            onClick={() => handleUpdateClient(clientEdit, selectedClient.id)}
+              title="Salvar"
-          />
+              onClick={() => handleUpdateClient(clientEdit, selectedClient.id)}
+            />
+            : <ReactLoading type='spin' color='#254f7f' height='5%' width='5%' />
+          }
         </Box>
       </Modal>
 

yarn.lock

@@ -4394,6 +4394,11 @@ react-is@^16.13.1, react-is@^16.7.0:
   version "17.0.2"
   resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
 
+react-loading@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/react-loading/-/react-loading-2.0.3.tgz#e8138fb0c3e4674e481b320802ac7048ae14ffb9"
+  integrity sha512-Vdqy79zq+bpeWJqC+xjltUjuGApyoItPgL0vgVfcJHhqwU7bAMKzysfGW/ADu6i0z0JiOCRJjo+IkFNkRNbA3A==
+
 react-pdf-thumbnail@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/react-pdf-thumbnail/-/react-pdf-thumbnail-0.1.0.tgz#6b8ddf861252acb2b137dfd42007f545fde52ef9"