formatting

2025-12-09 09:19:51 +03:00 · 2024-04-21 15:10:22 +02:00
parent befa487482
commit ac39a46442
100 changed files with 2778 additions and 798 deletions
--- a/interface/src/framework/system/ESPSystemStatus.tsx
+++ b/interface/src/framework/system/ESPSystemStatus.tsx
@@ -8,7 +8,16 @@ import MemoryIcon from '@mui/icons-material/Memory';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import SdCardAlertIcon from '@mui/icons-material/SdCardAlert';
 import SdStorageIcon from '@mui/icons-material/SdStorage';
-import { Avatar, Box, Button, Divider, List, ListItem, ListItemAvatar, ListItemText } from '@mui/material';
+import {
+  Avatar,
+  Box,
+  Button,
+  Divider,
+  List,
+  ListItem,
+  ListItemAvatar,
+  ListItemText
+} from '@mui/material';

 import * as SystemApi from 'api/system';

@@ -25,7 +34,11 @@ const ESPSystemStatus: FC = () => {

  useLayoutTitle(LL.STATUS_OF('ESP32'));

-  const { data: data, send: loadData, error } = useRequest(SystemApi.readESPSystemStatus, { force: true });
+  const {
+    data: data,
+    send: loadData,
+    error
+  } = useRequest(SystemApi.readESPSystemStatus, { force: true });

  const content = () => {
    if (!data) {
@@ -41,7 +54,10 @@ const ESPSystemStatus: FC = () => {
                <DevicesIcon />
              </Avatar>
            </ListItemAvatar>
-            <ListItemText primary="SDK" secondary={data.arduino_version + ' / ESP-IDF ' + data.sdk_version} />
+            <ListItemText
+              primary="SDK"
+              secondary={data.arduino_version + ' / ESP-IDF ' + data.sdk_version}
+            />
          </ListItem>
          <Divider variant="inset" component="li" />
          <ListItem>
@@ -75,7 +91,12 @@ const ESPSystemStatus: FC = () => {
            </ListItemAvatar>
            <ListItemText
              primary={LL.HEAP()}
-              secondary={formatNumber(data.free_heap) + ' KB / ' + formatNumber(data.max_alloc_heap) + ' KB '}
+              secondary={
+                formatNumber(data.free_heap) +
+                ' KB / ' +
+                formatNumber(data.max_alloc_heap) +
+                ' KB '
+              }
            />
          </ListItem>
          {data.psram_size !== undefined && data.free_psram !== undefined && (
@@ -89,7 +110,12 @@ const ESPSystemStatus: FC = () => {
                </ListItemAvatar>
                <ListItemText
                  primary={LL.PSRAM()}
-                  secondary={formatNumber(data.psram_size) + ' KB / ' + formatNumber(data.free_psram) + ' KB'}
+                  secondary={
+                    formatNumber(data.psram_size) +
+                    ' KB / ' +
+                    formatNumber(data.free_psram) +
+                    ' KB'
+                  }
                />
              </ListItem>
            </>
@@ -104,7 +130,10 @@ const ESPSystemStatus: FC = () => {
            <ListItemText
              primary={LL.FLASH()}
              secondary={
-                formatNumber(data.flash_chip_size) + ' KB / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'
+                formatNumber(data.flash_chip_size) +
+                ' KB / ' +
+                (data.flash_chip_speed / 1000000).toFixed(0) +
+                ' MHz'
              }
            />
          </ListItem>
@@ -118,7 +147,12 @@ const ESPSystemStatus: FC = () => {
            <ListItemText
              primary={LL.APPSIZE()}
              secondary={
-                data.partition + ': ' + formatNumber(data.app_used) + ' KB / ' + formatNumber(data.app_free) + ' KB'
+                data.partition +
+                ': ' +
+                formatNumber(data.app_used) +
+                ' KB / ' +
+                formatNumber(data.app_free) +
+                ' KB'
              }
            />
          </ListItem>
@@ -131,7 +165,12 @@ const ESPSystemStatus: FC = () => {
            </ListItemAvatar>
            <ListItemText
              primary={LL.FILESYSTEM()}
-              secondary={formatNumber(data.fs_used) + ' KB / ' + formatNumber(data.fs_free) + ' KB'}
+              secondary={
+                formatNumber(data.fs_used) +
+                ' KB / ' +
+                formatNumber(data.fs_free) +
+                ' KB'
+              }
            />
          </ListItem>
          <Divider variant="inset" component="li" />
@@ -139,7 +178,12 @@ const ESPSystemStatus: FC = () => {
        <Box display="flex" flexWrap="wrap">
          <Box flexGrow={1} sx={{ '& button': { mt: 2 } }}>
            <ButtonRow>
-              <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
+              <Button
+                startIcon={<RefreshIcon />}
+                variant="outlined"
+                color="secondary"
+                onClick={loadData}
+              >
                {LL.REFRESH()}
              </Button>
            </ButtonRow>
--- a/interface/src/framework/system/RestartMonitor.tsx
+++ b/interface/src/framework/system/RestartMonitor.tsx
@@ -36,7 +36,12 @@ const RestartMonitor: FC = () => {

  useEffect(() => () => timeoutId && clearTimeout(timeoutId), [timeoutId]);

-  return <FormLoader message={LL.APPLICATION_RESTARTING() + '...'} errorMessage={failed ? 'Timed out' : undefined} />;
+  return (
+    <FormLoader
+      message={LL.APPLICATION_RESTARTING() + '...'}
+      errorMessage={failed ? 'Timed out' : undefined}
+    />
+  );
 };

 export default RestartMonitor;
--- a/interface/src/framework/system/System.tsx
+++ b/interface/src/framework/system/System.tsx
@@ -24,7 +24,11 @@ const System: FC = () => {
      <RouterTabs value={routerTab}>
        <Tab value="status" label={LL.STATUS_OF('')} />
        <Tab value="activity" label={LL.ACTIVITY()} />
-        <Tab disabled={!me.admin} value="log" label={me.admin ? LL.LOG_OF('') : ''} />
+        <Tab
+          disabled={!me.admin}
+          value="log"
+          label={me.admin ? LL.LOG_OF('') : ''}
+        />
      </RouterTabs>
      <Routes>
        <Route path="status" element={<SystemStatus />} />
--- a/interface/src/framework/system/SystemLog.tsx
+++ b/interface/src/framework/system/SystemLog.tsx
@@ -4,14 +4,28 @@ import { toast } from 'react-toastify';

 import DownloadIcon from '@mui/icons-material/GetApp';
 import WarningIcon from '@mui/icons-material/Warning';
-import { Box, Button, Checkbox, Grid, MenuItem, TextField, styled } from '@mui/material';
+import {
+  Box,
+  Button,
+  Checkbox,
+  Grid,
+  MenuItem,
+  TextField,
+  styled
+} from '@mui/material';

 import * as SystemApi from 'api/system';
 import { fetchLogES } from 'api/system';

 import { useSSE } from '@alova/scene-react';
 import { useRequest } from 'alova';
-import { BlockFormControlLabel, BlockNavigation, FormLoader, SectionContent, useLayoutTitle } from 'components';
+import {
+  BlockFormControlLabel,
+  BlockNavigation,
+  FormLoader,
+  SectionContent,
+  useLayoutTitle
+} from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { LogEntry, LogSettings } from 'types';
 import { LogLevel } from 'types';
@@ -25,8 +39,10 @@ const LogEntryLine = styled('div')(() => ({
  whiteSpace: 'nowrap'
 }));

-const topOffset = () => document.getElementById('log-window')?.getBoundingClientRect().bottom || 0;
-const leftOffset = () => document.getElementById('log-window')?.getBoundingClientRect().left || 0;
+const topOffset = () =>
+  document.getElementById('log-window')?.getBoundingClientRect().bottom || 0;
+const leftOffset = () =>
+  document.getElementById('log-window')?.getBoundingClientRect().left || 0;

 const levelLabel = (level: LogLevel) => {
  switch (level) {
@@ -50,16 +66,30 @@ const SystemLog: FC = () => {

  useLayoutTitle(LL.LOG_OF(''));

-  const { loadData, data, updateDataValue, origData, dirtyFlags, setDirtyFlags, blocker, saveData, errorMessage } =
-    useRest<LogSettings>({
-      read: SystemApi.readLogSettings,
-      update: SystemApi.updateLogSettings
-    });
+  const {
+    loadData,
+    data,
+    updateDataValue,
+    origData,
+    dirtyFlags,
+    setDirtyFlags,
+    blocker,
+    saveData,
+    errorMessage
+  } = useRest<LogSettings>({
+    read: SystemApi.readLogSettings,
+    update: SystemApi.updateLogSettings
+  });

  const [logEntries, setLogEntries] = useState<LogEntry[]>([]);
  const [lastIndex, setLastIndex] = useState<number>(0);

-  const updateFormValue = updateValueDirty(origData, dirtyFlags, setDirtyFlags, updateDataValue);
+  const updateFormValue = updateValueDirty(
+    origData,
+    dirtyFlags,
+    setDirtyFlags,
+    updateDataValue
+  );

  // eslint-disable-next-line @typescript-eslint/unbound-method
  const { onMessage, onError } = useSSE(fetchLogES, {
@@ -102,10 +132,14 @@ const SystemLog: FC = () => {
  const onDownload = () => {
    let result = '';
    for (const i of logEntries) {
-      result += i.t + ' ' + levelLabel(i.l) + ' ' + i.i + ': [' + i.n + '] ' + i.m + '\n';
+      result +=
+        i.t + ' ' + levelLabel(i.l) + ' ' + i.i + ': [' + i.n + '] ' + i.m + '\n';
    }
    const a = document.createElement('a');
-    a.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(result));
+    a.setAttribute(
+      'href',
+      'data:text/plain;charset=utf-8,' + encodeURIComponent(result)
+    );
    a.setAttribute('download', 'log.txt');
    document.body.appendChild(a);
    a.click();
@@ -134,7 +168,13 @@ const SystemLog: FC = () => {

    return (
      <>
-        <Grid container spacing={3} direction="row" justifyContent="flex-start" alignItems="center">
+        <Grid
+          container
+          spacing={3}
+          direction="row"
+          justifyContent="flex-start"
+          alignItems="center"
+        >
          <Grid item xs={2}>
            <TextField
              name="level"
@@ -173,7 +213,13 @@ const SystemLog: FC = () => {
          </Grid>
          <Grid item>
            <BlockFormControlLabel
-              control={<Checkbox checked={data.compact} onChange={updateFormValue} name="compact" />}
+              control={
+                <Checkbox
+                  checked={data.compact}
+                  onChange={updateFormValue}
+                  name="compact"
+                />
+              }
              label={LL.COMPACT()}
            />
          </Grid>
@@ -185,7 +231,12 @@ const SystemLog: FC = () => {
              }
            }}
          >
-            <Button startIcon={<DownloadIcon />} variant="outlined" color="secondary" onClick={onDownload}>
+            <Button
+              startIcon={<DownloadIcon />}
+              variant="outlined"
+              color="secondary"
+              onClick={onDownload}
+            >
              {LL.EXPORT()}
            </Button>
            {dirtyFlags && dirtyFlags.length !== 0 && (
--- a/interface/src/framework/system/SystemStatus.tsx
+++ b/interface/src/framework/system/SystemStatus.tsx
@@ -49,7 +49,11 @@ const SystemStatus: FC = () => {

  const [confirmScan, setConfirmScan] = useState<boolean>(false);

-  const { data: data, send: loadData, error } = useRequest(SystemApi.readSystemStatus, { force: true });
+  const {
+    data: data,
+    send: loadData,
+    error
+  } = useRequest(SystemApi.readSystemStatus, { force: true });

  const { send: scanDevices } = useRequest(EMSESP.scanDevices, {
    immediate: false
@@ -134,7 +138,8 @@ const SystemStatus: FC = () => {
    }
  };

-  const activeHighlight = (value: boolean) => (value ? theme.palette.success.main : theme.palette.info.main);
+  const activeHighlight = (value: boolean) =>
+    value ? theme.palette.success.main : theme.palette.info.main;

  const scan = async () => {
    await scanDevices()
@@ -148,14 +153,28 @@ const SystemStatus: FC = () => {
  };

  const renderScanDialog = () => (
-    <Dialog sx={dialogStyle} open={confirmScan} onClose={() => setConfirmScan(false)}>
+    <Dialog
+      sx={dialogStyle}
+      open={confirmScan}
+      onClose={() => setConfirmScan(false)}
+    >
      <DialogTitle>{LL.SCAN_DEVICES()}</DialogTitle>
      <DialogContent dividers>{LL.EMS_SCAN()}</DialogContent>
      <DialogActions>
-        <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => setConfirmScan(false)} color="secondary">
+        <Button
+          startIcon={<CancelIcon />}
+          variant="outlined"
+          onClick={() => setConfirmScan(false)}
+          color="secondary"
+        >
          {LL.CANCEL()}
        </Button>
-        <Button startIcon={<PermScanWifiIcon />} variant="outlined" onClick={scan} color="primary">
+        <Button
+          startIcon={<PermScanWifiIcon />}
+          variant="outlined"
+          onClick={scan}
+          color="primary"
+        >
          {LL.SCAN()}
        </Button>
      </DialogActions>
@@ -282,7 +301,12 @@ const SystemStatus: FC = () => {
        {renderScanDialog()}

        <Box mt={2} display="flex" flexWrap="wrap">
-          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
+          <Button
+            startIcon={<RefreshIcon />}
+            variant="outlined"
+            color="secondary"
+            onClick={loadData}
+          >
            {LL.REFRESH()}
          </Button>
        </Box>
--- a/interface/src/framework/system/UploadDownload.tsx
+++ b/interface/src/framework/system/UploadDownload.tsx
@@ -8,7 +8,12 @@ import * as SystemApi from 'api/system';

 import * as EMSESP from 'project/api';
 import { useRequest } from 'alova';
-import { FormLoader, SectionContent, SingleUpload, useLayoutTitle } from 'components';
+import {
+  FormLoader,
+  SectionContent,
+  SingleUpload,
+  useLayoutTitle
+} from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 import type { APIcall } from 'project/types';

@@ -19,23 +24,40 @@ const UploadDownload: FC = () => {
  const [restarting, setRestarting] = useState<boolean>();
  const [md5, setMd5] = useState<string>();

-  const { send: getSettings, onSuccess: onSuccessGetSettings } = useRequest(EMSESP.getSettings(), {
-    immediate: false
-  });
-  const { send: getCustomizations, onSuccess: onSuccessGetCustomizations } = useRequest(EMSESP.getCustomizations(), {
-    immediate: false
-  });
-  const { send: getEntities, onSuccess: onSuccessGetEntities } = useRequest(EMSESP.getEntities(), {
-    immediate: false
-  });
-  const { send: getSchedule, onSuccess: onSuccessGetSchedule } = useRequest(EMSESP.getSchedule(), {
-    immediate: false
-  });
-  const { send: getAPI, onSuccess: onGetAPI } = useRequest((data: APIcall) => EMSESP.API(data), {
-    immediate: false
-  });
+  const { send: getSettings, onSuccess: onSuccessGetSettings } = useRequest(
+    EMSESP.getSettings(),
+    {
+      immediate: false
+    }
+  );
+  const { send: getCustomizations, onSuccess: onSuccessGetCustomizations } =
+    useRequest(EMSESP.getCustomizations(), {
+      immediate: false
+    });
+  const { send: getEntities, onSuccess: onSuccessGetEntities } = useRequest(
+    EMSESP.getEntities(),
+    {
+      immediate: false
+    }
+  );
+  const { send: getSchedule, onSuccess: onSuccessGetSchedule } = useRequest(
+    EMSESP.getSchedule(),
+    {
+      immediate: false
+    }
+  );
+  const { send: getAPI, onSuccess: onGetAPI } = useRequest(
+    (data: APIcall) => EMSESP.API(data),
+    {
+      immediate: false
+    }
+  );

-  const { data: data, send: loadData, error } = useRequest(SystemApi.readESPSystemStatus, { force: true });
+  const {
+    data: data,
+    send: loadData,
+    error
+  } = useRequest(SystemApi.readESPSystemStatus, { force: true });

  const { data: latestVersion } = useRequest(SystemApi.getStableVersion, {
    immediate: true,
@@ -50,11 +72,17 @@ const UploadDownload: FC = () => {
  const STABLE_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/';
  const DEV_URL = 'https://github.com/emsesp/EMS-ESP32/releases/download/latest/';

-  const STABLE_RELNOTES_URL = 'https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md';
-  const DEV_RELNOTES_URL = 'https://github.com/emsesp/EMS-ESP32/blob/dev/CHANGELOG_LATEST.md';
+  const STABLE_RELNOTES_URL =
+    'https://github.com/emsesp/EMS-ESP32/blob/main/CHANGELOG.md';
+  const DEV_RELNOTES_URL =
+    'https://github.com/emsesp/EMS-ESP32/blob/dev/CHANGELOG_LATEST.md';

  const getBinURL = (v: string) =>
-    'EMS-ESP-' + v.replaceAll('.', '_') + '-' + data.esp_platform.replaceAll('-', '_') + '.bin';
+    'EMS-ESP-' +
+    v.replaceAll('.', '_') +
+    '-' +
+    data.esp_platform.replaceAll('-', '_') +
+    '.bin';

  const {
    loading: isUploading,
@@ -115,8 +143,11 @@ const UploadDownload: FC = () => {
    saveFile(event.data, 'schedule.json');
  });
  onGetAPI((event) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    saveFile(event.data, event.sendArgs[0].device + '_' + event.sendArgs[0].entity + '.txt');
+    saveFile(
+      event.data,
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      event.sendArgs[0].device + '_' + event.sendArgs[0].entity + '.txt'
+    );
  });

  const downloadSettings = async () => {
@@ -170,7 +201,8 @@ const UploadDownload: FC = () => {
          <b>{data.emsesp_version}</b>&nbsp;({data.esp_platform})
          {latestVersion && (
            <Box mt={2}>
-              {LL.THE_LATEST()}&nbsp;{LL.OFFICIAL()}&nbsp;{LL.RELEASE_IS()}&nbsp;<b>{latestVersion}</b>
+              {LL.THE_LATEST()}&nbsp;{LL.OFFICIAL()}&nbsp;{LL.RELEASE_IS()}
+              &nbsp;<b>{latestVersion}</b>
              &nbsp;(
              <Link target="_blank" href={STABLE_RELNOTES_URL} color="primary">
                {LL.RELEASE_NOTES()}
@@ -178,7 +210,13 @@ const UploadDownload: FC = () => {
              )&nbsp;(
              <Link
                target="_blank"
-                href={STABLE_URL + 'v' + latestVersion + '/' + getBinURL(latestVersion as string)}
+                href={
+                  STABLE_URL +
+                  'v' +
+                  latestVersion +
+                  '/' +
+                  getBinURL(latestVersion as string)
+                }
                color="primary"
              >
                {LL.DOWNLOAD(1)}
@@ -188,14 +226,19 @@ const UploadDownload: FC = () => {
          )}
          {latestDevVersion && (
            <Box mt={2}>
-              {LL.THE_LATEST()}&nbsp;{LL.DEVELOPMENT()}&nbsp;{LL.RELEASE_IS()}&nbsp;
+              {LL.THE_LATEST()}&nbsp;{LL.DEVELOPMENT()}&nbsp;{LL.RELEASE_IS()}
+              &nbsp;
              <b>{latestDevVersion}</b>
              &nbsp;(
              <Link target="_blank" href={DEV_RELNOTES_URL} color="primary">
                {LL.RELEASE_NOTES()}
              </Link>
              )&nbsp;(
-              <Link target="_blank" href={DEV_URL + getBinURL(latestDevVersion as string)} color="primary">
+              <Link
+                target="_blank"
+                href={DEV_URL + getBinURL(latestDevVersion as string)}
+                color="primary"
+              >
                {LL.DOWNLOAD(1)}
              </Link>
              )
@@ -219,7 +262,12 @@ const UploadDownload: FC = () => {
            <Typography variant="body2">{'MD5: ' + md5}</Typography>
          </Box>
        )}
-        <SingleUpload onDrop={startUpload} onCancel={cancelUpload} isUploading={isUploading} progress={progress} />
+        <SingleUpload
+          onDrop={startUpload}
+          onCancel={cancelUpload}
+          isUploading={isUploading}
+          progress={progress}
+        />
        {!isUploading && (
          <>
            <Typography sx={{ pt: 4, pb: 2 }} variant="h6" color="primary">
@@ -307,7 +355,9 @@ const UploadDownload: FC = () => {
    );
  };

-  return <SectionContent>{restarting ? <RestartMonitor /> : content()}</SectionContent>;
+  return (
+    <SectionContent>{restarting ? <RestartMonitor /> : content()}</SectionContent>
+  );
 };

 export default UploadDownload;