Merge pull request #1462 from navikt/hente-varsel-uten-proxy

Hente varsler direkte fra tms-varsel-api
navikt · Jul 5, 2023 · 45d3aae · 45d3aae
2 parents 0eb2d08 + 4822578
commit 45d3aae
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 23 deletions.
diff --git a/.env b/.env
@@ -17,3 +17,4 @@ CASETYPE_ID=66D660EF-6F14-44B4-8ADE-A70A127202D0
 NAV_GROUP_ID=A034081B-6B73-46B7-BE27-23B8E9CE3079
 OPPORTUNITY_ID=615FF5E7-37B7-4697-A35F-72598B0DC53B
 SOLUTION_ID=5EB316A1-11E2-460A-B4E3-F82DBD13E21D
+VARSEL_API_URL=http://localhost:8095/tms-varsel-api
diff --git a/.nais/vars/dev-beta-navno.yaml b/.nais/vars/dev-beta-navno.yaml
@@ -23,6 +23,8 @@ env:
     value: https://login.ekstern.dev.nav.no/oauth2/login
   - name: LOGOUT_URL
     value: https://login.ekstern.dev.nav.no/oauth2/logout
+  - name: VARSEL_API_URL
+    value: https://www.intern.dev.nav.no/tms-varsel-api
 replicas:
   min: 1
   max: 1

diff --git a/.nais/vars/dev-beta-tms.yaml b/.nais/vars/dev-beta-tms.yaml
@@ -23,6 +23,8 @@ env:
     value: https://login.ekstern.dev.nav.no/oauth2/login
   - name: LOGOUT_URL
     value: https://login.ekstern.dev.nav.no/oauth2/logout
+  - name: VARSEL_API_URL
+    value: https://www.intern.dev.nav.no/tms-varsel-api
 replicas:
   min: 1
   max: 1

diff --git a/.nais/vars/dev-stable.yaml b/.nais/vars/dev-stable.yaml
@@ -23,6 +23,8 @@ env:
     value: https://login.ekstern.dev.nav.no/oauth2/login
   - name: LOGOUT_URL
     value: https://login.ekstern.dev.nav.no/oauth2/logout
+  - name: VARSEL_API_URL
+    value: https://www.intern.dev.nav.no/tms-varsel-api
 replicas:
   min: 1
   max: 2

diff --git a/.nais/vars/prod.yaml b/.nais/vars/prod.yaml
@@ -26,6 +26,8 @@ env:
     value: https://login.nav.no/oauth2/login
   - name: LOGOUT_URL
     value: https://login.nav.no/oauth2/logout
+  - name: VARSEL_API_URL
+    value: https://www.nav.no/tms-varsel-api
 replicas:
   min: 2
   max: 8

diff --git a/src/api/api.ts b/src/api/api.ts
@@ -28,12 +28,12 @@ export const hentInnloggingsstatusFetch = (API_DEKORATOREN_URL: string): Promise
         credentials: 'include',
     });
 
