From b11d85f0a7423e985f97eb8e146bfc25e1025b35 Mon Sep 17 00:00:00 2001 From: frodehansen2 Date: Mon, 12 Aug 2024 14:43:44 +0200 Subject: [PATCH] =?UTF-8?q?Velkommensider=20-=20fellesbranch=20for=204=20u?= =?UTF-8?q?like=20s=C3=B8knadsdialoger=20(#2086)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bruke SoknadVelkommenPage * Changeset * Bruke SoknadVelkommenPage * Changeset * Bruke Aksel mal for Velkommenside * Changeset * Bruke Aksel mal for Velkommenside - omsdager-ikke-tilsyn * Changeset * Sette på wrap=false for SoknadHeader * Sette wrap=false i SoknadHeader * Changeset * Oppdatere versjonsnumre --- .../CHANGELOG.md | 8 ++ .../package.json | 2 +- .../BehandlingAvPersonopplysningerContent.tsx | 62 +++++++-------- .../pages/velkommen/OmS\303\270knaden.tsx" | 49 ++++++------ .../app/pages/velkommen/VelkommenGuide.tsx | 48 ------------ .../pages/velkommen/VelkommenGuideContent.tsx | 38 ++++++++++ .../src/app/pages/velkommen/VelkommenPage.tsx | 23 +++--- apps/endringsmelding-pleiepenger/CHANGELOG.md | 7 ++ apps/endringsmelding-pleiepenger/package.json | 2 +- .../CHANGELOG.md | 8 ++ .../package.json | 2 +- .../BehandlingAvPersonopplysningerContent.tsx | 76 ++++++++++--------- .../pages/velkommen/OmS\303\270knaden.tsx" | 51 +++++++------ ...menGuide.tsx => VelkommenGuideContent.tsx} | 18 ++--- .../src/app/pages/velkommen/VelkommenPage.tsx | 19 ++--- .../CHANGELOG.md | 8 ++ .../package.json | 2 +- .../BehandlingAvPersonopplysningerContent.tsx | 49 ++++++------ .../pages/velkommen/OmS\303\270knaden.tsx" | 52 +++++++------ .../app/pages/velkommen/VelkommenGuide.tsx | 26 ------- .../pages/velkommen/VelkommenGuideContent.tsx | 18 +++++ .../src/app/pages/velkommen/VelkommenPage.tsx | 19 ++--- .../pages/velkommen/velkommenPageMessages.ts | 7 +- .../CHANGELOG.md | 8 ++ .../package.json | 2 +- .../BehandlingAvPersonopplysningerContent.tsx | 61 ++++++++------- .../pages/velkommen/OmS\303\270knaden.tsx" | 49 ++++++------ ...menGuide.tsx => VelkommenGuideContent.tsx} | 21 ++--- .../src/app/pages/velkommen/VelkommenPage.tsx | 16 ++-- apps/omsorgspengesoknad/CHANGELOG.md | 7 ++ apps/omsorgspengesoknad/package.json | 2 +- .../om-s\303\270knaden/OmS\303\270knaden.tsx" | 2 +- .../CHANGELOG.md | 7 ++ .../package.json | 2 +- apps/pleiepenger-sykt-barn/CHANGELOG.md | 7 ++ apps/pleiepenger-sykt-barn/package.json | 2 +- apps/sif-ettersending/CHANGELOG.md | 7 ++ apps/sif-ettersending/package.json | 2 +- packages/sif-common-soknad-ds/CHANGELOG.md | 6 ++ packages/sif-common-soknad-ds/package.json | 2 +- .../components/soknad-header/SoknadHeader.tsx | 2 +- 41 files changed, 433 insertions(+), 366 deletions(-) delete mode 100644 apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuide.tsx create mode 100644 apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuideContent.tsx rename apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/{VelkommenGuide.tsx => VelkommenGuideContent.tsx} (83%) delete mode 100644 apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuide.tsx create mode 100644 apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuideContent.tsx rename apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/{VelkommenGuide.tsx => VelkommenGuideContent.tsx} (56%) diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md index d26d28fb5c..a28175da26 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md @@ -1,5 +1,13 @@ # @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn +## 1.25.12 + +### Patch Changes + +- d2355d6: Bruke Aksel mal for Velkommenside +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 1.25.11 ### Patch Changes diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json index 2e5e2a4b63..9d659eba1b 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json @@ -3,7 +3,7 @@ "description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn", "license": "MIT", "name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn", - "version": "1.25.11", + "version": "1.25.12", "repository": "https://github.com/navikt/sif-brukerdialog", "private": true, "type": "module", diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx index 979db7ac85..590f13af6f 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx @@ -1,49 +1,51 @@ -import { Heading, Link } from '@navikt/ds-react'; +import { Heading, Link, List, VStack } from '@navikt/ds-react'; import React from 'react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; -import InfoList from '@navikt/sif-common-core-ds/src/components/lists/info-list/InfoList'; import { AppText, useAppIntl } from '../../i18n'; import getLenker from '../../lenker'; const BehandlingAvPersonopplysningerContent: React.FunctionComponent = () => { const { intl } = useAppIntl(); return ( - - - - -

- -

- - + +
+ + + +

+ +

+
+ +
+

- -
  • + + + -
    • -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -     - - + + +
    +
    { ), }} /> - - +
    +     ); }; diff --git "a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/OmS\303\270knaden.tsx" "b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/OmS\303\270knaden.tsx" index 608530ec7e..f04e9352fc 100644 --- "a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/OmS\303\270knaden.tsx" +++ "b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/OmS\303\270knaden.tsx" @@ -1,31 +1,36 @@ -import { BodyLong, Heading } from '@navikt/ds-react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; -import ExpandableInfo from '@navikt/sif-common-core-ds/src/components/expandable-info/ExpandableInfo'; +import { Accordion, Box, Heading, List, VStack } from '@navikt/ds-react'; import { AppText, useAppIntl } from '../../i18n'; import BehandlingAvPersonopplysningerContent from './BehandlingAvPersonopplysningerContent'; const OmSøknaden = () => { const { text } = useAppIntl(); return ( - - - - - -

    - -

    -

    - -

    -

    - -

    - - - -     -     + + + + + + + + + + + + + + + + + + + + {text('page.velkommen.omSøknaden.4')} + + + + + + ); }; diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuide.tsx b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuide.tsx deleted file mode 100644 index 7a5b587f1c..0000000000 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuide.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { BodyLong, GuidePanel, Heading } from '@navikt/ds-react'; -import React from 'react'; -import InfoList from '@navikt/sif-common-core-ds/src/components/lists/info-list/InfoList'; -import { AppText } from '../../i18n'; - -interface Props { - navn: string; -} - -const VelkommenGuide: React.FunctionComponent = ({ navn }) => ( - - - - - - - - - - -

    - -

    - -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -     -

    - -

    -     -     -); - -export default VelkommenGuide; diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuideContent.tsx b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuideContent.tsx new file mode 100644 index 0000000000..1491036b5c --- /dev/null +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenGuideContent.tsx @@ -0,0 +1,38 @@ +import { BodyLong, List } from '@navikt/ds-react'; +import { AppText } from '../../i18n'; + +const VelkommenGuideContent = () => ( + <> + + + + + +

    + +

    + + + + + + + + + + + + + + + + + +

    + +

    +     + +); + +export default VelkommenGuideContent; diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenPage.tsx b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenPage.tsx index a11ac3c0c3..033323f2ec 100644 --- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenPage.tsx +++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/src/app/pages/velkommen/VelkommenPage.tsx @@ -1,13 +1,12 @@ -import { SIFCommonPageKey, useAmplitudeInstance, useLogSidevisning } from '@navikt/sif-common-amplitude'; -import Page from '@navikt/sif-common-core-ds/src/components/page/Page'; import { OmsorgsdagerAnnenForelderIkkeTilsynApp } from '@navikt/sif-app-register'; -import { SamtykkeForm } from '@navikt/sif-common-soknad-ds'; +import { SIFCommonPageKey, useAmplitudeInstance, useLogSidevisning } from '@navikt/sif-common-amplitude'; +import { SoknadVelkommenPage } from '@navikt/sif-common-soknad-ds'; +import { useAppIntl } from '../../i18n'; import actionsCreator from '../../søknad/context/action/actionCreator'; import { useSøknadContext } from '../../søknad/context/hooks/useSøknadContext'; import { SøknadRoutes } from '../../types/SøknadRoutes'; import OmSøknaden from './OmSøknaden'; -import VelkommenGuide from './VelkommenGuide'; -import { useAppIntl } from '../../i18n'; +import VelkommenGuideContent from './VelkommenGuideContent'; const VelkommenPage = () => { const { text } = useAppIntl(); @@ -26,13 +25,15 @@ const VelkommenPage = () => { dispatch(actionsCreator.setSøknadRoute(SøknadRoutes.OM_ANNEN_FORELDER)); }; return ( - - - + , + }} + onStartSøknad={startSøknad}> - - - + ); }; diff --git a/apps/endringsmelding-pleiepenger/CHANGELOG.md b/apps/endringsmelding-pleiepenger/CHANGELOG.md index 7a2336fc8d..847a9cceaa 100644 --- a/apps/endringsmelding-pleiepenger/CHANGELOG.md +++ b/apps/endringsmelding-pleiepenger/CHANGELOG.md @@ -1,5 +1,12 @@ # @navikt/endringsmelding-pleiepenger +## 2.30.11 + +### Patch Changes + +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 2.30.10 ### Patch Changes diff --git a/apps/endringsmelding-pleiepenger/package.json b/apps/endringsmelding-pleiepenger/package.json index 869316a336..1bd0c8c221 100644 --- a/apps/endringsmelding-pleiepenger/package.json +++ b/apps/endringsmelding-pleiepenger/package.json @@ -5,7 +5,7 @@ "license": "MIT", "name": "@navikt/endringsmelding-pleiepenger", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.30.10", + "version": "2.30.11", "private": true, "dependencies": { "@navikt/ds-css": "6.15.0", diff --git a/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md b/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md index 202e4c1a9e..d1d1e6f475 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md +++ b/apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md @@ -1,5 +1,13 @@ # @navikt/omsorgsdager-aleneomsorg-dialog +## 2.19.12 + +### Patch Changes + +- 039a2c1: Bruke SoknadVelkommenPage komponent +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 2.19.11 ### Patch Changes diff --git a/apps/omsorgsdager-aleneomsorg-dialog/package.json b/apps/omsorgsdager-aleneomsorg-dialog/package.json index e1e1c25649..c106a00cb8 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/package.json +++ b/apps/omsorgsdager-aleneomsorg-dialog/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgsdager-aleneomsorg-dialog", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.19.11", + "version": "2.19.12", "private": true, "type": "module", "scripts": { diff --git a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx index 9663a8ee24..d5c004462a 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx +++ b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx @@ -1,53 +1,55 @@ -import { Heading, Link } from '@navikt/ds-react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; -import InfoList from '@navikt/sif-common-core-ds/src/components/lists/info-list/InfoList'; -import getLenker from '../../lenker'; +import { Heading, Link, List, VStack } from '@navikt/ds-react'; import { AppText } from '../../i18n'; +import getLenker from '../../lenker'; const BehandlingAvPersonopplysningerContent: React.FunctionComponent = () => { return ( - - - - -

    - -

    - - + +
    + + + +

    + +

    +
    +
    +

    - -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -     - - - ( - - {children} - - ), - }} - />{' '} - - + + +
    +
    +

    + ( + + {children} + + ), + }} + /> +

    +
    +     ); }; diff --git "a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/OmS\303\270knaden.tsx" "b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/OmS\303\270knaden.tsx" index 608530ec7e..0b680c7dc1 100644 --- "a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/OmS\303\270knaden.tsx" +++ "b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/OmS\303\270knaden.tsx" @@ -1,31 +1,38 @@ -import { BodyLong, Heading } from '@navikt/ds-react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; -import ExpandableInfo from '@navikt/sif-common-core-ds/src/components/expandable-info/ExpandableInfo'; +import { Accordion, Box, Heading, List, VStack } from '@navikt/ds-react'; import { AppText, useAppIntl } from '../../i18n'; import BehandlingAvPersonopplysningerContent from './BehandlingAvPersonopplysningerContent'; const OmSøknaden = () => { const { text } = useAppIntl(); return ( - - - - - -

    - -

    -

    - -

    -

    - -

    - - - -     -     + <> + + + + + + + + + + + + + + + + + + + + {text('page.velkommen.omSøknaden.4')} + + + + + + + ); }; diff --git a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenGuide.tsx b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenGuideContent.tsx similarity index 83% rename from apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenGuide.tsx rename to apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenGuideContent.tsx index c8e834076b..d30bcc3da9 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenGuide.tsx +++ b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenGuideContent.tsx @@ -1,19 +1,11 @@ -import { BodyLong, GuidePanel, Heading, Link, List } from '@navikt/ds-react'; +import { BodyLong, Heading, Link, List } from '@navikt/ds-react'; import { ListItem } from '@navikt/ds-react/List'; import React from 'react'; import { getEnvironmentVariable } from '@navikt/sif-common-core-ds/src/utils/envUtils'; import { AppText } from '../../i18n'; -interface Props { - navn: string; -} - -const VelkommenGuide: React.FunctionComponent = ({ navn }) => ( - - - - - +const VelkommenGuideContent = () => ( + <> @@ -64,7 +56,7 @@ const VelkommenGuide: React.FunctionComponent = ({ navn }) => (

    -     + ); -export default VelkommenGuide; +export default VelkommenGuideContent; diff --git a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenPage.tsx b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenPage.tsx index 0b8c880d87..eb8ed00dfd 100644 --- a/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenPage.tsx +++ b/apps/omsorgsdager-aleneomsorg-dialog/src/app/pages/velkommen/VelkommenPage.tsx @@ -1,13 +1,12 @@ import { OmsorgsdagerAleneomsorgApp } from '@navikt/sif-app-register'; import { SIFCommonPageKey, useAmplitudeInstance, useLogSidevisning } from '@navikt/sif-common-amplitude'; -import Page from '@navikt/sif-common-core-ds/src/components/page/Page'; -import { SamtykkeForm } from '@navikt/sif-common-soknad-ds'; +import { SoknadVelkommenPage } from '@navikt/sif-common-soknad-ds'; import { useAppIntl } from '../../i18n'; import actionsCreator from '../../søknad/context/action/actionCreator'; import { useSøknadContext } from '../../søknad/context/hooks/useSøknadContext'; import { SøknadRoutes } from '../../types/SøknadRoutes'; import OmSøknaden from './OmSøknaden'; -import VelkommenGuide from './VelkommenGuide'; +import VelkommenGuideContent from './VelkommenGuideContent'; const VelkommenPage = () => { const { text } = useAppIntl(); @@ -26,13 +25,15 @@ const VelkommenPage = () => { dispatch(actionsCreator.setSøknadRoute(SøknadRoutes.OM_OMSORGEN_FOR_BARN)); }; return ( - - - + , + }} + title={text('application.title')}> - - - + ); }; diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md index 02a9debf37..7a4f3d4a3a 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md @@ -1,5 +1,13 @@ # @navikt/omsorgspengerutbetaling-arbeidstaker-soknad +## 1.4.12 + +### Patch Changes + +- 80824d8: Bruke Aksel mal for velkommenside +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 1.4.11 ### Patch Changes diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json index 2cbd41f59d..1aad1460ac 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengerutbetaling-arbeidstaker-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.4.11", + "version": "1.4.12", "private": true, "dependencies": { "@navikt/ds-css": "6.15.0", diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx index 015250a732..232d1d7e77 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx @@ -1,21 +1,22 @@ +import { Heading, Link, VStack } from '@navikt/ds-react'; import React from 'react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; import InfoList from '@navikt/sif-common-core-ds/src/components/lists/info-list/InfoList'; -import { Heading, Link } from '@navikt/ds-react'; -import getLenker from '../../lenker'; import { AppText } from '../../i18n'; +import getLenker from '../../lenker'; const BehandlingAvPersonopplysningerContent: React.FunctionComponent = () => { return ( - - - - -

    - -

    - - + +
    + + + +

    + +

    +
    +
    +

    @@ -41,16 +42,20 @@ const BehandlingAvPersonopplysningerContent: React.FunctionComponent = () => { - - - - - - - - - - +

    +
    + ( + + {value} + + ), + }} + /> +
    +     ); }; diff --git "a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" "b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" index 340912f117..f04e9352fc 100644 --- "a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" +++ "b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" @@ -1,30 +1,36 @@ -import { BodyLong, Heading } from '@navikt/ds-react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; -import ExpandableInfo from '@navikt/sif-common-core-ds/src/components/expandable-info/ExpandableInfo'; -import { AppText } from '../../i18n'; +import { Accordion, Box, Heading, List, VStack } from '@navikt/ds-react'; +import { AppText, useAppIntl } from '../../i18n'; import BehandlingAvPersonopplysningerContent from './BehandlingAvPersonopplysningerContent'; const OmSøknaden = () => { + const { text } = useAppIntl(); return ( - - - - - -

    - -

    -

    - -

    -

    - -

    - - - -     -     + + + + + + + + + + + + + + + + + + + + {text('page.velkommen.omSøknaden.4')} + + + + + + ); }; diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuide.tsx b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuide.tsx deleted file mode 100644 index 0700479763..0000000000 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuide.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { BodyLong, GuidePanel, Heading } from '@navikt/ds-react'; -import React from 'react'; -import { AppText } from '../../i18n'; - -interface Props { - navn: string; -} - -const VelkommenGuide: React.FunctionComponent = ({ navn }) => ( - - - - - - - -

    - -

    -

    - -

    -     -); - -export default VelkommenGuide; diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuideContent.tsx b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuideContent.tsx new file mode 100644 index 0000000000..17df7b45d4 --- /dev/null +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenGuideContent.tsx @@ -0,0 +1,18 @@ +import { BodyLong } from '@navikt/ds-react'; +import { AppText } from '../../i18n'; + +const VelkommenGuideContent = () => ( + <> + + + +

    + +

    +

    + +

    + +); + +export default VelkommenGuideContent; diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenPage.tsx b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenPage.tsx index cbcb3a555a..4efb1f60c1 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenPage.tsx +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/VelkommenPage.tsx @@ -1,13 +1,12 @@ import { OmsorgspengerutbetalingArbeidstakerApp } from '@navikt/sif-app-register'; import { SIFCommonPageKey, useAmplitudeInstance, useLogSidevisning } from '@navikt/sif-common-amplitude'; -import Page from '@navikt/sif-common-core-ds/src/components/page/Page'; -import { SamtykkeForm } from '@navikt/sif-common-soknad-ds'; +import { SoknadVelkommenPage } from '@navikt/sif-common-soknad-ds'; import { useAppIntl } from '../../i18n'; import actionsCreator from '../../søknad/context/action/actionCreator'; import { useSøknadContext } from '../../søknad/context/hooks/useSøknadContext'; import { SøknadRoutes } from '../../types/SøknadRoutes'; import OmSøknaden from './OmSøknaden'; -import VelkommenGuide from './VelkommenGuide'; +import VelkommenGuideContent from './VelkommenGuideContent'; const VelkommenPage = () => { const { text } = useAppIntl(); @@ -26,13 +25,15 @@ const VelkommenPage = () => { dispatch(actionsCreator.setSøknadRoute(SøknadRoutes.DINE_BARN)); }; return ( - - - + , + }} + onStartSøknad={startSøknad}> - - - + ); }; diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/velkommenPageMessages.ts b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/velkommenPageMessages.ts index e253764c6e..6e0baaaead 100644 --- a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/velkommenPageMessages.ts +++ b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/src/app/pages/velkommen/velkommenPageMessages.ts @@ -34,11 +34,8 @@ const nb = { 'personopplysninger.4.5': 'tilknytningen din til Norge', 'personopplysninger.4.6': 'trygdeordninger du kan ha rett til i andre land. Vi kan også sende opplysninger om deg til trygdemyndigheter i andre land', - - 'personopplysninger.5.1': - 'Du har rett til innsyn i saken din. Vil du vite mer om hvordan NAV behandler personopplysninger? Se ', - 'personopplysninger.5.2': 'nav.no/personvern', - 'personopplysninger.5.3': '.', + 'personopplysninger.5': + 'Du har rett til innsyn i saken din. Vil du vite mer om hvordan NAV behandler personopplysninger? Se nav.no/personvern.', }; export const velkommenPageMessages = { nb }; diff --git a/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md b/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md index 4af741815f..a3e16adc4d 100644 --- a/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md +++ b/apps/omsorgspengerutbetaling-soknad/CHANGELOG.md @@ -1,5 +1,13 @@ # @navikt/omsorgspengerutbetaling-soknad +## 1.13.6 + +### Patch Changes + +- 3fbe91e: Bruke Aksel mal for Velkommenside +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 1.13.5 ### Patch Changes diff --git a/apps/omsorgspengerutbetaling-soknad/package.json b/apps/omsorgspengerutbetaling-soknad/package.json index a2abf6abc8..9b8e81692d 100644 --- a/apps/omsorgspengerutbetaling-soknad/package.json +++ b/apps/omsorgspengerutbetaling-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengerutbetaling-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.13.5", + "version": "1.13.6", "private": true, "type": "module", "dependencies": { diff --git a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx index aef4c99a64..b754e2b988 100644 --- a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx +++ b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/BehandlingAvPersonopplysningerContent.tsx @@ -1,49 +1,48 @@ -import { Heading, Link } from '@navikt/ds-react'; +import { Heading, Link, List, VStack } from '@navikt/ds-react'; import React from 'react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; -import InfoList from '@navikt/sif-common-core-ds/src/components/lists/info-list/InfoList'; import { AppText } from '../../i18n'; import getLenker from '../../lenker'; const BehandlingAvPersonopplysningerContent: React.FunctionComponent = () => { return ( - - - - -

    - -

    - - + +
    + + + +

    + +

    +
    +
    +

    - -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -
  • + + -
    • -     - - - + + +
    +
    { ), }} /> - - +
    +     ); }; diff --git "a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" "b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" index 608530ec7e..f04e9352fc 100644 --- "a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" +++ "b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/OmS\303\270knaden.tsx" @@ -1,31 +1,36 @@ -import { BodyLong, Heading } from '@navikt/ds-react'; -import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block'; -import ExpandableInfo from '@navikt/sif-common-core-ds/src/components/expandable-info/ExpandableInfo'; +import { Accordion, Box, Heading, List, VStack } from '@navikt/ds-react'; import { AppText, useAppIntl } from '../../i18n'; import BehandlingAvPersonopplysningerContent from './BehandlingAvPersonopplysningerContent'; const OmSøknaden = () => { const { text } = useAppIntl(); return ( - - - - - -

    - -

    -

    - -

    -

    - -

    - - - -     -     + + + + + + + + + + + + + + + + + + + + {text('page.velkommen.omSøknaden.4')} + + + + + + ); }; diff --git a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenGuide.tsx b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenGuideContent.tsx similarity index 56% rename from apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenGuide.tsx rename to apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenGuideContent.tsx index 13d9075a95..94f8f35ee7 100644 --- a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenGuide.tsx +++ b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenGuideContent.tsx @@ -1,21 +1,12 @@ -import { BodyLong, GuidePanel, Heading, Link } from '@navikt/ds-react'; -import React from 'react'; -import getLenker from '../../lenker'; +import { BodyLong, Link } from '@navikt/ds-react'; import { AppText } from '../../i18n'; +import getLenker from '../../lenker'; -interface Props { - navn: string; -} - -const VelkommenGuide: React.FunctionComponent = ({ navn }) => ( - - - - +const VelkommenGuideContent = () => ( + <> -

    {children} }} />

    @@ -25,7 +16,7 @@ const VelkommenGuide: React.FunctionComponent = ({ navn }) => ( values={{ Lenke: (children) => {children} }} />

    -     + ); -export default VelkommenGuide; +export default VelkommenGuideContent; diff --git a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenPage.tsx b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenPage.tsx index a9fe156490..4ec289332a 100644 --- a/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenPage.tsx +++ b/apps/omsorgspengerutbetaling-soknad/src/app/pages/velkommen/VelkommenPage.tsx @@ -1,13 +1,12 @@ import { OmsorgspengerutbetalingSNFriApp } from '@navikt/sif-app-register'; import { SIFCommonPageKey, useAmplitudeInstance, useLogSidevisning } from '@navikt/sif-common-amplitude'; -import Page from '@navikt/sif-common-core-ds/src/components/page/Page'; -import { SamtykkeForm } from '@navikt/sif-common-soknad-ds'; +import { SoknadVelkommenPage } from '@navikt/sif-common-soknad-ds'; import { useAppIntl } from '../../i18n'; import actionsCreator from '../../søknad/context/action/actionCreator'; import { useSøknadContext } from '../../søknad/context/hooks/useSøknadContext'; import { SøknadRoutes } from '../../types/SøknadRoutes'; import OmSøknaden from './OmSøknaden'; -import VelkommenGuide from './VelkommenGuide'; +import VelkommenGuideContent from './VelkommenGuideContent'; const VelkommenPage = () => { const { text } = useAppIntl(); @@ -26,13 +25,12 @@ const VelkommenPage = () => { dispatch(actionsCreator.setSøknadRoute(SøknadRoutes.DINE_BARN)); }; return ( - - - + }} + onStartSøknad={startSøknad}> - - - + ); }; diff --git a/apps/omsorgspengesoknad/CHANGELOG.md b/apps/omsorgspengesoknad/CHANGELOG.md index 5546850d36..616b0708f5 100644 --- a/apps/omsorgspengesoknad/CHANGELOG.md +++ b/apps/omsorgspengesoknad/CHANGELOG.md @@ -1,5 +1,12 @@ # @navikt/omsorgspengesoknad +## 1.28.11 + +### Patch Changes + +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 1.28.10 ### Patch Changes diff --git a/apps/omsorgspengesoknad/package.json b/apps/omsorgspengesoknad/package.json index 93b5417104..3d826cb77e 100644 --- a/apps/omsorgspengesoknad/package.json +++ b/apps/omsorgspengesoknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/omsorgspengesoknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "1.28.10", + "version": "1.28.11", "private": true, "type": "module", "dependencies": { diff --git "a/apps/omsorgspengesoknad/src/app/pages/velkommen/om-s\303\270knaden/OmS\303\270knaden.tsx" "b/apps/omsorgspengesoknad/src/app/pages/velkommen/om-s\303\270knaden/OmS\303\270knaden.tsx" index 276633bb70..9138bc3166 100644 --- "a/apps/omsorgspengesoknad/src/app/pages/velkommen/om-s\303\270knaden/OmS\303\270knaden.tsx" +++ "b/apps/omsorgspengesoknad/src/app/pages/velkommen/om-s\303\270knaden/OmS\303\270knaden.tsx" @@ -7,7 +7,7 @@ const OmSøknaden = () => { return ( - + diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md b/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md index e946db9742..f5737e31ca 100644 --- a/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md +++ b/apps/pleiepenger-i-livets-sluttfase-soknad/CHANGELOG.md @@ -1,5 +1,12 @@ # @navikt/pleiepenger-i-livets-sluttfase-soknad +## 2.9.6 + +### Patch Changes + +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 2.9.5 ### Patch Changes diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json index 94ae99121d..397bcc72f2 100644 --- a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json +++ b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/pleiepenger-i-livets-sluttfase-soknad", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "2.9.5", + "version": "2.9.6", "private": true, "type": "module", "dependencies": { diff --git a/apps/pleiepenger-sykt-barn/CHANGELOG.md b/apps/pleiepenger-sykt-barn/CHANGELOG.md index 79c5714bef..e247778134 100644 --- a/apps/pleiepenger-sykt-barn/CHANGELOG.md +++ b/apps/pleiepenger-sykt-barn/CHANGELOG.md @@ -1,5 +1,12 @@ # @navikt/pleiepenger-sykt-barn +## 3.15.6 + +### Patch Changes + +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 3.15.5 ### Patch Changes diff --git a/apps/pleiepenger-sykt-barn/package.json b/apps/pleiepenger-sykt-barn/package.json index 26c944f8dc..5d38cdc296 100644 --- a/apps/pleiepenger-sykt-barn/package.json +++ b/apps/pleiepenger-sykt-barn/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/pleiepenger-sykt-barn", "repository": "https://github.com/navikt/sif-brukerdialog", - "version": "3.15.5", + "version": "3.15.6", "private": true, "type": "module", "dependencies": { diff --git a/apps/sif-ettersending/CHANGELOG.md b/apps/sif-ettersending/CHANGELOG.md index 38426da0f0..86811711cb 100644 --- a/apps/sif-ettersending/CHANGELOG.md +++ b/apps/sif-ettersending/CHANGELOG.md @@ -1,5 +1,12 @@ # @navikt/sif-ettersending +## 3.35.6 + +### Patch Changes + +- Updated dependencies [7f61cd6] + - @navikt/sif-common-soknad-ds@12.0.5 + ## 3.35.5 ### Patch Changes diff --git a/apps/sif-ettersending/package.json b/apps/sif-ettersending/package.json index 86ff30ff17..b9b994da45 100644 --- a/apps/sif-ettersending/package.json +++ b/apps/sif-ettersending/package.json @@ -4,7 +4,7 @@ "license": "MIT", "name": "@navikt/sif-ettersending", "repository": "https://github.com/navikt/sif-ettersending", - "version": "3.35.5", + "version": "3.35.6", "private": true, "type": "module", "dependencies": { diff --git a/packages/sif-common-soknad-ds/CHANGELOG.md b/packages/sif-common-soknad-ds/CHANGELOG.md index 6201ff8e5e..f1030b16e3 100644 --- a/packages/sif-common-soknad-ds/CHANGELOG.md +++ b/packages/sif-common-soknad-ds/CHANGELOG.md @@ -1,5 +1,11 @@ # @navikt/sif-common-soknad-ds +## 12.0.5 + +### Patch Changes + +- 7f61cd6: Sette wrap=false for SoknadHeader + ## 12.0.4 ### Patch Changes diff --git a/packages/sif-common-soknad-ds/package.json b/packages/sif-common-soknad-ds/package.json index 5fd5eaf159..335e4645fa 100644 --- a/packages/sif-common-soknad-ds/package.json +++ b/packages/sif-common-soknad-ds/package.json @@ -3,7 +3,7 @@ "description": "Basis felleskomponenter for sykdom i familien søknadsskjema", "name": "@navikt/sif-common-soknad-ds", "main": "src", - "version": "12.0.4", + "version": "12.0.5", "private": true, "peerDependencies": { "@navikt/ds-css": "6.13.0", diff --git a/packages/sif-common-soknad-ds/src/components/soknad-header/SoknadHeader.tsx b/packages/sif-common-soknad-ds/src/components/soknad-header/SoknadHeader.tsx index 78fa7b75ed..02c265764f 100644 --- a/packages/sif-common-soknad-ds/src/components/soknad-header/SoknadHeader.tsx +++ b/packages/sif-common-soknad-ds/src/components/soknad-header/SoknadHeader.tsx @@ -11,7 +11,7 @@ interface Props { const SoknadHeader: React.FunctionComponent = ({ title, level = '1' }) => (
    - +