Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Breadcrumb in inject details is not consistent #2131

Merged
merged 1 commit into from
Dec 30, 2024
Merged

Breadcrumb in inject details is not consistent #2131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions openbas-front/src/admin/components/simulations/simulation/injects/InjectIndex.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Link, Route, Routes, useLocation, useParams, useSearchParams } from 're
import { fetchInjectResultOverviewOutput } from '../../../../../actions/atomic_testings/atomic-testing-actions';
import { fetchExercise } from '../../../../../actions/Exercise';
import type { ExercisesHelper } from '../../../../../actions/exercises/exercise-helper';
import Breadcrumbs, { BreadcrumbsElement } from '../../../../../components/Breadcrumbs';
import Breadcrumbs, { BACK_LABEL, BACK_URI, BreadcrumbsElement } from '../../../../../components/Breadcrumbs';
import { errorWrapper } from '../../../../../components/Error';
import { useFormatter } from '../../../../../components/i18n';
import Loader from '../../../../../components/Loader';
Expand Down Expand Up @@ -71,6 +71,13 @@ const InjectIndexComponent: FunctionComponent<{ exercise: ExerciseType; injectRe
breadcrumbs.push({ label: t('Injects') });
breadcrumbs.push({ label: injectResultOverviewOutput.inject_title, current: true });

const computePath = (path: string) => {
if (backlabel && backuri) {
return path + `?${BACK_LABEL}=${backlabel}&${BACK_URI}=${backuri}`;
}
return path;
};

return (
<InjectResultOverviewOutputContext.Provider value={{ injectResultOverviewOutput, updateInjectResultOverviewOutput }}>
<PermissionsContext.Provider value={permissionsContext}>
Expand All @@ -86,14 +93,14 @@ const InjectIndexComponent: FunctionComponent<{ exercise: ExerciseType; injectRe
<Tabs value={tabValue}>
<Tab
component={Link}
to={`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}`}
to={computePath(`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}`)}
value={`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}`}
label={t('Overview')}
className={classes.item}
/>
<Tab
component={Link}
to={`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}/detail`}
to={computePath(`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}/detail`)}
value={`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}/detail`}
label={t('Execution details')}
className={classes.item}
Expand All @@ -102,7 +109,7 @@ const InjectIndexComponent: FunctionComponent<{ exercise: ExerciseType; injectRe
isInjectWithPayloadInfo(injectResultOverviewOutput) && (
<Tab
component={Link}
to={`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}/payload_info`}
to={computePath(`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}/payload_info`)}
value={`/admin/simulations/${exercise.exercise_id}/injects/${injectResultOverviewOutput.inject_id}/payload_info`}
label={t('Payload info')}
className={classes.item}
Expand Down
3 changes: 2 additions & 1 deletion openbas-front/src/admin/components/simulations/simulation/timeline/TimelineOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import type { ExercisesHelper } from '../../../../../actions/exercises/exercise-
import { fetchExerciseInjects, updateInjectForExercise } from '../../../../../actions/Inject';
import type { InjectStore } from '../../../../../actions/injects/Inject';
import type { InjectHelper } from '../../../../../actions/injects/inject-helper';
import { BACK_LABEL, BACK_URI } from '../../../../../components/Breadcrumbs';
import Empty from '../../../../../components/Empty';
import { useFormatter } from '../../../../../components/i18n';
import ItemStatus from '../../../../../components/ItemStatus';
Expand Down Expand Up @@ -243,7 +244,7 @@ const TimelineOverview = () => {
classes={{ root: classes.item }}
divider
component={Link}
to={`/admin/simulations/${exerciseId}/injects/${inject.inject_id}?backlabel=Animation&backuri=/admin/simulations/${exerciseId}/animation/timeline`}
to={`/admin/simulations/${exerciseId}/injects/${inject.inject_id}?${BACK_LABEL}=Animation&${BACK_URI}=/admin/simulations/${exerciseId}/animation/timeline`}
>
<ListItemIcon>
<InjectIcon
Expand Down
3 changes: 3 additions & 0 deletions openbas-front/src/components/Breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import { Link } from 'react-router';

import { truncate } from '../utils/String';

export const BACK_LABEL = 'backlabel';
export const BACK_URI = 'backuri';

export interface BreadcrumbsElement {
label: string;
link?: string;
Expand Down
Loading