From 62dce8b91b18d873650ee7bcdf993028d42a36c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Garseg=20M=C3=B8rk?= Date: Mon, 16 Dec 2024 20:38:00 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Sender=20ikke=20med=20fnr=20og=20navn=20n?= =?UTF-8?q?=C3=A5r=20ingen=20verdi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../steg/8-dokumentasjon/SendS\303\270knad.tsx" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" "b/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" index 28ae54297..ebb3b9f34 100644 --- "a/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" +++ "b/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" @@ -61,7 +61,7 @@ const SendSøknadKnapper: FC = () => { venter: false, }); - const skalViseNyKnapp = toggles[ToggleName.visNyInnsendingsknapp]; + const skalViseNyKnapp = toggles[ToggleName.visNyInnsendingsknapp] || true; const sendSøknadBrukFamiliePdf = async ( brukFamiliePdf: boolean = false, From e0a61bc732ee7544544b82a48b3ee5c34af424e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Garseg=20M=C3=B8rk?= Date: Mon, 16 Dec 2024 20:59:13 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Sender=20ikke=20med=20fnr=20og=20navn=20n?= =?UTF-8?q?=C3=A5r=20ingen=20verdi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/barn.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/utils/barn.ts b/src/utils/barn.ts index 5626e79c1..881aa41da 100644 --- a/src/utils/barn.ts +++ b/src/utils/barn.ts @@ -138,8 +138,12 @@ export const antallBarnMedForeldreUtfylt = (barna: IBarn[]): number => { export const oppdaterBarnLabels = (barn: IBarn[], intl: LokalIntlShape) => { const oppdaterteBarn = barn.map((barnet: any) => { const navnEllerBarn = barnetsNavnEllerBarnet(barnet, intl); - - const oppdatertBarn = { ...barnet }; + const { ident, navn, ...rest } = barnet; + const oppdatertBarn = { + ...rest, + ...(ident?.verdi ? { ident } : {}), + ...(navn?.verdi ? { navn } : {}), + }; if (oppdatertBarn?.forelder) { Object.keys(oppdatertBarn.forelder).forEach((key) => { From ce8606856b2f0782046616bb4f23b168cec7d6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Garseg=20M=C3=B8rk?= Date: Mon, 16 Dec 2024 21:00:51 +0100 Subject: [PATCH 3/3] Fjerner tvungen visning --- .../steg/8-dokumentasjon/SendS\303\270knad.tsx" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" "b/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" index ebb3b9f34..28ae54297 100644 --- "a/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" +++ "b/src/overgangsst\303\270nad/steg/8-dokumentasjon/SendS\303\270knad.tsx" @@ -61,7 +61,7 @@ const SendSøknadKnapper: FC = () => { venter: false, }); - const skalViseNyKnapp = toggles[ToggleName.visNyInnsendingsknapp] || true; + const skalViseNyKnapp = toggles[ToggleName.visNyInnsendingsknapp]; const sendSøknadBrukFamiliePdf = async ( brukFamiliePdf: boolean = false,