Skip to content

Commit 6864c0e

Browse files
authored
Add min side to breadcrumbs (#228)
1 parent 8fbca4c commit 6864c0e

File tree

6 files changed

+24
-14
lines changed

6 files changed

+24
-14
lines changed

.env.development

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ DECORATOR_ENV=dev
33
NEXT_PUBLIC_IS_DEVELOPMENT=true
44
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://www.nav.no/syk/sykefravaer
55
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.nav.no/arbeidsgiver/sykmeldte
6+
NEXT_PUBLIC_MIN_SIDE_ROOT=https://www.intern.dev.nav.no/minside/

nais/envs/.env.demo

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
22
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=demo
33
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.ekstern.dev.nav.no/collect
44
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://demo.ekstern.dev.nav.no/syk/sykefravaer
5-
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://dinesykmeldte.ekstern.dev.nav.no/arbeidsgiver/sykmeldte
5+
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://dinesykmeldte.ekstern.dev.nav.no/arbeidsgiver/sykmeldte
6+
NEXT_PUBLIC_MIN_SIDE_ROOT=https://www.intern.dev.nav.no/minside/

nais/envs/.env.dev

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
22
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=dev
33
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.ekstern.dev.nav.no/collect
44
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://www.ekstern.dev.nav.no/syk/sykefravaer
5-
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.ekstern.dev.nav.no/arbeidsgiver/sykmeldte
5+
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.ekstern.dev.nav.no/arbeidsgiver/sykmeldte
6+
NEXT_PUBLIC_MIN_SIDE_ROOT=https://www.intern.dev.nav.no/minside/

nais/envs/.env.prod

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
22
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=prod
33
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.nav.no/collect
44
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://www.nav.no/syk/sykefravaer
5-
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.nav.no/arbeidsgiver/sykmeldte
5+
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.nav.no/arbeidsgiver/sykmeldte
6+
NEXT_PUBLIC_MIN_SIDE_ROOT=https://www.nav.no/minside/

src/components/blocks/breadcrumbs/breadcrumbPaths.ts

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,26 @@ import {
22
basePath,
33
dineSykemeldteRoot,
44
dittSykefravarRoot,
5+
minSideRoot,
56
} from "../../../environments/publicEnv";
67

78
// Breadcrumbs for sykmeldt
8-
export function dittSykefravaerBreadcrumbSM() {
9+
export function baseBreadcrumbSM() {
910
return [
1011
{
11-
url: dittSykefravarRoot(),
12+
url: minSideRoot,
13+
title: "Min side",
14+
},
15+
{
16+
url: dittSykefravarRoot,
1217
title: "Ditt sykefravær",
1318
},
1419
];
1520
}
1621

1722
export function landingBreadcrumbSM() {
1823
return [
19-
...dittSykefravaerBreadcrumbSM(),
24+
...baseBreadcrumbSM(),
2025
{
2126
url: `${basePath}/sykmeldt`,
2227
title: "Oppfølgingsplaner",
@@ -40,14 +45,14 @@ export function dineSykemeldteBreadcrumbAG(
4045
narmestelederId: string
4146
) {
4247
const dineSykemeldteBreadcrumb = {
43-
url: dineSykemeldteRoot(),
48+
url: dineSykemeldteRoot,
4449
title: "Dine sykmeldte",
4550
};
4651

4752
return [
4853
dineSykemeldteBreadcrumb,
4954
{
50-
url: `${dineSykemeldteRoot()}/${narmestelederId}`,
55+
url: `${dineSykemeldteRoot}/${narmestelederId}`,
5156
title: sykmeldtName,
5257
},
5358
];

src/environments/publicEnv.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
export const basePath = process.env.NEXT_PUBLIC_BASEPATH;
22

3-
export const dineSykemeldteRoot = (): string => {
4-
return process.env.NEXT_PUBLIC_DINE_SYKMELDTE_URL || "";
5-
};
3+
export const minSideRoot = process.env.NEXT_PUBLIC_MIN_SIDE_ROOT as string;
4+
5+
export const dineSykemeldteRoot = process.env
6+
.NEXT_PUBLIC_DINE_SYKMELDTE_URL as string;
7+
8+
export const dittSykefravarRoot = process.env
9+
.NEXT_PUBLIC_DITT_SYKEFRAVAER_URL as string;
610

7-
export const dittSykefravarRoot = (): string => {
8-
return process.env.NEXT_PUBLIC_DITT_SYKEFRAVAER_URL || "";
9-
};
1011
export const displayTestScenarioSelector =
1112
process.env.NEXT_PUBLIC_IS_DEVELOPMENT === "true" ||
1213
process.env.NEXT_PUBLIC_RUNTIME_ENVIRONMENT === "demo";

0 commit comments

Comments
 (0)