Skip to content

Commit faac3d2

Browse files
committed
Sørg for at landData er definert før det brukes
1 parent 914111c commit faac3d2

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

skribenten-web/frontend/src/components/OppsummeringAvMottaker.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const OppsummeringAvMottaker = (props: { saksId: string; mottaker: Nullable<Mott
3232
</BodyShort>
3333
)}
3434
{props.mottaker.type === "UtenlandskAdresse" && (
35-
<BodyShort size="small">{getCountryNameByKode(props.mottaker.landkode, landData)}</BodyShort>
35+
<BodyShort size="small">{getCountryNameByKode(props.mottaker.landkode, landData || [])}</BodyShort>
3636
)}
3737
</VStack>
3838
);

skribenten-web/frontend/src/routes/saksnummer_/$saksId/brevvelger/-components/endreMottaker/OppsummeringAvValgtMottaker.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const OppsummeringAvAdresse = (properties: { type: Nullable<string>; adresse: Ad
8989
<InversedTableRow label="Adresselinje 3" value={properties.adresse.linje3} />
9090
<InversedTableRow label="Postnummer" value={properties.adresse.postnr} />
9191
<InversedTableRow label="Poststed" value={properties.adresse.poststed} />
92-
<InversedTableRow label="Land" value={getCountryNameByKode(properties.adresse.land, landData)} />
92+
<InversedTableRow label="Land" value={getCountryNameByKode(properties.adresse.land, landData || [])} />
9393
</Table.Body>
9494
</Table>
9595
);

skribenten-web/frontend/src/utils/countryUtils.ts

+11-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ type Land = {
77
/**
88
* Hent landnavn basert på landkode
99
*/
10-
export const getCountryNameByKode = (kode: Nullable<string>, landData: Land[] | undefined): Nullable<string> => {
11-
const country = landData?.find((land) => land.kode === kode);
12-
return country ? country.navn : kode;
10+
export const getCountryNameByKode = (kode: Nullable<string>, landData: Land[]): string => {
11+
if (!Array.isArray(landData)) {
12+
return kode || "";
13+
}
14+
15+
if (landData) {
16+
const country = landData.find((land) => land.kode === kode);
17+
return country ? country.navn : kode || "";
18+
}
19+
20+
return kode || "";
1321
};

0 commit comments

Comments
 (0)