From d66205e7de7ca801d655f08d3606cd640c1ca4bd Mon Sep 17 00:00:00 2001 From: Jesper Paulsen Date: Fri, 1 Dec 2023 11:52:43 +0100 Subject: [PATCH] [KAIZEN-0] Fjerne fnr fra sakstema requests --- src/rest/resources/sakstemaResource.tsx | 34 ++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/rest/resources/sakstemaResource.tsx b/src/rest/resources/sakstemaResource.tsx index 1ddb33e3c4..37991e79a4 100644 --- a/src/rest/resources/sakstemaResource.tsx +++ b/src/rest/resources/sakstemaResource.tsx @@ -8,7 +8,9 @@ import { useSelector } from 'react-redux'; import { AppState } from '../../redux/reducers'; import { useValgtenhet } from '../../context/valgtenhet-state'; import { useQuery, UseQueryResult } from '@tanstack/react-query'; -import { FetchError, get } from '../../api/api'; +import { FetchError, get, post } from '../../api/api'; +import useFeatureToggle from '../../components/featureToggle/useFeatureToggle'; +import { FeatureToggles } from '../../components/featureToggle/toggleIDs'; const defaults: DefaultConfig = { ifPending: , @@ -32,6 +34,16 @@ function urlV2(fnr: string, enhet?: string) { return `${apiBaseUri}/saker/${fnr}/v2/sakstema${header}`; } +function urlUtenFnrIPath(enhet?: string) { + const header = enhet ? `?enhet=${enhet}` : ''; + return `${apiBaseUri}/saker/sakstema/${header}`; +} + +function urlUtenFnrIPathV2(enhet?: string) { + const header = enhet ? `?enhet=${enhet}` : ''; + return `${apiBaseUri}/saker/v2/sakstema/${header}`; +} + function useFnrEnhet(): [string, string | undefined] { const fnr = useSelector((state: AppState) => state.gjeldendeBruker.fødselsnummer); const enhet = useValgtenhet().enhetId; @@ -41,7 +53,15 @@ function useFnrEnhet(): [string, string | undefined] { const resource = { useFetch(): UseQueryResult { const [fnr, enhet] = useFnrEnhet(); - return useQuery(queryKey(fnr, enhet), () => get(url(fnr, enhet))); + const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); + + let fetchFn = () => get(url(fnr, enhet)); + + if (isOn) { + fetchFn = () => post(urlUtenFnrIPath(enhet), { fnr }); + } + + return useQuery(queryKey(fnr, enhet), fetchFn); }, useRenderer(renderer: RendererOrConfig) { const response = this.useFetch(); @@ -52,7 +72,15 @@ const resource = { export const sakstemaResourceV2 = { useFetch(): UseQueryResult { const [fnr, enhet] = useFnrEnhet(); - return useQuery(queryKeyV2(fnr, enhet), () => get(urlV2(fnr, enhet))); + const { isOn } = useFeatureToggle(FeatureToggles.IkkeFnrIPath); + + let fetchFn = () => get(url(fnr, enhet)); + + if (isOn) { + fetchFn = () => post(urlUtenFnrIPathV2(enhet), { fnr }); + } + + return useQuery(queryKey(fnr, enhet), fetchFn); }, useRenderer(renderer: RendererOrConfig) { const response = this.useFetch();