Fix mission name

equinor · Oct 18, 2022 · eb6cfef · eb6cfef
1 parent 6ce3d42
commit eb6cfef
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/backend/api/Controllers/MissionController.cs b/backend/api/Controllers/MissionController.cs
@@ -118,6 +118,7 @@ [FromBody] ScheduledMissionQuery scheduledMissionQuery
 
         var scheduledMission = new Mission
         {
+            Name = echoMission.Name,
             Robot = robot,
             EchoMissionId = scheduledMissionQuery.EchoMissionId,
             MissionStatus = MissionStatus.Pending,

diff --git a/backend/api/Database/Models/Mission.cs b/backend/api/Database/Models/Mission.cs
@@ -11,6 +11,8 @@ public class Mission
         [Required]
         public string Id { get; set; }
 
+        public string Name { get; set; }
+
         public string AssetCode { get; set; }
 
         [Required]

diff --git a/frontend/src/components/MissionOverview/OngoingMissionCard.tsx b/frontend/src/components/MissionOverview/OngoingMissionCard.tsx
@@ -28,8 +28,7 @@ export function OngoingMissionCard({ mission }: MissionProps) {
     }
     return (
         <StyledMissionCard variant="default" style={{ boxShadow: tokens.elevation.raised }} onClick={routeChange}>
-            <Typography variant="h6">INSPECTION</Typography>
-            <Typography>{mission.name}</Typography>
+            <Typography variant="h6">{mission.name}</Typography>
             <HorisontalContent>
                 <MissionStatusDisplay status={mission.missionStatus} />
                 <MissionProgressDisplay />

diff --git a/frontend/src/components/MissionOverview/UpcomingMissionCard.tsx b/frontend/src/components/MissionOverview/UpcomingMissionCard.tsx
@@ -43,7 +43,7 @@ export function UpcomingMissionCard({ mission }: MissionProps) {
         >
             <HorizontalContent>
                 <Checkbox />
-                <Typography variant="h6">Mission name</Typography>
+                <Typography variant="h6">{mission.name}</Typography>
                 <MissionStartTimeDisplay mission={mission} />
                 <Typography>Tasks: {numberOfTasks}</Typography>
                 <MissionDurationDisplay mission={mission} />

diff --git a/frontend/src/models/Mission.ts b/frontend/src/models/Mission.ts
@@ -14,7 +14,7 @@ export enum MissionStatus {
 
 export interface Mission {
     id: string
-    name?: string
+    name: string
     assetCode?: string
     robot: Robot
     isarMissionId?: string