Skip to content

Commit 9e8f0f9

Browse files
frodehansen2frodehansen2
committed
Merge branch 'main' into innsyn-status-i-sak
2 parents 4d83a5e + 82f49f8 commit 9e8f0f9

File tree

45 files changed

+1781
-1521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1781
-1521
lines changed

‎apps/dine-pleiepenger/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @navikt/dine-pleiepenger
22

3+
## 0.5.16
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdatering patch
8+
- Updated dependencies
9+
- @navikt/sif-common-core-ds@9.15.7
10+
311
## 0.5.15
412

513
### Patch Changes

‎apps/dine-pleiepenger/e2e/playwright/tests/svarfrist.test.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,13 @@ test('Ingen svarfrist, men behandlingstid', async ({ page }) => {
6464
await page.route('**/innsynsdata', async (route) => {
6565
const response: Innsynsdata = {
6666
...defaultInnsynsdata,
67-
saker: [{ pleietrengende, sak: { ...sak, saksbehandlingsFrist: undefined } }],
68-
saksbehandlingstidUker: 3,
67+
saker: [{ pleietrengende, sak: { ...sak, saksbehandlingsFrist: dayjs().toDate() } }],
6968
harSak: true,
7069
};
7170
await route.fulfill({ status: 200, body: JSON.stringify(response) });
7271
});
7372
await page.goto('http://localhost:8080/innsyn');
74-
await expect(page.getByText('Forventet behandlingstid er 3 uker fra vi fikk søknaden din.')).toBeVisible();
73+
await expect(page.getByText('Du kan forvente svar innen:')).toBeVisible();
7574
});
7675

