Merge branch 'master' into dev-ung

hallvardastark · hallvardastark · commit fd427e0aa407 · 2025-02-24T15:03:03.000+01:00
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -14,7 +14,7 @@ const config: StorybookConfig = {
         csfPluginOptions: null,
       },
     },
-    // '@storybook/addon-a11y',
+    '@storybook/addon-a11y',
   ],
   staticDirs: ['../public'],
 
diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "@navikt/familie-endringslogg": "14.0.0",
     "@navikt/ft-plattform-komponenter": "^7.2.5",
     "@popperjs/core": "2.11.8",
-    "@sentry/browser": "8.53.0",
+    "@sentry/browser": "9.1.0",
     "@sentry/react": "^9.1.0",
     "axios": "1.7.9",
     "date-fns": "4.1.0",
@@ -67,7 +67,7 @@
     "postcss-import": "^16.1.0",
     "react": "19.0.0",
     "react-dom": "19.0.0",
-    "react-router": "7.1.4",
+    "react-router": "7.2.0",
     "vite-plugin-svgr": "4.3.0"
   },
   "devDependencies": {
@@ -82,7 +82,7 @@
     "@storybook/react": "8.5.8",
     "@storybook/react-vite": "8.5.8",
     "@storybook/test": "8.5.8",
-    "@storybook/test-runner": "^0.21.2",
+    "@storybook/test-runner": "^0.21.3",
     "@storybook/theming": "8.5.8",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
@@ -104,14 +104,14 @@
     "eslint-plugin-react": "7.37.4",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-vitest": "~0.5.4",
-    "globals": "^15.15.0",
+    "globals": "^16.0.0",
     "husky": "9.1.7",
     "jsdom": "26.0.0",
     "lint-staged": "15.4.3",
     "loose-ts-check": "^2.0.0",
-    "msw": "2.7.0",
+    "msw": "2.7.1",
     "msw-storybook-addon": "^2.0.4",
-    "postcss": "^8.5.2",
+    "postcss": "^8.5.3",
     "prettier": "3.5.1",
     "storybook": "8.5.8",
     "stylelint": "16.14.1",
@@ -127,7 +127,7 @@
     "vitest-axe": "0.1.0"
   },
   "resolutions": {
-    "postcss": "8.5.2",
+    "postcss": "8.5.3",
     "parse-url": "8.1.0",
     "@types/react": "19.0.3"
   },
diff --git a/packages/behandling-omsorgspenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx b/packages/behandling-omsorgspenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
@@ -37,6 +37,7 @@ class FordelBeregningPanelDef extends FaktaPanelDef {
         submitCallback={data => props.submitCallback(transformBeregningValues([data]))} // Returnerer alltid kun eitt aksjonspunkt om gangen
         formData={props.formData}
         setFormData={props.setFormData}
+        skalHåndtereNyInntekt={!props.featureToggles?.NY_INNTEKT_EGET_PANEL}
       />
     );
   };
diff --git a/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx b/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
@@ -37,6 +37,7 @@ class FordelBeregningPanelDef extends FaktaPanelDef {
         submitCallback={data => props.submitCallback(transformBeregningValues([data]))} // Returnerer alltid kun eitt aksjonspunkt om gangen
         formData={props.formData}
         setFormData={props.setFormData}
+        skalHåndtereNyInntekt={!props.featureToggles?.NY_INNTEKT_EGET_PANEL}
       />
     );
   };
diff --git a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
@@ -37,6 +37,7 @@ class FordelBeregningPanelDef extends FaktaPanelDef {
         submitCallback={data => props.submitCallback(transformBeregningValues([data]))} // Returnerer alltid kun eitt aksjonspunkt om gangen
         formData={props.formData}
         setFormData={props.setFormData}
+        skalHåndtereNyInntekt={!props.featureToggles?.NY_INNTEKT_EGET_PANEL}
       />
     );
   };
diff --git a/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx b/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
@@ -37,6 +37,7 @@ class FordelBeregningPanelDef extends FaktaPanelDef {
         submitCallback={data => props.submitCallback(transformBeregningValues([data]))} // Returnerer alltid kun eitt aksjonspunkt om gangen
         formData={props.formData}
         setFormData={props.setFormData}
+        skalHåndtereNyInntekt={!props.featureToggles?.NY_INNTEKT_EGET_PANEL}
       />
     );
   };
diff --git a/packages/fakta-barn-oms/package.json b/packages/fakta-barn-oms/package.json
@@ -15,7 +15,7 @@
     "moment": "2.30.1",
     "react": "19.0.0",
     "react-intl": "7.1.6",
