Add timedelay const and remove duplicate code

equinor · Oct 14, 2022 · 50063ee · 50063ee
1 parent f9b61e7
commit 50063ee
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/frontend/src/components/MissionOverview/OngoingMissionView.tsx b/frontend/src/components/MissionOverview/OngoingMissionView.tsx
@@ -21,20 +21,23 @@ export function OngoingMissionView() {
     const apiCaller = useApi()
     const [ongoingMissions, setOngoingMissions] = useState<Mission[]>([])
     useEffect(() => {
-        apiCaller.getMissionsByStatus(MissionStatus.Ongoing).then((missions) => {
-            setOngoingMissions(missions)
-        })
+        updateOngoingMissions()
     }, [])
 
     useEffect(() => {
+        const timeDelay = 1000
         const id = setInterval(() => {
-            apiCaller.getMissionsByStatus(MissionStatus.Ongoing).then((missions) => {
-                setOngoingMissions(missions)
-            })
-        }, 1000)
+            updateOngoingMissions()
+        }, timeDelay)
         return () => clearInterval(id)
     }, [])
 
+    const updateOngoingMissions = () => {
+        apiCaller.getMissionsByStatus(MissionStatus.Ongoing).then((missions) => {
+            setOngoingMissions(missions)
+        })
+    }
+
     var missionDisplay = ongoingMissions.map(function (mission, index) {
         return <OngoingMissionCard key={index} mission={mission} />
     })

diff --git a/frontend/src/components/MissionOverview/UpcomingMissionView.tsx b/frontend/src/components/MissionOverview/UpcomingMissionView.tsx
@@ -50,6 +50,7 @@ export function UpcomingMissionView() {
     const [robotOptions, setRobotOptions] = useState<Map<string, Robot>>()
     const [assetString, setAssetString] = useState<string>('')
     const [scheduleButtonDisabled, setScheduleButtonDisabled] = useState<boolean>(true)
+    const timeDelay = 1000
 
     const onSelectedEchoMissions = (selectedEchoMissions: string[]) => {
         var echoMissionsToSchedule: EchoMission[] = []
@@ -80,7 +81,7 @@ export function UpcomingMissionView() {
 
     useEffect(() => {
         const installationCode = sessionStorage.getItem('assetString')
-        if (installationCode != assetString) {
+        if (installationCode !== assetString) {
             setAssetString(installationCode as string)
         }
     }, [sessionStorage.getItem('assetString')])
@@ -91,7 +92,7 @@ export function UpcomingMissionView() {
                 const mappedEchoMissions: Map<string, EchoMission> = mapEchoMissionToString(missions)
                 setEchoMissions(mappedEchoMissions)
             })
-        }, 1000)
+        }, timeDelay)
         return () => clearInterval(id)
     }, [])
 
@@ -101,7 +102,7 @@ export function UpcomingMissionView() {
                 const mappedRobots: Map<string, Robot> = mapRobotsToString(robots)
                 setRobotOptions(mappedRobots)
             })
-        }, 1000)
+        }, timeDelay)
         return () => clearInterval(id)
     }, [])
 
@@ -110,7 +111,7 @@ export function UpcomingMissionView() {
             apiCaller.getMissionsByStatus(MissionStatus.Pending).then((missions) => {
                 setUpcomingMissions(missions)
             })
-        }, 1000)
+        }, timeDelay)
         return () => clearInterval(id)
     }, [])
 

diff --git a/frontend/src/components/RobotCards/RobotStatusView.tsx b/frontend/src/components/RobotCards/RobotStatusView.tsx
@@ -21,20 +21,23 @@ export function RobotStatusSection() {
 
     const [robots, setRobots] = useState<Robot[]>([])
     useEffect(() => {
-        apiCaller.getRobots().then((result) => {
-            setRobots(result)
-        })
+        updateRobots()
     }, [])
 
     useEffect(() => {
+        const timeDelay = 1000
         const id = setInterval(() => {
-            apiCaller.getRobots().then((result) => {
-                setRobots(result)
-            })
-        }, 1000)
+            updateRobots()
+        }, timeDelay)
         return () => clearInterval(id)
     }, [])
 
+    const updateRobots = () => {
+        apiCaller.getRobots().then((result) => {
+            setRobots(result)
+        })
+    }
+
     var robotDisplay = robots.map(function (robot) {
         return <RobotStatusCard key={robot.id} robot={robot} />
     })