2 files changed, 11 insertions, 20 deletions

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index 4134de3d..fce9597f 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -25,19 +25,19 @@ const EventReportPage = () => {
   const classes = useStyles();
   const [data, setData] = useState([]);
 
-  const handleSubmit = (deviceId, from, to) => {
+  const handleSubmit = async (deviceId, from, to) => {
     const query = new URLSearchParams({
       deviceId,
       from: from.toISOString(),
       to: to.toISOString(),
     });
 
-    fetch(`/api/reports/events?${query.toString()}`, { headers: { Accept: 'application/json' } })
-      .then((response) => {
-        if (response.ok) {
-          response.json().then(setData);
-      }
-    });
+    const response = await fetch(`/api/reports/events?${query.toString()}`, { headers: { Accept: 'application/json' } })
+    
+    if(response.ok) {
+      const data = await response.json();
+      setData(data);
+    }
   }
 
   return (
diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js
index 6f248048..be48413b 100644
--- a/modern/src/reports/ReportFilter.js
+++ b/modern/src/reports/ReportFilter.js
@@ -81,8 +81,7 @@ const ReportFilter = (props) => {
           onChange={(e) =>
             setFrom(moment(e.target.value, moment.HTML5_FMT.DATETIME_LOCAL))
           }
-          fullWidth
-        />
+          fullWidth />
       )}
       {period === 'custom' && (
         <TextField
@@ -94,23 +93,15 @@ const ReportFilter = (props) => {
           onChange={(e) =>
             setTo(moment(e.target.value, moment.HTML5_FMT.DATETIME_LOCAL))
           }
-          fullWidth
-        />
+          fullWidth />
       )}
       <FormControl margin="normal" fullWidth>
-        <Button
-          type="button"
-          color="primary"
-          variant="contained"
-          disabled={!deviceId}
-          onClick={handleShow}
-        >
+        <Button type="button" color="primary" variant="contained" disabled={!deviceId} onClick={handleShow}>
           {t('reportShow')}
         </Button>
       </FormControl>
     </>
   );
-  
 }
 
-export default ReportFilter;
\ No newline at end of file
+export default ReportFilter;