From d07eec7fe477b210f0aee8bed008c883f1bd155d Mon Sep 17 00:00:00 2001
From: ramziabuqassim <ramzi.abu.qassim@nav.no>
Date: Mon, 26 Aug 2024 10:18:16 +0200
Subject: [PATCH] =?UTF-8?q?klage=20utfall=20har=20ogs=C3=A5=20felt=20for?=
 =?UTF-8?q?=20n=C3=A5r=20klageinstans=20mottok=20klagen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OppsummeringAvKlage.tsx                   | 31 +++++++++----------
 .../oppsummeringAvKlage.module.less           |  6 ----
 src/types/Klage.ts                            |  1 +
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/components/oppsummering/oppsummeringAvKlage/OppsummeringAvKlage.tsx b/src/components/oppsummering/oppsummeringAvKlage/OppsummeringAvKlage.tsx
index a1c5477f4..529da9daf 100644
--- a/src/components/oppsummering/oppsummeringAvKlage/OppsummeringAvKlage.tsx
+++ b/src/components/oppsummering/oppsummeringAvKlage/OppsummeringAvKlage.tsx
@@ -1,5 +1,5 @@
 import * as RemoteData from '@devexperts/remote-data-ts';
-import { BodyShort, Label, Heading, Button, Tag } from '@navikt/ds-react';
+import { BodyShort, Label, Heading, Button, VStack } from '@navikt/ds-react';
 import classNames from 'classnames';
 
 import * as DokumentApi from '~src/api/dokumentApi';
@@ -73,14 +73,19 @@ const OppsummeringAvKlage = (props: { klage: Klage; klagensVedtak: Vedtak }) =>
                         <Heading size="xsmall" level="6">
                             Utfallshistorikk
                         </Heading>
-                        {props.klage.klagevedtakshistorikk.map((vedtattUtfall, idx) => (
-                            <div key={`${props.klage.id} - ${idx}`}>
-                                <BodyShort>
-                                    {vedtattUtfall.utfall ?? 'Anke'} -{' '}
-                                    {DateUtils.formatDateTime(vedtattUtfall.opprettet)}
-                                </BodyShort>
-                            </div>
-                        ))}
+                        <VStack gap="2">
+                            {props.klage.klagevedtakshistorikk.map((vedtattUtfall, idx) => (
+                                <div key={`${props.klage.id} - ${idx}`}>
+                                    <BodyShort>{vedtattUtfall.utfall ?? 'Anke'}</BodyShort>
+                                    {vedtattUtfall.klageinstansMottok && (
+                                        <BodyShort>
+                                            Klageinstans mottok klagen:{' '}
+                                            {DateUtils.formatDateTime(vedtattUtfall.klageinstansMottok)}
+                                        </BodyShort>
+                                    )}
+                                </div>
+                            ))}
+                        </VStack>
                     </div>
                 )}
 
@@ -187,14 +192,6 @@ export const FormkravInfo = (props: { klage: Klage; klagensVedtak: Vedtak }) =>
                 />
             </div>
 
-            <div className={styles.klagevedtakshistorikkContainer}>
-                {props.klage.klagevedtakshistorikk.map((vedtattUtfall) => (
-                    <Tag key={vedtattUtfall.opprettet} variant="info">
-                        {vedtattUtfall.utfall} - {DateUtils.formatDateTime(vedtattUtfall.opprettet)}
-                    </Tag>
-                ))}
-            </div>
-
             {props.klage.begrunnelse && (
                 <OppsummeringPar
                     label={formatMessage('formkrav.begrunnelse.label')}
diff --git a/src/components/oppsummering/oppsummeringAvKlage/oppsummeringAvKlage.module.less b/src/components/oppsummering/oppsummeringAvKlage/oppsummeringAvKlage.module.less
index 75aac00ed..ec4942390 100644
--- a/src/components/oppsummering/oppsummeringAvKlage/oppsummeringAvKlage.module.less
+++ b/src/components/oppsummering/oppsummeringAvKlage/oppsummeringAvKlage.module.less
@@ -29,12 +29,6 @@
     grid-template-columns: repeat(5, 1fr);
 }
 
-.klagevedtakshistorikkContainer {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: @spacing-s;
-}
-
 .formkravBegrunnelse {
     white-space: pre-wrap;
 }
diff --git a/src/types/Klage.ts b/src/types/Klage.ts
index 895039955..63b68b020 100644
--- a/src/types/Klage.ts
+++ b/src/types/Klage.ts
@@ -129,6 +129,7 @@ export enum Utfall {
 export interface VedtattUtfall {
     utfall: Nullable<Utfall>;
     opprettet: string;
+    klageinstansMottok: Nullable<string>;
 }
 
 export enum KlageSteg {