diff --git a/frontend/src/api/ApiCaller.tsx b/frontend/src/api/ApiCaller.tsx index 10bbc939..16459796 100644 --- a/frontend/src/api/ApiCaller.tsx +++ b/frontend/src/api/ApiCaller.tsx @@ -173,7 +173,6 @@ export class BackendAPICaller { if (parameters.nameSearch) path = path + 'NameSearch=' + parameters.nameSearch + '&' if (parameters.robotNameSearch) path = path + 'RobotNameSearch=' + parameters.robotNameSearch + '&' if (parameters.tagSearch) path = path + 'TagSearch=' + parameters.tagSearch + '&' - if (parameters.excludeLocalization) path = path + 'ExcludeLocalization=' + parameters.excludeLocalization + '&' if (parameters.excludeReturnToHome) path = path + 'ExcludeReturnToHome=' + parameters.excludeReturnToHome + '&' if (parameters.minStartTime) path = path + 'MinStartTime=' + parameters.minStartTime + '&' if (parameters.maxStartTime) path = path + 'MaxStartTime=' + parameters.maxStartTime + '&' diff --git a/frontend/src/components/Alerts/AlertsListItem.tsx b/frontend/src/components/Alerts/AlertsListItem.tsx index bff6f92e..27f572fb 100644 --- a/frontend/src/components/Alerts/AlertsListItem.tsx +++ b/frontend/src/components/Alerts/AlertsListItem.tsx @@ -96,15 +96,13 @@ export const AlertListContents = ({ icon, iconColor, alertTitle, alertText, miss {alertText} - {mission !== undefined && - mission.tasks[0]?.type !== TaskType.ReturnHome && - mission.tasks[0]?.type !== TaskType.Localization && ( - - )} + {mission !== undefined && mission.tasks[0]?.type !== TaskType.ReturnHome && ( + + )} diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionCard.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionCard.tsx index 1734682d..ca9db51f 100644 --- a/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionCard.tsx +++ b/frontend/src/components/Pages/FrontPage/MissionOverview/OngoingMissionCard.tsx @@ -81,7 +81,6 @@ export const OngoingMissionCard = ({ mission }: MissionProps): JSX.Element => { let missionTaskType = TaskType.Inspection if (mission.tasks.every((task) => task.type === TaskType.ReturnHome)) missionTaskType = TaskType.ReturnHome - if (mission.tasks.every((task) => task.type === TaskType.Localization)) missionTaskType = TaskType.Localization const SmallScreenContent = ( diff --git a/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx b/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx index 3bbd72f2..57b24e78 100644 --- a/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx +++ b/frontend/src/components/Pages/FrontPage/MissionOverview/StopDialogs.tsx @@ -52,17 +52,6 @@ export enum MissionStatusRequest { const DialogContent = ({ missionTaskType }: { missionTaskType: TaskType | undefined }) => { const { TranslateText } = useLanguageContext() switch (missionTaskType) { - case TaskType.Localization: - return ( - - - {TranslateText('Stop button pressed during localization warning text')} - - - {TranslateText('Stop button pressed confirmation text')} - - - ) case TaskType.ReturnHome: return ( diff --git a/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx b/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx index 2cc15591..b08dc594 100644 --- a/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx +++ b/frontend/src/components/Pages/MissionHistoryPage/HistoricMissionCard.tsx @@ -68,7 +68,7 @@ export const HistoricMissionCard = ({ index, mission }: IndexedMissionProps) => - {mission.tasks[0]?.type !== TaskType.ReturnHome && mission.tasks[0]?.type !== TaskType.Localization && ( + {mission.tasks[0]?.type !== TaskType.ReturnHome && ( )} diff --git a/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx b/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx index 6876013e..2cc2db49 100644 --- a/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx +++ b/frontend/src/components/Pages/MissionPage/MissionHeader/MissionHeader.tsx @@ -164,7 +164,6 @@ export const MissionHeader = ({ mission }: { mission: Mission }) => { let missionTaskType = TaskType.Inspection if (mission.tasks.every((task) => task.type === TaskType.ReturnHome)) missionTaskType = TaskType.ReturnHome - if (mission.tasks.every((task) => task.type === TaskType.Localization)) missionTaskType = TaskType.Localization return ( <> @@ -179,15 +178,13 @@ export const MissionHeader = ({ mission }: { mission: Mission }) => { missionStatus={mission.status} /> )} - {mission.endTime && - mission.tasks[0]?.type !== TaskType.ReturnHome && - mission.tasks[0]?.type !== TaskType.Localization && ( - - )} + {mission.endTime && mission.tasks[0]?.type !== TaskType.ReturnHome && ( + + )} { let missionTaskType = undefined if (mission?.tasks.every((task) => task.type === TaskType.Inspection)) missionTaskType = TaskType.Inspection if (mission?.tasks.every((task) => task.type === TaskType.ReturnHome)) missionTaskType = TaskType.ReturnHome - if (mission?.tasks.every((task) => task.type === TaskType.Localization)) missionTaskType = TaskType.Localization useEffect(() => { if (robotId && mediaStreams && Object.keys(mediaStreams).includes(robotId)) { diff --git a/frontend/src/models/MissionRunQueryParameters.ts b/frontend/src/models/MissionRunQueryParameters.ts index 3c0f9568..253e7abf 100644 --- a/frontend/src/models/MissionRunQueryParameters.ts +++ b/frontend/src/models/MissionRunQueryParameters.ts @@ -10,7 +10,6 @@ export interface MissionRunQueryParameters { tagSearch?: string inspectionTypes?: InspectionType[] inspectionArea?: string - excludeLocalization?: boolean excludeReturnToHome?: boolean minStartTime?: number maxStartTime?: number diff --git a/frontend/src/models/Task.ts b/frontend/src/models/Task.ts index 655d6a7e..c147cdb7 100644 --- a/frontend/src/models/Task.ts +++ b/frontend/src/models/Task.ts @@ -30,6 +30,5 @@ export enum TaskStatus { export enum TaskType { Inspection = 'Inspection', - Localization = 'Localization', ReturnHome = 'ReturnHome', }