Prevent all robots from showing while loading

equinor · Nov 9, 2023 · 638752a · 638752a
1 parent 61678f3
commit 638752a
Showing 1 changed file with 13 additions and 20 deletions.
diff --git a/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusView.tsx b/frontend/src/components/Pages/FrontPage/RobotCards/RobotStatusView.tsx
@@ -18,12 +18,13 @@ const RobotView = styled.div`
     grid-column: 1/ -1;
     gap: 1rem;
 `
+
 export function RobotStatusSection() {
     const { TranslateText } = useLanguageContext()
     const { installationCode } = useInstallationContext()
-    const [robots, setRobots] = useState<Robot[]>([])
     const { enabledRobots } = useRobotContext()
     const { safeZoneStatus, switchSafeZoneStatus } = useSafeZoneContext()
+    const [robots, setRobots] = useState<Robot[]>([])
 
     useEffect(() => {
         const sortRobotsByStatus = (robots: Robot[]): Robot[] => {
@@ -32,7 +33,13 @@ export function RobotStatusSection() {
             )
             return sortedRobots
         }
-        setRobots(sortRobotsByStatus(enabledRobots))
+        const relevantRobots = sortRobotsByStatus(
+            enabledRobots.filter(function (robot) {
+                return robot.currentInstallation.toLocaleLowerCase() === installationCode.toLocaleLowerCase()
+            })
+        )
+        setRobots(relevantRobots)
+
         const missionQueueFozenStatus = enabledRobots
             .map((robot: Robot) => {
                 return robot.missionQueueFrozen
@@ -41,26 +48,12 @@ export function RobotStatusSection() {
 
         if (missionQueueFozenStatus.length > 0 && !safeZoneStatus) switchSafeZoneStatus(true)
         else switchSafeZoneStatus(false)
-    }, [enabledRobots])
-
-    const filteredRobots = robots.filter(function (robot) {
-        return (
-            robot.currentInstallation.toLocaleLowerCase() === installationCode.toLocaleLowerCase() ||
-            (typeof robot.currentInstallation === 'string' && robot.currentInstallation.includes('default')) ||
-            !robot.currentInstallation
-        )
-    })
+    }, [enabledRobots, installationCode])
 
     const getRobotDisplay = () => {
-        if (installationCode === '') {
-            return robots.map(function (robot) {
-                return <RobotStatusCard key={robot.id} robot={robot} />
-            })
-        } else {
-            return filteredRobots.map(function (robot) {
-                return <RobotStatusCard key={robot.id} robot={robot} />
-            })
-        }
+        return robots.map(function (robot) {
+            return <RobotStatusCard key={robot.id} robot={robot} />
+        })
     }
 
     return (