From 634325163ad29495dfd04e4ec4103d29e2f28b69 Mon Sep 17 00:00:00 2001 From: Sven Anders Robbestad Date: Fri, 11 Dec 2020 11:46:12 +0100 Subject: [PATCH] mer timeout --- frontend/src/tilstand/moduler/meg.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/tilstand/moduler/meg.ts b/frontend/src/tilstand/moduler/meg.ts index 3fb79884c..c29eb52b5 100644 --- a/frontend/src/tilstand/moduler/meg.ts +++ b/frontend/src/tilstand/moduler/meg.ts @@ -2,7 +2,15 @@ import { createAction, createSlice, PayloadAction } from "@reduxjs/toolkit"; import { RootStateOrAny } from "react-redux"; import { ActionsObservable, ofType, StateObservable } from "redux-observable"; import { concat, from, of } from "rxjs"; -import { catchError, concatAll, map, mergeMap, retryWhen, withLatestFrom } from "rxjs/operators"; +import { + catchError, + concatAll, + map, + mergeMap, + retryWhen, + timeout, + withLatestFrom, +} from "rxjs/operators"; import { provIgjenStrategi } from "../../utility/rxUtils"; import { AjaxCreationMethod, AjaxObservable } from "rxjs/internal-compatibility"; import { oppgaveHentingFeilet as oppgaveFeiletHandling } from "./oppgave"; @@ -108,6 +116,7 @@ export function hentMegEpos( mergeMap(([action, state]) => { return getJSON(megUrl) .pipe( + timeout(5000), map((response: Graphdata) => { return { fornavn: response.givenName, @@ -121,6 +130,7 @@ export function hentMegEpos( .pipe( map((graphData) => { return getJSON<[EnhetData]>(`/api/ansatte/${graphData.id}/enheter`).pipe( + timeout(5000), map((response: [EnhetData]) => { return concat([ >response,