From 8b16725760f4aa3fa189195093164c481d29407f Mon Sep 17 00:00:00 2001 From: Amirhossien Lotfi Date: Fri, 9 Aug 2024 07:01:38 +0200 Subject: [PATCH 1/2] Legge app bakk ansatt url i dev --- nais/dev-gcp/nais.yaml | 1 + src/api/urls.ts | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nais/dev-gcp/nais.yaml b/nais/dev-gcp/nais.yaml index 24e35df..9e5ac5c 100644 --- a/nais/dev-gcp/nais.yaml +++ b/nais/dev-gcp/nais.yaml @@ -24,6 +24,7 @@ spec: max: 4 ingresses: - "https://www.intern.dev.nav.no/tms-tidligere-varsler-mikrofrontend" + - "https://www.ansatt.dev.nav.no/tms-tidligere-varsler-mikrofrontend" resources: limits: cpu: "3" diff --git a/src/api/urls.ts b/src/api/urls.ts index 2fe503e..a9a4a53 100644 --- a/src/api/urls.ts +++ b/src/api/urls.ts @@ -1,5 +1,5 @@ const isProduction = window.location.href.includes("www.nav.no"); -const isDevelopment = window.location.href.includes("www.intern.dev.nav.no"); +const isDevelopment = window.location.href.includes("www.intern.dev.nav.no") || window.location.href.includes("www.ansatt.dev.nav.no"); export const getEnvironment = () => { if (isDevelopment) { @@ -15,13 +15,13 @@ export const getEnvironment = () => { const TMS_VARSEL_API = { local: "http://localhost:3000/api/tms-varsel-api", - development: "https://www.intern.dev.nav.no/tms-varsel-api", + development: `${window.location.origin}/tms-varsel-api`, production: "https://www.nav.no/tms-varsel-api", }; const MIN_SIDE_URL = { local: "http://localhost:3000/minside", - development: "https://www.intern.dev.nav.no/minside", + development: `${window.location.origin}/minside`, production: "https://www.nav.no/minside", }; From 8e9a2cf5c2ecf5dd79d8fdfbadefe497f2cc08a8 Mon Sep 17 00:00:00 2001 From: Amirhossien Lotfi Date: Fri, 9 Aug 2024 07:02:51 +0200 Subject: [PATCH 2/2] fjerne urbukt kode --- src/api/urls.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/urls.ts b/src/api/urls.ts index a9a4a53..72ca34b 100644 --- a/src/api/urls.ts +++ b/src/api/urls.ts @@ -1,5 +1,6 @@ const isProduction = window.location.href.includes("www.nav.no"); -const isDevelopment = window.location.href.includes("www.intern.dev.nav.no") || window.location.href.includes("www.ansatt.dev.nav.no"); +const isDevelopment = + window.location.href.includes("www.intern.dev.nav.no") || window.location.href.includes("www.ansatt.dev.nav.no"); export const getEnvironment = () => { if (isDevelopment) { @@ -28,4 +29,3 @@ const MIN_SIDE_URL = { const tmsVarselAPI = TMS_VARSEL_API[getEnvironment()]; export const minSideUrl = MIN_SIDE_URL[getEnvironment()]; export const inaktiveVarslerApiUrl = `${tmsVarselAPI}/inaktive`; -export const tidligereVarslerUrl = `${minSideUrl}/varslinger`;