formatting

2026-01-28 01:29:07 +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/mqtt/MqttSettings.tsx
+++ b/interface/src/framework/mqtt/MqttSettings.tsx
@@ -3,7 +3,15 @@ import type { FC } from 'react';

 import CancelIcon from '@mui/icons-material/Cancel';
 import WarningIcon from '@mui/icons-material/Warning';
-import { Button, Checkbox, Grid, InputAdornment, MenuItem, TextField, Typography } from '@mui/material';
+import {
+  Button,
+  Checkbox,
+  Grid,
+  InputAdornment,
+  MenuItem,
+  TextField,
+  Typography
+} from '@mui/material';

 import * as MqttApi from 'api/mqtt';

@@ -43,7 +51,12 @@ const MqttSettings: FC = () => {

  const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();

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

  const content = () => {
    if (!data) {
@@ -63,10 +76,22 @@ const MqttSettings: FC = () => {
    return (
      <>
        <BlockFormControlLabel
-          control={<Checkbox name="enabled" checked={data.enabled} onChange={updateFormValue} />}
+          control={
+            <Checkbox
+              name="enabled"
+              checked={data.enabled}
+              onChange={updateFormValue}
+            />
+          }
          label={LL.ENABLE_MQTT()}
        />
-        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+        <Grid
+          container
+          spacing={1}
+          direction="row"
+          justifyContent="flex-start"
+          alignItems="flex-start"
+        >
          <Grid item xs={12} sm={6}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
@@ -144,7 +169,9 @@ const MqttSettings: FC = () => {
              name="keep_alive"
              label="Keep Alive"
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -173,7 +200,13 @@ const MqttSettings: FC = () => {
        </Grid>
        {data.enableTLS !== undefined && (
          <BlockFormControlLabel
-            control={<Checkbox name="enableTLS" checked={data.enableTLS} onChange={updateFormValue} />}
+            control={
+              <Checkbox
+                name="enableTLS"
+                checked={data.enableTLS}
+                onChange={updateFormValue}
+              />
+            }
            label={LL.ENABLE_TLS()}
          />
        )}
@@ -190,11 +223,23 @@ const MqttSettings: FC = () => {
        )}

        <BlockFormControlLabel
-          control={<Checkbox name="clean_session" checked={data.clean_session} onChange={updateFormValue} />}
+          control={
+            <Checkbox
+              name="clean_session"
+              checked={data.clean_session}
+              onChange={updateFormValue}
+            />
+          }
          label={LL.MQTT_CLEAN_SESSION()}
        />
        <BlockFormControlLabel
-          control={<Checkbox name="mqtt_retain" checked={data.mqtt_retain} onChange={updateFormValue} />}
+          control={
+            <Checkbox
+              name="mqtt_retain"
+              checked={data.mqtt_retain}
+              onChange={updateFormValue}
+            />
+          }
          label={LL.MQTT_RETAIN_FLAG()}
        />

@@ -215,7 +260,13 @@ const MqttSettings: FC = () => {
          <MenuItem value={2}>{LL.MQTT_NEST_2()}</MenuItem>
        </TextField>
        <BlockFormControlLabel
-          control={<Checkbox name="send_response" checked={data.send_response} onChange={updateFormValue} />}
+          control={
+            <Checkbox
+              name="send_response"
+              checked={data.send_response}
+              onChange={updateFormValue}
+            />
+          }
          label={LL.MQTT_RESPONSE()}
        />
        {!data.ha_enabled && (
@@ -229,7 +280,13 @@ const MqttSettings: FC = () => {
          >
            <Grid item>
              <BlockFormControlLabel
-                control={<Checkbox name="publish_single" checked={data.publish_single} onChange={updateFormValue} />}
+                control={
+                  <Checkbox
+                    name="publish_single"
+                    checked={data.publish_single}
+                    onChange={updateFormValue}
+                  />
+                }
                label={LL.MQTT_PUBLISH_TEXT_1()}
              />
            </Grid>
@@ -237,7 +294,11 @@ const MqttSettings: FC = () => {
              <Grid item>
                <BlockFormControlLabel
                  control={
-                    <Checkbox name="publish_single2cmd" checked={data.publish_single2cmd} onChange={updateFormValue} />
+                    <Checkbox
+                      name="publish_single2cmd"
+                      checked={data.publish_single2cmd}
+                      onChange={updateFormValue}
+                    />
                  }
                  label={LL.MQTT_PUBLISH_TEXT_2()}
                />
@@ -246,10 +307,22 @@ const MqttSettings: FC = () => {
          </Grid>
        )}
        {!data.publish_single && (
-          <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+          <Grid
+            container
+            spacing={1}
+            direction="row"
+            justifyContent="flex-start"
+            alignItems="flex-start"
+          >
            <Grid item>
              <BlockFormControlLabel
-                control={<Checkbox name="ha_enabled" checked={data.ha_enabled} onChange={updateFormValue} />}
+                control={
+                  <Checkbox
+                    name="ha_enabled"
+                    checked={data.ha_enabled}
+                    onChange={updateFormValue}
+                  />
+                }
                label={LL.MQTT_PUBLISH_TEXT_3()}
              />
            </Grid>
@@ -312,14 +385,22 @@ const MqttSettings: FC = () => {
        <Typography sx={{ pt: 2 }} variant="h6" color="primary">
          {LL.MQTT_PUBLISH_INTERVALS()}&nbsp;(0=auto)
        </Typography>
-        <Grid container spacing={1} direction="row" justifyContent="flex-start" alignItems="flex-start">
+        <Grid
+          container
+          spacing={1}
+          direction="row"
+          justifyContent="flex-start"
+          alignItems="flex-start"
+        >
          <Grid item xs={12} sm={6} md={4}>
            <ValidatedTextField
              fieldErrors={fieldErrors}
              name="publish_time_heartbeat"
              label="Heartbeat"
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -334,7 +415,9 @@ const MqttSettings: FC = () => {
              name="publish_time_boiler"
              label={LL.MQTT_INT_BOILER()}
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -349,7 +432,9 @@ const MqttSettings: FC = () => {
              name="publish_time_thermostat"
              label={LL.MQTT_INT_THERMOSTATS()}
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -364,7 +449,9 @@ const MqttSettings: FC = () => {
              name="publish_time_solar"
              label={LL.MQTT_INT_SOLAR()}
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -379,7 +466,9 @@ const MqttSettings: FC = () => {
              name="publish_time_mixer"
              label={LL.MQTT_INT_MIXER()}
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -394,7 +483,9 @@ const MqttSettings: FC = () => {
              name="publish_time_water"
              label={LL.MQTT_INT_WATER()}
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -409,7 +500,9 @@ const MqttSettings: FC = () => {
              name="publish_time_sensor"
              label={LL.TEMP_SENSORS()}
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              fullWidth
              variant="outlined"
@@ -423,7 +516,9 @@ const MqttSettings: FC = () => {
            <TextField
              name="publish_time_other"
              InputProps={{
-                endAdornment: <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                endAdornment: (
+                  <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
+                )
              }}
              label={LL.DEFAULT(0)}
              fullWidth
--- a/interface/src/framework/mqtt/MqttStatus.tsx
+++ b/interface/src/framework/mqtt/MqttStatus.tsx
@@ -5,7 +5,16 @@ import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import ReportIcon from '@mui/icons-material/Report';
 import SpeakerNotesOffIcon from '@mui/icons-material/SpeakerNotesOff';
-import { Avatar, Button, Divider, List, ListItem, ListItemAvatar, ListItemText, useTheme } from '@mui/material';
+import {
+  Avatar,
+  Button,
+  Divider,
+  List,
+  ListItem,
+  ListItemAvatar,
+  ListItemText,
+  useTheme
+} from '@mui/material';
 import type { Theme } from '@mui/material';

 import * as MqttApi from 'api/mqtt';
@@ -16,7 +25,10 @@ import { useI18nContext } from 'i18n/i18n-react';
 import type { MqttStatusType } from 'types';
 import { MqttDisconnectReason } from 'types';

-export const mqttStatusHighlight = ({ enabled, connected }: MqttStatusType, theme: Theme) => {
+export const mqttStatusHighlight = (
+  { enabled, connected }: MqttStatusType,
+  theme: Theme
+) => {
  if (!enabled) {
    return theme.palette.info.main;
  }
@@ -26,14 +38,20 @@ export const mqttStatusHighlight = ({ enabled, connected }: MqttStatusType, them
  return theme.palette.error.main;
 };

-export const mqttPublishHighlight = ({ mqtt_fails }: MqttStatusType, theme: Theme) => {
+export const mqttPublishHighlight = (
+  { mqtt_fails }: MqttStatusType,
+  theme: Theme
+) => {
  if (mqtt_fails === 0) return theme.palette.success.main;
  if (mqtt_fails < 10) return theme.palette.warning.main;

  return theme.palette.error.main;
 };

-export const mqttQueueHighlight = ({ mqtt_queued }: MqttStatusType, theme: Theme) => {
+export const mqttQueueHighlight = (
+  { mqtt_queued }: MqttStatusType,
+  theme: Theme
+) => {
  if (mqtt_queued <= 1) return theme.palette.success.main;

  return theme.palette.warning.main;
@@ -92,7 +110,10 @@ const MqttStatus: FC = () => {
                  <ReportIcon />
                </Avatar>
              </ListItemAvatar>
-              <ListItemText primary={LL.DISCONNECT_REASON()} secondary={disconnectReason(data)} />
+              <ListItemText
+                primary={LL.DISCONNECT_REASON()}
+                secondary={disconnectReason(data)}
+              />
            </ListItem>
            <Divider variant="inset" component="li" />
          </>
@@ -140,7 +161,12 @@ const MqttStatus: FC = () => {
          {data.enabled && renderConnectionStatus()}
        </List>
        <ButtonRow>
-          <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={loadData}>
+          <Button
+            startIcon={<RefreshIcon />}
+            variant="outlined"
+            color="secondary"
+            onClick={loadData}
+          >
            {LL.REFRESH()}
          </Button>
        </ButtonRow>