updates to backend to match new frontend - #1665

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;

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}

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}>

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;