Skip to content

Commit dea9bd2

Browse files
authored
Fix environment variables (#219)
* Fix environment variables
1 parent 4ada721 commit dea9bd2

File tree

7 files changed

+8
-23
lines changed

7 files changed

+8
-23
lines changed

.env

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NEXT_PUBLIC_BASEPATH=/syk/oppfolgingsplaner

.env.development

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
MOCK_BACKEND=true
22
DECORATOR_ENV=dev
33
NEXT_PUBLIC_IS_DEVELOPMENT=true
4+
NEXT_PUBLIC_DITT_SYKEFRAVAER_URL=https://www.nav.no/syk/sykefravaer
5+
NEXT_PUBLIC_DINE_SYKMELDTE_URL=https://www.nav.no/arbeidsgiver/sykmeldte

nais/envs/.env.demo

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
NEXT_PUBLIC_BASE_PATH=/syk/oppfolgingsplaner
21
NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
32
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=demo
43
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.ekstern.dev.nav.no/collect

nais/envs/.env.dev

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
NEXT_PUBLIC_BASE_PATH=/syk/oppfolgingsplaner
21
NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
32
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=dev
43
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.ekstern.dev.nav.no/collect

nais/envs/.env.prod

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
NEXT_PUBLIC_BASE_PATH=/syk/oppfolgingsplaner
21
NEXT_PUBLIC_ASSET_PREFIX=https://cdn.nav.no/team-esyfo/oppfolgingsplan-frontend
32
NEXT_PUBLIC_RUNTIME_ENVIRONMENT=prod
43
NEXT_PUBLIC_TELEMETRY_URL=https://telemetry.nav.no/collect

package-lock.json

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/environments/publicEnv.ts

+2-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
export const basePath = process.env.NEXT_PUBLIC_BASEPATH;
22

3-
const devOrigin = "https://www-gcp.dev.nav.no";
4-
const demoOrigin = "https://demo.ekstern.dev.nav.no";
5-
6-
export const isDemo = () => {
7-
if (typeof window !== "undefined") {
8-
return window.location.origin === demoOrigin;
9-
}
10-
11-
return process.env.RUNTIME_ENVIRONMENT === "demo";
12-
};
13-
14-
export const isDev = () => {
15-
if (typeof window !== "undefined") {
16-
return window.location.origin === devOrigin;
17-
}
18-
19-
return process.env.RUNTIME_ENVIRONMENT === "dev";
20-
};
21-
223
export const dineSykemeldteRoot = (): string => {
234
return process.env.NEXT_PUBLIC_DINE_SYKMELDTE_URL || "";
245
};
@@ -27,7 +8,8 @@ export const dittSykefravarRoot = (): string => {
278
return process.env.NEXT_PUBLIC_DITT_SYKEFRAVAER_URL || "";
289
};
2910
export const displayTestScenarioSelector =
30-
process.env.NEXT_PUBLIC_IS_DEVELOPMENT === "true" || isDemo();
11+
process.env.NEXT_PUBLIC_IS_DEVELOPMENT === "true" ||
12+
process.env.NEXT_PUBLIC_RUNTIME_ENVIRONMENT === "demo";
3113

3214
export const cdnPublicPath: string | undefined = process.env
3315
.NEXT_PUBLIC_ASSET_PREFIX

0 commit comments

Comments
 (0)