From ab062e3de10dbaa397a2e020f6bfe53deb1474fd Mon Sep 17 00:00:00 2001 From: Markus Johansen Date: Thu, 3 Aug 2023 15:13:13 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Notatlapper=20er=20persistente=20p?= =?UTF-8?q?=C3=A5=20frontend=20feilkort?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sindre Kjelsrud --- frontend/src/components/FeilKort.tsx | 1 + frontend/src/components/FeilkortHeader.tsx | 1 - frontend/src/components/FeilmeldingsInnhold.tsx | 6 ++++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/FeilKort.tsx b/frontend/src/components/FeilKort.tsx index 4059d68..b41f587 100644 --- a/frontend/src/components/FeilKort.tsx +++ b/frontend/src/components/FeilKort.tsx @@ -74,6 +74,7 @@ const FeilKort = (props: IFeilKort) => { setVisModal={setVisModal} setRedigeringsmodus={setRedigeringsmodus} reset={props.reset} + kommentar={props.kommentar} >

Her kommer det content

diff --git a/frontend/src/components/FeilkortHeader.tsx b/frontend/src/components/FeilkortHeader.tsx index 5b70344..08e1caf 100644 --- a/frontend/src/components/FeilkortHeader.tsx +++ b/frontend/src/components/FeilkortHeader.tsx @@ -21,7 +21,6 @@ export const FeilkortHeader = (props: IFeilmelding) => {

{props.beskrivelse}

-

{props.kommentar}

) } diff --git a/frontend/src/components/FeilmeldingsInnhold.tsx b/frontend/src/components/FeilmeldingsInnhold.tsx index 8309f1a..af57182 100644 --- a/frontend/src/components/FeilmeldingsInnhold.tsx +++ b/frontend/src/components/FeilmeldingsInnhold.tsx @@ -7,7 +7,7 @@ import Skillelinje from "./Skillelinje" import axios from "axios" const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => { - const [kommentar, setKommentar] = useState(props.kommentar ? props.kommentar : "") + const [kommentar, setKommentar] = useState(props.kommentar != (null || undefined) ? props.kommentar : "") const [kommentarfelt, setKommentarfelt] = useState("") const oppdaterkommentar = async() => { @@ -42,7 +42,9 @@ const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => { beskrivelse={props.beskrivelse} dato={props.dato} haster={props.haster} - arbeidsstatus={props.arbeidsstatus} /> + arbeidsstatus={props.arbeidsstatus} + kommentar={props.kommentar} + />