diff --git a/packages/aap-felles-css/CHANGELOG.md b/packages/aap-felles-css/CHANGELOG.md index d1237ae..8829df9 100644 --- a/packages/aap-felles-css/CHANGELOG.md +++ b/packages/aap-felles-css/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.2.5 + +### Patch Changes + +- kelvinsok + ## 4.2.4 ## 4.2.3 diff --git a/packages/aap-felles-css/package.json b/packages/aap-felles-css/package.json index 878857c..d685961 100644 --- a/packages/aap-felles-css/package.json +++ b/packages/aap-felles-css/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.4", + "version": "4.2.5", "name": "@navikt/aap-felles-css", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-css/src/kelvin-app-header.css b/packages/aap-felles-css/src/kelvin-app-header.css index 1fc6a26..a12ea70 100644 --- a/packages/aap-felles-css/src/kelvin-app-header.css +++ b/packages/aap-felles-css/src/kelvin-app-header.css @@ -1,6 +1,20 @@ .kelvin-app-header { + display: flex; + flex-direction: column; +} +.kelvin-app-header a { + color: var(--a-white); +} + +.kelvin-app-main-header { + display: flex; justify-content: space-between; max-height: 4rem; + width: 100%; +} + +.kelvin-app-main-header-borderBottom { + border-bottom: 1px solid grey; //TODO: riktig farge } .kelvin-app-header-leftSide { @@ -16,13 +30,15 @@ .kelvin-oppgavesok-form { padding-top: var(--a-spacing-2); background-color: var(--a-surface-inverted); - overflow: visible; +} + +.kelvin-oppgavesok-resultat-container { + padding: var(--a-spacing-2); } .kelvin-oppgavesok-resultat { - overflow: visible; - position: relative; background-color: var(--a-surface-inverted); list-style: none; - padding: 0 var(--a-spacing-2) var(--a-spacing-2) var(--a-spacing-2); + padding: 0; + margin: 0; } diff --git a/packages/aap-felles-prettier/CHANGELOG.md b/packages/aap-felles-prettier/CHANGELOG.md index c3a16b0..b0cf6e7 100644 --- a/packages/aap-felles-prettier/CHANGELOG.md +++ b/packages/aap-felles-prettier/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.5 + ## 4.2.4 ## 4.2.3 diff --git a/packages/aap-felles-prettier/package.json b/packages/aap-felles-prettier/package.json index 099eef9..180a120 100644 --- a/packages/aap-felles-prettier/package.json +++ b/packages/aap-felles-prettier/package.json @@ -1,7 +1,7 @@ { "name": "@navikt/aap-felles-prettier", "author": "NAV", - "version": "4.2.4", + "version": "4.2.5", "main": "index.json", "license": "MIT", "dependencies": { diff --git a/packages/aap-felles-react/CHANGELOG.md b/packages/aap-felles-react/CHANGELOG.md index 77692be..840d2e8 100644 --- a/packages/aap-felles-react/CHANGELOG.md +++ b/packages/aap-felles-react/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.2.5 + +### Patch Changes + +- kelvinsok + ## 4.2.4 ### Patch Changes diff --git a/packages/aap-felles-react/package.json b/packages/aap-felles-react/package.json index d5af725..661fca2 100644 --- a/packages/aap-felles-react/package.json +++ b/packages/aap-felles-react/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.4", + "version": "4.2.5", "name": "@navikt/aap-felles-react", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx b/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx index 73fde43..d14e111 100644 --- a/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx +++ b/packages/aap-felles-react/src/KelvinAppHeader/KelvinAppHeader.tsx @@ -1,8 +1,9 @@ 'use client'; -import React from 'react'; -import { Dropdown, InternalHeader, Link } from '@navikt/ds-react'; -import { Oppgavesøk } from './Oppgavesøk'; +import React, {useState} from 'react'; +import {Button, Dropdown, HStack, InternalHeader, Link, VStack} from '@navikt/ds-react'; +import { Kelvinsøk} from './Kelvinsøk'; +import {Kelvinsøkeresultat, Søkeresultat} from "./Kelvinsøkeresultat"; interface BrukerInformasjon { navn: string; @@ -24,17 +25,29 @@ const Brukermeny = ({ brukerInformasjon }: { brukerInformasjon: BrukerInformasjo ); -export const KelvinAppHeader = ({ brukerInformasjon }: { brukerInformasjon: BrukerInformasjon }) => ( - - - Kelvin - - Sanity - Saksoversikt - Oppgaveliste - Postmottak - - - - -); +export const KelvinAppHeader = ({ brukerInformasjon }: { brukerInformasjon: BrukerInformasjon }) => { + const [søkeresultat, setSøkeresultat] = useState(undefined); + return ( + + + + Kelvin + + Oppgaveliste + Oppgaveliste + Saksoversikt + Postmottak + Sanity + + + + {søkeresultat && + + Søkeresultater + setSøkeresultat(undefined)}>Lukk + + + } + + ); +} diff --git "a/packages/aap-felles-react/src/KelvinAppHeader/Kelvins\303\270k.tsx" "b/packages/aap-felles-react/src/KelvinAppHeader/Kelvins\303\270k.tsx" new file mode 100644 index 0000000..1013ab8 --- /dev/null +++ "b/packages/aap-felles-react/src/KelvinAppHeader/Kelvins\303\270k.tsx" @@ -0,0 +1,70 @@ +'use client' + +import {Dispatch, SetStateAction} from "react"; +import { Search} from "@navikt/ds-react"; +import React from "react"; +import {Søkeresultat} from "./Kelvinsøkeresultat"; +interface OppgavesøkeResultat { + label: string; + href: string; +} +interface SaksøkeResultat { + saksnummer: string; + periode: { + fom: string; + tom: string; + }; +} +interface Props { + setSøkeresultat: Dispatch>; +} +export const Kelvinsøk = ({ setSøkeresultat }: Props) => { + + async function utførSøk(søketekst: string) { + const isFnr = søketekst.length === 11; + let oppgaveData: OppgavesøkeResultat[] = []; + try { + oppgaveData = await fetch(`${process.env.NEXT_PUBLIC_OPPGAVESTYRING_URL}/api/oppgave/sok`, { + method: 'POST', + body: JSON.stringify({ søketekst }), + }).then((res) => res.json()); + } catch (error) { + console.error(error) + } + let sakData: SaksøkeResultat[] = []; + if(isFnr){ + try { + sakData = await fetch(`${process.env.NEXT_PUBLIC_SAKSBEHANDLING_URL}/api/sak/finn`, { + method: 'POST', + body: JSON.stringify({ ident: søketekst }), + }).then((res) => res.json()); + } catch (error) { + console.error(error) + } + } + const resData: Søkeresultat = { + oppgaver: oppgaveData, + saker: sakData.map(sak => ({ + href: `${process.env.NEXT_PUBLIC_SAKSBEHANDLING_URL}/sak/${sak.saksnummer}`, + label: `${sak.periode.fom} - ${sak.periode.tom} (${sak.saksnummer})` + })) + } + setSøkeresultat(resData); + } + return ( + { + const input = e.currentTarget.elements?.[0] as HTMLInputElement; + if (input.value) { + utførSøk(input.value); + } + e.preventDefault(); + }} + > + + + ); +}; diff --git "a/packages/aap-felles-react/src/KelvinAppHeader/Kelvins\303\270keresultat.tsx" "b/packages/aap-felles-react/src/KelvinAppHeader/Kelvins\303\270keresultat.tsx" new file mode 100644 index 0000000..5e4b86a --- /dev/null +++ "b/packages/aap-felles-react/src/KelvinAppHeader/Kelvins\303\270keresultat.tsx" @@ -0,0 +1,43 @@ +'use client' + +import {HStack, Label} from "@navikt/ds-react"; +import React from "react"; +export interface Søkeresultat { + saker: {href: string; label: string}[]; + oppgaver: {href: string; label: string}[]; +} +interface Props { + søkeresultat: Søkeresultat +} +export const Kelvinsøkeresultat = ({søkeresultat}: Props) => { + return ( + + + {søkeresultat.saker.length > 0 && ( + Saker + + {søkeresultat.saker.map((søk, index) => ( + + {søk.label} + + ))} + + )} + {søkeresultat.oppgaver.length > 0 && ( + Oppgaver + + {søkeresultat.oppgaver.map((søk, index) => ( + + {søk.label} + + ))} + + )} + + + ) +} \ No newline at end of file diff --git "a/packages/aap-felles-react/src/KelvinAppHeader/Oppgaves\303\270k.tsx" "b/packages/aap-felles-react/src/KelvinAppHeader/Oppgaves\303\270k.tsx" deleted file mode 100644 index ff4eb76..0000000 --- "a/packages/aap-felles-react/src/KelvinAppHeader/Oppgaves\303\270k.tsx" +++ /dev/null @@ -1,80 +0,0 @@ -'use client' - -import {useState} from "react"; -import { Label, Search} from "@navikt/ds-react"; -import React from "react"; -interface OppgavesøkeResultat { - label: string; - href: string; -} -interface SaksøkeResultat { - saksnummer: string; - status: string; -} -export const Oppgavesøk = () => { - const [søkeResultat, setSøkeresultat] = useState([]); - const [sakSøkeResultat, setSaksøkeresultat] = useState([]); - - async function utførSøk(søketekst: string) { - try { - const oppgaveData: OppgavesøkeResultat[] = await fetch(`${process.env.NEXT_PUBLIC_OPPGAVESTYRING_URL}/api/oppgave/sok`, { - method: 'POST', - body: JSON.stringify({ søketekst }), - }).then((res) => res.json()); - setSøkeresultat(oppgaveData); - const sakData: SaksøkeResultat[] = await fetch(`${process.env.NEXT_PUBLIC_SAKSBEHANDLING_URL}/api/sak/finn`, { - method: 'POST', - body: JSON.stringify({ ident: søketekst }), - }).then((res) => res.json()); - setSaksøkeresultat(sakData); - } catch (error) { - console.error(error) - } - } - return ( - { - const input = e.currentTarget.elements?.[0] as HTMLInputElement; - if (input.value) { - utførSøk(input.value); - } - e.preventDefault(); - }} - > - - - {sakSøkeResultat.length !== 0 && ( - <> - {'Saker'} - - {sakSøkeResultat.map((sak, index) => ( - - {`${sak.saksnummer} - ${sak.status}`} - - ))} - - > - )} - {søkeResultat.length !== 0 && ( - <> - {'Oppgaver'} - - {søkeResultat.map((søk, index) => ( - - {søk.label} - - ))} - - > - )} - - - ); -}; diff --git a/packages/aap-felles-utils-client/CHANGELOG.md b/packages/aap-felles-utils-client/CHANGELOG.md index 7f6dde2..23b67cf 100644 --- a/packages/aap-felles-utils-client/CHANGELOG.md +++ b/packages/aap-felles-utils-client/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.5 + ## 4.2.4 ## 4.2.3 diff --git a/packages/aap-felles-utils-client/package.json b/packages/aap-felles-utils-client/package.json index 36d1943..ad89919 100644 --- a/packages/aap-felles-utils-client/package.json +++ b/packages/aap-felles-utils-client/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.4", + "version": "4.2.5", "name": "@navikt/aap-felles-utils-client", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/aap-felles-utils/CHANGELOG.md b/packages/aap-felles-utils/CHANGELOG.md index 203ef10..cd57e2e 100644 --- a/packages/aap-felles-utils/CHANGELOG.md +++ b/packages/aap-felles-utils/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.5 + ## 4.2.4 ## 4.2.3 diff --git a/packages/aap-felles-utils/package.json b/packages/aap-felles-utils/package.json index f020114..9bef110 100644 --- a/packages/aap-felles-utils/package.json +++ b/packages/aap-felles-utils/package.json @@ -1,5 +1,5 @@ { - "version": "4.2.4", + "version": "4.2.5", "name": "@navikt/aap-felles-utils", "author": "NAV", "homepage": "https://github.com/navikt/aap-felles-frontend#readme", diff --git a/packages/eslint-config-aap/CHANGELOG.md b/packages/eslint-config-aap/CHANGELOG.md index 84c48ac..2f9b815 100644 --- a/packages/eslint-config-aap/CHANGELOG.md +++ b/packages/eslint-config-aap/CHANGELOG.md @@ -1,5 +1,7 @@ # Change Log +## 4.2.5 + ## 4.2.4 ## 4.2.3 diff --git a/packages/eslint-config-aap/package.json b/packages/eslint-config-aap/package.json index ff65a07..fd9d9d8 100644 --- a/packages/eslint-config-aap/package.json +++ b/packages/eslint-config-aap/package.json @@ -1,7 +1,7 @@ { "name": "@navikt/eslint-config-aap", "author": "NAV", - "version": "4.2.4", + "version": "4.2.5", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\"",
Søkeresultater