scottk/OptimCloud-gw-ui
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/OptimCloud-gw-ui.git synced 2025-11-01 18:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36 from stephb9959/main

Browse Source 
Merge master into feature/32-statistics
This commit is contained in:
Charles
2021-05-29 11:56:06 -04:00
committed by GitHub
parent b987fbe0ad 85fa46394e
commit c2d53e210b
6 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/containers/TheFooter.js
View File

@@ -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>

2
src/pages/DevicePage/ActionModal.js
View File

@@ -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' });
});
};

2
src/pages/DevicePage/BlinkModal.js
View File

@@ -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' });
});
};

2
src/pages/DevicePage/DeviceCommands.js
View File

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

2
src/pages/DevicePage/FirmwareUpgradeModal.js
View File

@@ -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' });
});
};

2
src/pages/DevicePage/TraceModal.js
View File

@@ -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' });
});
};