Include pressure/battery checks for 0 values

equinor · Oct 28, 2024 · 5ea6039 · 5ea6039
1 parent 7804581
commit 5ea6039
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/frontend/src/components/Displays/ConfirmScheduleDialogs/ConfirmScheduleDialog.tsx b/frontend/src/components/Displays/ConfirmScheduleDialogs/ConfirmScheduleDialog.tsx
@@ -23,17 +23,25 @@ export const ScheduleMissionWithConfirmDialogs = ({
     const { enabledRobots } = useRobotContext()
     const [robot, setRobot] = useState<Robot>()
 
-    const isBatteryInsufficient = (currentRobot: Robot) =>
-        currentRobot.batteryLevel &&
-        currentRobot.model.batteryWarningThreshold &&
-        currentRobot.batteryLevel < currentRobot.model.batteryWarningThreshold
+    const isBatteryInsufficient = (currentRobot: Robot) => {
+        const hasBatteryValue = currentRobot.batteryLevel !== null && currentRobot.batteryLevel !== undefined
+        return (
+            hasBatteryValue &&
+            currentRobot.model.batteryWarningThreshold &&
+            currentRobot.batteryLevel! < currentRobot.model.batteryWarningThreshold
+        )
+    }
 
-    const isPressureInsufficient = (currentRobot: Robot) =>
-        currentRobot.pressureLevel &&
-        ((currentRobot.model.lowerPressureWarningThreshold &&
-            currentRobot.pressureLevel < currentRobot.model.lowerPressureWarningThreshold) ||
+    const isPressureInsufficient = (currentRobot: Robot) => {
+        const hasPressureValue = currentRobot.pressureLevel !== null && currentRobot.pressureLevel !== undefined
+        return (
+            (hasPressureValue &&
+                currentRobot.model.lowerPressureWarningThreshold &&
+                currentRobot.pressureLevel! < currentRobot.model.lowerPressureWarningThreshold) ||
             (currentRobot.model.upperPressureWarningThreshold &&
-                currentRobot.pressureLevel > currentRobot.model.upperPressureWarningThreshold))
+                currentRobot.pressureLevel! > currentRobot.model.upperPressureWarningThreshold)
+        )
+    }
 
     useEffect(() => {
         setRobot(enabledRobots.find((robot) => robot.id === robotId))