Skip to content

Commit

Permalink
Remove localization taskType from frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
Eddasol committed Feb 7, 2025
1 parent 345594d commit 3cf832b
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 36 deletions.
1 change: 0 additions & 1 deletion frontend/src/api/ApiCaller.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 + '&'
Expand Down
16 changes: 7 additions & 9 deletions frontend/src/components/Alerts/AlertsListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,13 @@ export const AlertListContents = ({ icon, iconColor, alertTitle, alertText, miss
<StyledListItem>
<Typography variant="caption">{alertText}</Typography>
<Right>
{mission !== undefined &&
mission.tasks[0]?.type !== TaskType.ReturnHome &&
mission.tasks[0]?.type !== TaskType.Localization && (
<MissionRestartButton
mission={mission}
hasFailedTasks={missionHasFailedTasks}
smallButton={false}
/>
)}
{mission !== undefined && mission.tasks[0]?.type !== TaskType.ReturnHome && (
<MissionRestartButton
mission={mission}
hasFailedTasks={missionHasFailedTasks}
smallButton={false}
/>
)}
</Right>
</StyledListItem>
</StyledListContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
<StyledSmallScreenMissionCard>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,6 @@ export enum MissionStatusRequest {
const DialogContent = ({ missionTaskType }: { missionTaskType: TaskType | undefined }) => {
const { TranslateText } = useLanguageContext()
switch (missionTaskType) {
case TaskType.Localization:
return (
<StyledText>
<Typography variant="body_long">
{TranslateText('Stop button pressed during localization warning text')}
</Typography>
<Typography variant="body_long">
{TranslateText('Stop button pressed confirmation text')}
</Typography>
</StyledText>
)
case TaskType.ReturnHome:
return (
<StyledText>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const HistoricMissionCard = ({ index, mission }: IndexedMissionProps) =>
<MissionEndTimeDisplay mission={mission} />
</Table.Cell>
<Table.Cell id={InspectionTableColumns.Rerun}>
{mission.tasks[0]?.type !== TaskType.ReturnHome && mission.tasks[0]?.type !== TaskType.Localization && (
{mission.tasks[0]?.type !== TaskType.ReturnHome && (
<MissionRestartButton mission={mission} hasFailedTasks={missionHasFailedTasks} smallButton={true} />
)}
</Table.Cell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
Expand All @@ -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 && (
<MissionRestartButton
mission={mission}
hasFailedTasks={missionHasFailedTasks}
smallButton={false}
/>
)}
{mission.endTime && mission.tasks[0]?.type !== TaskType.ReturnHome && (
<MissionRestartButton
mission={mission}
hasFailedTasks={missionHasFailedTasks}
smallButton={false}
/>
)}
</TitleSection>
<Typography
variant="body_long"
Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/Pages/RobotPage/RobotPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ export const RobotPage = () => {
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)) {
Expand Down
1 change: 0 additions & 1 deletion frontend/src/models/MissionRunQueryParameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export interface MissionRunQueryParameters {
tagSearch?: string
inspectionTypes?: InspectionType[]
inspectionArea?: string
excludeLocalization?: boolean
excludeReturnToHome?: boolean
minStartTime?: number
maxStartTime?: number
Expand Down
1 change: 0 additions & 1 deletion frontend/src/models/Task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ export enum TaskStatus {

export enum TaskType {
Inspection = 'Inspection',
Localization = 'Localization',
ReturnHome = 'ReturnHome',
}

0 comments on commit 3cf832b

Please sign in to comment.