-    "uuid": "11.0.5"
+    "uuid": "11.1.0"
   },
   "devDependencies": {
     "@fpsak-frontend/utils-test": "1.0.0"
diff --git a/packages/fakta-inntektsmelding/package.json b/packages/fakta-inntektsmelding/package.json
@@ -10,7 +10,7 @@
   "author": "NAV IT",
   "license": "MIT",
   "devDependencies": {
-    "msw": "2.7.0",
+    "msw": "2.7.1",
     "vite": "^6.1.1",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
diff --git a/packages/fakta-medisinsk-vilkår/package.json b/packages/fakta-medisinsk-vilkår/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "cors": "^2.8.5",
-    "msw": "2.7.0",
+    "msw": "2.7.1",
     "vite": "^6.1.1",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
@@ -23,7 +23,7 @@
     "@navikt/ds-react": "7.13.0",
     "@navikt/ft-plattform-komponenter": "^7.2.5",
     "@popperjs/core": "2.11.8",
-    "@tanstack/react-query": "^5.66.7",
+    "@tanstack/react-query": "^5.66.9",
     "axios": "1.7.9",
     "classnames": "2.5.1",
     "dayjs": "1.11.13",
diff --git a/packages/fakta-ny-inntekt/package.json b/packages/fakta-ny-inntekt/package.json
@@ -23,6 +23,6 @@
     "react": "19.0.0",
     "react-hook-form": "7.54.2",
     "react-intl": "7.1.6",
-    "uuid": "11.0.5"
+    "uuid": "11.1.0"
   }
 }
diff --git a/packages/fakta-om-barnet/package.json b/packages/fakta-om-barnet/package.json
@@ -10,7 +10,7 @@
     "dev": "vite serve"
   },
   "devDependencies": {
-    "msw": "2.7.0",
+    "msw": "2.7.1",
     "vite": "^6.1.1",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
diff --git a/packages/fakta-omsorgen-for/package.json b/packages/fakta-omsorgen-for/package.json
@@ -10,7 +10,7 @@
     "dev": "vite serve"
   },
   "devDependencies": {
-    "msw": "2.7.0",
+    "msw": "2.7.1",
     "vite": "^6.1.1",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
diff --git a/packages/fakta-opplaering/package.json b/packages/fakta-opplaering/package.json
@@ -16,7 +16,7 @@
     "formik": "2.4.6",
     "react-intl": "7.1.6",
     "react-outside-click-handler": "1.3.0",
-    "uuid": "11.0.5",
+    "uuid": "11.1.0",
     "yup": "1.6.1"
   }
 }
diff --git a/packages/prosess-aarskvantum-oms/package.json b/packages/prosess-aarskvantum-oms/package.json
@@ -19,7 +19,7 @@
     "react-dom": "19.0.0",
     "react-intl": "7.1.6",
     "react-redux": "9.2.0",
-    "react-router": "7.1.4",
+    "react-router": "7.2.0",
     "redux-form": "8.3.10"
   },
   "devDependencies": {
diff --git a/packages/prosess-uttak/package.json b/packages/prosess-uttak/package.json
@@ -14,7 +14,7 @@
     "vite-plugin-node-polyfills": "^0.23.0"
   },
   "dependencies": {
-    "@hookform/resolvers": "^3.10.0",
+    "@hookform/resolvers": "^4.1.2",
     "@navikt/ds-css": "7.13.0",
     "@navikt/ds-react": "7.13.0",
     "@navikt/ft-form-hooks": "^6.2.2",
diff --git a/packages/sak-app/package.json b/packages/sak-app/package.json
@@ -45,9 +45,9 @@
     "@navikt/ft-plattform-komponenter": "^7.2.5",
     "@navikt/ft-prosess-beregningsgrunnlag": "^8.2.2",
     "@navikt/ft-ui-komponenter": "^3.1.6",
-    "@sentry/browser": "8.53.0",
+    "@sentry/browser": "9.1.0",
     "@sentry/react": "^9.1.0",
-    "@tanstack/react-query": "^5.66.7",
+    "@tanstack/react-query": "^5.66.9",
     "axios": "1.7.9",
     "classnames": "2.5.1",
     "history": "5.3.0",
@@ -57,7 +57,7 @@
     "react-dom": "19.0.0",
     "react-intl": "7.1.6",
     "react-redux": "9.2.0",
-    "react-router": "7.1.4",
+    "react-router": "7.2.0",
     "redux": "5.0.1",
     "redux-form": "8.3.10",
     "redux-thunk": "3.1.0"
diff --git a/packages/sak-behandling-velger/package.json b/packages/sak-behandling-velger/package.json
@@ -10,13 +10,13 @@
     "@fpsak-frontend/shared-components": "1.0.0",
     "@k9-sak-web/konstanter": "1.0.0",
     "@k9-sak-web/types": "1.0.0",
-    "@tanstack/react-query": "^5.66.7",
+    "@tanstack/react-query": "^5.66.9",
     "classnames": "2.5.1",
     "history": "5.3.0",
     "moment": "2.30.1",
     "react": "19.0.0",
     "react-intl": "7.1.6",
-    "react-router": "7.1.4"
+    "react-router": "7.2.0"
   },
   "devDependencies": {
     "@fpsak-frontend/utils-test": "1.0.0"
diff --git a/packages/sak-dokumenter/package.json b/packages/sak-dokumenter/package.json
@@ -9,7 +9,7 @@
     "@fpsak-frontend/kodeverk": "1.0.0",
     "@fpsak-frontend/shared-components": "1.0.0",
     "@k9-sak-web/types": "1.0.0",
-    "@tanstack/react-query": "^5.66.7",
+    "@tanstack/react-query": "^5.66.9",
     "react": "19.0.0",
     "react-intl": "7.1.6"
   },
