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

table formatting

Browse Source
This commit is contained in:
Proddy
2022-05-01 13:12:30 +02:00
parent 7130513593
commit 0143e89e27
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,7 +207,6 @@ const DashboardData: FC = () => {
border-bottom: 1px solid transparent;
&:last-of-type {
text-align: right;
min-width: 64px;
}
`,
HeaderCell: `
@@ -360,7 +359,7 @@ const DashboardData: FC = () => {
const fetchCoreData = useCallback(async () => {
try {
setCoreData((await EMSESP.readCoreData()).data);
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Failed to fetch core data'), { variant: 'error' });
}
}, [enqueueSnackbar]);
@@ -381,7 +380,7 @@ const DashboardData: FC = () => {
const unique_id = parseInt(id);
try {
setDeviceData((await EMSESP.readDeviceData({ id: unique_id })).data);
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem fetching device data'), { variant: 'error' });
}
};
@@ -389,7 +388,7 @@ const DashboardData: FC = () => {
const fetchSensorData = async () => {
try {
setSensorData((await EMSESP.readSensorData()).data);
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem fetching sensor data'), { variant: 'error' });
}
};
@@ -442,7 +441,7 @@ const DashboardData: FC = () => {
enqueueSnackbar('Write command sent', { variant: 'success' });
}
setDeviceValue(undefined);
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem writing value'), { variant: 'error' });
} finally {
refreshData();
@@ -533,7 +532,7 @@ const DashboardData: FC = () => {
enqueueSnackbar('Sensor updated', { variant: 'success' });
}
setSensor(undefined);
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem updating sensor'), { variant: 'error' });
} finally {
setSensor(undefined);
@@ -741,6 +740,7 @@ const DashboardData: FC = () => {
}}
theme={data_theme}
sort={dv_sort}
// layout={{ custom: true }}
>
{(tableList: any) => (
<>
@@ -940,7 +940,7 @@ const DashboardData: FC = () => {
} else {
enqueueSnackbar('Analog sensor removed', { variant: 'success' });
}
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem updating analog sensor'), { variant: 'error' });
} finally {
setAnalog(undefined);
@@ -968,7 +968,7 @@ const DashboardData: FC = () => {
} else {
enqueueSnackbar('Analog sensor updated', { variant: 'success' });
}
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem updating analog'), { variant: 'error' });
} finally {
setAnalog(undefined);

19
interface/src/project/SettingsCustomization.tsx
View File

@@ -108,7 +108,6 @@ const SettingsCustomization: FC = () => {
min-width: 124px;
width: 124px;
padding-left: 0px;
}
&:nth-of-type(2) {
min-width: 70%;
@@ -155,7 +154,7 @@ const SettingsCustomization: FC = () => {
const fetchDevices = useCallback(async () => {
try {
setDevices((await EMSESP.readDevices()).data);
} catch (error: any) {
} catch (error: unknown) {
setErrorMessage(extractErrorMessage(error, 'Failed to fetch device list'));
}
}, []);
@@ -168,7 +167,7 @@ const SettingsCustomization: FC = () => {
try {
const data = (await EMSESP.readDeviceEntities({ id: unique_id })).data;
setInitialMask(data);
} catch (error: any) {
} catch (error: unknown) {
setErrorMessage(extractErrorMessage(error, 'Problem fetching device entities'));
}
};
@@ -250,7 +249,7 @@ const SettingsCustomization: FC = () => {
try {
await EMSESP.resetCustomizations();
enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' });
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' });
} finally {
setConfirmReset(false);
@@ -278,7 +277,7 @@ const SettingsCustomization: FC = () => {
} else {
enqueueSnackbar('Customization save failed', { variant: 'error' });
}
} catch (error: any) {
} catch (error: unknown) {
enqueueSnackbar(extractErrorMessage(error, 'Problem sending entity list'), { variant: 'error' });
}
setInitialMask(deviceEntities);
@@ -414,17 +413,12 @@ const SettingsCustomization: FC = () => {
</Button>
</Grid>
</Grid>
<Table
data={{ nodes: shown_data }}
theme={entities_theme}
sort={entity_sort}
layout={{ custom: true, horizontalScroll: true }}
>
<Table data={{ nodes: shown_data }} theme={entities_theme} sort={entity_sort} layout={{ custom: true }}>
{(tableList: any) => (
<>
<Header>
<HeaderRow>
<HeaderCell pinLeft>OPTIONS</HeaderCell>
<HeaderCell>OPTIONS</HeaderCell>
<HeaderCell resize>
<Button
fullWidth
@@ -436,7 +430,6 @@ const SettingsCustomization: FC = () => {
</Button>
</HeaderCell>
<HeaderCell>VALUE</HeaderCell>
<HeaderCell />
</HeaderRow>
</Header>
<Body>