diff --git a/package.json b/package.json
index 32024233d5..00cb02ed6e 100644
--- a/package.json
+++ b/package.json
@@ -43,12 +43,12 @@
],
"dependencies": {
"@hookform/error-message": "^2.0.1",
- "@navikt/aksel-icons": "7.2.1",
- "@navikt/ds-css": "7.2.1",
- "@navikt/ds-react": "7.2.1",
- "@navikt/ds-tailwind": "^7.2.1",
+ "@navikt/aksel-icons": "7.4.0",
+ "@navikt/ds-css": "7.4.0",
+ "@navikt/ds-react": "7.4.0",
+ "@navikt/ds-tailwind": "^7.4.0",
"@navikt/familie-endringslogg": "13.1.4",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"@sentry/browser": "8.35.0",
"@sentry/react": "^8.35.0",
@@ -66,8 +66,8 @@
"vite-plugin-svgr": "4.2.0"
},
"devDependencies": {
- "@playwright/test": "^1.48.1",
- "@sentry/cli": "2.38.0",
+ "@playwright/test": "^1.48.2",
+ "@sentry/cli": "2.38.1",
"@storybook/addon-a11y": "^8.3.6",
"@storybook/addon-actions": "^8.3.6",
"@storybook/addon-docs": "^8.3.6",
@@ -85,7 +85,7 @@
"@testing-library/user-event": "14.5.2",
"@types/history": "5.0.0",
"@types/prop-types": "15.7.13",
- "@types/react": "18.3.11",
+ "@types/react": "18.3.12",
"@types/react-collapse": "5.0.4",
"@types/react-router-dom": "5.3.3",
"@types/redux-form": "8.3.11",
@@ -95,14 +95,14 @@
"cross-env": "7.0.3",
"eslint": "9.13.0",
"eslint-config-prettier": "9.1.0",
- "eslint-plugin-jsx-a11y": "6.10.1",
+ "eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-vitest": "~0.5.4",
"globals": "^15.11.0",
"husky": "9.1.6",
"jsdom": "25.0.1",
"lint-staged": "15.2.10",
- "msw": "2.5.0",
+ "msw": "2.6.0",
"msw-storybook-addon": "^2.0.3",
"postcss": "^8.4.47",
"prettier": "3.3.3",
@@ -117,7 +117,7 @@
"typescript-eslint": "^7.18.0",
"vite": "^5.4.10",
"vite-plugin-html": "^3.2.2",
- "vitest": "2.1.3",
+ "vitest": "2.1.4",
"vitest-axe": "0.1.0"
},
"resolutions": {
diff --git a/packages/behandling-anke/package.json b/packages/behandling-anke/package.json
index 3f7e9840c6..c56d9bd963 100644
--- a/packages/behandling-anke/package.json
+++ b/packages/behandling-anke/package.json
@@ -18,6 +18,6 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-felles/package.json b/packages/behandling-felles/package.json
index 65635ad85d..fd8942e95d 100644
--- a/packages/behandling-felles/package.json
+++ b/packages/behandling-felles/package.json
@@ -15,10 +15,10 @@
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"classnames": "2.5.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux-form": "8.3.10"
}
diff --git a/packages/behandling-frisinn/package.json b/packages/behandling-frisinn/package.json
index c6441b00b3..151a397ae6 100644
--- a/packages/behandling-frisinn/package.json
+++ b/packages/behandling-frisinn/package.json
@@ -18,9 +18,9 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-fakta-beregning": "6.0.2",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
+ "@navikt/ft-fakta-beregning": "7.0.2",
+ "@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-klage/package.json b/packages/behandling-klage/package.json
index d67163f1cb..38f7877ee6 100644
--- a/packages/behandling-klage/package.json
+++ b/packages/behandling-klage/package.json
@@ -18,6 +18,6 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-omsorgspenger/package.json b/packages/behandling-omsorgspenger/package.json
index f1b0694389..4dd83d194e 100644
--- a/packages/behandling-omsorgspenger/package.json
+++ b/packages/behandling-omsorgspenger/package.json
@@ -30,10 +30,10 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-fakta-beregning": "6.0.2",
- "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
+ "@navikt/ft-fakta-beregning": "7.0.2",
+ "@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
+ "@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-opplaeringspenger/package.json b/packages/behandling-opplaeringspenger/package.json
index dfbae68f02..9da6378300 100644
--- a/packages/behandling-opplaeringspenger/package.json
+++ b/packages/behandling-opplaeringspenger/package.json
@@ -34,11 +34,11 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-fakta-beregning": "6.0.2",
- "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
+ "@navikt/ft-fakta-beregning": "7.0.2",
+ "@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
+ "@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"axios": "1.7.7",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-pleiepenger-sluttfase/package.json b/packages/behandling-pleiepenger-sluttfase/package.json
index f0a3266b77..263f9894b5 100644
--- a/packages/behandling-pleiepenger-sluttfase/package.json
+++ b/packages/behandling-pleiepenger-sluttfase/package.json
@@ -30,11 +30,11 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-fakta-beregning": "6.0.2",
- "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
+ "@navikt/ft-fakta-beregning": "7.0.2",
+ "@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
+ "@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"axios": "1.7.7",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-pleiepenger/package.json b/packages/behandling-pleiepenger/package.json
index 97f62c438c..b91643aadb 100644
--- a/packages/behandling-pleiepenger/package.json
+++ b/packages/behandling-pleiepenger/package.json
@@ -35,11 +35,11 @@
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/diagnosekoder": "^1.2024.1",
- "@navikt/ft-fakta-beregning": "6.0.2",
- "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
+ "@navikt/ft-fakta-beregning": "7.0.2",
+ "@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
+ "@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"axios": "1.7.7",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx b/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
index 774c583531..03a7097edc 100644
--- a/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
+++ b/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import { konverterKodeverkTilKode, transformBeregningValues } from '@fpsak-frontend/utils';
diff --git a/packages/behandling-tilbakekreving/package.json b/packages/behandling-tilbakekreving/package.json
index 1df447aa72..744590632a 100644
--- a/packages/behandling-tilbakekreving/package.json
+++ b/packages/behandling-tilbakekreving/package.json
@@ -16,9 +16,9 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-kodeverk": "^2.5.4",
- "@navikt/ft-prosess-tilbakekreving-foreldelse": "3.4.10",
+ "@navikt/ft-kodeverk": "^2.5.5",
+ "@navikt/ft-prosess-tilbakekreving-foreldelse": "3.4.11",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-ungdomsytelse/package.json b/packages/behandling-ungdomsytelse/package.json
index 05f25768e4..4b8c8bba07 100644
--- a/packages/behandling-ungdomsytelse/package.json
+++ b/packages/behandling-ungdomsytelse/package.json
@@ -20,6 +20,6 @@
"@k9-sak-web/types": "1.0.0",
"axios": "1.7.7",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/behandling-unntak/package.json b/packages/behandling-unntak/package.json
index d83050015b..5184d1d5cc 100644
--- a/packages/behandling-unntak/package.json
+++ b/packages/behandling-unntak/package.json
@@ -30,7 +30,7 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
diff --git a/packages/fakta-arbeidsforhold/package.json b/packages/fakta-arbeidsforhold/package.json
index 8acc9f04e2..877dfbe7b8 100644
--- a/packages/fakta-arbeidsforhold/package.json
+++ b/packages/fakta-arbeidsforhold/package.json
@@ -13,7 +13,7 @@
"@k9-sak-web/types": "1.0.0",
"moment": "2.30.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
diff --git a/packages/fakta-barn-og-overfoeringsdager/package.json b/packages/fakta-barn-og-overfoeringsdager/package.json
index a8162fdd91..8637f0fcdf 100644
--- a/packages/fakta-barn-og-overfoeringsdager/package.json
+++ b/packages/fakta-barn-og-overfoeringsdager/package.json
@@ -13,7 +13,7 @@
"just-is-empty": "3.4.1",
"moment": "2.30.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux-form": "8.3.10"
},
diff --git a/packages/fakta-barn-oms/package.json b/packages/fakta-barn-oms/package.json
index 9b53482f48..475e0bd0e4 100644
--- a/packages/fakta-barn-oms/package.json
+++ b/packages/fakta-barn-oms/package.json
@@ -14,7 +14,7 @@
"@k9-sak-web/types": "1.0.0",
"moment": "2.30.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"uuid": "10.0.0"
},
"devDependencies": {
diff --git a/packages/fakta-direkte-overgang/package.json b/packages/fakta-direkte-overgang/package.json
index 0f6430e3dd..72450b4847 100644
--- a/packages/fakta-direkte-overgang/package.json
+++ b/packages/fakta-direkte-overgang/package.json
@@ -10,7 +10,7 @@
"dayjs": "1.11.13",
"formik": "2.4.6",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"yup": "1.4.0"
},
"peerDependencies": {
diff --git a/packages/fakta-etablert-tilsyn/package.json b/packages/fakta-etablert-tilsyn/package.json
index a7f67e5f3f..01aec747ce 100644
--- a/packages/fakta-etablert-tilsyn/package.json
+++ b/packages/fakta-etablert-tilsyn/package.json
@@ -14,10 +14,10 @@
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
- "@navikt/ds-css": "7.2.1",
+ "@navikt/ds-css": "7.4.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "7.2.1",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ds-react": "7.4.0",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
@@ -25,7 +25,7 @@
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
- "react-hook-form": "7.53.0",
+ "react-hook-form": "7.53.1",
"react-popper": "2.3.0"
},
"msw": {
diff --git a/packages/fakta-feilutbetaling/package.json b/packages/fakta-feilutbetaling/package.json
index b882f1df81..b54d1e2510 100644
--- a/packages/fakta-feilutbetaling/package.json
+++ b/packages/fakta-feilutbetaling/package.json
@@ -13,7 +13,7 @@
"moment": "2.30.1",
"prop-types": "15.8.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
diff --git a/packages/fakta-felles/package.json b/packages/fakta-felles/package.json
index 22c073677e..ef03541940 100644
--- a/packages/fakta-felles/package.json
+++ b/packages/fakta-felles/package.json
@@ -10,7 +10,7 @@
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1"
},
diff --git a/packages/fakta-inntekt-og-ytelser/package.json b/packages/fakta-inntekt-og-ytelser/package.json
index b5209ab1b7..20a14412da 100644
--- a/packages/fakta-inntekt-og-ytelser/package.json
+++ b/packages/fakta-inntekt-og-ytelser/package.json
@@ -9,6 +9,6 @@
"@fpsak-frontend/utils": "1.0.0",
"moment": "2.30.1",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/fakta-inntektsmelding/package.json b/packages/fakta-inntektsmelding/package.json
index ecce61a4e8..9ebc4aa37e 100644
--- a/packages/fakta-inntektsmelding/package.json
+++ b/packages/fakta-inntektsmelding/package.json
@@ -10,23 +10,23 @@
"author": "NAV IT",
"license": "MIT",
"devDependencies": {
- "msw": "2.5.0",
+ "msw": "2.6.0",
"vite": "^5.4.10",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
- "@navikt/ds-css": "7.2.1",
+ "@navikt/ds-css": "7.4.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "7.2.1",
- "@navikt/ft-form-hooks": "5.1.9",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ds-react": "7.4.0",
+ "@navikt/ft-form-hooks": "5.1.10",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
- "react-hook-form": "7.53.0",
+ "react-hook-form": "7.53.1",
"react-popper": "2.3.0"
},
"msw": {
diff --git a/packages/fakta-institusjon/package.json b/packages/fakta-institusjon/package.json
index 8e6b4f923b..3a269aa488 100644
--- a/packages/fakta-institusjon/package.json
+++ b/packages/fakta-institusjon/package.json
@@ -7,7 +7,7 @@
"dependencies": {
"@fpsak-frontend/form": "*",
"@k9-sak-web/types": "*",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"formik": "2.4.6"
}
}
diff --git "a/packages/fakta-medisinsk-vilk\303\245r/package.json" "b/packages/fakta-medisinsk-vilk\303\245r/package.json"
index 9fb1c4d21e..42bd93a5b0 100644
--- "a/packages/fakta-medisinsk-vilk\303\245r/package.json"
+++ "b/packages/fakta-medisinsk-vilk\303\245r/package.json"
@@ -11,26 +11,26 @@
},
"devDependencies": {
"cors": "^2.8.5",
- "msw": "2.5.0",
+ "msw": "2.6.0",
"vite": "^5.4.10",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
"@fpsak-frontend/form": "1.0.0",
"@navikt/diagnosekoder": "^1.2024.1",
- "@navikt/ds-css": "7.2.1",
+ "@navikt/ds-css": "7.4.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "7.2.1",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ds-react": "7.4.0",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
- "@tanstack/react-query": "^5.59.15",
+ "@tanstack/react-query": "^5.59.16",
"axios": "1.7.7",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
- "react-hook-form": "7.53.0",
+ "react-hook-form": "7.53.1",
"react-outside-click-handler": "1.3.0",
"react-popper": "2.3.0"
},
diff --git a/packages/fakta-medlemskap/package.json b/packages/fakta-medlemskap/package.json
index 5fbb36a252..de62b8bf05 100644
--- a/packages/fakta-medlemskap/package.json
+++ b/packages/fakta-medlemskap/package.json
@@ -12,13 +12,13 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/fakta-felles": "1.0.0",
- "@navikt/ft-form-hooks": "5.1.9",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ft-form-hooks": "5.1.10",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"i18n-iso-countries": "7.12.0",
"moment": "2.30.1",
"prop-types": "15.8.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
diff --git a/packages/fakta-om-barnet/package.json b/packages/fakta-om-barnet/package.json
index 1e63702e16..a3ed524dff 100644
--- a/packages/fakta-om-barnet/package.json
+++ b/packages/fakta-om-barnet/package.json
@@ -10,20 +10,20 @@
"dev": "vite serve"
},
"devDependencies": {
- "msw": "2.5.0",
+ "msw": "2.6.0",
"vite": "^5.4.10",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
- "@navikt/ds-react": "7.2.1",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ds-react": "7.4.0",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
- "react-hook-form": "7.53.0",
+ "react-hook-form": "7.53.1",
"react-popper": "2.3.0",
"tailwindcss": "^3.4.14"
},
diff --git a/packages/fakta-omsorgen-for/package.json b/packages/fakta-omsorgen-for/package.json
index eac214edf8..781e7520c2 100644
--- a/packages/fakta-omsorgen-for/package.json
+++ b/packages/fakta-omsorgen-for/package.json
@@ -10,16 +10,16 @@
"dev": "vite serve"
},
"devDependencies": {
- "msw": "2.5.0",
+ "msw": "2.6.0",
"vite": "^5.4.10",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
- "@navikt/ds-css": "7.2.1",
+ "@navikt/ds-css": "7.4.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "7.2.1",
+ "@navikt/ds-react": "7.4.0",
"@navikt/fnrvalidator": "2.1.2",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
@@ -27,8 +27,8 @@
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
- "react-hook-form": "7.53.0",
- "react-intl": "6.8.0",
+ "react-hook-form": "7.53.1",
+ "react-intl": "6.8.2",
"react-popper": "2.3.0"
},
"msw": {
diff --git a/packages/fakta-opplaering/package.json b/packages/fakta-opplaering/package.json
index 5627bc95b1..5c2e4ab0cf 100644
--- a/packages/fakta-opplaering/package.json
+++ b/packages/fakta-opplaering/package.json
@@ -9,12 +9,12 @@
"@fpsak-frontend/utils": "*",
"@k9-sak-web/types": "*",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "7.2.1",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ds-react": "7.4.0",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"formik": "2.4.6",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-outside-click-handler": "1.3.0",
"uuid": "10.0.0",
"yup": "1.4.0"
diff --git a/packages/fakta-opplysninger-fra-soknaden/package.json b/packages/fakta-opplysninger-fra-soknaden/package.json
index 1e5458618b..2621a0e6f9 100644
--- a/packages/fakta-opplysninger-fra-soknaden/package.json
+++ b/packages/fakta-opplysninger-fra-soknaden/package.json
@@ -13,7 +13,7 @@
"classnames": "2.5.1",
"moment": "2.30.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10"
diff --git a/packages/fakta-opptjening-oms/package.json b/packages/fakta-opptjening-oms/package.json
index 2fda1505f1..1acda367c3 100644
--- a/packages/fakta-opptjening-oms/package.json
+++ b/packages/fakta-opptjening-oms/package.json
@@ -15,7 +15,7 @@
"object-hash": "3.0.0",
"react": "18.3.1",
"react-dom": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
diff --git a/packages/fakta-overstyr-beregning/package.json b/packages/fakta-overstyr-beregning/package.json
index 665d3b703b..bc451a1115 100644
--- a/packages/fakta-overstyr-beregning/package.json
+++ b/packages/fakta-overstyr-beregning/package.json
@@ -9,11 +9,11 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "workspace:^",
"@k9-sak-web/types": "workspace:^",
- "@navikt/ds-react": "7.2.1",
+ "@navikt/ds-react": "7.4.0",
"date-fns": "4.1.0",
"formik": "2.4.6",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"yup": "1.4.0"
}
}
diff --git a/packages/fakta-soknadsperioder/package.json b/packages/fakta-soknadsperioder/package.json
index 276c3e2285..c8c24ed062 100644
--- a/packages/fakta-soknadsperioder/package.json
+++ b/packages/fakta-soknadsperioder/package.json
@@ -9,6 +9,6 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"react": "18.3.1",
- "react-intl": "6.8.0"
+ "react-intl": "6.8.2"
}
}
diff --git a/packages/fakta-verge/package.json b/packages/fakta-verge/package.json
index 87780eeb5a..0868bb4d1f 100644
--- a/packages/fakta-verge/package.json
+++ b/packages/fakta-verge/package.json
@@ -13,7 +13,7 @@
"@k9-sak-web/fakta-felles": "1.0.0",
"prop-types": "15.8.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"reselect": "5.1.1"
diff --git a/packages/form/package.json b/packages/form/package.json
index b3c6e2c3ab..d9065e8cab 100644
--- a/packages/form/package.json
+++ b/packages/form/package.json
@@ -8,13 +8,13 @@
"dependencies": {
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
- "@navikt/ft-plattform-komponenter": "5.0.1",
+ "@navikt/ft-plattform-komponenter": "5.0.3",
"classnames": "2.5.1",
"formik": "2.4.6",
"moment": "2.30.1",
"react": "18.3.1",
- "react-hook-form": "7.53.0",
- "react-intl": "6.8.0",
+ "react-hook-form": "7.53.1",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
diff --git a/packages/kodeverk/src/opptjeningAktivitetType.ts b/packages/kodeverk/src/opptjeningAktivitetType.ts
index a7fdd386e7..2a5df0596c 100644
--- a/packages/kodeverk/src/opptjeningAktivitetType.ts
+++ b/packages/kodeverk/src/opptjeningAktivitetType.ts
@@ -1,28 +1,3 @@
-import { opptjeningAktivitetType as opptjeningAktivitetTypeV2 } from '@k9-sak-web/backend/k9sak/kodeverk/OpptjeningAktivitetType.js';
-
-const opptjeningAktivitetType: typeof opptjeningAktivitetTypeV2 = {
- ARBEID: 'ARBEID',
- AAP: 'AAP',
- DAGPENGER: 'DAGPENGER',
- FORELDREPENGER: 'FORELDREPENGER',
- FRILANS: 'FRILANS',
- MILITÆR_ELLER_SIVILTJENESTE: 'MILITÆR_ELLER_SIVILTJENESTE',
- NÆRING: 'NÆRING',
- OMSORGSPENGER: 'OMSORGSPENGER',
- OPPLÆRINGSPENGER: 'OPPLÆRINGSPENGER',
- PLEIEPENGER: 'PLEIEPENGER',
- SVANGERSKAPSPENGER: 'SVANGERSKAPSPENGER',
- SYKEPENGER: 'SYKEPENGER',
- VIDERE_ETTERUTDANNING: 'VIDERE_ETTERUTDANNING',
- UTENLANDSK_ARBEIDSFORHOLD: 'UTENLANDSK_ARBEIDSFORHOLD',
- VENTELØNN_VARTPENGER: 'VENTELØNN_VARTPENGER',
- ETTERLØNN_SLUTTPAKKE: 'ETTERLØNN_SLUTTPAKKE',
- SYKEPENGER_AV_DAGPENGER: 'SYKEPENGER_AV_DAGPENGER',
- PLEIEPENGER_AV_DAGPENGER: 'PLEIEPENGER_AV_DAGPENGER',
- FRISINN: 'FRISINN',
- MELLOM_ARBEID: 'MELLOM_ARBEID',
- UTDANNINGSPERMISJON: 'UTDANNINGSPERMISJON',
- '-': '-',
-};
+import { opptjeningAktivitetType } from '@k9-sak-web/backend/k9sak/kodeverk/OpptjeningAktivitetType.js';
export default opptjeningAktivitetType;
diff --git a/packages/modal-sett-pa-vent/package.json b/packages/modal-sett-pa-vent/package.json
index 152296ef89..c36f95a933 100644
--- a/packages/modal-sett-pa-vent/package.json
+++ b/packages/modal-sett-pa-vent/package.json
@@ -14,7 +14,7 @@
"@k9-sak-web/types": "1.0.0",
"moment": "2.30.1",
"react": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10"
diff --git a/packages/prosess-aarskvantum-oms/i18n/nb_NO.json b/packages/prosess-aarskvantum-oms/i18n/nb_NO.json
index 1375c89165..b223da21b9 100644
--- a/packages/prosess-aarskvantum-oms/i18n/nb_NO.json
+++ b/packages/prosess-aarskvantum-oms/i18n/nb_NO.json
@@ -2,19 +2,13 @@
"Årskvantum.Aksjonspunkt.Uavklart.UidentifiserteRammemeldinger": "Det finnes uavklarte perioder som følge av rammemeldinger som ikke kan tolkes. Korriger disse i Infotrygd. Det kan i tillegg finnes overlappende perioder i Infotrygd",
"Årskvantum.Aksjonspunkt.Uavklart.OverlappInfotrygd": "Det finnes overlappende perioder i Infotrygd. Annuller perioden i Infotrygd og kjør behandlingen på nytt.",
"Årskvantum.Aksjonspunkt.Uavklart": "Sjekk om det finnes rammemelding eller fosterbarn.",
- "Årskvantum.Aksjonspunkt.Uavklart.Fosterbarn": "Det er registrert fosterbarn i Infotrygd. Vurder om søker har omsorg for fosterbarn.",
- "Årskvantum.Aksjonspunkt.Uavklart.Fosterbarn.KanIkkeFortsette": "For å fortsette uten endring må det ikke ha blitt gjort endringer i listen over fosterbarn.",
- "Årskvantum.Aksjonspunkt.Uavklart.Fosterbarn.NullstillKnapp": "Nullstill skjema",
- "Årskvantum.Aksjonspunkt.Uavklart.Fosterbarn.BekreftNullstillTekst": "Dette vil nullstille alle endrede verdier i skjemaet, inkludert begrunnelse.",
"Årskvantum.Aksjonspunkt.Uavklart.Fosterbarn.LeggTil": "Legg til fosterbarn",
"Årskvantum.Aksjonspunkt.Uavklart.Fosterbarn.Fnr": "Fødselsnummer",
"Årskvantum.Aksjonspunkt.Uavklart.Fosterbarn.Fjern": "Fjern",
"Årskvantum.Aksjonspunkt.Uavklart.Valg": "Valg",
"Årskvantum.Aksjonspunkt.Uavklart.FosterbarnTittel": "Fosterbarn",
"Årskvantum.Aksjonspunkt.Uavklart.ReBehandling": "Rammemelding eller fosterbarn skal endres eller legges til",
- "Årskvantum.Aksjonspunkt.Uavklart.ReBehandling.Fosterbarn": "Fosterbarn skal legges til",
"Årskvantum.Aksjonspunkt.Uavklart.Fortsett": "Fortsett uten endring",
- "Årskvantum.Aksjonspunkt.Uavklart.Fortsett.Fosterbarn": "Fortsett uten endring",
"Årskvantum.Aksjonspunkt.Uavklart.Begrunnelse": "Begrunnelse",
"Årskvantum.Aksjonspunkt.Uavklart.Bekreft": "Bekreft",
"Årskvantum.Aksjonspunkt.Uavklart.BekreftInfotrygd": "Rammemeldinger er oppdatert i Infotrygd",
diff --git a/packages/prosess-aarskvantum-oms/package.json b/packages/prosess-aarskvantum-oms/package.json
index d1d164d7e0..923fe02077 100644
--- a/packages/prosess-aarskvantum-oms/package.json
+++ b/packages/prosess-aarskvantum-oms/package.json
@@ -17,7 +17,7 @@
"moment": "2.30.1",
"react": "18.3.1",
"react-dom": "18.3.1",
- "react-intl": "6.8.0",
+ "react-intl": "6.8.2",
"react-redux": "9.1.2",
"react-router-dom": "6.27.0",
"redux-form": "8.3.10"
diff --git a/packages/prosess-aarskvantum-oms/src/components/AksjonspunktForm9014.tsx b/packages/prosess-aarskvantum-oms/src/components/AksjonspunktForm9014.tsx
index 2a5c2af923..89e2db0a2c 100644
--- a/packages/prosess-aarskvantum-oms/src/components/AksjonspunktForm9014.tsx
+++ b/packages/prosess-aarskvantum-oms/src/components/AksjonspunktForm9014.tsx
@@ -4,7 +4,7 @@ import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import { AksjonspunktHelpText, BorderBox, VerticalSpacer } from '@fpsak-frontend/shared-components';
import { hasValidText, maxLength, minLength, required } from '@fpsak-frontend/utils';
import { Aksjonspunkt } from '@k9-sak-web/types';
-import { Button, Label, Table } from '@navikt/ds-react';
+import { Button, Label } from '@navikt/ds-react';
import React from 'react';
import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
@@ -19,6 +19,7 @@ interface AksjonspunktFormImplProps {
aktiviteter: Aktivitet[];
isAksjonspunktOpen: boolean;
fosterbarn: fosterbarnDto[];
+ harEndretFosterbarn: boolean;
aksjonspunktKode: string;
valgValue: string;
}
@@ -28,6 +29,7 @@ interface FormContentProps {
aktiviteter: Aktivitet[];
isAksjonspunktOpen: boolean;
fosterbarn: fosterbarnDto[];
+ harEndretFosterbarn: boolean;
aksjonspunktKode: string;
valgValue: string;
initialValues: { begrunnelse: string; fosterbarn: fosterbarnDto[] } | any;
@@ -52,22 +54,14 @@ export const FormContent = ({
handleSubmit,
isAksjonspunktOpen,
fosterbarn,
+ harEndretFosterbarn,
aksjonspunktKode,
valgValue,
- initialValues,
}: FormContentProps) => {
-
- const erÅF = aksjonspunktKode === aksjonspunktCodes.ÅRSKVANTUM_FOSTERBARN;
-
return (
<>
- {[
- ,
- ]}
+ {[]}
{isAksjonspunktOpen && (
@@ -82,27 +76,12 @@ export const FormContent = ({
radios={[
{
value: valgValues.reBehandling,
- label: (
-
- ),
+ label: ,
},
{
value: valgValues.fortsett,
- label: (
-
- ),
+ disabled: harEndretFosterbarn,
+ label: ,
},
]}
/>
@@ -116,7 +95,7 @@ export const FormContent = ({
/>
- {isAksjonspunktOpen && (!erÅF || valgValue === valgValues.reBehandling) && (
+ {isAksjonspunktOpen && (
<>
)}
- {erÅF && (valgValue === valgValues.fortsett || !valgValue) && initialValues.fosterbarn.length > 0 && (
- <>
-
-
-
-
-
-
-
-
-
- {initialValues.fosterbarn.map((fosterbarnFnr, index) => {
- const fosterbarnObj = fosterbarn.find(barn => barn.fnr === fosterbarnFnr);
- const navn = fosterbarnObj && fosterbarnObj.navn ? fosterbarnObj.navn : `Fosterbarn ${index + 1}`;
- return (
-
-
- {navn} ({fosterbarnObj.fnr})
-
-
- );
- })}
-
-
- >
- )}
-
{isAksjonspunktOpen && (