From 25ebc5a4d3ddefa2942f99b8d9e7f6426c222f3a Mon Sep 17 00:00:00 2001 From: abrha Date: Thu, 23 Feb 2023 15:44:11 +0100 Subject: [PATCH 1/2] [OPP-1532] ny meldingsvisning endringer - clean up --- src/app/personside/infotabs/InfoTabEnum.ts | 10 ---------- src/app/personside/infotabs/NyTabKnapper.tsx | 8 ++++---- .../infotabs/dyplenkeTest/meldingerDyplenker.test.tsx | 2 +- .../infotabs/meldinger/traadliste/TraadListe.tsx | 8 ++++---- .../traadliste/__snapshots__/TraadListe.test.tsx.snap | 10 +++++----- src/app/personside/infotabs/oversikt/Oversikt.tsx | 2 +- .../oversikt/__snapshots__/Oversikt.test.tsx.snap | 4 ++-- 7 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/app/personside/infotabs/InfoTabEnum.ts b/src/app/personside/infotabs/InfoTabEnum.ts index 4e15f72e8..4b34e982a 100644 --- a/src/app/personside/infotabs/InfoTabEnum.ts +++ b/src/app/personside/infotabs/InfoTabEnum.ts @@ -15,16 +15,6 @@ export interface InfotabConfig { export type Infotabs = Record; export const INFOTABS: Infotabs = { - OVERSIKT: { tittel: 'Oversikt', path: 'oversikt' }, - OPPFOLGING: { tittel: 'Oppfølging', path: 'oppfolging' }, - MELDINGER: { tittel: 'Meldinger', path: 'meldinger' }, - UTBETALING: { tittel: 'Utbetaling', path: 'utbetaling' }, - SAKER: { tittel: 'Saker', path: 'saker' }, - YTELSER: { tittel: 'Ytelser', path: 'ytelser' }, - VARSLER: { tittel: 'Varsler', path: 'varsler' } -}; - -export const NY_INFOTABS: Infotabs = { OVERSIKT: { tittel: 'Oversikt', path: 'oversikt' }, OPPFOLGING: { tittel: 'Oppfølging', path: 'oppfolging' }, MELDINGER: { tittel: 'Kommunikasjon', path: 'meldinger' }, diff --git a/src/app/personside/infotabs/NyTabKnapper.tsx b/src/app/personside/infotabs/NyTabKnapper.tsx index 7de891cfa..f83c6fde8 100644 --- a/src/app/personside/infotabs/NyTabKnapper.tsx +++ b/src/app/personside/infotabs/NyTabKnapper.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { InfotabConfig, NY_INFOTABS } from './InfoTabEnum'; +import { InfotabConfig, INFOTABS } from './InfoTabEnum'; import styled, { css } from 'styled-components/macro'; import theme, { pxToRem } from '../../../styles/personOversiktTheme'; @@ -63,12 +63,12 @@ const TabKnapp = styled.button` `; function NyTabKnapper(props: TabPanelProps) { - const knapper = Object.keys(NY_INFOTABS).map((key) => { - const erValgt = NY_INFOTABS[key] === props.openTab; + const knapper = Object.keys(INFOTABS).map((key) => { + const erValgt = INFOTABS[key] === props.openTab; return ( props.onTabChange(key)}> - {NY_INFOTABS[key].tittel} + {INFOTABS[key].tittel} ); diff --git a/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx b/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx index faf2b30cd..b79633db3 100644 --- a/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx +++ b/src/app/personside/infotabs/dyplenkeTest/meldingerDyplenker.test.tsx @@ -28,7 +28,7 @@ test('bytter til riktig tab og setter fokus på riktig melding ved bruk av dyple clickOnMeldingerIOversikt(infoTabs); - expect(getAktivTab(infoTabs).toLowerCase()).toContain(INFOTABS.MELDINGER.path); + expect(getAktivTab(infoTabs)).toContain(INFOTABS.MELDINGER.tittel); const checkedMelding = infoTabs.find('input[checked=true].' + meldingerTest.melding).html(); const expectedElement = infoTabs diff --git a/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx b/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx index dab9cb880..6ac2db707 100644 --- a/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx +++ b/src/app/personside/infotabs/meldinger/traadliste/TraadListe.tsx @@ -82,7 +82,7 @@ function PrintAlleMeldinger({ traader }: { traader: Traad[] }) { return ( <> - printer?.triggerPrint()} /> + printer?.triggerPrint()} /> {traader.map((traad) => ( @@ -131,7 +131,7 @@ function TraadListe(props: Props) { ); - const meldingTekst = props.traader.length === 1 ? 'melding' : 'meldinger'; + const meldingTekst = props.traader.length === 1 ? 'kommunikasjon' : 'kommunikasjoner'; const soketreffTekst = props.traaderEtterSokOgFiltrering.length !== props.traader.length ? `Søket traff ${props.traaderEtterSokOgFiltrering.length} av ${props.traader.length} ${meldingTekst}` @@ -162,8 +162,8 @@ function TraadListe(props: Props) { } value={meldingsok.query} onChange={onMeldingerSok} - label={'Søk etter melding'} - placeholder={'Søk etter melding'} + label={'Søk etter kommunikasjon'} + placeholder={'Søk etter kommunikasjon'} className={'move-input-label'} /> diff --git a/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap b/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap index 46e5375c4..578436297 100644 --- a/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap +++ b/src/app/personside/infotabs/meldinger/traadliste/__snapshots__/TraadListe.test.tsx.snap @@ -346,14 +346,14 @@ exports[`Viser Traadliste 1`] = ` className="skjemaelement__label" htmlFor="Helt tilfeldig ID" > - Søk etter melding + Søk etter kommunikasjon @@ -370,7 +370,7 @@ exports[`Viser Traadliste 1`] = ` - Skriv ut alle meldinger + Skriv ut all kommunikasjon - Totalt 1 melding + Totalt 1 kommunikasjon

@@ -701,7 +701,7 @@ exports[`Viser Traadliste 1`] = ` id="Helt tilfeldig ID" > Meldingsliste - - Totalt 1 melding + Totalt 1 kommunikasjon
    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 9aca748d0..5939d5506 100644 --- a/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap +++ b/src/app/personside/infotabs/oversikt/__snapshots__/Oversikt.test.tsx.snap @@ -907,7 +907,7 @@ exports[`Viser oversikt med alt innhold 1`] = ` className="typo-undertittel" id="Helt tilfeldig ID" > - Meldinger + Kommunikasjon
    Gå til - meldinger + kommunikasjon

    From f56870fd13b629687f0ea91f3b1cefce13cbd90a Mon Sep 17 00:00:00 2001 From: abrha Date: Thu, 23 Feb 2023 16:08:13 +0100 Subject: [PATCH 2/2] [OPP-1532] fjern feature toggle for ny meldingsvisning endringer --- package-lock.json | 17 +- .../personside/dialogpanel/DialogPanel.tsx | 35 +- .../__snapshots__/DialogPanel.test.tsx.snap | 198 +++++--- .../personside/dialogpanel/fellesStyling.tsx | 20 +- .../fortsettDialog/FortsettDialog.tsx | 101 ++-- .../FortsettDialogContainer.tsx | 65 +-- .../FortsettDialogKvittering.tsx | 3 +- .../fortsettDialog/FortsettDialogTypes.ts | 7 +- .../fortsettDialog/NyFortsettDialog.tsx | 150 ------ .../NyFortsettDialogContainer.tsx | 230 --------- .../NyFortsettDialogKvittering.tsx | 22 - .../fortsettDialog/NyFortsettDialogTypes.ts | 43 -- .../fortsettDialog/VelgDialogType.tsx | 56 -- .../fortsettDialog/nyValidatorer.ts | 21 - .../tidligereMeldinger/EnkeltMelding.tsx | 7 +- .../tidligereMeldinger/NyEnkeltMelding.tsx | 60 --- .../tidligereMeldinger/TidligereMeldinger.tsx | 28 +- .../dialogpanel/fortsettDialog/validatorer.ts | 25 +- .../sendMelding/NySendNyMelding.tsx | 192 ------- .../sendMelding/NySendNyMeldingContainer.tsx | 185 ------- .../sendMelding/NySendNyMeldingKvittering.tsx | 38 -- .../sendMelding/NyVelgDialogType.tsx | 37 -- .../dialogpanel/sendMelding/SendNyMelding.tsx | 95 ++-- .../sendMelding/SendNyMeldingContainer.tsx | 103 ++-- .../sendMelding/SendNyMeldingKvittering.tsx | 33 +- .../sendMelding/VelgDialogType.tsx | 28 +- .../__snapshots__/SendNyMelding.test.tsx.snap | 198 +++++--- .../dialogpanel/sendMelding/nyValidatorer.ts | 26 - .../dialogpanel/sendMelding/validatorer.ts | 20 +- src/app/personside/infotabs/InfoTabs.tsx | 11 +- src/app/personside/infotabs/NyTabKnapper.tsx | 85 ---- src/app/personside/infotabs/TabKnapper.tsx | 6 +- .../traadliste/NyTraadSammendrag.tsx | 120 ----- .../traadliste/TraadListeElement.tsx | 11 +- .../meldinger/traadliste/TraadSammendrag.tsx | 4 +- .../__snapshots__/TraadListe.test.tsx.snap | 2 +- .../meldinger/traadvisning/Enkeltmelding.tsx | 89 ++-- .../traadvisning/NyEnkeltmelding.tsx | 134 ----- .../meldinger/traadvisning/NyTraadVisning.tsx | 173 ------- .../meldinger/traadvisning/TraadVisning.tsx | 60 ++- .../traadvisning/TraadVisningWrapper.tsx | 11 +- .../TraadVisningWrapper.test.tsx.snap | 479 +++++++++--------- .../sladdevalg/SladdMeldingerMedArsak.tsx | 28 +- .../infotabs/oversikt/MeldingerOversikt.tsx | 11 +- .../__snapshots__/Oversikt.test.tsx.snap | 2 +- src/svg/ReadIcon.tsx | 4 +- 46 files changed, 831 insertions(+), 2442 deletions(-) delete mode 100644 src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialog.tsx delete mode 100644 src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogContainer.tsx delete mode 100644 src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogKvittering.tsx delete mode 100644 src/app/personside/dialogpanel/fortsettDialog/NyFortsettDialogTypes.ts delete mode 100644 src/app/personside/dialogpanel/fortsettDialog/VelgDialogType.tsx delete mode 100644 src/app/personside/dialogpanel/fortsettDialog/nyValidatorer.ts delete mode 100644 src/app/personside/dialogpanel/fortsettDialog/tidligereMeldinger/NyEnkeltMelding.tsx delete mode 100644 src/app/personside/dialogpanel/sendMelding/NySendNyMelding.tsx delete mode 100644 src/app/personside/dialogpanel/sendMelding/NySendNyMeldingContainer.tsx delete mode 100644 src/app/personside/dialogpanel/sendMelding/NySendNyMeldingKvittering.tsx delete mode 100644 src/app/personside/dialogpanel/sendMelding/NyVelgDialogType.tsx delete mode 100644 src/app/personside/dialogpanel/sendMelding/nyValidatorer.ts delete mode 100644 src/app/personside/infotabs/NyTabKnapper.tsx delete mode 100644 src/app/personside/infotabs/meldinger/traadliste/NyTraadSammendrag.tsx delete mode 100644 src/app/personside/infotabs/meldinger/traadvisning/NyEnkeltmelding.tsx delete mode 100644 src/app/personside/infotabs/meldinger/traadvisning/NyTraadVisning.tsx diff --git a/package-lock.json b/package-lock.json index a5ac7299f..4f7704bb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.4.2", "license": "MIT", "dependencies": { - "@navikt/ds-icons": "^2.0.1", "@navikt/fnrvalidator": "^1.1.3", "@navikt/navspa": "^4.0.0", "@navikt/tag-input": "^2.0.1", @@ -5855,9 +5854,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001352", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz", - "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==", + "version": "1.0.30001480", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001480.tgz", + "integrity": "sha512-q7cpoPPvZYgtyC4VaBSN0Bt+PJ4c4EYRf0DrduInOz2SkFpHD5p3LnvEpqBp7UnJn+8x1Ogl1s38saUxe+ihQQ==", "dev": true, "funding": [ { @@ -5867,6 +5866,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -27236,9 +27239,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001352", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz", - "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==", + "version": "1.0.30001480", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001480.tgz", + "integrity": "sha512-q7cpoPPvZYgtyC4VaBSN0Bt+PJ4c4EYRf0DrduInOz2SkFpHD5p3LnvEpqBp7UnJn+8x1Ogl1s38saUxe+ihQQ==", "dev": true }, "capture-exit": { diff --git a/src/app/personside/dialogpanel/DialogPanel.tsx b/src/app/personside/dialogpanel/DialogPanel.tsx index 36be9d8bd..1fa0bc47b 100644 --- a/src/app/personside/dialogpanel/DialogPanel.tsx +++ b/src/app/personside/dialogpanel/DialogPanel.tsx @@ -8,11 +8,6 @@ import useVisTraadTilknyttetPlukketOppgave from './fortsettDialog/useVisTraadTil import { OppgavelisteValg } from './sendMelding/SendNyMelding'; import LazySpinner from '../../../components/LazySpinner'; import innstillingerResource from '../../../rest/resources/innstillingerResource'; -import IfFeatureToggleOn from '../../../components/featureToggle/IfFeatureToggleOn'; -import { FeatureToggles } from '../../../components/featureToggle/toggleIDs'; -import IfFeatureToggleOff from '../../../components/featureToggle/IfFeatureToggleOff'; -import NyFortsettDialogContainer from './fortsettDialog/NyFortsettDialogContainer'; -import NySendNyMeldingContainer from './sendMelding/NySendNyMeldingContainer'; const DialogPanelWrapper = styled.div` flex-grow: 1; @@ -38,31 +33,13 @@ function DialogPanel() { {dialogpanelTraad ? ( - <> - - - - - - - + ) : ( - <> - - - - - - - + )} diff --git a/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap b/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap index 8402db63b..99cf067e1 100644 --- a/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap +++ b/src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap @@ -100,6 +100,21 @@ exports[`viser dialogpanel 1`] = ` padding-left: 2.25rem; } +.c16 { + margin-top: 1rem; +} + +.c16 label { + position: absolute !important; + height: 1px; + width: 1px; + overflow: hidden; + -webkit-clip: rect(1px 1px 1px 1px); + clip: rect(1px 1px 1px 1px); + -webkit-clip: rect(1px,1px,1px,1px); + clip: rect(1px,1px,1px,1px); +} + .c5 { display: -webkit-box; display: -webkit-flex; @@ -158,7 +173,7 @@ exports[`viser dialogpanel 1`] = ` padding: 1rem .5rem; } -.c16 { +.c18 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -168,7 +183,7 @@ exports[`viser dialogpanel 1`] = ` flex-direction: column; } -.c16 > * { +.c18 > * { margin-bottom: 0.7rem; } @@ -176,6 +191,10 @@ exports[`viser dialogpanel 1`] = ` margin-top: 1rem; } +.c17 { + margin-top: 1rem; +} + .c4 { margin-bottom: 1rem !important; } @@ -477,7 +496,7 @@ exports[`viser dialogpanel 1`] = ` className="skjemaelement__label" htmlFor="Helt tilfeldig ID" > - Referat telefon + Referat
    - Referat oppmøte - -
    -
    - -
    -
    +
    - -

    + Velg sak + +

    + Ingen valgt sak +

    +
    +
    - Ingen valgt sak -

    -
    -
    - + Oppgaveliste + +
    + +
    +
    +
    - info + + info + + + + + + + - - - - - - - + Gir varsel, bruker må svare +
    +
    - Gir varsel, bruker kan ikke svare + +
    - Referat oppmøte - -
    -
    - -
    -
    +
    - -

    + Velg sak + +

    + Ingen valgt sak +

    +
    +
    - Ingen valgt sak -

    -
    -
    - + Oppgaveliste + +
    + +
    +
    +
    - info + + info + + + + + + + - - - - - - - + Gir varsel, bruker må svare +
    +
    - Gir varsel, bruker kan ikke svare + +