updates to backend to match new frontend - #1665

2025-12-06 07:49:52 +03:00 · 2024-03-22 16:25:18 +01:00
parent c8e7eb3657
commit a2fa2515b3
23 changed files with 360 additions and 293 deletions
--- a/interface/package.json
+++ b/interface/package.json
@@ -49,7 +49,7 @@
    "react-toastify": "^10.0.5",
    "sockette": "^2.0.6",
    "typesafe-i18n": "^5.26.2",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.3"
  },
  "devDependencies": {
    "@preact/compat": "^17.1.2",
@@ -70,7 +70,7 @@
    "prettier": "^3.2.5",
    "rollup-plugin-visualizer": "^5.12.0",
    "terser": "^5.29.2",
-    "vite": "^5.2.2",
+    "vite": "^5.2.3",
    "vite-plugin-imagemin": "^0.6.1",
    "vite-tsconfig-paths": "^4.3.2"
  },
--- a/interface/src/components/layout/ListMenuItem.tsx
+++ b/interface/src/components/layout/ListMenuItem.tsx
@@ -1,15 +1,15 @@
 import NavigateNextIcon from '@mui/icons-material/NavigateNext';
 import { Avatar, ListItem, ListItemAvatar, ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
-import { Fragment, type FC } from 'react';
 import { Link } from 'react-router-dom';
 import type { SvgIconProps } from '@mui/material';
+import type { FC } from 'react';

 interface ListMenuItemProps {
  icon: React.ComponentType<SvgIconProps>;
  bgcolor?: string;
  label: string;
  text: string;
-  to: string;
+  to?: string;
  disabled?: boolean;
 }

@@ -27,12 +27,8 @@ function RenderIcon({ icon: Icon, bgcolor, label, text }: ListMenuItemProps) {
 }

 const LayoutMenuItem: FC<ListMenuItemProps> = ({ icon, bgcolor, label, text, to, disabled }) => (
-  <Fragment>
-    {disabled ? (
-      <ListItem>
-        <RenderIcon icon={icon} bgcolor={bgcolor} label={label} text={text} to="" />
-      </ListItem>
-    ) : (
+  <>
+    {to && !disabled ? (
      <ListItem
        disablePadding
        secondaryAction={
@@ -45,8 +41,12 @@ const LayoutMenuItem: FC<ListMenuItemProps> = ({ icon, bgcolor, label, text, to,
          <RenderIcon icon={icon} bgcolor={bgcolor} label={label} text={text} to="" />
        </ListItemButton>
      </ListItem>
+    ) : (
+      <ListItem>
+        <RenderIcon icon={icon} bgcolor={bgcolor} label={label} text={text} to="" />
+      </ListItem>
    )}
-  </Fragment>
+  </>
 );

 export default LayoutMenuItem;
--- a/interface/src/framework/system/SystemStatus.tsx
+++ b/interface/src/framework/system/SystemStatus.tsx
@@ -83,7 +83,7 @@ const SystemStatus: FC = () => {
    if (data) {
      switch (data.status) {
        case busConnectionStatus.BUS_STATUS_CONNECTED:
-          return LL.CONNECTED(0);
+          return LL.CONNECTED(0) + ' (' + formatDurationSec(data.bus_uptime) + ')';
        case busConnectionStatus.BUS_STATUS_TX_ERRORS:
          return LL.TX_ISSUES();
        case busConnectionStatus.BUS_STATUS_OFFLINE:
@@ -178,6 +178,15 @@ const SystemStatus: FC = () => {
          </ListItem>
          <Divider variant="inset" component="li" />

+          <ListMenuItem
+            disabled={!me.admin}
+            icon={TimerIcon}
+            bgcolor="#c5572c"
+            label={LL.UPTIME()}
+            text={formatDurationSec(data.uptime)}
+          />
+          <Divider variant="inset" component="li" />
+
          <ListItem>
            <ListItemAvatar>
              <Avatar sx={{ bgcolor: '#5d89f7', color: 'white' }}>
@@ -207,16 +216,6 @@ const SystemStatus: FC = () => {
          </ListItem>
          <Divider variant="inset" component="li" />

-          <ListItem>
-            <ListItemAvatar>
-              <Avatar sx={{ bgcolor: '#c5572c', color: 'white' }}>
-                <TimerIcon />
-              </Avatar>
-            </ListItemAvatar>
-            <ListItemText primary={LL.UPTIME()} secondary={formatDurationSec(data.uptime)} />
-          </ListItem>
-          <Divider variant="inset" component="li" />
-
          <ListMenuItem
            disabled={!me.admin}
            icon={BuildIcon}
--- a/interface/src/project/Sensors.tsx
+++ b/interface/src/project/Sensors.tsx
@@ -408,24 +408,19 @@ const Sensors: FC = () => {

  return (
    <SectionContent>
-      {sensorData.ts.length > 0 && (
-        <>
-          <Typography sx={{ pb: 1 }} variant="h6" color="secondary">
-            {LL.TEMP_SENSORS()}
-          </Typography>
-          <RenderTemperatureSensors />
-          {selectedTemperatureSensor && (
-            <DashboardSensorsTemperatureDialog
-              open={temperatureDialogOpen}
-              onClose={onTemperatureDialogClose}
-              onSave={onTemperatureDialogSave}
-              selectedItem={selectedTemperatureSensor}
-              validator={temperatureSensorItemValidation()}
-            />
-          )}
-        </>
+      <Typography sx={{ pb: 1 }} variant="h6" color="secondary">
+        {LL.TEMP_SENSORS()}
+      </Typography>
+      <RenderTemperatureSensors />
+      {selectedTemperatureSensor && (
+        <DashboardSensorsTemperatureDialog
+          open={temperatureDialogOpen}
+          onClose={onTemperatureDialogClose}
+          onSave={onTemperatureDialogSave}
+          selectedItem={selectedTemperatureSensor}
+          validator={temperatureSensorItemValidation()}
+        />
      )}
-
      {sensorData?.analog_enabled === true && (
        <>
          <Typography sx={{ pt: 4, pb: 1 }} variant="h6" color="secondary">
@@ -444,7 +439,6 @@ const Sensors: FC = () => {
          )}
        </>
      )}
-
      <ButtonRow>
        <Box mt={2} display="flex" flexWrap="wrap">
          <Box flexGrow={1}>
--- a/interface/src/types/system.ts
+++ b/interface/src/types/system.ts
@@ -29,6 +29,7 @@ export interface SystemStatus {
  esp_platform: string;
  status: busConnectionStatus;
  uptime: number;
+  bus_uptime: number;
  num_devices: number;
  num_sensors: number;
  num_analogs: number;
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -1817,8 +1817,8 @@ __metadata:
    sockette: "npm:^2.0.6"
    terser: "npm:^5.29.2"
    typesafe-i18n: "npm:^5.26.2"
-    typescript: "npm:^5.4.2"
-    vite: "npm:^5.2.2"
+    typescript: "npm:^5.4.3"
+    vite: "npm:^5.2.3"
    vite-plugin-imagemin: "npm:^0.6.1"
    vite-tsconfig-paths: "npm:^4.3.2"
  languageName: unknown
@@ -8294,23 +8294,23 @@ __metadata:
  languageName: node
  linkType: hard

-"typescript@npm:^5.4.2":
-  version: 5.4.2
-  resolution: "typescript@npm:5.4.2"
+"typescript@npm:^5.4.3":
+  version: 5.4.3
+  resolution: "typescript@npm:5.4.3"
  bin:
    tsc: bin/tsc
    tsserver: bin/tsserver
-  checksum: 10/f8cfdc630ab1672f004e9561eb2916935b2d267792d07ce93e97fc601c7a65191af32033d5e9c0169b7dc37da7db9bf320f7432bc84527cb7697effaa4e4559d
+  checksum: 10/de4c69f49a7ad4b1ea66a6dcc8b055ac34eb56af059a069d8988dd811c5e649be07e042e5bf573e8d0ac3ec2f30e6c999aa651cd09f6e9cbc6113749e8b6be20
  languageName: node
  linkType: hard

-"typescript@patch:typescript@npm%3A^5.4.2#optional!builtin<compat/typescript>":
-  version: 5.4.2
-  resolution: "typescript@patch:typescript@npm%3A5.4.2#optional!builtin<compat/typescript>::version=5.4.2&hash=5adc0c"
+"typescript@patch:typescript@npm%3A^5.4.3#optional!builtin<compat/typescript>":
+  version: 5.4.3
+  resolution: "typescript@patch:typescript@npm%3A5.4.3#optional!builtin<compat/typescript>::version=5.4.3&hash=5adc0c"
  bin:
    tsc: bin/tsc
    tsserver: bin/tsserver
-  checksum: 10/f5f9a4133c2670761f0166eae5b3bafbc4a3fc24f0f42a93c9c893d9e9d6e66ea066969c5e7483fa66b4ae0e99125592553f3b92fd3599484de8be13b0615176
+  checksum: 10/5aedd97595582b08aadb8a70e8e3ddebaf5a9c1e5ad4d6503c2fcfc15329b5cf8d01145b09913e9555683ac16c5123a96be32b6d72614098ebd42df520eed9b1
  languageName: node
  linkType: hard

@@ -8491,9 +8491,9 @@ __metadata:
  languageName: node
  linkType: hard

-"vite@npm:^5.2.2":
-  version: 5.2.2
-  resolution: "vite@npm:5.2.2"
+"vite@npm:^5.2.3":
+  version: 5.2.3
+  resolution: "vite@npm:5.2.3"
  dependencies:
    esbuild: "npm:^0.20.1"
    fsevents: "npm:~2.3.3"
@@ -8527,7 +8527,7 @@ __metadata:
      optional: true
  bin:
    vite: bin/vite.js
-  checksum: 10/8e7f1e79e00a092b43378565898b5b60f66738d55fdcd2bb3a17b07183d32c3bfda30135490956ad8eb5eb77b0e56d4377655bf9478898616edbb20645477edb
+  checksum: 10/5033a989462bc3127cb937ae5138024af68ec1b67accad07e07e116254b84fc6888a18d7a0358e3d3ce19fe160d72b6622259edc93e7fba47b84d042dcbe1e4e
  languageName: node
  linkType: hard