From efad2c5cdaee47cee42eb73f0c66de19255f3c4b Mon Sep 17 00:00:00 2001
From: "Markus A. R. Johansen" <90006516+J0hans1@users.noreply.github.com>
Date: Thu, 3 Aug 2023 08:48:16 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20Saker=20som=20meldes=20inn=20ka?=
 =?UTF-8?q?n=20merkes=20som=20haster=20fra=20innmelding=20(#24)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sid <93219711+SindreKjelsrud@users.noreply.github.com>
---
 frontend/src/pages/feil.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx
index f962b90..28f09f4 100644
--- a/frontend/src/pages/feil.tsx
+++ b/frontend/src/pages/feil.tsx
@@ -1,7 +1,7 @@
 import "@navikt/ds-css";
 
 import { ArrowLeftIcon, BugIcon } from "@navikt/aksel-icons";
-import { Alert, Button, Heading, TextField, Textarea } from "@navikt/ds-react";
+import { Alert, Button, Heading, Switch, TextField, Textarea } from "@navikt/ds-react";
 import axios from "axios";
 import { useState } from "react";
 import BildeOpplastning from "../components/BildeOpplastning";
@@ -13,7 +13,7 @@ export default function Feil() {
     const [tittel, setTittel] = useState("");
     const [beskrivelse, setBeskrivelse] = useState("");
     const [status, setStatus] = useState(0)
-    //const [haster, setHaster] = useState(false)
+    const [haster, setHaster] = useState(false)
 
     const handleSubmit = () => {
 
@@ -23,8 +23,8 @@ export default function Feil() {
             beskrivelse: beskrivelse,
             dato: new Date().toISOString().replace('Z', ''), // Litt wack fix, burde endres
             arbeidsstatus: 0,
-            haster: false,
-            kommentar: ""
+            haster: haster,
+            kommentar: null
         }
         
         axios.post("/api/nyfeil", payload, {
@@ -88,8 +88,15 @@ export default function Feil() {
                         />
                         <Skillelinje/>
                         <BildeOpplastning/>
+                        <Switch 
+                            onClick={() => setHaster(!haster)}
+                        >
+                            Saken Haster
+                        </Switch>
                         <Skillelinje/>
                     </div>
+
+
                     <div className="w-1/2 flex flex-col gap-2 justify-center">
                         {status != 0 ? handleAlerts() : <></>}
                         <Button

From 95332663071c7fb4ddc675baabc66a6b474df582 Mon Sep 17 00:00:00 2001
From: "Markus A. R. Johansen" <90006516+J0hans1@users.noreply.github.com>
Date: Thu, 3 Aug 2023 10:10:59 +0200
Subject: [PATCH 2/3] Kommentarer frontend (#26)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 💄 Laget mulighet for å skrive inn og submitte kommentar

* 💄 Gjorde kommentar til en "notat-klistrelapp"

* 🚑 Frontend bruker oppdaterkommentar endepunktet
---
 frontend/src/components/FeilKort.tsx          |  5 +-
 .../src/components/FeilmeldingsInnhold.tsx    | 94 ++++++++++++++++++-
 frontend/src/interface.ts                     |  1 +
 3 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/FeilKort.tsx b/frontend/src/components/FeilKort.tsx
index 08a5cfb..31ddbe9 100644
--- a/frontend/src/components/FeilKort.tsx
+++ b/frontend/src/components/FeilKort.tsx
@@ -46,7 +46,10 @@ const FeilKort = (props: IFeilKort) => {
                     arbeidsstatus={props.arbeidsstatus}
                 />
             </div>
-            <FeilModal open={visModal} setOpen={setVisModal} >
+            <FeilModal 
+                open={visModal} 
+                setOpen={setVisModal} 
+            >
                 {redigeringsmodus ? 
                     <RedigeringsVerktoy 
                         id={props.id}
diff --git a/frontend/src/components/FeilmeldingsInnhold.tsx b/frontend/src/components/FeilmeldingsInnhold.tsx
index 50384ac..caa3c6d 100644
--- a/frontend/src/components/FeilmeldingsInnhold.tsx
+++ b/frontend/src/components/FeilmeldingsInnhold.tsx
@@ -1,9 +1,37 @@
-import { PencilIcon, XMarkIcon } from "@navikt/aksel-icons"
-import { Button } from "@navikt/ds-react"
+import { ChatElipsisIcon, PencilIcon, XMarkIcon } from "@navikt/aksel-icons"
+import { Button, Heading, TextField } from "@navikt/ds-react"
 import { FeilmeldingsInnholdInterface } from "../interface"
 import FeilkortHeader from "./FeilkortHeader"
+import { useState } from "react"
+import Skillelinje from "./Skillelinje"
+import axios from "axios"
+
 
 const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => {
+    const [kommentar, setKommentar] = useState("") 
+    const [kommentarfelt, setKommentarfelt] = useState("")
+
+    const oppdaterkommentar = async() => {
+        setKommentar(kommentarfelt)
+
+        const payload = {
+            id: props.id,
+            tittel: kommentar,
+        }
+
+        await axios.put("/api/oppdaterkommentar", payload, {
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        }).then((response) => {
+            console.log(response);
+        }).catch((error) => {
+            console.log(error);
+        })
+
+        props.reset()
+    }
+
     return(
         <div>
             <div className="flex justify-between">
@@ -16,7 +44,7 @@ const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => {
                     arbeidsstatus={props.arbeidsstatus} />
                 <div className="flex gap-4 items-start">
                     <Button
-                        variant="secondary"
+                        variant="tertiary"
                         icon={<PencilIcon />}
                         onClick={() => props.setRedigeringsmodus(true)}
                     >
@@ -33,9 +61,67 @@ const FeilmeldingsInnhold = (props: FeilmeldingsInnholdInterface) => {
                     </Button>
                 </div>
             </div>
-            <div className="h-2 bg-gray-200 my-4 rounded-lg"></div>
+            <Skillelinje/>
             {props.children}
+            {kommentar.length === 0 ? 
+                <KommentarTekstfelt
+                    kommentarfelt={kommentarfelt} 
+                    setKommentarfelt={setKommentarfelt}
+                    oppdaterKommentar={() => oppdaterkommentar()}
+                /> 
+                    : 
+                <Kommentar 
+                    tekst={kommentar}
+                />
+            }
         </div>
     )
 }
 export default FeilmeldingsInnhold;
+
+
+interface Ikommentar {
+    setKommentarfelt: (val: string) => void
+    oppdaterKommentar: () => void
+}
+
+interface kommentarTekstfeltInterface extends Ikommentar{
+    kommentarfelt: string,
+}
+interface kommentarInterface {
+    tekst: string
+}
+
+
+const KommentarTekstfelt = (props: kommentarTekstfeltInterface) => {
+    return(
+        <div className="flex items-end gap-12 w-full mt-4 h-fit">
+            <TextField
+                className="grow"
+                label="Skriv inn din kommentar til feilen"
+                value={props.kommentarfelt}
+                onChange={e => props.setKommentarfelt(e.target.value)}
+            >
+            </TextField>
+            <Button
+                variant="secondary"
+                icon={<ChatElipsisIcon/>}
+                onClick={() => props.oppdaterKommentar()}
+            >
+                Legg til kommentar
+            </Button>
+        </div>
+    )
+}
+
+const Kommentar = (props: kommentarInterface) => {
+    return(
+        <>
+            <Skillelinje/>
+            <div className="p-5 bg-bg-subtle rounded-lg w-2/3 my-4">
+                <Heading size="medium">Notat</Heading>
+                <p className="break-words">{props.tekst}</p>
+            </div> 
+        </>
+    )
+}
\ No newline at end of file
diff --git a/frontend/src/interface.ts b/frontend/src/interface.ts
index a95a0aa..6b698b4 100644
--- a/frontend/src/interface.ts
+++ b/frontend/src/interface.ts
@@ -16,6 +16,7 @@ export interface FeilmeldingsInnholdInterface extends IFeilmelding {
     children?: React.ReactNode
     setRedigeringsmodus: (redigeringsmodus: boolean) => void
     setVisModal: (visModal: boolean) => void
+    reset: () => void
 }
 
 export class Feilmelding implements IFeilmelding {

From a399eb31d1cfe61d4eb357f8dc8b7f1b6df7bcdf Mon Sep 17 00:00:00 2001
From: Markus Johansen <markus.aleksander.rakil.johansen@nav.no>
Date: Thu, 3 Aug 2023 10:39:47 +0200
Subject: [PATCH 3/3] =?UTF-8?q?=E2=99=BF=EF=B8=8F=20Heading=20for=20haster?=
 =?UTF-8?q?=20switch=20i=20innmeldingsskjema?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Skillelinje.tsx | 2 +-
 frontend/src/pages/feil.tsx             | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Skillelinje.tsx b/frontend/src/components/Skillelinje.tsx
index 1df1ccd..4caef55 100644
--- a/frontend/src/components/Skillelinje.tsx
+++ b/frontend/src/components/Skillelinje.tsx
@@ -2,7 +2,7 @@
 
 const Skillelinje = () => {
     return (
-        <div className="h-1 bg-gray-200 my-4 rounded-lg w-full"></div>
+        <div className="h-1 bg-gray-200 my-3 rounded-lg w-full"></div>
     )
 }
 export default Skillelinje
\ No newline at end of file
diff --git a/frontend/src/pages/feil.tsx b/frontend/src/pages/feil.tsx
index 28f09f4..658ac99 100644
--- a/frontend/src/pages/feil.tsx
+++ b/frontend/src/pages/feil.tsx
@@ -63,7 +63,7 @@ export default function Feil() {
             <Header/>
             <div className="flex grow">
                 <div className="w-1/4 bg-bg-subtle"></div>
-                <div className="flex flex-col justify-center gap-16 p-8 px-16  grow">
+                <div className="flex flex-col justify-center gap-8 p-8 px-16  grow">
                     <div className=" flex flex-col gap-2 justify-center">
                         <BugIcon
                             title="Insekts ikon"
@@ -88,12 +88,15 @@ export default function Feil() {
                         />
                         <Skillelinje/>
                         <BildeOpplastning/>
+                        <Skillelinje/>
+                        <Heading size="xsmall">
+                            Haster det å fikse feilen?
+                        </Heading>
                         <Switch 
                             onClick={() => setHaster(!haster)}
                         >
                             Saken Haster
                         </Switch>
-                        <Skillelinje/>
                     </div>