Skip to content

Commit 9b75c36

Browse files
committed
Remove localization taskType from frontend
1 parent 283780d commit 9b75c36

File tree

9 files changed

+15
-36
lines changed

9 files changed

+15
-36
lines changed

frontend/src/api/ApiCaller.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ export class BackendAPICaller {
173173
if (parameters.nameSearch) path = path + 'NameSearch=' + parameters.nameSearch + '&'
174174
if (parameters.robotNameSearch) path = path + 'RobotNameSearch=' + parameters.robotNameSearch + '&'
175175
if (parameters.tagSearch) path = path + 'TagSearch=' + parameters.tagSearch + '&'
176-
if (parameters.excludeLocalization) path = path + 'ExcludeLocalization=' + parameters.excludeLocalization + '&'
177176
if (parameters.excludeReturnToHome) path = path + 'ExcludeReturnToHome=' + parameters.excludeReturnToHome + '&'
178177
if (parameters.minStartTime) path = path + 'MinStartTime=' + parameters.minStartTime + '&'
179178
if (parameters.maxStartTime) path = path + 'MaxStartTime=' + parameters.maxStartTime + '&'

frontend/src/components/Alerts/AlertsListItem.tsx

+7-9
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,13 @@ export const AlertListContents = ({ icon, iconColor, alertTitle, alertText, miss
9696
<StyledListItem>
9797
<Typography variant="caption">{alertText}</Typography>
9898
<Right>
99-
{mission !== undefined &&
100-
mission.tasks[0]?.type !== TaskType.ReturnHome &&
101-
mission.tasks[0]?.type !== TaskType.Localization && (
102-
<MissionRestartButton
103-
mission={mission}
104-
hasFailedTasks={missionHasFailedTasks}
105-
smallButton={false}
106-
/>
107-
)}
99+
{mission !== undefined && mission.tasks[0]?.type !== TaskType.ReturnHome && (
100+
<MissionRestartButton
101+
mission={mission}
102+
hasFailedTasks={missionHasFailedTasks}
103+
smallButton={false}
104+
/>
105+
)}
108106
</Right>
109107
</StyledListItem>
110108
</StyledListContainer>

frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionCard.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export const OngoingMissionCard = ({ mission }: MissionProps): JSX.Element => {
8181

8282
let missionTaskType = TaskType.Inspection
8383
if (mission.tasks.every((task) => task.type === TaskType.ReturnHome)) missionTaskType = TaskType.ReturnHome
84-
if (mission.tasks.every((task) => task.type === TaskType.Localization)) missionTaskType = TaskType.Localization
8584

8685
const SmallScreenContent = (
8786
<StyledSmallScreenMissionCard>

frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx

-11
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@ export enum MissionStatusRequest {
5252
const DialogContent = ({ missionTaskType }: { missionTaskType: TaskType | undefined }) => {
5353
const { TranslateText } = useLanguageContext()
5454
switch (missionTaskType) {
55-
case TaskType.Localization:
56-
return (
57-
<StyledText>
58-
<Typography variant="body_long">
59-
{TranslateText('Stop button pressed during localization warning text')}
60-
</Typography>
61-
<Typography variant="body_long">
62-
{TranslateText('Stop button pressed confirmation text')}
63-
</Typography>
64-
</StyledText>
65-
)
6655
case TaskType.ReturnHome:
6756
return (
6857
<StyledText>

frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const HistoricMissionCard = ({ index, mission }: IndexedMissionProps) =>
6868
<MissionEndTimeDisplay mission={mission} />
6969
</Table.Cell>
7070
<Table.Cell id={InspectionTableColumns.Rerun}>
71-
{mission.tasks[0]?.type !== TaskType.ReturnHome && mission.tasks[0]?.type !== TaskType.Localization && (
71+
{mission.tasks[0]?.type !== TaskType.ReturnHome && (
7272
<MissionRestartButton mission={mission} hasFailedTasks={missionHasFailedTasks} smallButton={true} />
7373
)}
7474
</Table.Cell>

frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx

+7-10
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ export const MissionHeader = ({ mission }: { mission: Mission }) => {
164164

165165
let missionTaskType = TaskType.Inspection
166166
if (mission.tasks.every((task) => task.type === TaskType.ReturnHome)) missionTaskType = TaskType.ReturnHome
167-
if (mission.tasks.every((task) => task.type === TaskType.Localization)) missionTaskType = TaskType.Localization
168167

169168
return (
170169
<>
@@ -179,15 +178,13 @@ export const MissionHeader = ({ mission }: { mission: Mission }) => {
179178
missionStatus={mission.status}
180179
/>
181180
)}
182-
{mission.endTime &&
183-
mission.tasks[0]?.type !== TaskType.ReturnHome &&
184-
mission.tasks[0]?.type !== TaskType.Localization && (
185-
<MissionRestartButton
186-
mission={mission}
187-
hasFailedTasks={missionHasFailedTasks}
188-
smallButton={false}
189-
/>
190-
)}
181+
{mission.endTime && mission.tasks[0]?.type !== TaskType.ReturnHome && (
182+
<MissionRestartButton
183+
mission={mission}
184+
hasFailedTasks={missionHasFailedTasks}
185+
smallButton={false}
186+
/>
187+
)}
191188
</TitleSection>
192189
<Typography
193190
variant="body_long"

frontend/src/components/Pages/RobotPage/RobotPage.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ export const RobotPage = () => {
7676
let missionTaskType = undefined
7777
if (mission?.tasks.every((task) => task.type === TaskType.Inspection)) missionTaskType = TaskType.Inspection
7878
if (mission?.tasks.every((task) => task.type === TaskType.ReturnHome)) missionTaskType = TaskType.ReturnHome
79-
if (mission?.tasks.every((task) => task.type === TaskType.Localization)) missionTaskType = TaskType.Localization
8079

8180
useEffect(() => {
8281
if (robotId && mediaStreams && Object.keys(mediaStreams).includes(robotId)) {

frontend/src/models/MissionRunQueryParameters.ts

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export interface MissionRunQueryParameters {
1010
tagSearch?: string
1111
inspectionTypes?: InspectionType[]
1212
inspectionArea?: string
13-
excludeLocalization?: boolean
1413
excludeReturnToHome?: boolean
1514
minStartTime?: number
1615
maxStartTime?: number

frontend/src/models/Task.ts

-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ export enum TaskStatus {
3030

3131
export enum TaskType {
3232
Inspection = 'Inspection',
33-
Localization = 'Localization',
3433
ReturnHome = 'ReturnHome',
3534
}

0 commit comments

Comments
 (0)