-export const hentVarslerFetch = (API_DEKORATOREN_URL: string): Promise<varselinnboksData> => {
-    return fetchToJson(`${API_DEKORATOREN_URL}/varsel/proxy/varsel`, { credentials: 'include' });
+export const hentVarslerFetch = (VARSEL_API_URL: string): Promise<varselinnboksData> => {
+    return fetchToJson(`${VARSEL_API_URL}/varselbjelle/varsler`, { credentials: 'include' });
 };
 
-export const postDone = (API_DEKORATOREN_URL: string, eventId: DoneEvent) =>
-    fetch(`${API_DEKORATOREN_URL}/varsel/beskjed/done`, {
+export const postInaktiver = (VARSEL_API_URL: string, eventId: DoneEvent) =>
+    fetch(`${VARSEL_API_URL}/beskjed/inaktiver`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(eventId),

diff --git a/src/komponenter/header/Header.tsx b/src/komponenter/header/Header.tsx
@@ -59,7 +59,7 @@ export const Header = () => {
     const { language } = useSelector(stateSelector);
     const { innloggingsstatus, menypunkt } = useSelector(stateSelector);
     const { authenticated } = innloggingsstatus.data;
-    const { PARAMS, APP_URL, API_DEKORATOREN_URL, ENV } = environment;
+    const { PARAMS, APP_URL, API_DEKORATOREN_URL, ENV, VARSEL_API_URL } = environment;
     const currentFeatureToggles = useSelector(stateSelector).featureToggles;
     const breadcrumbs = PARAMS.BREADCRUMBS || [];
     const availableLanguages = PARAMS.AVAILABLE_LANGUAGES || [];
@@ -157,7 +157,7 @@ export const Header = () => {
     // Fetch notifications
     useEffect(() => {
         if (authenticated) {
-            hentVarsler(API_DEKORATOREN_URL)(dispatch);
+            hentVarsler(VARSEL_API_URL)(dispatch);
         }
     }, [authenticated]);
 

diff --git a/src/komponenter/header/header-regular/common/varsler/varsel-boks/VarselBoks.tsx b/src/komponenter/header/header-regular/common/varsler/varsel-boks/VarselBoks.tsx
@@ -3,7 +3,7 @@ import { Next } from '@navikt/ds-icons';
 import Tekst from 'tekster/finn-tekst';
 import { fjernLestVarsel } from 'store/reducers/varselinnboks-duck';
 import { useDispatch } from 'react-redux';
-import { postDone } from 'api/api';
+import { postInaktiver } from 'api/api';
 import { logAmplitudeEvent } from 'utils/analytics/amplitude';
 import ArkiverKnapp from './arkiver-knapp/ArkiverKnapp';
 import beskjedIkon from '../../../../../../ikoner/varsler/beskjedIkon.svg';
@@ -26,7 +26,7 @@ const getEksternvarslingStatus = (kanaler: string[]) => {
 
 type Props = {
     eventId: string;
-    apiVarselinnboksUrl: string;
+    VARSEL_API_URL: string;
     tekst: string;
     dato: string;
     href: string;
@@ -39,7 +39,7 @@ type Props = {
 
 const Beskjed = ({
     eventId,
-    apiVarselinnboksUrl,
+    VARSEL_API_URL,
     tekst,
     dato,
     href,
@@ -53,16 +53,16 @@ const Beskjed = ({
 
     const dispatch = useDispatch();
 
-    const isOppgave = type === 'OPPGAVE';
+    const isOppgave = type.toLowerCase() === 'oppgave';
     const isArkiverbar = !href && !isOppgave;
     const eksternVarslingStatus = getEksternvarslingStatus(eksternVarslingKanaler);
 
     const handleOnClick = () => {
-        if (type === 'BESKJED' && !isMasked) {
-            postDone(apiVarselinnboksUrl, { eventId: eventId });
+        if (type.toLowerCase() === 'beskjed' && !isMasked) {
+            postInaktiver(VARSEL_API_URL, { eventId: eventId });
             dispatch(fjernLestVarsel(eventId));
         }
-        logAmplitudeEvent('navigere', { komponent: type == "BESKJED" ? "varsel-beskjed" : "varsel-oppgave", kategori: "varselbjelle", destinasjon: href });
+        logAmplitudeEvent('navigere', { komponent: type.toLowerCase() == "beskjed" ? "varsel-beskjed" : "varsel-oppgave", kategori: "varselbjelle", destinasjon: href });
     };
 
     return isArkiverbar ? (
@@ -81,7 +81,7 @@ const Beskjed = ({
                     </div>
                     <ArkiverKnapp
                         eventId={eventId}
-                        apiVarselinnboksUrl={apiVarselinnboksUrl}
+                        VARSEL_API_URL={VARSEL_API_URL}
                         setActivateScreenReaderText={setActivateScreenReaderText}
                         id={id}
                     />

diff --git a/...mponenter/header/header-regular/common/varsler/varsel-boks/arkiver-knapp/ArkiverKnapp.tsx b/...mponenter/header/header-regular/common/varsler/varsel-boks/arkiver-knapp/ArkiverKnapp.tsx
@@ -1,4 +1,4 @@
-import { postDone } from 'api/api';
+import { postInaktiver } from 'api/api';
 import React from 'react';
 import { useDispatch } from 'react-redux';
 import { fjernLestVarsel } from 'store/reducers/varselinnboks-duck';
@@ -9,16 +9,16 @@ import Tekst from 'tekster/finn-tekst';
 
 type Props = {
     eventId: string;
-    apiVarselinnboksUrl: string;
+    VARSEL_API_URL: string;
     setActivateScreenReaderText: (setActivateScreenReaderText: boolean) => void;
     id?: string;
 };
 
-const ArkiverKnapp = ({ eventId, apiVarselinnboksUrl, setActivateScreenReaderText, id }: Props) => {
+const ArkiverKnapp = ({ eventId, VARSEL_API_URL, setActivateScreenReaderText, id }: Props) => {
     const dispatch = useDispatch();
 
     const handleOnClick = () => {
-        postDone(apiVarselinnboksUrl, { eventId: eventId });
+        postInaktiver(VARSEL_API_URL, { eventId: eventId });
         setActivateScreenReaderText(false);
         setActivateScreenReaderText(true);
         dispatch(fjernLestVarsel(eventId));

diff --git a/...mponenter/header/header-regular/common/varsler/varselvisning/varsel-liste/VarselListe.tsx b/...mponenter/header/header-regular/common/varsler/varselvisning/varsel-liste/VarselListe.tsx
@@ -35,7 +35,7 @@ export const VarselListe = ({ varsler, rowIndex }: Props) => {
     const [activateScreenReaderText, setActivateScreenReaderText] = useState(false);
     const arbeidsflate = useSelector((state: AppState) => state.arbeidsflate.status);
     const environment = useSelector((state: AppState) => state.environment);
-    const { API_DEKORATOREN_URL } = environment;
+    const { VARSEL_API_URL } = environment;
 
     const hasNoOppgaver = varsler?.oppgaver.length === 0;
     const hasNoBeskjeder = varsler?.beskjeder.length === 0;
@@ -53,7 +53,7 @@ export const VarselListe = ({ varsler, rowIndex }: Props) => {
                             <li key={o.eventId}>
                                 <VarselBoks
                                     eventId={o.eventId}
-                                    apiVarselinnboksUrl={API_DEKORATOREN_URL}
+                                    VARSEL_API_URL={VARSEL_API_URL}
                                     tekst={o.tekst}
                                     dato={formatDato(o.tidspunkt)}
                                     href={o.isMasked ? getLoginUrl(environment, arbeidsflate, 'Level4') : o.link}
@@ -86,7 +86,7 @@ export const VarselListe = ({ varsler, rowIndex }: Props) => {
                             <li key={b.eventId}>
                                 <VarselBoks
                                     eventId={b.eventId}
-                                    apiVarselinnboksUrl={API_DEKORATOREN_URL}
+                                    VARSEL_API_URL={VARSEL_API_URL}
                                     tekst={b.tekst}
                                     dato={formatDato(b.tidspunkt)}
                                     href={b.isMasked ? getLoginUrl(environment, arbeidsflate, 'Level4') : b.link}

diff --git a/src/server/utils.ts b/src/server/utils.ts
@@ -40,6 +40,7 @@ export const clientEnv = ({ req }: Props): Environment => {
         MIN_SIDE_URL: process.env.MIN_SIDE_URL as string,
         LOGIN_URL: process.env.LOGIN_URL as string,
         LOGOUT_URL: process.env.LOGOUT_URL as string,
+        VARSEL_API_URL: process.env.VARSEL_API_URL as string,
         ...(req.query && {
             PARAMS: {
                 CONTEXT: chosenContext,

diff --git a/src/store/reducers/environment-duck.ts b/src/store/reducers/environment-duck.ts
@@ -18,6 +18,7 @@ export interface Environment {
     CASETYPE_ID: string;
     SOLUTION_ID: string;
     NAV_GROUP_ID: string;
+    VARSEL_API_URL: string;
 
     // Parameters
     PARAMS: Params;
@@ -66,6 +67,7 @@ export const initialState: Environment = {
     CASETYPE_ID: '',
     SOLUTION_ID: '',
     NAV_GROUP_ID: '',
+    VARSEL_API_URL:'',
 
     // Parameters
     PARAMS: {

diff --git a/src/store/reducers/varselinnboks-duck.ts b/src/store/reducers/varselinnboks-duck.ts
@@ -64,8 +64,8 @@ export default function reducer(state: VarselinnboksState = initialState, action
     }
 }
 
-export function hentVarsler(APP_URL: string): (dispatch: Dispatch) => Promise<void> {
-    return fetchThenDispatch<VarslerData>(() => hentVarslerFetch(APP_URL), {
+export function hentVarsler(VARSEL_API_URL: string): (dispatch: Dispatch) => Promise<void> {
+    return fetchThenDispatch<VarslerData>(() => hentVarslerFetch(VARSEL_API_URL), {
         ok: hentVarslerOk,
         feilet: hentVarslerFeilet,
         pending: hentVarslerPending,