Fix etter PR

Author: betsytraran

apps/dolly-frontend/src/main/js/src/components/fagsystem/kdi/form/partials/RedigeringAnnulleringForm.tsx

@@ -34,9 +34,11 @@ export const RedigeringAnnulleringForm = ({
 				...annulleringer,
 				{ ...initialAnnullering, annullertMeldingId: meldingId },
 			])
-		} else {
-			annulleringer?.splice(index, 1)
-			formMethods.setValue('instdataKdi.annullering', annulleringer || [])
+		} else if (index >= 0) {
+			formMethods.setValue(
+				'instdataKdi.annullering',
+				annulleringer.filter((_: KdiMeldingProps, i: number) => i !== index),
+			)
 		}
 	}
 

apps/dolly-frontend/src/main/js/src/components/fagsystem/kdi/utils.tsx

@@ -1,4 +1,4 @@
-export const getTidspunktLabel = (meldingstype: string) => {
+export const getTidspunktLabel = (meldingstype?: string) => {
 	switch (meldingstype) {
 		case 'innsettelse':
 			return 'Innsettelsestidspunkt'

apps/dolly-frontend/src/main/js/src/components/fagsystem/kdi/visning/KdiVisning.tsx

@@ -19,11 +19,11 @@ import { KdiMeldingProps, KdiProps } from '@/components/fagsystem/kdi/form/parti
 type KdiMeldingVisningProps = {
 	melding: KdiMeldingProps
 	id: number
-	annulleringListe: Array<KdiMeldingProps>
+	annulleringListe?: Array<KdiMeldingProps>
 }
 
 type KdiVisningProps = {
-	data: KdiProps
+	data?: KdiProps
 	loading: boolean
 	harKdiBestilling: boolean
 }
@@ -101,9 +101,9 @@ export const KdiVisning = ({ data, loading, harKdiBestilling }: KdiVisningProps)
 		return <Loading label="Laster KDI-meldinger ..." />
 	}
 
-	const annullering = data.annullering
+	const annullering = data?.annullering ?? []
 
-	const meldinger = Object.entries(data)
+	const meldinger = Object.entries(data ?? {})
 		.flatMap(([type, values]) => values?.map((melding) => ({ ...melding, type })))
 		?.filter((melding) => melding && melding.type !== 'annullering')
 		?.sort(

apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonVisning/PersonVisning.tsx

@@ -730,8 +730,6 @@ const PersonVisning = (props: PersonVisningProps) => {
 					data={kdiData}
 					loading={loadingKdiData}
 					harKdiBestilling={harKdiBestilling(bestillingerFagsystemer)}
-					bestillingIdListe={bestillingIdListe}
-					tilgjengeligMiljoe={tilgjengeligMiljoe}
 				/>
 				<KrrVisning data={krrstub} loading={loading.krrstub} />
 				<MedlVisning data={medl} timedOutFagsystemer={timedOutFagsystemer} />

apps/dolly-frontend/src/main/js/src/utils/hooks/useInstitusjon.tsx

@@ -45,7 +45,9 @@ export const useKdiData = (ident: string, harKdiBestilling: boolean) => {
 }
 
 export const useFengsel = () => {
-	const { data, isLoading, error } = useSWR<any, Error>(fengselUrl, postFetcher)
+	const { data, isLoading, error } = useSWR<any, Error>(fengselUrl, (url: string) =>
+		postFetcher(url, {}),
+	)
 
 	return {
 		fengsler: data,