Merge pull request #4247 from navikt/feature/kdi-institusjonsopphold-frontend

Feature/kdi institusjonsopphold frontend

Author: betsytraran

apps/dolly-frontend/src/main/js/src/api/index.ts

@@ -35,6 +35,22 @@ export const multiFetcherInst = (miljoUrlListe, headers = null, path = null) =>
 		),
 	)
 
+export const postFetcher = (url, body) =>
+	axios
+		.post(url, body, { headers: { 'Content-Type': 'application/json' } })
+		.then((res) => {
+			if (res.status === 404) {
+				return null
+			}
+			return res.data
+		})
+		.catch((reason) => {
+			if (reason.code === 'ECONNABORTED' || reason.message?.includes('timeout')) {
+				throw new Error(`Tjenesten tok for lang tid å svare: ${url}`)
+			}
+			throw new Error(`Henting av data fra ${url} feilet.`)
+		})
+
 export const multiFetcherArena = (miljoUrlListe, headers = null) =>
 	Promise.all(
 		miljoUrlListe?.map((obj) =>

apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/bestillingsdata/Bestillingsdata.tsx

@@ -58,6 +58,7 @@ import { AlderspensjonNyUttaksgrad } from '@/components/fagsystem/alderspensjon/
 import { SigrunstubSummertSkattegrunnlag } from '@/components/fagsystem/sigrunstubSummertSkattegrunnlag/bestilling/SigrunstubSummertSkattegrunnlag'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { KelvinAap } from '@/components/fagsystem/kelvin/bestilling/KelvinAap'
+import { KdiBestilling } from '@/components/fagsystem/kdi/bestilling/KdiBestilling'
 
 type BestillingsdataTypes = {
 	bestilling: any
@@ -138,6 +139,7 @@ export const Bestillingsdata = ({ bestilling, erGruppevisning = false }: Bestill
 				kontaktinformasjonForDoedsboListe={bestilling.pdldata?.person?.kontaktinformasjonForDoedsbo}
 			/>
 			<Inst inst={bestilling.instdata} />
+			<KdiBestilling kdi={bestilling.instdataKdi} />
 			<Krrstub krrstub={bestilling.krrstub} />
 			<Medl medl={bestilling.medl} />
 			<Udistub udistub={bestilling.udistub} />

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Institusjonsopphold.tsx

@@ -9,48 +9,77 @@ import {
 } from '@/components/bestillingsveileder/BestillingsveilederContext'
 import { useContext } from 'react'
 import { getTimeoutAttr } from '@/components/bestillingsveileder/utils/timeoutTitle'
+import {
+	initialKdi,
+	initialKdiTesting,
+	instdataKdiAttributt,
+} from '@/components/fagsystem/kdi/initialValues'
 
 export const InstitusjonsoppholdPanel = ({ stateModifier, formValues }: any) => {
 	const sm = stateModifier(InstitusjonsoppholdPanel.initialValues)
 	const opts: any = useContext(BestillingsveilederContext) as BestillingsveilederContextType
 	const instTimeout = getTimeoutAttr('INST', opts)
+	const kdiTimeout = getTimeoutAttr('INST_KDI', opts)
+
 	return (
 		<Panel
 			heading={InstitusjonsoppholdPanel.heading}
 			checkAttributeArray={sm.batchAdd as any}
 			uncheckAttributeArray={sm.batchRemove as any}
 			iconType="institusjon"
-			startOpen={harValgtAttributt(formValues, [instAttributt])}
+			startOpen={harValgtAttributt(formValues, [instAttributt, instdataKdiAttributt])}
 		>
 			<AttributtKategori attr={sm.attrs}>
 				<Attributt
 					attr={sm.attrs.instdata}
 					disabled={instTimeout.disabled}
 					title={instTimeout.title}
 				/>
+				<Attributt
+					attr={sm.attrs.instdataKdi}
+					disabled={kdiTimeout.disabled}
+					title={kdiTimeout.title}
+				/>
 			</AttributtKategori>
 		</Panel>
 	)
 }
 
 InstitusjonsoppholdPanel.heading = 'Institusjonsopphold'
 
-InstitusjonsoppholdPanel.initialValues = ({ set, del, has }: any) => ({
-	instdata: {
-		label: 'Har institusjonsopphold',
-		checked: has('instdata'),
-		add() {
-			set('instdata', [
-				{
-					institusjonstype: runningE2ETest() ? 'AS' : '',
-					startdato: runningE2ETest() ? new Date() : '',
-					forventetSluttdato: '',
-					sluttdato: '',
-				},
-			])
+InstitusjonsoppholdPanel.initialValues = ({ set, opts, del, has }: any) => {
+	const eksisterendeKdiData = opts?.personFoerLeggTil?.instdataKdi
+
+	return {
+		instdata: {
+			label: 'Institusjonsopphold',
+			checked: has('instdata'),
+			add() {
+				set('instdata', [
+					{
+						institusjonstype: runningE2ETest() ? 'AS' : '',
+						startdato: runningE2ETest() ? new Date() : '',
+						forventetSluttdato: '',
+						sluttdato: '',
+					},
+				])
+			},
+			remove() {
+				del('instdata')
+			},
 		},
-		remove() {
-			del('instdata')
+		instdataKdi: {
+			label: 'KDI-meldinger',
+			checked: has('instdataKdi'),
+			add() {
+				set(
+					'instdataKdi',
+					runningE2ETest() ? initialKdiTesting : (eksisterendeKdiData ?? initialKdi),
+				)
+			},
+			remove() {
+				del('instdataKdi')
+			},
 		},
-	},
-})
+	}
+}

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/DollyIdentValidation.tsx

@@ -28,6 +28,7 @@ import { validation as sykdomValidation } from '@/components/fagsystem/sykdom/fo
 import { validation as pdlfValidation } from '@/components/fagsystem/pdlf/form/validation/validation'
 import BankkontoForm from '@/components/fagsystem/bankkonto/form/Form'
 import { KelvinAapForm } from '@/components/fagsystem/kelvin/form/Form'
+import { KdiForm } from '@/components/fagsystem/kdi/form/Form'
 
 export const DollyIdentValidation = Yup.object({
 	antall: ifPresent(
@@ -53,6 +54,7 @@ export const DollyIdentValidation = Yup.object({
 	...YrkesskaderForm.validation,
 	...BrregstubForm.validation,
 	...InstForm.validation,
+	...KdiForm.validation,
 	...KrrstubForm.validation,
 	...MedlForm.validation,
 	...KelvinAapForm.validation,

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg2/Steg2.tsx

@@ -48,6 +48,7 @@ import {
 } from '@/components/fagsystem/alderspensjon/form/AlderspensjonNyUttaksgradForm'
 import BankkontoForm from '@/components/fagsystem/bankkonto/form/Form'
 import { KelvinAapForm } from '@/components/fagsystem/kelvin/form/Form'
+import { KdiForm } from '@/components/fagsystem/kdi/form/Form'
 
 const HistarkForm = lazy(() => import('@/components/fagsystem/histark/form/HistarkForm'))
 const DokarkivForm = lazy(() => import('@/components/fagsystem/dokarkiv/form/DokarkivForm'))
@@ -113,6 +114,7 @@ const Steg2: React.FC = () => {
 			{getValues('bankkonto') && <BankkontoForm />}
 			{getValues('brregstub') && <BrregstubForm />}
 			{getValues('instdata') && <InstForm />}
+			{getValues('instdataKdi') && <KdiForm />}
 			{getValues('krrstub') && <KrrstubForm />}
 			{getValues('medl') && <MedlForm />}
 			{getValues('udistub') && <UdistubForm />}

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/Steg3.tsx

@@ -46,7 +46,7 @@ const Steg3 = ({ loadingBestilling }: { loadingBestilling: boolean }) => {
 			(values.pensjonforvalter && values.sykemelding)
 		) {
 			return ['q1', 'q2']
-		} else if (values.pensjonforvalter) {
+		} else if (values.pensjonforvalter || values.instdataKdi) {
 			return ['q2']
 		} else if (values.sykemelding) {
 			return ['q1']

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

@@ -69,6 +69,7 @@ export const rootPaths = [
 	'pensjonforvalter',
 	'inntektstub',
 	'instdata',
+	'instdataKdi',
 	'krrstub',
 	'kelvinAap',
 	'arenaforvalter',

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils/timeoutTitle.ts

@@ -11,6 +11,7 @@ const names: Record<string, string> = {
 	YRKESSKADE: 'Yrkesskade',
 	BRREG: 'Brreg',
 	INST: 'Institusjonsopphold',
+	INST_KDI: 'KDI',
 	ARBEIDSPLASSENCV: 'Nav CV',
 }
 

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

@@ -0,0 +1,37 @@
+import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
+import React from 'react'
+import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
+import { BestillingTitle } from '@/components/bestillingsveileder/stegVelger/steg/steg3/Bestillingsvisning'
+import { KdiMelding } from '@/components/fagsystem/kdi/visning/KdiVisning'
+import { publiseringstidspunktTid } from '@/components/fagsystem/kdi/form/Form'
+import { KdiMeldingProps, KdiProps } from '@/components/fagsystem/kdi/form/partials/types'
+
+export const KdiBestilling = ({ kdi }: { kdi: KdiProps }) => {
+	if (!kdi) {
+		return null
+	}
+
+	const annullering = kdi.annullering
+
+	const meldinger = Object.entries(kdi)
+		.flatMap(([type, values]) => values?.map((melding) => ({ ...melding, type })))
+		?.filter((melding) => melding && melding.type !== 'annullering')
+		?.sort(
+			(a, b) =>
+				publiseringstidspunktTid(a.publiseringstidspunkt) -
+				publiseringstidspunktTid(b.publiseringstidspunkt),
+		)
+
+	return (
+		<div className="bestilling-visning">
+			<ErrorBoundary>
+				<BestillingTitle>KDI-meldinger</BestillingTitle>
+				<DollyFieldArray data={meldinger} nested>
+					{(melding: KdiMeldingProps, idx: number) => (
+						<KdiMelding melding={melding} id={idx} annulleringListe={annullering} />
+					)}
+				</DollyFieldArray>
+			</ErrorBoundary>
+		</div>
+	)
+}