diff --git a/packages/sak-historikk/i18n/nb_NO.json b/packages/sak-historikk/i18n/nb_NO.json
@@ -466,6 +466,7 @@
   "HistorikkEndretFeltHeading.FordelingForNyAndel": "<b>Det er lagt til ny aktivitet:</b> {br}<b>{value}</b>: Fordeling for ",
   "HistorikkEndretFeltHeading.FordelingForAndel": "Fordeling for <b>{value}</b>:",
   "HistorikkEndretFeltHeading.overstyrtUttakFjernet": "Overstyring for periode {value} er fjernet.",
+  "HistorikkEndretFeltHeading.uttakFastsattForPeriode": "Uttak er fastsatt for periode {value}.",
   "HistorikkResultat.FullTilbakebetaling": "Full tilbakebetaling",
   "HistorikkResultat.DelvisTilbakebetaling": "Delvis tilbakebetaling",
   "HistorikkResultat.IngenTilbakebetaling": "Ingen tilbakebetaling",
diff --git a/packages/sak-historikk/package.json b/packages/sak-historikk/package.json
@@ -12,7 +12,7 @@
     "history": "5.3.0",
     "react": "19.0.0",
     "react-intl": "7.1.6",
-    "react-router": "7.1.4"
+    "react-router": "7.2.0"
   },
   "devDependencies": {
     "@fpsak-frontend/utils-test": "1.0.0"
diff --git a/packages/sak-historikk/src/components/History.tsx b/packages/sak-historikk/src/components/History.tsx
@@ -76,13 +76,13 @@ const velgHistorikkMal = (histType: Kodeverk) => {
     case historikkinnslagType.OVST_UTTAK_NY:
     case historikkinnslagType.OVST_UTTAK_OPPDATERT:
     case historikkinnslagType.OVST_UTTAK_FJERNET:
+    case historikkinnslagType.FASTSATT_UTTAKSGRAD:
       return HistorikkMalType5;
     case historikkinnslagType.NY_INFO_FRA_TPS:
     case historikkinnslagType.NY_GRUNNLAG_MOTTATT:
       return HistorikkMalType6;
     case historikkinnslagType.OVERSTYRT:
     case historikkinnslagType.FJERNET_OVERSTYRING:
-    case historikkinnslagType.FASTSATT_UTTAKSGRAD:
       return HistorikkMalType7;
     case historikkinnslagType.OPPTJENING:
       return HistorikkMalType8;
diff --git a/packages/sak-historikk/src/kodeverk/historikkEndretFeltTypeCodes.ts b/packages/sak-historikk/src/kodeverk/historikkEndretFeltTypeCodes.ts
@@ -512,6 +512,10 @@ const historikkEndretFeltTypeCodes = {
     kode: 'KOMPLETTHET',
     feltId: 'HistorikkEndretFelt.Kompletthet',
   },
+  UTTAK_FASTSATT_SØKERS_UTTAKSGRAD: {
+    kode: 'UTTAK_FASTSATT_SØKERS_UTTAKSGRAD',
+    feltId: 'HistorikkEndretFelt.uttakOverstyrtSokersUttaksgrad',
+  },
   VIRKNINGSDATO_UTTAK_NYE_REGLER: {
     kode: 'VIRKNINGSDATO_UTTAK_NYE_REGLER',
     feltId: 'HistorikkEndretFelt.VirkningsdatoNyeRegler',
diff --git a/packages/sak-historikk/src/kodeverk/historikkEndretFeltTypeHeadingCodes.ts b/packages/sak-historikk/src/kodeverk/historikkEndretFeltTypeHeadingCodes.ts
@@ -12,6 +12,10 @@ const historikkEndretFeltTypeHeadingCodes = {
     kode: 'OVST_UTTAK_FJERNET',
     feltId: 'HistorikkEndretFeltHeading.overstyrtUttakFjernet',
   },
+  UTTAK_FASTSATT_FOR_PERIODE: {
+    kode: 'UTTAK_FASTSATT_FOR_PERIODE',
+    feltId: 'HistorikkEndretFeltHeading.uttakFastsattForPeriode',
+  },
 };
 
 export default historikkEndretFeltTypeHeadingCodes;
diff --git a/packages/sak-meny-sett-pa-vent/package.json b/packages/sak-meny-sett-pa-vent/package.json
@@ -10,7 +10,7 @@
     "react": "19.0.0",
     "react-intl": "7.1.6",
     "react-redux": "9.2.0",
-    "react-router": "7.1.4",
+    "react-router": "7.2.0",
     "redux": "5.0.1",
     "redux-form": "8.3.10"
   }
diff --git a/packages/sak-totrinnskontroll/package.json b/packages/sak-totrinnskontroll/package.json
@@ -18,7 +18,7 @@
     "react": "19.0.0",
     "react-intl": "7.1.6",
     "react-redux": "9.2.0",
-    "react-router": "7.1.4",
+    "react-router": "7.2.0",
     "redux": "5.0.1",
     "redux-form": "8.3.10",
     "reselect": "5.1.1"
diff --git a/packages/utils-test/package.json b/packages/utils-test/package.json
@@ -8,7 +8,7 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "@tanstack/react-query": "^5.66.7",
+    "@tanstack/react-query": "^5.66.9",
     "react": "19.0.0",
     "react-intl": "7.1.6"
   }
