andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #347 from MichaelDvP/dev_340

Browse Source 
fix #340, refresh only device/sensor-data if open
This commit is contained in:
Proddy
2022-02-05 12:48:18 +01:00
committed by GitHub
parent 35013a71d4 77df8cc69b
commit 43d0197a60
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
interface/src/project/DashboardData.tsx
View File

@@ -98,12 +98,11 @@ const DashboardData: FC = () => {
const desktopWindow = useMediaQuery('(min-width:600px)');
const refreshData = () => {
const refreshAllData = () => {
if (analog || sensor || deviceValue) {
return;
}
loadData();
if (sensorData) {
fetchSensorData();
} else if (selectedDevice) {
@@ -111,6 +110,19 @@ const DashboardData: FC = () => {
}
};
const refreshData = () => {
if (analog || sensor || deviceValue) {
return;
}
if (sensorData) {
fetchSensorData();
} else if (selectedDevice) {
fetchDeviceData(selectedDevice);
} else {
loadData();
}
};
useEffect(() => {
const timer = setInterval(() => refreshData(), 60000);
return () => {
@@ -407,6 +419,7 @@ const DashboardData: FC = () => {
};
const toggleDeviceData = (index: number) => {
loadData();
if (selectedDevice === index) {
setSelectedDevice(undefined);
} else {
@@ -415,6 +428,7 @@ const DashboardData: FC = () => {
};
const toggleSensorData = () => {
loadData();
if (sensorData) {
setSensorData(undefined);
} else {
@@ -810,7 +824,7 @@ const DashboardData: FC = () => {
{renderSensorDialog()}
{renderAnalogDialog()}
<ButtonRow>
<Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={refreshData}>
<Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={refreshAllData}>
Refresh
</Button>
</ButtonRow>