mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 15:59:52 +03:00
table formatting
This commit is contained in:
@@ -207,7 +207,6 @@ const DashboardData: FC = () => {
|
|||||||
border-bottom: 1px solid transparent;
|
border-bottom: 1px solid transparent;
|
||||||
&:last-of-type {
|
&:last-of-type {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
min-width: 64px;
|
|
||||||
}
|
}
|
||||||
`,
|
`,
|
||||||
HeaderCell: `
|
HeaderCell: `
|
||||||
@@ -360,7 +359,7 @@ const DashboardData: FC = () => {
|
|||||||
const fetchCoreData = useCallback(async () => {
|
const fetchCoreData = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
setCoreData((await EMSESP.readCoreData()).data);
|
setCoreData((await EMSESP.readCoreData()).data);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Failed to fetch core data'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Failed to fetch core data'), { variant: 'error' });
|
||||||
}
|
}
|
||||||
}, [enqueueSnackbar]);
|
}, [enqueueSnackbar]);
|
||||||
@@ -381,7 +380,7 @@ const DashboardData: FC = () => {
|
|||||||
const unique_id = parseInt(id);
|
const unique_id = parseInt(id);
|
||||||
try {
|
try {
|
||||||
setDeviceData((await EMSESP.readDeviceData({ id: unique_id })).data);
|
setDeviceData((await EMSESP.readDeviceData({ id: unique_id })).data);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem fetching device data'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem fetching device data'), { variant: 'error' });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -389,7 +388,7 @@ const DashboardData: FC = () => {
|
|||||||
const fetchSensorData = async () => {
|
const fetchSensorData = async () => {
|
||||||
try {
|
try {
|
||||||
setSensorData((await EMSESP.readSensorData()).data);
|
setSensorData((await EMSESP.readSensorData()).data);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem fetching sensor data'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem fetching sensor data'), { variant: 'error' });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -442,7 +441,7 @@ const DashboardData: FC = () => {
|
|||||||
enqueueSnackbar('Write command sent', { variant: 'success' });
|
enqueueSnackbar('Write command sent', { variant: 'success' });
|
||||||
}
|
}
|
||||||
setDeviceValue(undefined);
|
setDeviceValue(undefined);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem writing value'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem writing value'), { variant: 'error' });
|
||||||
} finally {
|
} finally {
|
||||||
refreshData();
|
refreshData();
|
||||||
@@ -533,7 +532,7 @@ const DashboardData: FC = () => {
|
|||||||
enqueueSnackbar('Sensor updated', { variant: 'success' });
|
enqueueSnackbar('Sensor updated', { variant: 'success' });
|
||||||
}
|
}
|
||||||
setSensor(undefined);
|
setSensor(undefined);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem updating sensor'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem updating sensor'), { variant: 'error' });
|
||||||
} finally {
|
} finally {
|
||||||
setSensor(undefined);
|
setSensor(undefined);
|
||||||
@@ -741,6 +740,7 @@ const DashboardData: FC = () => {
|
|||||||
}}
|
}}
|
||||||
theme={data_theme}
|
theme={data_theme}
|
||||||
sort={dv_sort}
|
sort={dv_sort}
|
||||||
|
// layout={{ custom: true }}
|
||||||
>
|
>
|
||||||
{(tableList: any) => (
|
{(tableList: any) => (
|
||||||
<>
|
<>
|
||||||
@@ -940,7 +940,7 @@ const DashboardData: FC = () => {
|
|||||||
} else {
|
} else {
|
||||||
enqueueSnackbar('Analog sensor removed', { variant: 'success' });
|
enqueueSnackbar('Analog sensor removed', { variant: 'success' });
|
||||||
}
|
}
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem updating analog sensor'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem updating analog sensor'), { variant: 'error' });
|
||||||
} finally {
|
} finally {
|
||||||
setAnalog(undefined);
|
setAnalog(undefined);
|
||||||
@@ -968,7 +968,7 @@ const DashboardData: FC = () => {
|
|||||||
} else {
|
} else {
|
||||||
enqueueSnackbar('Analog sensor updated', { variant: 'success' });
|
enqueueSnackbar('Analog sensor updated', { variant: 'success' });
|
||||||
}
|
}
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem updating analog'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem updating analog'), { variant: 'error' });
|
||||||
} finally {
|
} finally {
|
||||||
setAnalog(undefined);
|
setAnalog(undefined);
|
||||||
|
|||||||
@@ -108,7 +108,6 @@ const SettingsCustomization: FC = () => {
|
|||||||
min-width: 124px;
|
min-width: 124px;
|
||||||
width: 124px;
|
width: 124px;
|
||||||
padding-left: 0px;
|
padding-left: 0px;
|
||||||
|
|
||||||
}
|
}
|
||||||
&:nth-of-type(2) {
|
&:nth-of-type(2) {
|
||||||
min-width: 70%;
|
min-width: 70%;
|
||||||
@@ -155,7 +154,7 @@ const SettingsCustomization: FC = () => {
|
|||||||
const fetchDevices = useCallback(async () => {
|
const fetchDevices = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
setDevices((await EMSESP.readDevices()).data);
|
setDevices((await EMSESP.readDevices()).data);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
setErrorMessage(extractErrorMessage(error, 'Failed to fetch device list'));
|
setErrorMessage(extractErrorMessage(error, 'Failed to fetch device list'));
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
@@ -168,7 +167,7 @@ const SettingsCustomization: FC = () => {
|
|||||||
try {
|
try {
|
||||||
const data = (await EMSESP.readDeviceEntities({ id: unique_id })).data;
|
const data = (await EMSESP.readDeviceEntities({ id: unique_id })).data;
|
||||||
setInitialMask(data);
|
setInitialMask(data);
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
setErrorMessage(extractErrorMessage(error, 'Problem fetching device entities'));
|
setErrorMessage(extractErrorMessage(error, 'Problem fetching device entities'));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -250,7 +249,7 @@ const SettingsCustomization: FC = () => {
|
|||||||
try {
|
try {
|
||||||
await EMSESP.resetCustomizations();
|
await EMSESP.resetCustomizations();
|
||||||
enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' });
|
enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' });
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' });
|
||||||
} finally {
|
} finally {
|
||||||
setConfirmReset(false);
|
setConfirmReset(false);
|
||||||
@@ -278,7 +277,7 @@ const SettingsCustomization: FC = () => {
|
|||||||
} else {
|
} else {
|
||||||
enqueueSnackbar('Customization save failed', { variant: 'error' });
|
enqueueSnackbar('Customization save failed', { variant: 'error' });
|
||||||
}
|
}
|
||||||
} catch (error: any) {
|
} catch (error: unknown) {
|
||||||
enqueueSnackbar(extractErrorMessage(error, 'Problem sending entity list'), { variant: 'error' });
|
enqueueSnackbar(extractErrorMessage(error, 'Problem sending entity list'), { variant: 'error' });
|
||||||
}
|
}
|
||||||
setInitialMask(deviceEntities);
|
setInitialMask(deviceEntities);
|
||||||
@@ -414,17 +413,12 @@ const SettingsCustomization: FC = () => {
|
|||||||
</Button>
|
</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Table
|
<Table data={{ nodes: shown_data }} theme={entities_theme} sort={entity_sort} layout={{ custom: true }}>
|
||||||
data={{ nodes: shown_data }}
|
|
||||||
theme={entities_theme}
|
|
||||||
sort={entity_sort}
|
|
||||||
layout={{ custom: true, horizontalScroll: true }}
|
|
||||||
>
|
|
||||||
{(tableList: any) => (
|
{(tableList: any) => (
|
||||||
<>
|
<>
|
||||||
<Header>
|
<Header>
|
||||||
<HeaderRow>
|
<HeaderRow>
|
||||||
<HeaderCell pinLeft>OPTIONS</HeaderCell>
|
<HeaderCell>OPTIONS</HeaderCell>
|
||||||
<HeaderCell resize>
|
<HeaderCell resize>
|
||||||
<Button
|
<Button
|
||||||
fullWidth
|
fullWidth
|
||||||
@@ -436,7 +430,6 @@ const SettingsCustomization: FC = () => {
|
|||||||
</Button>
|
</Button>
|
||||||
</HeaderCell>
|
</HeaderCell>
|
||||||
<HeaderCell>VALUE</HeaderCell>
|
<HeaderCell>VALUE</HeaderCell>
|
||||||
<HeaderCell />
|
|
||||||
</HeaderRow>
|
</HeaderRow>
|
||||||
</Header>
|
</Header>
|
||||||
<Body>
|
<Body>
|
||||||
|
|||||||
Reference in New Issue
Block a user