diff --git a/src/app/personside/infotabs/oversikt/VarselOversikt.tsx b/src/app/personside/infotabs/oversikt/VarselOversikt.tsx index ce063782d..769cde810 100644 --- a/src/app/personside/infotabs/oversikt/VarselOversikt.tsx +++ b/src/app/personside/infotabs/oversikt/VarselOversikt.tsx @@ -1,16 +1,12 @@ import * as React from 'react'; import styled from 'styled-components/macro'; import theme from '../../../../styles/personOversiktTheme'; -import Varsel from '../varsel/Varsel'; import { AlertStripeInfo } from 'nav-frontend-alertstriper'; import { ReactNode } from 'react'; import { useOnMount } from '../../../../utils/customHooks'; import { Normaltekst } from 'nav-frontend-typografi'; import VarslerLoader, { VarslerRendererProps } from '../varsel/varsel-loader'; -import VarselNy from '../varsel/VarselNy'; -import IfFeatureToggleOn from '../../../../components/featureToggle/IfFeatureToggleOn'; -import IfFeatureToggleOff from '../../../../components/featureToggle/IfFeatureToggleOff'; -import { FeatureToggles } from '../../../../components/featureToggle/toggleIDs'; +import Varsel from '../varsel/Varsel'; const ListStyle = styled.ol` > *:not(:first-child) { @@ -23,16 +19,7 @@ interface Props { } function VarselOversikt(props: Props) { - return ( - <> - - - - - - - - ); + return ; } function VarselVisning(props: VarslerRendererProps & Props) { @@ -58,27 +45,4 @@ function VarselVisning(props: VarslerRendererProps & Props) { ); } -function VarselVisningNy(props: VarslerRendererProps & Props) { - const forsteVarsler = props.varsler.slice(0, 2); - useOnMount(() => { - props.setHeaderContent( - - {forsteVarsler.length} / {props.varsler.length} - - ); - }); - - if (props.varsler.length === 0) { - return Ingen varsler på bruker; - } - - return ( - - {forsteVarsler.map((varsel, index) => ( - - ))} - - ); -} - export default VarselOversikt; diff --git a/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap b/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap index f9320f662..9aca748d0 100644 --- a/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap +++ b/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap @@ -50,7 +50,7 @@ exports[`Viser oversikt med alt innhold 1`] = ` padding: 0 1rem; } -.c30 { +.c31 { border: none; cursor: pointer; background-color: transparent; @@ -58,17 +58,17 @@ exports[`Viser oversikt med alt innhold 1`] = ` border-radius: 0.5em; } -.c30:focus { +.c31:focus { outline: none; box-shadow: 0 0 0 0.1875rem #254b6d; } -.c30:focus { +.c31:focus { outline: none; box-shadow: none; } -.c30:focus::after { +.c31:focus::after { position: absolute; top: 0; left: 0; @@ -87,8 +87,8 @@ exports[`Viser oversikt med alt innhold 1`] = ` position: relative; display: -ms-grid; display: grid; - -ms-grid-columns: 6rem 55% 1fr auto; - grid-template-columns: 6rem minmax(35%,55%) 1fr auto; + -ms-grid-columns: 6rem 3rem 55% 1fr auto; + grid-template-columns: 6rem 3rem minmax(35%,55%) 1fr auto; -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -109,6 +109,10 @@ exports[`Viser oversikt med alt innhold 1`] = ` -ms-grid-column: 3; } +.c26 > *:nth-child(4) { + -ms-grid-column: 4; +} + .c26:hover { box-shadow: inset 0 0 0 0.1rem #0067c5,0 0.1rem 0.1rem rgba(0,0,0,0.2); } @@ -117,11 +121,11 @@ exports[`Viser oversikt med alt innhold 1`] = ` padding: 0.7rem; } -.c29 li { +.c30 li { display: inline-block; } -.c29 li:not(:last-child):after { +.c30 li:not(:last-child):after { content: ','; margin-right: 0.5em; } @@ -133,20 +137,36 @@ exports[`Viser oversikt med alt innhold 1`] = ` display: flex; } -.c28 { +.c29 { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; } -.c31 { +.c28 { + width: 100%; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; +} + +.c32 { border-radius: 0.5rem; background-color: #f1f0f0; box-shadow: inset 0 0 0 0.3rem white,inset 0 0 0 0.37rem rgba(0,0,0,0.15); padding: 1.25rem; } -.c31 dt { +.c32 dt { float: left; clear: left; font-weight: bold; @@ -154,11 +174,24 @@ exports[`Viser oversikt med alt innhold 1`] = ` width: 7rem; } -.c31 dd { +.c32 dd { margin-bottom: 0.5rem; margin-left: 7.125rem; } +.c34 { + font-weight: bold; +} + +.c35 { + margin-top: 0.5rem; +} + +.c33 { + margin-top: 1rem; + margin-bottom: 1rem; +} + .c24 > *:not(:first-child) { border-top: solid 0.0625rem #78706a; } @@ -1149,18 +1182,42 @@ exports[`Viser oversikt med alt innhold 1`] = ` - 01.01.2023 + 11.01.2023 + + + 01.08.2023

+
+ + + +

Notifikasjon (Ferdigstilt): Et nytt samtalereferat er tilgjengelig i din innboks