diff --git a/packages/v2/backend/package.json b/packages/v2/backend/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@navikt/k9-klage-typescript-client": "2.0.20250218125133",
-    "@navikt/k9-sak-typescript-client": "2.0.20250218115003",
+    "@navikt/k9-sak-typescript-client": "2.0.20250220084527",
     "@navikt/ung-sak-typescript-client": "0.2.20250221104339"
   },
   "devDependencies": {
diff --git a/packages/v2/gui/package.json b/packages/v2/gui/package.json
@@ -16,19 +16,19 @@
   },
   "dependencies": {
     "@hookform/error-message": "^2.0.1",
-    "@hookform/resolvers": "^3.10.0",
+    "@hookform/resolvers": "^4.1.2",
     "@k9-sak-web/backend": "workspace:^",
     "@k9-sak-web/lib": "1.0.0",
     "@navikt/ft-form-hooks": "^6.2.2",
     "@navikt/ft-form-validators": "^3.1.5",
     "@navikt/ft-utils": "^3.1.5",
-    "@tanstack/react-query": "^5.66.7",
+    "@tanstack/react-query": "^5.66.9",
     "@types/object-hash": "^3.0.6",
     "axios": "1.7.9",
     "object-hash": "^3.0.0",
     "react": "19.0.0",
     "react-hook-form": "7.54.2",
-    "react-router": "7.1.4",
+    "react-router": "7.2.0",
     "yup": "^1.6.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@`
`23`	`23`	`"react": "19.0.0",`
`24`	`24`	`"react-hook-form": "7.54.2",`
`25`	`25`	`"react-intl": "7.1.6",`
`26`		`- "uuid": "11.0.5"`
	`26`	`+ "uuid": "11.1.0"`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"formik": "2.4.6",`
`17`	`17`	`"react-intl": "7.1.6",`
`18`	`18`	`"react-outside-click-handler": "1.3.0",`
`19`		`- "uuid": "11.0.5",`
	`19`	`+ "uuid": "11.1.0",`
`20`	`20`	`"yup": "1.6.1"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"react": "19.0.0",`
`11`	`11`	`"react-intl": "7.1.6",`
`12`	`12`	`"react-redux": "9.2.0",`
`13`		`- "react-router": "7.1.4",`
	`13`	`+ "react-router": "7.2.0",`
`14`	`14`	`"redux": "5.0.1",`
`15`	`15`	`"redux-form": "8.3.10"`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"license": "MIT",`
`9`	`9`	`"private": true,`
`10`	`10`	`"dependencies": {`
`11`		`- "@tanstack/react-query": "^5.66.7",`
	`11`	`+ "@tanstack/react-query": "^5.66.9",`
`12`	`12`	`"react": "19.0.0",`
`13`	`13`	`"react-intl": "7.1.6"`
`14`	`14`	`}`