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

replace notistack

Browse Source
This commit is contained in:
Proddy
2023-03-10 20:28:43 +01:00
parent ae890dab37
commit 8cbae88dc3
22 changed files with 129 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import {
Checkbox
} from '@mui/material';
import { useSnackbar } from 'notistack';
import { toast } from 'react-toastify';
import { useTheme } from '@table-library/react-table-library/theme';
import { useSort, SortToggleType } from '@table-library/react-table-library/sort';
@@ -78,8 +78,6 @@ const DashboardData: FC = () => {
const { LL } = useI18nContext();
const { enqueueSnackbar } = useSnackbar();
const [coreData, setCoreData] = useState<CoreData>({
connected: true,
devices: [],
@@ -363,9 +361,9 @@ const DashboardData: FC = () => {
try {
setCoreData((await EMSESP.readCoreData()).data);
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_LOADING()));
}
}, [enqueueSnackbar, LL]);
}, [LL]);
useEffect(() => {
fetchCoreData();
@@ -384,7 +382,7 @@ const DashboardData: FC = () => {
try {
setDeviceData((await EMSESP.readDeviceData({ id: unique_id })).data);
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_LOADING()));
}
};
@@ -392,7 +390,7 @@ const DashboardData: FC = () => {
try {
setSensorData((await EMSESP.readSensorData()).data);
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_LOADING()));
}
};
@@ -468,15 +466,15 @@ const DashboardData: FC = () => {
devicevalue: deviceValue
});
if (response.status === 204) {
enqueueSnackbar(LL.WRITE_CMD_FAILED(), { variant: 'error' });
toast.error(LL.WRITE_CMD_FAILED());
} else if (response.status === 403) {
enqueueSnackbar(LL.ACCESS_DENIED(), { variant: 'error' });
toast.error(LL.ACCESS_DENIED());
} else {
enqueueSnackbar(LL.WRITE_CMD_SENT(), { variant: 'success' });
toast.success(LL.WRITE_CMD_SENT());
}
setDeviceValue(undefined);
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
} finally {
refreshData();
setDeviceValue(undefined);
@@ -562,15 +560,15 @@ const DashboardData: FC = () => {
offset: sensor.o
});
if (response.status === 204) {
enqueueSnackbar(LL.UPLOAD_OF(LL.SENSOR()) + ' ' + LL.FAILED(), { variant: 'error' });
toast.error(LL.UPLOAD_OF(LL.SENSOR()) + ' ' + LL.FAILED());
} else if (response.status === 403) {
enqueueSnackbar(LL.ACCESS_DENIED(), { variant: 'error' });
toast.error(LL.ACCESS_DENIED());
} else {
enqueueSnackbar(LL.UPDATED_OF(LL.SENSOR()), { variant: 'success' });
toast.success(LL.UPDATED_OF(LL.SENSOR()));
}
setSensor(undefined);
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
} finally {
setSensor(undefined);
fetchSensorData();
@@ -991,14 +989,14 @@ const DashboardData: FC = () => {
});
if (response.status === 204) {
enqueueSnackbar(LL.DELETION_OF(LL.ANALOG_SENSOR()) + ' ' + LL.FAILED(), { variant: 'error' });
toast.error(LL.DELETION_OF(LL.ANALOG_SENSOR()) + ' ' + LL.FAILED());
} else if (response.status === 403) {
enqueueSnackbar(LL.ACCESS_DENIED(), { variant: 'error' });
toast.error(LL.ACCESS_DENIED());
} else {
enqueueSnackbar(LL.REMOVED_OF(LL.ANALOG_SENSOR()), { variant: 'success' });
toast.success(LL.REMOVED_OF(LL.ANALOG_SENSOR()));
}
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
} finally {
setAnalog(undefined);
fetchSensorData();
@@ -1019,14 +1017,14 @@ const DashboardData: FC = () => {
});
if (response.status === 204) {
enqueueSnackbar(LL.UPDATE_OF(LL.ANALOG_SENSOR()) + ' ' + LL.FAILED(), { variant: 'error' });
toast.error(LL.UPDATE_OF(LL.ANALOG_SENSOR()) + ' ' + LL.FAILED());
} else if (response.status === 403) {
enqueueSnackbar(LL.ACCESS_DENIED(), { variant: 'error' });
toast.error(LL.ACCESS_DENIED());
} else {
enqueueSnackbar(LL.UPDATED_OF(LL.ANALOG_SENSOR()), { variant: 'success' });
toast.success(LL.UPDATED_OF(LL.ANALOG_SENSOR()));
}
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
} finally {
setAnalog(undefined);
fetchSensorData();

7
interface/src/project/DashboardStatus.tsx
View File

@@ -1,5 +1,5 @@
import { FC, useState, useContext, useEffect } from 'react';
import { useSnackbar } from 'notistack';
import { toast } from 'react-toastify';
import {
Avatar,
Button,
@@ -74,7 +74,6 @@ const DashboardStatus: FC = () => {
const theme = useTheme();
const [confirmScan, setConfirmScan] = useState<boolean>(false);
const { enqueueSnackbar } = useSnackbar();
const { me } = useContext(AuthenticatedContext);
@@ -146,9 +145,9 @@ const DashboardStatus: FC = () => {
const scan = async () => {
try {
await EMSESP.scanDevices();
enqueueSnackbar(LL.SCANNING() + '...', { variant: 'info' });
toast.info(LL.SCANNING() + '...');
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
} finally {
setConfirmScan(false);
}

10
interface/src/project/HelpInformation.tsx
View File

@@ -4,7 +4,7 @@ import { Typography, Button, Box, List, ListItem, ListItemText, Link, ListItemAv
import { SectionContent } from 'components';
import { useSnackbar } from 'notistack';
import { toast } from 'react-toastify';
import CommentIcon from '@mui/icons-material/CommentTwoTone';
import MenuBookIcon from '@mui/icons-material/MenuBookTwoTone';
@@ -21,8 +21,6 @@ import * as EMSESP from './api';
const HelpInformation: FC = () => {
const { LL } = useI18nContext();
const { enqueueSnackbar } = useSnackbar();
const saveFile = (json: any, endpoint: string) => {
const a = document.createElement('a');
const filename = 'emsesp_' + endpoint + '.txt';
@@ -35,7 +33,7 @@ const HelpInformation: FC = () => {
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
enqueueSnackbar(LL.DOWNLOAD_SUCCESSFUL(), { variant: 'info' });
toast.info(LL.DOWNLOAD_SUCCESSFUL());
};
const callAPI = async (endpoint: string) => {
@@ -46,12 +44,12 @@ const HelpInformation: FC = () => {
id: 0
});
if (response.status !== 200) {
enqueueSnackbar(LL.PROBLEM_LOADING(), { variant: 'error' });
toast.error(LL.PROBLEM_LOADING());
} else {
saveFile(response.data, endpoint);
}
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_LOADING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_LOADING()));
}
};

8
interface/src/project/SettingsApplication.tsx
View File

@@ -1,7 +1,7 @@
import { FC, useState } from 'react';
import { ValidateFieldsError } from 'async-validator';
import { useSnackbar } from 'notistack';
import { toast } from 'react-toastify';
import { Box, Button, Checkbox, MenuItem, Grid, Typography, Divider, InputAdornment } from '@mui/material';
@@ -58,8 +58,6 @@ const SettingsApplication: FC = () => {
const { LL } = useI18nContext();
const { enqueueSnackbar } = useSnackbar();
const updateFormValue = updateValueDirty(origData, dirtyFlags, setDirtyFlags, setData);
const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -85,7 +83,7 @@ const SettingsApplication: FC = () => {
});
}
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
} finally {
setProcessingBoard(false);
}
@@ -124,7 +122,7 @@ const SettingsApplication: FC = () => {
await EMSESP.restart();
setRestarting(true);
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
}
};

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

@@ -22,7 +22,7 @@ import {
import { useTheme } from '@table-library/react-table-library/theme';
import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
import { useSnackbar } from 'notistack';
import { toast } from 'react-toastify';
import WarningIcon from '@mui/icons-material/Warning';
import CancelIcon from '@mui/icons-material/Cancel';
@@ -51,7 +51,6 @@ export const APIURL = window.location.origin + '/api/';
const SettingsCustomization: FC = () => {
const { LL } = useI18nContext();
const { enqueueSnackbar } = useSnackbar();
const emptyDeviceEntity = { id: '', v: 0, n: '', cn: '', m: 0, w: false };
@@ -257,9 +256,9 @@ const SettingsCustomization: FC = () => {
const resetCustomization = async () => {
try {
await EMSESP.resetCustomizations();
enqueueSnackbar(LL.CUSTOMIZATIONS_RESTART(), { variant: 'info' });
toast.info(LL.CUSTOMIZATIONS_RESTART());
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
} finally {
setConfirmReset(false);
}
@@ -296,7 +295,7 @@ const SettingsCustomization: FC = () => {
await EMSESP.restart();
setRestarting(true);
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
}
};
@@ -307,7 +306,7 @@ const SettingsCustomization: FC = () => {
// check size in bytes to match buffer in CPP, which is 2048
const bytes = new TextEncoder().encode(JSON.stringify(masked_entities)).length;
if (bytes > 2000) {
enqueueSnackbar(LL.CUSTOMIZATIONS_FULL(), { variant: 'warning' });
toast.warning(LL.CUSTOMIZATIONS_FULL());
return;
}
@@ -317,14 +316,14 @@ const SettingsCustomization: FC = () => {
entity_ids: masked_entities
});
if (response.status === 200) {
enqueueSnackbar(LL.CUSTOMIZATIONS_SAVED(), { variant: 'success' });
toast.success(LL.CUSTOMIZATIONS_SAVED());
} else if (response.status === 201) {
setRestartNeeded(true);
} else {
enqueueSnackbar(LL.PROBLEM_UPDATING(), { variant: 'error' });
toast.error(LL.PROBLEM_UPDATING());
}
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
}
setOriginalSettings(deviceEntities);
}

10
interface/src/project/SettingsScheduler.tsx
View File

@@ -21,7 +21,7 @@ import {
import { useTheme } from '@table-library/react-table-library/theme';
import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
import { useSnackbar } from 'notistack';
import { toast } from 'react-toastify';
import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
import WarningIcon from '@mui/icons-material/Warning';
@@ -66,8 +66,6 @@ function makeid() {
const SettingsScheduler: FC = () => {
const { LL, locale } = useI18nContext();
const { enqueueSnackbar } = useSnackbar();
const [numChanges, setNumChanges] = useState<number>(0);
const blocker = useBlocker(numChanges !== 0);
@@ -263,12 +261,12 @@ const SettingsScheduler: FC = () => {
})
});
if (response.status === 200) {
enqueueSnackbar(LL.SCHEDULE_SAVED(), { variant: 'success' });
toast.success(LL.SCHEDULE_SAVED());
} else {
enqueueSnackbar(LL.PROBLEM_UPDATING(), { variant: 'error' });
toast.error(LL.PROBLEM_UPDATING());
}
} catch (error) {
enqueueSnackbar(extractErrorMessage(error, LL.PROBLEM_UPDATING()), { variant: 'error' });
toast.error(extractErrorMessage(error, LL.PROBLEM_UPDATING()));
}
setOriginalSchedule(schedule);
}