Use battery charging symbol when robot is charging

equinor · Dec 12, 2024 · e0a4d41 · e0a4d41
1 parent aecc67c
commit e0a4d41
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/frontend/src/components/Displays/RobotDisplays/BatteryStatusDisplay.tsx b/frontend/src/components/Displays/RobotDisplays/BatteryStatusDisplay.tsx
@@ -2,6 +2,7 @@ import { tokens } from '@equinor/eds-tokens'
 import { Icon, Typography } from '@equinor/eds-core-react'
 import styled from 'styled-components'
 import { Icons } from 'utils/icons'
+import { BatteryStatus } from 'models/Battery'
 
 const BatteryAlignment = styled.div`
     display: flex;
@@ -12,13 +13,15 @@ const StyledTypography = styled(Typography)<{ $fontSize?: 24 | 16 | 18 | 32 | 40
 `
 interface BatteryStatusDisplayProps {
     batteryLevel?: number
+    batteryState?: BatteryStatus
     itemSize?: 24 | 16 | 18 | 32 | 40 | 48 | undefined
     batteryWarningLimit?: number
     textAlignedBottom?: boolean
 }
 
 export const BatteryStatusDisplay = ({
     batteryLevel,
+    batteryState,
     itemSize,
     batteryWarningLimit,
     textAlignedBottom,
@@ -27,6 +30,8 @@ export const BatteryStatusDisplay = ({
 
     const getBatteryIcon = (batteryLevel?: number) => {
         switch (true) {
+            case batteryState === BatteryStatus.Charging:
+                return Icons.BatteryCharging
             case batteryLevel === null || batteryLevel === undefined:
                 return Icons.BatteryUnknown
             case !batteryWarningLimit || batteryLevel! > batteryWarningLimit:

diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/RobotCard.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/RobotCard.tsx
@@ -145,6 +145,7 @@ export const RobotCard = ({ robot }: { robot: Robot }) => {
                                     <AttributeTitleTypography>{TranslateText('Battery')}</AttributeTitleTypography>
                                     <BatteryStatusDisplay
                                         batteryLevel={robot.batteryLevel}
+                                        batteryState={robot.batteryState}
                                         batteryWarningLimit={robot.model.batteryWarningThreshold}
                                     />
                                 </VerticalContent>

diff --git a/frontend/src/components/Pages/RobotPage/RobotPage.tsx b/frontend/src/components/Pages/RobotPage/RobotPage.tsx
@@ -137,6 +137,7 @@ export const RobotPage = () => {
                                         <BatteryStatusDisplay
                                             itemSize={32}
                                             batteryLevel={selectedRobot.batteryLevel}
+                                            batteryState={selectedRobot.batteryState}
                                             batteryWarningLimit={selectedRobot.model.batteryWarningThreshold}
                                         />
                                         {selectedRobot.pressureLevel !== null &&

diff --git a/frontend/src/models/Robot.ts b/frontend/src/models/Robot.ts
@@ -28,7 +28,7 @@ export interface Robot {
     serialNumber?: string
     currentInstallation: Installation
     batteryLevel?: number
-    batteryStatus?: BatteryStatus
+    batteryState?: BatteryStatus
     pressureLevel?: number
     pose?: Pose
     status: RobotStatus