From c16d75781d482e917ac320c1b257f797fcac63c3 Mon Sep 17 00:00:00 2001
From: adriano <adriano08andra@hotmail.com>
Date: Fri, 4 Feb 2022 12:31:08 -0300
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20do=20bug=20do=20relat?=
 =?UTF-8?q?=C3=B3rio=20para=20quando=20o=20chamado=20ainda=20est=C3=A1=20n?=
 =?UTF-8?q?o=20status=20pending=20e=20n=C3=A3o=20tem=20nenhum=20atendente?=
 =?UTF-8?q?=20atrelado=20ao=20chamado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Report/ExportCSV/index.js | 2 +-
 frontend/src/components/Report/MTable/index.js    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Report/ExportCSV/index.js b/frontend/src/components/Report/ExportCSV/index.js
index d34d04a..177449c 100644
--- a/frontend/src/components/Report/ExportCSV/index.js
+++ b/frontend/src/components/Report/ExportCSV/index.js
@@ -48,7 +48,7 @@ const ExportCSV = (props) => {
  
     return (   
         <div> 
-            <Button onClick={getTransactionData}>EXPORT CSV</Button>
+            <Button onClick={getTransactionData}>CSV EXPORT</Button>
             <CSVLink
             headers={header}
             data={dataRow} 
diff --git a/frontend/src/components/Report/MTable/index.js b/frontend/src/components/Report/MTable/index.js
index 2e2ceb5..b7c5ac7 100644
--- a/frontend/src/components/Report/MTable/index.js
+++ b/frontend/src/components/Report/MTable/index.js
@@ -11,8 +11,10 @@ const MTable = (props) => {
   const [selectedRow, setSelectedRow] = useState(null);   
 
 
-  const dataLoad =    props.data.map((dt) => { return { ...dt }});
-  const columnsLoad = props.columns.map((column) => { return { ...column }}); 
+  //const dataLoad =    props.data.map((dt) => { return { ...dt }}); 
+  const dataLoad =    props.data.map(({user, ...others})=>({...others, 'user': user ? user : {name: 'Aguardando atendente', email:''}}));
+
+  const columnsLoad = props.columns.map((column) => { return { ...column }});  
  
   useEffect(() => {
    
@@ -41,7 +43,7 @@ const MTable = (props) => {
                     render(<Modal data={selectedRow.messages} 
                       hasChild={false} 
                       modal_header={'Chat do atendimento pelo Whatsapp'}
-                      user={selectedRow.user.name}
+                      user={selectedRow.user.name} 
                       clientContactNumber={selectedRow.contact.number}/>)  
                   }