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

Endre tekst når saksbehandlingstid er passert #1806

Merged
merged 6 commits into from
May 2, 2024
Merged

Endre tekst når saksbehandlingstid er passert #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0acf718
Endre tekst i Saksbehandlingstid når frist er passert
frodehansen2 Apr 30, 2024
1e89080
Changeset
frodehansen2 Apr 30, 2024
6215567
Oppdatere test
frodehansen2 Apr 30, 2024
450e714
CR fix
frodehansen2 May 2, 2024
97b33c2
Tekstjustering
frodehansen2 May 2, 2024
ba4187b
Tekstjustering
frodehansen2 May 2, 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
5 changes: 5 additions & 0 deletions .changeset/eighty-lemons-call.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@navikt/dine-pleiepenger": patch
---

Endre tekst som kommer når saksbehandlingstid-fristen er passert.
2 changes: 1 addition & 1 deletion apps/dine-pleiepenger/e2e/playwright/tests/saksbehandlingstid.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ test('Saksbehandlingstid er i fortid', async ({ page }) => {
await route.fulfill({ status: 200, body: JSON.stringify(response) });
});
await page.goto('http://localhost:8080/innsyn');
await expect(page.getByText('Forventet behandlingstid er')).toBeVisible();
await expect(page.getByText('Vi jobber fremdeles med søknaden din')).toBeVisible();
});

test('Ingen Saksbehandlingstid, men behandlingstid', async ({ page }) => {
Expand Down
40 changes: 29 additions & 11 deletions apps/dine-pleiepenger/src/components/saksbehandlingstid/Saksbehandlingstid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import { BodyShort, Box, Heading, Link } from '@navikt/ds-react';
import React from 'react';
import { dateFormatter } from '@navikt/sif-common-utils';
import { Msg } from '../../i18n';
import { Venteårsak } from '../../types/Venteårsak';
import { browserEnv } from '../../utils/env';
import { Msg, useMessages } from '../../i18n';
import { erSaksbehandlingsfristPassert } from '../../utils/sakUtils';

interface Props {
Expand Down Expand Up @@ -38,23 +38,41 @@ const getFristTekst = (frist: Date, venteårsak?: Venteårsak): React.ReactNode
}
};

const Saksbehandlingstid: React.FunctionComponent<Props> = ({ frist, venteårsak, saksbehandlingstidUker = 7 }) => {
const SaksbehandlingstidMelding = ({ frist, venteårsak, saksbehandlingstidUker }: Props) => {
const fristErPassert = frist ? erSaksbehandlingsfristPassert(frist) : false;
const { text } = useMessages();
if (frist) {
return fristErPassert ? (
<>
<BodyShort spacing={true}>
<Msg id="svarfrist.fristPassert.1" />
</BodyShort>
<BodyShort spacing={true}>
<Msg id="svarfrist.fristPassert.2" />
</BodyShort>
</>
) : (
getFristTekst(frist, venteårsak)
);
}
return <Msg id="svarfrist.forventetBehandlingstid" values={{ saksbehandlingstidUker }} />;
};

const Saksbehandlingstid: React.FunctionComponent<Props> = ({ frist, venteårsak, saksbehandlingstidUker = 7 }) => {
return (
<Box>
<Heading size="medium" level="2" className="text-deepblue-800" spacing={true}>
{text('svarfrist.tittel')}
<Msg id="svarfrist.tittel" />
</Heading>
<BodyShort as="div" className="bg-deepblue-100 pt-4 pl-6 pr-6 pb-6 rounded">
{frist && fristErPassert === false ? (
<p className="mb-2">{getFristTekst(frist, venteårsak)}</p>
) : (
<p className="mb-2">{text('svarfrist.forventetBehandlingstid', { saksbehandlingstidUker })}</p>
)}

<Box className="mb-2">
<SaksbehandlingstidMelding
frist={frist}
venteårsak={venteårsak}
saksbehandlingstidUker={saksbehandlingstidUker}
/>
</Box>
<Link variant="neutral" href={browserEnv.NEXT_PUBLIC_SAKSBEHANDLINGSTID_INFO_URL}>
{text('svarfrist.lesMerLenke')}
<Msg id="svarfrist.lesMerLenke" />
</Link>
</BodyShort>
</Box>
Expand Down
4 changes: 4 additions & 0 deletions apps/dine-pleiepenger/src/i18n/nb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ export const nb = {
'svarfrist.tittel': 'Saksbehandlingstid',
'svarfrist.forventetBehandlingstid':
'Forventet behandlingstid er {saksbehandlingstidUker} uker fra vi fikk søknaden din.',
'svarfrist.fristPassert.1':
'Vi jobber fremdeles med søknaden din. Noen ganger kan det ta lengre tid, spesielt hvis saken er komplisert eller vi har ventet på dokumenter.',
'svarfrist.fristPassert.2':
'Hvis du eller arbeidsgiveren din nylig har sendt oss dokumenter, tar det som regel noen dager før vår saksbehandler har vurdert dem.',
'svarfrist.lesMerLenke': 'Se saksbehandlingstider',
'svarfrist.dokumenterManglerFrist':
'Fordi vi mangler dokumenter kan saksbehandlingstiden bli lenger enn <dato>{frist}</dato>.',
Expand Down