WIP

equinor · Dec 12, 2024 · 7456234 · 7456234
1 parent 5b041b4
commit 7456234
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 51 deletions.
diff --git a/frontend/src/components/Contexts/MissionRunsContext.tsx b/frontend/src/components/Contexts/MissionRunsContext.tsx
@@ -178,8 +178,10 @@ const useMissionRuns = (): IMissionRunsContext => {
     const [filteredMissionQueue, setFilteredMissionQueue] = useState<Mission[]>([])
     const [filteredOngoingMissions, setFilteredOngoingMissions] = useState<Mission[]>([])
     useEffect(() => {
-        setFilteredOngoingMissions(ongoingMissions.filter((m) => m.area?.installationCode === installationCode))
-        setFilteredMissionQueue(missionQueue.filter((m) => m.area?.installationCode === installationCode))
+        setFilteredOngoingMissions(
+            ongoingMissions.filter((m) => m.inspectionArea?.installationCode === installationCode)
+        )
+        setFilteredMissionQueue(missionQueue.filter((m) => m.inspectionArea?.installationCode === installationCode))
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [installationCode, ongoingMissions, missionQueue])
 

diff --git a/...mScheduleDialogs/LocalizationVerification/ScheduleMissionWithLocalizationVerification.tsx b/...mScheduleDialogs/LocalizationVerification/ScheduleMissionWithLocalizationVerification.tsx
@@ -38,7 +38,8 @@ export const ScheduleMissionWithLocalizationVerificationDialog = ({
 
     const ongoingLocalizationMissionOnSameDeckExists =
         ongoingMissions.filter(
-            (mission) => mission.robot?.id === selectedRobot?.id && mission.area?.deckName === unikMissionDeckNames[0]
+            (mission) =>
+                mission.robot?.id === selectedRobot?.id && mission.inspectionArea?.deckName === unikMissionDeckNames[0]
         ).length > 0
 
     useEffect(() => {

diff --git a/frontend/src/components/Displays/MissionButtons/MissionRestartButton.tsx b/frontend/src/components/Displays/MissionButtons/MissionRestartButton.tsx
@@ -115,7 +115,7 @@ export const MissionRestartButton = ({ mission, hasFailedTasks, smallButton }: M
                     scheduleMissions={() => startReRun(selectedRerunOption!)}
                     closeDialog={() => setIsLocationVerificationOpen(false)}
                     robotId={mission.robot.id}
-                    missionDeckNames={[mission.area?.deckName ?? '']}
+                    missionDeckNames={[mission.inspectionArea?.deckName ?? '']}
                 />
             )}
         </Centered>

diff --git a/frontend/src/components/Displays/MissionDisplays/MissionAreaDispaly.tsx b/frontend/src/components/Displays/MissionDisplays/MissionAreaDispaly.tsx
diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/MissionQueueCard.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/MissionQueueCard.tsx
@@ -174,9 +174,8 @@ const MissionDetails = ({ mission }: { mission: Mission }) => {
         return translateNotAvailable
     }
 
-    const area = `${TranslateText('Area')}: ${mission.area?.areaName ?? TranslateText('Not available')}`
     const tasks = `${TranslateText('Tasks')}: ${mission.tasks.length}`
-    const missionDetails = `${area} | ${tasks} | ${estimatedDuration()}`
+    const missionDetails = `${tasks} | ${estimatedDuration()}`
 
     return (
         <Typography variant="caption" color={tokens.colors.text.static_icons__tertiary.hex}>

diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionCard.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionCard.tsx
@@ -11,7 +11,6 @@ import { TaskType } from 'models/Task'
 import { StyledButton } from 'components/Styles/StyledComponents'
 import { useLanguageContext } from 'components/Contexts/LanguageContext'
 import { Icons } from 'utils/icons'
-import { MissionAreaDisplay } from 'components/Displays/MissionDisplays/MissionAreaDispaly'
 
 interface MissionProps {
     mission: Mission
@@ -95,7 +94,6 @@ export const OngoingMissionCard = ({ mission }: MissionProps): JSX.Element => {
             <ControllButtonSpacing>
                 <Midcontent>
                     <MissionStatusDisplayWithHeader status={mission.status} />
-                    <MissionAreaDisplay mission={mission} />
                     <MissionProgressDisplay mission={mission} />
                 </Midcontent>
                 <MissionControlButtons
@@ -117,7 +115,6 @@ export const OngoingMissionCard = ({ mission }: MissionProps): JSX.Element => {
                     </Typography>
                     <Midcontent>
                         <MissionStatusDisplayWithHeader status={mission.status} />
-                        <MissionAreaDisplay mission={mission} />
                         <MissionProgressDisplay mission={mission} />
                     </Midcontent>
                 </LeftSection>

diff --git a/frontend/src/components/Pages/InspectionPage/DeckCards.tsx b/frontend/src/components/Pages/InspectionPage/DeckCards.tsx
@@ -54,11 +54,6 @@ const DeckCard = ({ deckData, onClickDeck, selectedDeck, handleScheduleAll }: De
     if (deckData.inspections.length === 0) queueMissionsTooltip = TranslateText('No planned inspection')
     else if (isScheduleMissionsDisabled) queueMissionsTooltip = TranslateText('No robot available')
 
-    const formattedAreaNames = deckData.areas
-        .map((area) => area.areaName.toLocaleUpperCase())
-        .sort()
-        .join(' | ')
-
     return (
         <StyledDict.DeckCard key={deckData.deck.deckName}>
             <StyledDict.Rectangle style={{ background: `${getCardColorFromInspections(deckData.inspections)}` }} />
@@ -83,7 +78,6 @@ const DeckCard = ({ deckData, onClickDeck, selectedDeck, handleScheduleAll }: De
                                 </StyledDict.Content>
                             ))}
                     </StyledDict.TopDeckText>
-                    {deckData.areas && <Typography variant={'body_short'}>{formattedAreaNames}</Typography>}
                     {deckData.inspections && (
                         <CardMissionInformation deckName={deckData.deck.deckName} inspections={deckData.inspections} />
                     )}

diff --git a/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx b/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx
@@ -61,9 +61,6 @@ export const HistoricMissionCard = ({ index, mission }: IndexedMissionProps) =>
                     {mission.name}
                 </Typography>
             </Table.Cell>
-            <Table.Cell id={InspectionTableColumns.Area}>
-                <Typography>{mission.area?.areaName}</Typography>
-            </Table.Cell>
             <Table.Cell id={InspectionTableColumns.Robot}>
                 <Typography>{mission.robot.name}</Typography>
             </Table.Cell>

diff --git a/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryView.tsx b/frontend/src/components/Pages/MissionHistoryPage/MissionHistoryView.tsx
@@ -45,9 +45,6 @@ const HideColumnsOnSmallScreen = styled.div`
         #${InspectionTableColumns.Status} {
             display: none;
         }
-        #${InspectionTableColumns.Area} {
-            display: none;
-        }
         #${InspectionTableColumns.Robot} {
             display: none;
         }
@@ -296,9 +293,6 @@ export const MissionHistoryView = ({ refreshInterval }: RefreshProps) => {
                                 <StyledTableCell id={InspectionTableColumns.Name}>
                                     {TranslateText('Name')}
                                 </StyledTableCell>
-                                <StyledTableCell id={InspectionTableColumns.Area}>
-                                    {TranslateText('Area')}
-                                </StyledTableCell>
                                 <StyledTableCell id={InspectionTableColumns.Robot}>
                                     {TranslateText('Robot')}
                                 </StyledTableCell>

diff --git a/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx b/frontend/src/components/Pages/MissionPage/MapPosition/MissionMapView.tsx
@@ -50,11 +50,11 @@ export const MissionMapView = ({ mission }: MissionProps) => {
 
     const updateMap = useCallback(() => {
         let context = mapCanvas.getContext('2d')
-        if (context === null) {
+        if (!context || !mission.map) {
             return
         }
         context.clearRect(0, 0, mapCanvas.width, mapCanvas.height)
-        context?.drawImage(mapImage, 0, 0)
+        context.drawImage(mapImage, 0, 0)
         placeTagsInMap(mission.tasks, mission.map!, mapCanvas, currentTaskOrder)
         if (missionRobot?.pose && mission.map) {
             placeRobotInMap(mission.map, mapCanvas, missionRobot.pose)

diff --git a/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx b/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx
@@ -135,7 +135,6 @@ export const MissionHeader = ({ mission }: { mission: Mission }) => {
     const translatedBatteryLevel = TranslateText('Battery level')
     const translatedPressureLevel = TranslateText('Pressure level')
     const translatedDescription = TranslateText('Description')
-    const translatedArea = TranslateText('Area')
     const translatedTasks = TranslateText('Completed Tasks')
     const translatedStatus = TranslateText('Status')
 
@@ -193,7 +192,6 @@ export const MissionHeader = ({ mission }: { mission: Mission }) => {
                         {HeaderText(translatedStatus, '')}
                         <MissionStatusDisplay status={mission.status} />
                     </div>
-                    {HeaderText(translatedArea, `${mission.area?.areaName}`)}
                     {HeaderText(translatedTasks, `${numberOfCompletedTasks + '/' + mission.tasks.length}`)}
                 </StyledCard>
                 <StyledCard>

diff --git a/frontend/src/models/Mission.ts b/frontend/src/models/Mission.ts
@@ -1,5 +1,5 @@
 import { MapMetadata } from './MapMetadata'
-import { Area } from './Area'
+import { Deck } from './Deck'
 import { Robot, placeholderRobot } from './Robot'
 import { Task } from './Task'
 
@@ -32,7 +32,7 @@ export interface Mission {
     statusReason?: string
     comment?: string
     installationCode?: string
-    area?: Area
+    inspectionArea?: Deck
     robot: Robot
     status: MissionStatus
     isCompleted: boolean