Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EY-4542: mellomrom mellom knapper legg til barn #1546

Merged
merged 3 commits into from
Oct 9, 2024
Merged

EY-4542: mellomrom mellom knapper legg til barn #1546

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7b1ab4
Legg til mellomrom mellom endre og fjern barn for å unngå at bruker k…
emilps Oct 9, 2024
df63e79
Endre tekst på knapp til lagre endring hvis man skal endre på et barn
emilps Oct 9, 2024
9900911
snapshot...
emilps Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 10 additions & 33 deletions apps/omstillingsstoenad-ui/src/components/soknad/7-barnepensjon/BarnInfokort.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ikon from '../../../assets/ikoner/barn1.svg'
import React, { memo } from 'react'
import { useTranslation } from 'react-i18next'
import { IValg } from '../../../typer/Spoersmaal'
import { BodyShort, Heading, BodyLong, Link, Tag } from '@navikt/ds-react'
import { BodyShort, Heading, Tag, Button, VStack } from '@navikt/ds-react'
import { DeleteFilled, EditFilled } from '@navikt/ds-icons'
import { Infokort, InfokortHeader, InfokortInformasjonsboks } from '../../felles/StyledComponents'
import styled from 'styled-components'
Expand All @@ -14,17 +14,6 @@ const InfokortInformasjonsElement = styled.div`
margin: 10px 0 10px 0;
`

const InfokortFooter = styled.div`
margin-bottom: 1rem;
`

const InfokortFooterItem = styled(Link)`
display: flex;
justify-content: center;
flex-grow: 1;
text-align: center;
`

interface Props {
barn: IBarn
index: number
Expand Down Expand Up @@ -85,28 +74,16 @@ const BarnInfokort = memo(({ barn, index, fjern, setAktivBarnIndex }: Props) =>
</SkjemaElement>
)}
</InfokortInformasjonsElement>
</InfokortInformasjonsboks>

<InfokortFooter>
<BodyLong>
<InfokortFooterItem
href={'#'}
onClick={(e: React.MouseEvent) => {
e.preventDefault()
setAktivBarnIndex()
}}
>
<EditFilled className={'edit-svg'} />
<span>{t('knapp.endre')}</span>
</InfokortFooterItem>
</BodyLong>
<BodyLong>
<InfokortFooterItem href={'#'} onClick={() => fjern(index)}>
<DeleteFilled className={'edit-svg'} />
<span>{t('knapp.fjernFraSoeknad')}</span>
</InfokortFooterItem>
</BodyLong>
</InfokortFooter>
<VStack gap="2" align="center">
<Button onClick={() => setAktivBarnIndex()} icon={<EditFilled fontSize={20} />} variant="tertiary">
{t('knapp.endre')}
</Button>
<Button onClick={() => fjern(index)} icon={<DeleteFilled fontSize={20} />} variant="tertiary">
{t('knapp.fjernFraSoeknad')}
</Button>
</VStack>
</InfokortInformasjonsboks>
</Infokort>
)
})
Expand Down
4 changes: 3 additions & 1 deletion apps/omstillingsstoenad-ui/src/components/soknad/7-barnepensjon/LeggTilBarnSkjema.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ const LeggTilBarnSkjema = ({ avbryt, lagre, barn, fnrRegistrerteBarn }: Props) =
const { state: bruker } = useBrukerContext()
const { state: soeknad } = useSoknadContext()

const endrerBarn = !!barn?.fornavn?.length

const methods = useForm<IBarn>({
defaultValues: {
...barn,
Expand Down Expand Up @@ -502,7 +504,7 @@ const LeggTilBarnSkjema = ({ avbryt, lagre, barn, fnrRegistrerteBarn }: Props) =
onClick={handleSubmit(leggTilOgLukk)}
style={{ minWidth: '80px' }}
>
{t('knapp.leggTil')}
{endrerBarn ? t('knapp.lagreEndring') : t('knapp.leggTil')}
</Button>
</NavigasjonsRad>
</EndreBarnKortInnhold>
Expand Down
1 change: 1 addition & 0 deletions apps/omstillingsstoenad-ui/src/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
'knapp.fjern': 'Remove',
'knapp.fjernFraSoeknad': 'Remove from the application',
'knapp.lagre': 'Save',
'knapp.lagreEndring': 'Save changes',
'knapp.slett': 'Delete the application',
'knapp.endre': 'Change',
'knapp.ja': 'Yes, send application',
Expand Down
1 change: 1 addition & 0 deletions apps/omstillingsstoenad-ui/src/locales/nb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
'knapp.fjern': 'Fjern',
'knapp.fjernFraSoeknad': 'Fjern fra søknad',
'knapp.lagre': 'Lagre',
'knapp.lagreEndring': 'Lagre endring',
'knapp.slett': 'Slett søknad',
'knapp.endre': 'Endre',
'knapp.ja': 'Ja, send søknad',
Expand Down
1 change: 1 addition & 0 deletions apps/omstillingsstoenad-ui/src/locales/nn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
'knapp.fjern': 'Fjern',
'knapp.fjernFraSoeknad': 'Fjern frå søknad',
'knapp.lagre': 'Lagre',
'knapp.lagreEndring': 'Lagre endring',
'knapp.slett': 'Slett søknad',
'knapp.endre': 'Endre',
'knapp.ja': 'Ja, send søknad',
Expand Down
Loading