From cc0a9aae7fdfd0275e8cc07b93a84ca8cae934c6 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Wed, 6 Oct 2021 08:38:42 +0200 Subject: [PATCH] Fixed breadcrumbs for reporting pages --- .../src/app/shared/constants/navigation.ts | 7 +++++++ .../shared/utils/map-paths-to-breadcrumbs.util.ts | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts b/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts index 1f73432..056c715 100644 --- a/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts +++ b/apps/mina-sidor-fa/src/app/shared/constants/navigation.ts @@ -1,3 +1,9 @@ +export const DELTAGARE_REPORTING_ROUTES = { + 'gemensam-planering': 'Gemensam planering', + 'periodisk-redovisning': 'Periodisk redovisning', + avvikelserapport: 'Avvikelserapport', +}; + export const NAVIGATION = { administration: 'Administration', personal: 'Hantera personalkonton', @@ -9,4 +15,5 @@ export const NAVIGATION = { 'skapa-personalkonto': 'Skapa personalkonto', obehorig: 'Saknar behörigheter', tillganglighet: 'Tillgänglighetsredogörelse', + ...DELTAGARE_REPORTING_ROUTES, }; diff --git a/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts b/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts index 1714d8a..fe2a4b4 100644 --- a/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts +++ b/apps/mina-sidor-fa/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts @@ -1,4 +1,5 @@ import { NavigationBreadcrumbsItem } from '@af/digi-ng/_navigation/navigation-breadcrumbs'; +import { DELTAGARE_REPORTING_ROUTES } from '@msfa-constants/navigation'; import { mapPathToPageName } from './map-path-to-page-name.util'; export function mapPathsToBreadcrumbs( @@ -21,9 +22,12 @@ export function mapPathsToBreadcrumbs( routerLink: '/administration/personal', }; breadcrumbs[breadcrumbs.length - 1].text = 'Redigera personalkonto'; - } else if (isParticipantCardRoute(paths)) { + } else if (isDeltagareCardRoute(paths)) { breadcrumbs[breadcrumbs.length - 1].text = 'Deltagarinformation'; + } else if (isDeltagareReportingRoute(paths)) { + breadcrumbs[breadcrumbs.length - 2].text = 'Deltagarinformation'; } + return breadcrumbs; } @@ -35,6 +39,10 @@ function isEmployeeEditRoute(paths: string[]): boolean { return paths.length === 3 && paths[1] === 'redigera-personalkonto'; } -function isParticipantCardRoute(paths: string[]): boolean { +function isDeltagareCardRoute(paths: string[]): boolean { return paths.length === 2 && paths[0] === 'deltagare'; } + +function isDeltagareReportingRoute(paths: string[]): boolean { + return paths.length === 3 && paths[0] === 'deltagare' && paths[2] in DELTAGARE_REPORTING_ROUTES; +}