Merge pull request #36 from stephb9959/main

Merge master into feature/32-statistics

src/containers/TheFooter.js

@@ -4,7 +4,7 @@ import { CFooter } from '@coreui/react';
 const TheFooter = () => (
   <CFooter fixed={false}>
     <div>
-        Version 0.0.2
+        Version 0.0.3
     </div>
     <div className="mfs-auto">
       <span className="mr-1">Powered by</span>

src/pages/DevicePage/ActionModal.js

@@ -18,6 +18,7 @@ import { convertDateToUtc, convertDateFromUtc, dateToUnix } from '../../utils/he
 import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
+import eventBus from '../../utils/EventBus';
 
 const ActionModal = ({ show, toggleModal, title, directions, action }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
@@ -104,6 +105,7 @@ const ActionModal = ({ show, toggleModal, title, directions, action }) => {
         setDoingNow(false);
         setCheckingIfSure(false);
         setWaiting(false);
+        eventBus.dispatch('actionCompleted', { message: 'An action has been completed' });
       });
   };
 

src/pages/DevicePage/BlinkModal.js

@@ -21,6 +21,7 @@ import { convertDateFromUtc, convertDateToUtc, dateToUnix } from '../../utils/he
 import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
+import eventBus from '../../utils/EventBus';
 
 const BlinkModal = ({ show, toggleModal }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
@@ -101,6 +102,7 @@ const BlinkModal = ({ show, toggleModal }) => {
         setDoingNow(false);
         setCheckingIfSure(false);
         setWaiting(false);
+        eventBus.dispatch('actionCompleted', { message: 'An action has been completed' });
       });
   };
 

src/pages/DevicePage/DeviceCommands.js

@@ -193,7 +193,7 @@ const DeviceCommands = ({ selectedDeviceId }) => {
   }, [selectedDeviceId, start, end]);
 
   useEffect(() => {
-    eventBus.on('actionCompleted', () => getCommands());
+    eventBus.on('actionCompleted', () => refreshCommands());
 
     return () => {
       eventBus.remove('actionCompleted');

src/pages/DevicePage/FirmwareUpgradeModal.js

@@ -19,6 +19,7 @@ import { convertDateToUtc, convertDateFromUtc, dateToUnix } from '../../utils/he
 import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
+import eventBus from '../../utils/EventBus';
 
 const FirmwareUpgradeModal = ({ show, toggleModal }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
@@ -126,6 +127,7 @@ const FirmwareUpgradeModal = ({ show, toggleModal }) => {
         setDoingNow(false);
         setCheckingIfSure(false);
         setWaiting(false);
+        eventBus.dispatch('actionCompleted', { message: 'An action has been completed' });
       });
   };
 

src/pages/DevicePage/TraceModal.js

@@ -20,6 +20,7 @@ import { convertDateToUtc, dateToUnix } from '../../utils/helper';
 import 'react-widgets/styles.css';
 import { getToken } from '../../utils/authHelper';
 import axiosInstance from '../../utils/axiosInstance';
+import eventBus from '../../utils/EventBus';
 
 const TraceModal = ({ show, toggleModal }) => {
   const [hadSuccess, setHadSuccess] = useState(false);
@@ -100,6 +101,7 @@ const TraceModal = ({ show, toggleModal }) => {
       .finally(() => {
         setCheckingIfSure(false);
         setWaiting(false);
+        eventBus.dispatch('actionCompleted', { message: 'An action has been completed' });
       });
   };