7776
test('Hverken svarfrist eller behandlingstid', async ({ page }) => {

‎apps/dine-pleiepenger/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@navikt/dine-pleiepenger",
3-
"version": "0.5.15",
3+
"version": "0.5.16",
44
"private": true,
55
"scripts": {
66
"build-storybook": "storybook build",
@@ -31,7 +31,7 @@
3131
"react": "18.2.0",
3232
"react-dom": "18.2.0",
3333
"react-loading-skeleton": "3.4.0",
34-
"swr": "2.2.4",
34+
"swr": "2.2.5",
3535
"uuid": "9.0.1",
3636
"zod": "3.22.4"
3737
},
@@ -43,14 +43,14 @@
4343
"@navikt/ds-tailwind": "5.18.1",
4444
"@next/bundle-analyzer": "14.1.0",
4545
"@playwright/test": "1.41.2",
46-
"@storybook/addon-essentials": "7.6.15",
47-
"@storybook/addon-interactions": "7.6.15",
48-
"@storybook/addon-links": "7.6.15",
46+
"@storybook/addon-essentials": "7.6.16",
47+
"@storybook/addon-interactions": "7.6.16",
48+
"@storybook/addon-links": "7.6.16",
4949
"@storybook/addon-onboarding": "1.0.11",
50-
"@storybook/blocks": "7.6.15",
51-
"@storybook/nextjs": "7.6.15",
52-
"@storybook/react": "7.6.15",
53-
"@storybook/test": "7.6.15",
50+
"@storybook/blocks": "7.6.16",
51+
"@storybook/nextjs": "7.6.16",
52+
"@storybook/react": "7.6.16",
53+
"@storybook/test": "7.6.16",
5454
"chromatic": "10.9.5",
5555
"classnames": "2.5.1",
5656
"dayjs": "1.11.10",
@@ -64,7 +64,7 @@
6464
"react-day-picker": "8.10.0",
6565
"react-dom": "18.2.0",
6666
"react-intl": "6.6.2",
67-
"storybook": "7.6.15",
67+
"storybook": "7.6.16",
6868
"tailwindcss": "3.4.1",
6969
"uuid": "9.0.1"
7070
},

‎apps/dine-pleiepenger/src/components/svarfrist/Svarfrist.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
import { BodyShort, Box, Heading, Link } from '@navikt/ds-react';
33
import React from 'react';
44
import { dateFormatter } from '@navikt/sif-common-utils';
5-
import { browserEnv } from '../../utils/env';
65
import dayjs from 'dayjs';
76
import { Venteårsak } from '../../types/Venteårsak';
7+
import { browserEnv } from '../../utils/env';
88

99
interface Props {
1010
frist?: Date;

‎apps/dine-pleiepenger/src/pages/index.page.tsx

+24-7
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,41 @@
11
import { Box, Heading, LinkPanel, VStack } from '@navikt/ds-react';
22
import { ReactElement } from 'react';
3+
import { setBreadcrumbs } from '@navikt/nav-dekoratoren-moduler';
34
import { useAmplitudeInstance } from '@navikt/sif-common-amplitude';
45
import { useEffectOnce } from '@navikt/sif-common-hooks';
6+
import { dateFormatter } from '@navikt/sif-common-utils';
57
import Head from 'next/head';
8+
import Link from 'next/link';
69
import { withAuthenticatedPage } from '../auth/withAuthentication';
710
import DineInnsendteSøknader from '../components/dine-innsendte-søknader/DineInnsendteSøknader';
811
import HvaSkjer from '../components/hva-skjer/HvaSkjer';
912
import DefaultPageLayout from '../components/page-layout/default-page-layout/DefaultPageLayout';
1013
import Snarveier from '../components/snarveier/Snarveier';
14+
import StatusTag from '../components/status-tag/StatusTag';
1115
import Svarfrist from '../components/svarfrist/Svarfrist';
1216
import { useInnsynsdataContext } from '../hooks/useInnsynsdataContext';
17+
import { PleietrengendeMedSak } from '../server/api-models/PleietrengendeMedSakSchema';
18+
import { InnsendtSøknad, InnsendtSøknadstype } from '../types/Søknad';
19+
import { getAllBreadcrumbs } from '../utils/decoratorBreadcrumbs';
1320
import { Feature } from '../utils/features';
14-
import SakPage from './sak/SakPage';
1521
import { personaliaUtils } from '../utils/personaliaUtils';
16-
import { dateFormatter } from '@navikt/sif-common-utils';
17-
import Link from 'next/link';
18-
import { getAllBreadcrumbs } from '../utils/decoratorBreadcrumbs';
19-
import { setBreadcrumbs } from '@navikt/nav-dekoratoren-moduler';
20-
import StatusTag from '../components/status-tag/StatusTag';
2122
import { getBehandlingsstatusISak } from '../utils/sakUtils';
23+
import SakPage from './sak/SakPage';
24+
25+
const harSendtInnSøknadEllerEndringsmelding = (søknader: InnsendtSøknad[]): boolean => {
26+
return søknader.some(
27+
(søknad) =>
28+
søknad.søknadstype === InnsendtSøknadstype.PP_SYKT_BARN ||
29+
søknad.søknadstype === InnsendtSøknadstype.PP_SYKT_BARN_ENDRINGSMELDING,
30+
);
31+
};
32+
33+
const getSaksbehandlingsfrist = (søknader: InnsendtSøknad[], saker: PleietrengendeMedSak[]): Date | undefined => {
34+
if (saker.length === 1 && harSendtInnSøknadEllerEndringsmelding(søknader)) {
35+
return saker[0].sak.saksbehandlingsFrist;
36+
}
37+
return undefined;
38+
};
2239

2340
function DinePleiepengerPage(): ReactElement {
2441
const {
@@ -99,7 +116,7 @@ function DinePleiepengerPage(): ReactElement {
99116
</div>
100117
<div className="md:mb-none shrink-0 md:w-72">
101118
<Svarfrist
102-
frist={saker.length === 1 ? saker[0].sak.saksbehandlingsFrist : undefined}
119+
frist={getSaksbehandlingsfrist(innsendteSøknader, saker)}
103120
saksbehandlingstidUker={saksbehandlingstidUker}
104121
/>
105122
</div>

‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn
22

3+
## 1.21.28
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdatering patch
8+
- Updated dependencies
9+
- @navikt/sif-common-formik-ds@1.7.16
10+
- @navikt/sif-common-soknad-ds@10.13.16
11+
- @navikt/sif-common-core-ds@9.15.7
12+
13+
## 1.21.27
14+
15+
### Patch Changes
16+
17+
- Updated dependencies
18+
- @navikt/sif-common-amplitude@2.24.21
19+
- @navikt/sif-common-formik-ds@1.7.15
20+
- @navikt/sif-common-soknad-ds@10.13.15
21+
- @navikt/sif-common-core-ds@9.15.6
22+
- @navikt/sif-common-sentry@0.25.19
23+
- @navikt/sif-common-utils@3.44.5
24+
325
## 1.21.26
426

527
### Patch Changes

‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn",
44
"license": "MIT",
55
"name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn",
6-
"version": "1.21.26",
6+
"version": "1.21.28",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
88
"private": true,
99
"type": "module",
@@ -53,7 +53,7 @@
5353
"react-fast-compare": "3.2.2",
5454
"react-intl": "6.6.2",
5555
"react-router-dom": "6.22.0",
56-
"vite": "5.1.2",
56+
"vite": "5.1.3",
5757
"vite-plugin-checker": "0.6.4"
5858
},
5959
"devDependencies": {
@@ -64,7 +64,7 @@
6464
"@babel/preset-env": "7.23.9",
6565
"@babel/preset-react": "7.23.3",
6666
"@playwright/test": "1.41.2",
67-
"@storybook/react-vite": "7.6.15",
67+
"@storybook/react-vite": "7.6.16",
6868
"@testing-library/react": "14.2.1",
6969
"@types/object-hash": "3.0.6",
7070
"@types/react": "18.2.55",

‎apps/endringsmelding-pleiepenger/CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# @navikt/endringsmelding-pleiepenger
22

3+
## 2.25.9
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdatering patch
8+
- Updated dependencies
9+
- @navikt/sif-common-formik-ds@1.7.16
10+
- @navikt/sif-common-soknad-ds@10.13.16
11+
- @navikt/sif-common-forms-ds@8.19.5
12+
- @navikt/sif-common-core-ds@9.15.7
13+
14+
## 2.25.8
15+
16+
### Patch Changes
17+
18+
- Updated dependencies
19+
- @navikt/sif-common-amplitude@2.24.21
20+
- @navikt/sif-common-formik-ds@1.7.15
21+
- @navikt/sif-common-soknad-ds@10.13.15
22+
- @navikt/sif-common-forms-ds@8.19.4
23+
- @navikt/sif-common-core-ds@9.15.6
24+
- @navikt/sif-common-sentry@0.25.19
25+
- @navikt/sif-common-utils@3.44.5
26+
327
## 2.25.7
428

529
### Patch Changes

‎apps/endringsmelding-pleiepenger/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"name": "@navikt/endringsmelding-pleiepenger",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
8-
"version": "2.25.7",
8+
"version": "2.25.9",
99
"private": true,
1010
"dependencies": {
1111
"@navikt/ds-css": "5.18.1",
@@ -53,14 +53,14 @@
5353
"@babel/preset-typescript": "7.23.3",
5454
"@mswjs/data": "0.16.1",
5555
"@navikt/ds-tailwind": "5.18.1",
56-
"@sentry/vite-plugin": "2.14.0",
57-
"@storybook/addon-actions": "7.6.15",
58-
"@storybook/addon-essentials": "7.6.15",
59-
"@storybook/addon-interactions": "7.6.15",
60-
"@storybook/addon-links": "7.6.15",
61-
"@storybook/node-logger": "7.6.15",
62-
"@storybook/preset-create-react-app": "7.6.15",
63-
"@storybook/react": "7.6.15",
56+
"@sentry/vite-plugin": "2.14.1",
57+
"@storybook/addon-actions": "7.6.16",
58+
"@storybook/addon-essentials": "7.6.16",
59+
"@storybook/addon-interactions": "7.6.16",
60+
"@storybook/addon-links": "7.6.16",
61+
"@storybook/node-logger": "7.6.16",
62+
"@storybook/preset-create-react-app": "7.6.16",
63+
"@storybook/react": "7.6.16",
6464
"@storybook/testing-library": "0.2.2",
6565
"@types/flat": "5.0.5",
6666
"@types/intl": "1.2.2",
@@ -82,10 +82,10 @@
8282
"msw": "2.2.0",
8383
"postcss": "8.4.35",
8484
"postcss-import": "16.0.1",
85-
"storybook": "7.6.15",
85+
"storybook": "7.6.16",
8686
"tailwindcss": "3.4.1",
8787
"typescript": "5.3.3",
88-
"vite": "5.1.2",
88+
"vite": "5.1.3",
8989
"vite-plugin-checker": "0.6.4",
9090
"vitest": "1.2.2"
9191
},

‎apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# @navikt/omsorgsdager-aleneomsorg-dialog
22

3+
## 2.14.31
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdatering patch
8+
- Updated dependencies
9+
- @navikt/sif-common-formik-ds@1.7.16
10+
- @navikt/sif-common-soknad-ds@10.13.16
11+
- @navikt/sif-common-forms-ds@8.19.5
12+
- @navikt/sif-common-core-ds@9.15.7
13+
14+
## 2.14.30
15+
16+
### Patch Changes
17+
18+
- Updated dependencies
19+
- @navikt/sif-common-amplitude@2.24.21
20+
- @navikt/sif-common-formik-ds@1.7.15
21+
- @navikt/sif-common-soknad-ds@10.13.15
22+
- @navikt/sif-common-forms-ds@8.19.4
23+
- @navikt/sif-common-core-ds@9.15.6
24+
- @navikt/sif-common-sentry@0.25.19
25+
- @navikt/sif-common-utils@3.44.5
26+
327
## 2.14.29
428

529
### Patch Changes

‎apps/omsorgsdager-aleneomsorg-dialog/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"name": "@navikt/omsorgsdager-aleneomsorg-dialog",
66
"repository": "https://github.com/navikt/sif-brukerdialog",
7-
"version": "2.14.29",
7+
"version": "2.14.31",
88
"private": true,
99
"type": "module",
1010
"scripts": {
@@ -73,7 +73,7 @@
7373
"jsdom": "24.0.0",
7474
"less": "4.2.0",
7575
"mini-css-extract-plugin": "2.8.0",
76-
"vite": "5.1.2",
76+
"vite": "5.1.3",
7777
"vite-plugin-checker": "0.6.4"
7878
},
7979
"eslintConfig": {

‎apps/omsorgsdager-kalkulator/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @navikt/omsorgsdager-kalkulator
22

3+
## 3.5.21
4+
5+
### Patch Changes
6+
7+
- Patch oppdatering av sentry
8+
39
## 3.5.20
410

511
### Patch Changes

‎apps/omsorgsdager-kalkulator/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "En kalkulator for beregning av omsorgsdager.",
44
"license": "MIT",
55
"name": "@navikt/omsorgsdager-kalkulator",
6-
"version": "3.5.20",
6+
"version": "3.5.21",
77
"private": true,
88
"scripts": {
99
"dev": "next dev -p 8080",
@@ -35,7 +35,7 @@
3535
"devDependencies": {
3636
"@axe-core/playwright": "4.8.5",
3737
"@playwright/test": "1.41.2",
38-
"@types/node": "20.11.17",
38+
"@types/node": "20.11.19",
3939
"@types/react": "18.2.55",
4040
"@types/react-dom": "18.2.19",
4141
"@types/uuid": "9.0.8",

‎apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md

+25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# @navikt/omsorgspengerutbetaling-arbeidstaker-soknad
22

3+
## 1.0.13
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdatering patch
8+
- Updated dependencies
9+
- @navikt/sif-common-formik-ds@1.7.16
10+
- @navikt/sif-common-soknad-ds@10.13.16
11+
- @navikt/sif-common-forms-ds@8.19.5
12+
- @navikt/sif-common-core-ds@9.15.7
13+
14+
## 1.0.12
15+
16+
### Patch Changes
17+
18+
- Patch oppdatering av sentry
19+
- Updated dependencies
20+
- @navikt/sif-common-amplitude@2.24.21
21+
- @navikt/sif-common-formik-ds@1.7.15
22+
- @navikt/sif-common-soknad-ds@10.13.15
23+
- @navikt/sif-common-forms-ds@8.19.4
24+
- @navikt/sif-common-core-ds@9.15.6
25+
- @navikt/sif-common-sentry@0.25.19
26+
- @navikt/sif-common-utils@3.44.5
27+
328
## 1.0.11
429

530
### Patch Changes

0 commit comments

Comments
 (0)