From 2a7387cb6c6e397f484023ec128da9ed5a0eaff3 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Fri, 5 Feb 2021 13:28:32 -0800
Subject: [PATCH] Fix minor bugs on history

---
 packages/webapp/lang/en.json                  | 18 +++++++++
 packages/webapp/src/compiled-lang/en.json     | 36 ++++++++++++++++++
 .../history-dialog/index.tsx                  | 37 +++++++++++--------
 3 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/packages/webapp/lang/en.json b/packages/webapp/lang/en.json
index fd3a1edc..7e9e4cf7 100644
--- a/packages/webapp/lang/en.json
+++ b/packages/webapp/lang/en.json
@@ -110,6 +110,9 @@
   "forgot.desc": {
     "defaultMessage": "We will send you an email to reset your password"
   },
+  "forgot.email": {
+    "defaultMessage": "Email"
+  },
   "forgot.register": {
     "defaultMessage": "Send recovery link"
   },
@@ -128,6 +131,9 @@
   "header.haveaccount": {
     "defaultMessage": "Already have an account?"
   },
+  "history.no-changes": {
+    "defaultMessage": "There is no changes available"
+  },
   "login.desc": {
     "defaultMessage": "Log into your account"
   },
@@ -198,6 +204,18 @@
   "registration.desc": {
     "defaultMessage": "Signing up is free and just take a moment"
   },
+  "registration.email": {
+    "defaultMessage": "Email"
+  },
+  "registration.firstname": {
+    "defaultMessage": "First Name"
+  },
+  "registration.lastname": {
+    "defaultMessage": "Last Name"
+  },
+  "registration.password": {
+    "defaultMessage": "Password"
+  },
   "registration.register": {
     "defaultMessage": "Register"
   },
diff --git a/packages/webapp/src/compiled-lang/en.json b/packages/webapp/src/compiled-lang/en.json
index 422a080a..39e085a9 100644
--- a/packages/webapp/src/compiled-lang/en.json
+++ b/packages/webapp/src/compiled-lang/en.json
@@ -221,6 +221,12 @@
       "value": "We will send you an email to reset your password"
     }
   ],
+  "forgot.email": [
+    {
+      "type": 0,
+      "value": "Email"
+    }
+  ],
   "forgot.register": [
     {
       "type": 0,
@@ -257,6 +263,12 @@
       "value": "Already have an account?"
     }
   ],
+  "history.no-changes": [
+    {
+      "type": 0,
+      "value": "There is no changes available"
+    }
+  ],
   "login.desc": [
     {
       "type": 0,
@@ -395,6 +407,30 @@
       "value": "Signing up is free and just take a moment"
     }
   ],
+  "registration.email": [
+    {
+      "type": 0,
+      "value": "Email"
+    }
+  ],
+  "registration.firstname": [
+    {
+      "type": 0,
+      "value": "First Name"
+    }
+  ],
+  "registration.lastname": [
+    {
+      "type": 0,
+      "value": "Last Name"
+    }
+  ],
+  "registration.password": [
+    {
+      "type": 0,
+      "value": "Password"
+    }
+  ],
   "registration.register": [
     {
       "type": 0,
diff --git a/packages/webapp/src/components/maps-page/action-dispatcher/history-dialog/index.tsx b/packages/webapp/src/components/maps-page/action-dispatcher/history-dialog/index.tsx
index 64439cf4..7e3a715c 100644
--- a/packages/webapp/src/components/maps-page/action-dispatcher/history-dialog/index.tsx
+++ b/packages/webapp/src/components/maps-page/action-dispatcher/history-dialog/index.tsx
@@ -24,12 +24,12 @@ const HistoryDialog = (props: DialogProps) => {
     props.onClose();
   };
 
-  const handleOnClick = (event,vid): void => {
+  const handleOnClick = (event, vid): void => {
     event.preventDefault();
-    client.revertHistory(mapId,vid)
-    .then((mapId)=>{
-      handleOnClose();
-    })
+    client.revertHistory(mapId, vid)
+      .then((mapId) => {
+        handleOnClose();
+      })
   };
 
 
@@ -50,18 +50,25 @@ const HistoryDialog = (props: DialogProps) => {
               </TableRow>
             </TableHead>
             <TableBody>
-              {changeHistory.map((row) => (
-                <TableRow key={row.id}>
-                  <TableCell align="left">{row.creator}</TableCell>
-                  <TableCell align="left">
-                    <Tooltip title={moment(row.modified).format("lll")} placement="bottom-start">
-                      <span>{moment(row.modified).fromNow()}</span>
-                    </Tooltip>
+
+              {changeHistory.length == 0 ? (
+                <TableRow>
+                  <TableCell colSpan={4}><FormattedMessage id='history.no-changes' defaultMessage='There is no changes available' />
                   </TableCell>
-                  <TableCell align="left"><Link href={`c/maps/${mapId}/${row.id}/view`} target="history"><FormattedMessage id="maps.view" defaultMessage="View" /></Link></TableCell>
-                  <TableCell align="left"><Link href="#" onClick={(e)=>handleOnClick(e,row.id)}><FormattedMessage id="maps.revert" defaultMessage="Revert" /></Link></TableCell>
                 </TableRow>
-              ))}
+              ) :
+                changeHistory.map((row) => (
+                  <TableRow key={row.id}>
+                    <TableCell align="left">{row.creator}</TableCell>
+                    <TableCell align="left">
+                      <Tooltip title={moment(row.modified).format("lll")} placement="bottom-start">
+                        <span>{moment(row.modified).fromNow()}</span>
+                      </Tooltip>
+                    </TableCell>
+                    <TableCell align="left"><Link href={`c/maps/${mapId}/${row.id}/view`} target="history"><FormattedMessage id="maps.view" defaultMessage="View" /></Link></TableCell>
+                    <TableCell align="left"><Link href="#" onClick={(e) => handleOnClick(e, row.id)}><FormattedMessage id="maps.revert" defaultMessage="Revert" /></Link></TableCell>
+                  </TableRow>
+                ))}
             </TableBody>
           </Table>
         </TableContainer>