From 07679f7bc4bf03b2a555f0b05baf175e88b59b4e Mon Sep 17 00:00:00 2001 From: Jesper Paulsen Date: Mon, 4 Dec 2023 14:41:33 +0100 Subject: [PATCH] [KAIZEN-0] Fjerne fnr fra path i tilgangskontroll resource --- src/rest/resources/tilgangskontrollResource.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/rest/resources/tilgangskontrollResource.tsx b/src/rest/resources/tilgangskontrollResource.tsx index eb53485e6..b04edd9e1 100644 --- a/src/rest/resources/tilgangskontrollResource.tsx +++ b/src/rest/resources/tilgangskontrollResource.tsx @@ -6,8 +6,10 @@ import { BigCenteredLazySpinner } from '../../components/BigCenteredLazySpinner' import FillCenterAndFadeIn from '../../components/FillCenterAndFadeIn'; import { useGjeldendeBruker } from '../../redux/gjeldendeBruker/types'; import { useQuery, UseQueryResult } from '@tanstack/react-query'; -import { FetchError, get } from '../../api/api'; +import { FetchError, get, post } from '../../api/api'; import { useValgtenhet } from '../../context/valgtenhet-state'; +import useFeatureToggle from '../../components/featureToggle/useFeatureToggle'; +import { FeatureToggles } from '../../components/featureToggle/toggleIDs'; const defaults: DefaultConfig = { ifPending: BigCenteredLazySpinner, @@ -49,11 +51,17 @@ function url(fnr: string | undefined, enhet: string | undefined) { return `${apiBaseUri}/tilgang${params}`; } +function urlV2(enhet: string | undefined) { + const params = enhet ? `?enhet=${enhet}` : ''; + return `${apiBaseUri}/tilgang${params}`; +} + const resource = { useFetch(): UseQueryResult { const fnr = useGjeldendeBruker(); const enhet = useValgtenhet().enhetId; - return useQuery(queryKey(fnr), () => get(url(fnr, enhet))); + const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); + return useQuery(queryKey(fnr), () => (isOn ? post(urlV2(enhet), fnr) : get(url(fnr, enhet)))); }, useRenderer(renderer: RendererOrConfig) { const response = this.useFetch();