Pkg upd (#2231)

* patch * minor * major * fix tester
navikt · Mar 15, 2024 · 0c6f969 · 0c6f969
1 parent 1b7e20d
commit 0c6f969
Show file tree

Hide file tree

Showing 34 changed files with 1,514 additions and 2,132 deletions.
diff --git a/dist/mockServiceWorker.js b/dist/mockServiceWorker.js
@@ -2,7 +2,7 @@
 /* tslint:disable */
 
 /**
- * Mock Service Worker (2.1.5).
+ * Mock Service Worker (2.2.3).
  * @see https://github.com/mswjs/msw
  * - Please do NOT modify this file.
  * - Please do NOT serve this file on production.

diff --git a/package.json b/package.json
@@ -5,35 +5,35 @@
     "repository": "https://github.com/navikt/k9-punsj-frontend",
     "license": "MIT",
     "dependencies": {
-        "@babel/runtime": "7.23.9",
+        "@babel/runtime": "7.24.0",
         "@grafana/faro-web-sdk": "1.4.2",
         "@grafana/faro-web-tracing": "1.4.2",
         "@k9-punsj-frontend/server": "workspace:^",
-        "@navikt/aksel-icons": "^5.17.2",
-        "@navikt/ds-css": "5.17.2",
+        "@navikt/aksel-icons": "^6.2.0",
+        "@navikt/ds-css": "6.2.0",
         "@navikt/ds-icons": "3.4.3",
-        "@navikt/ds-react": "5.17.2",
+        "@navikt/ds-react": "6.2.0",
         "@navikt/fnrvalidator": "1.3.3",
         "@navikt/ft-plattform-komponenter": "2.3.18",
         "@popperjs/core": "^2.11.8",
         "@redux-devtools/extension": "3.3.0",
-        "@sentry/react": "7.99.0",
+        "@sentry/react": "7.107.0",
         "@storybook/testing-react": "2.0.1",
         "@types/classnames": "2.3.1",
         "@types/redux-logger": "3.0.13",
         "@types/uuid": "9.0.8",
         "classnames": "2.5.1",
         "css-minimizer-webpack-plugin": "6.0.0",
-        "cypress": "13.6.4",
+        "cypress": "13.7.0",
         "cypress-wait-until": "3.0.1",
         "dayjs": "1.11.10",
-        "dotenv": "16.4.1",
+        "dotenv": "16.4.5",
         "formik": "2.4.5",
         "html-webpack-plugin": "5.6.0",
-        "i18n-iso-countries": "7.8.0",
+        "i18n-iso-countries": "7.10.1",
         "lodash": "4.17.21",
         "lodash.throttle": "4.1.1",
-        "mini-css-extract-plugin": "2.7.7",
+        "mini-css-extract-plugin": "2.8.1",
         "mustache-express": "1.3.2",
         "nav-datovelger": "12.6.0",
         "nav-frontend-chevron-style": "^1.0.4",
@@ -60,24 +60,24 @@
         "react-collapse": "5.1.1",
         "react-day-picker": "7.4.10",
         "react-dom": "18.2.0",
-        "react-hook-form": "^7.49.3",
+        "react-hook-form": "^7.51.0",
         "react-intl": "6.6.2",
         "react-modal": "3.16.1",
         "react-popper": "2.3.0",
         "react-query": "3.39.3",
         "react-redux": "9.1.0",
-        "react-router": "6.21.3",
-        "react-router-dom": "6.21.3",
+        "react-router": "6.22.3",
+        "react-router-dom": "6.22.3",
         "redux": "5.0.1",
         "redux-logger": "3.0.6",
         "source-map-loader": "5.0.0",
         "start-server-and-test": "2.0.3",
         "tailwindcss": "^3.4.1",
         "tsconfig-paths-webpack-plugin": "4.1.0",
-        "typescript-string-operations": "1.5.0",
+        "typescript-string-operations": "1.5.1",
         "ulid": "2.3.0",
         "uuid": "9.0.1",
-        "yup": "1.3.3"
+        "yup": "1.4.0"
     },
     "resolutions": {
         "@babel/traverse": "7.23.2",
@@ -89,7 +89,7 @@
         "start:e2e": "yarn run dev-env-variables MSW_MODE=test node src/build/scripts/start-dev.js",
         "start-express": "node ./server.js",
         "build": "cross-env NODE_ENV=production SENTRY_RELEASE=$(git rev-parse --short HEAD) node ./src/build/scripts/production-build.js",
-        "test": "node node_modules/jest/bin/jest.js --config ./jest.config.json",
+        "test": "node node_modules/jest/bin/jest.js  --config ./jest.config.json",
         "lint": "eslint --quiet 'src/**/*.{ts,tsx}'",
         "eject": "react-scripts eject",
         "prepare": "husky install",
@@ -103,46 +103,46 @@
     },
     "devDependencies": {
         "@babel/cli": "7.23.9",
-        "@babel/core": "7.23.9",
-        "@babel/plugin-transform-runtime": "7.23.9",
-        "@babel/preset-env": "7.23.9",
+        "@babel/core": "7.24.0",
+        "@babel/plugin-transform-runtime": "7.24.0",
+        "@babel/preset-env": "7.24.0",
         "@babel/preset-react": "7.23.3",
         "@babel/preset-typescript": "7.23.3",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
-        "@sentry/cli": "2.27.0",
-        "@storybook/addon-actions": "7.6.11",
-        "@storybook/addon-essentials": "7.6.11",
-        "@storybook/addon-interactions": "7.6.11",
-        "@storybook/addon-links": "7.6.11",
-        "@storybook/react": "7.6.11",
-        "@storybook/react-webpack5": "7.6.11",
+        "@sentry/cli": "2.30.2",
+        "@storybook/addon-actions": "8.0.0",
+        "@storybook/addon-essentials": "8.0.0",
+        "@storybook/addon-interactions": "8.0.0",
+        "@storybook/addon-links": "8.0.0",
+        "@storybook/react": "8.0.0",
+        "@storybook/react-webpack5": "8.0.0",
         "@storybook/testing-library": "0.2.2",
         "@testing-library/cypress": "10.0.1",
-        "@testing-library/jest-dom": "^6.4.0",
-        "@testing-library/react": "14.2.0",
+        "@testing-library/jest-dom": "^6.4.2",
+        "@testing-library/react": "14.2.1",
         "@testing-library/user-event": "14.5.2",
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "@types/enzyme": "3.10.18",
         "@types/enzyme-adapter-react-16": "1.0.9",
         "@types/fetch-headers": "2.0.2",
         "@types/intl": "1.2.2",
-        "@types/jest": "29.5.11",
+        "@types/jest": "29.5.12",
         "@types/object-hash": "3.0.6",
-        "@types/react": "18.2.48",
+        "@types/react": "18.2.66",
         "@types/react-aria-menubutton": "6.2.14",
         "@types/react-collapse": "5.0.4",
         "@types/react-document-title": "2.0.9",
-        "@types/react-dom": "18.2.18",
+        "@types/react-dom": "18.2.22",
         "@types/react-intl": "3.0.0",
         "@types/react-router": "5.1.20",
         "@types/react-router-dom": "5.3.3",
         "@types/react-test-renderer": "18.0.7",
         "@types/redux-mock-store": "1.0.6",
         "@types/testing-library__cypress": "^5.0.13",
-        "@typescript-eslint/eslint-plugin": "6.20.0",
-        "@typescript-eslint/parser": "6.20.0",
+        "@typescript-eslint/eslint-plugin": "7.2.0",
+        "@typescript-eslint/parser": "7.2.0",
         "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
-        "autoprefixer": "10.4.17",
+        "autoprefixer": "10.4.18",
         "babel-jest": "29.7.0",
         "babel-loader": "9.1.3",
         "case-sensitive-paths-webpack-plugin": "2.4.0",
@@ -151,17 +151,17 @@
         "cross-env": "7.0.3",
         "css-loader": "6.10.0",
         "enzyme": "3.11.0",
-        "eslint": "8.56.0",
+        "eslint": "8.57.0",
         "eslint-config-airbnb": "19.0.4",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",
         "eslint-plugin-jsx-a11y": "6.8.0",
         "eslint-plugin-prettier": "5.1.3",
-        "eslint-plugin-react": "7.33.2",
+        "eslint-plugin-react": "7.34.0",
         "eslint-plugin-react-hooks": "4.6.0",
         "fetch-mock": "9.11.0",
         "html-webpack-harddisk-plugin": "2.0.0",
-        "husky": "9.0.7",
+        "husky": "9.0.11",
         "intl": "1.2.5",
         "jest": "29.7.0",
         "jest-cli": "29.7.0",
@@ -171,25 +171,25 @@
         "jest-mock": "29.7.0",
         "less": "4.2.0",
         "less-loader": "12.2.0",
-        "lint-staged": "15.2.1",
-        "msw": "2.1.5",
+        "lint-staged": "15.2.2",
+        "msw": "2.2.3",
         "nav-frontend-ekspanderbartpanel-style": "2.0.2",
         "nav-frontend-skjema-style": "3.0.3",
-        "postcss": "^8.4.33",
+        "postcss": "^8.4.35",
         "postcss-less": "6.0.0",
-        "postcss-loader": "8.1.0",
-        "prettier": "3.2.4",
+        "postcss-loader": "8.1.1",
+        "prettier": "3.2.5",
         "react-refresh": "0.14.0",
         "regenerator-runtime": "0.14.1",
-        "storybook": "7.6.11",
+        "storybook": "8.0.0",
         "style-loader": "3.3.4",
-        "stylelint": "16.2.0",
+        "stylelint": "16.2.1",
         "stylelint-config-prettier": "9.0.5",
         "stylelint-config-standard": "36.0.0",
         "terser-webpack-plugin": "5.3.10",
         "ts-jest": "29.1.2",
-        "typescript": "5.3.3",
-        "webpack": "5.90.0",
+        "typescript": "5.4.2",
+        "webpack": "5.90.3",
         "webpack-dev-server": "4.15.1"
     },
     "browserslist": [

diff --git a/src/app/components/calendar/TidsbrukKalender.tsx b/src/app/components/calendar/TidsbrukKalender.tsx
@@ -216,7 +216,7 @@ export const TidsbrukKalender = forwardRef<HTMLDivElement, OwnProps>(
                                         setVisModal(false);
                                         clearSelectedDates();
                                     }}
-                                    closeButton
+                                    aria-label="Modal"
                                 >
                                     <Modal.Body>
                                         {React.cloneElement(ModalContent, {

diff --git a/src/app/components/tilsyn/TilsynKalender.tsx b/src/app/components/tilsyn/TilsynKalender.tsx
@@ -81,6 +81,7 @@ export default function TilsynKalender({
                 open={visLengrePerioder}
                 onClose={() => setVisLengrePerioder(false)}
                 className="venstrestilt lengre-periode-modal"
+                aria-label="Lengre periode modal"
             >
                 <Modal.Body>
                     <TilsynPeriodeListe

diff --git a/src/app/components/ventModal/VentModal.tsx b/src/app/components/ventModal/VentModal.tsx
@@ -4,7 +4,7 @@ import { useMutation } from 'react-query';
 import { Modal } from '@navikt/ds-react';
 
 import { settJournalpostPaaVent } from 'app/api/api';
-import OkGaaTilLosModal from 'app/containers/pleiepenger/OkGaaTilLosModal';
+import { OkGaaTilLosModal } from 'app/containers/pleiepenger/OkGaaTilLosModal';
 import SettPaaVentErrorModal from 'app/containers/pleiepenger/SettPaaVentErrorModal';
 import SettPaaVentModal from 'app/containers/pleiepenger/SettPaaVentModal';
 

diff --git a/src/app/containers/JournalpostLoader.tsx b/src/app/containers/JournalpostLoader.tsx
@@ -12,7 +12,7 @@ import { IJournalpostConflictResponse } from '../models/types/Journalpost/IJourn
 import { RootStateType } from '../state/RootState';
 import { lukkJournalpostOppgave as lukkJournalpostOppgaveAction, lukkOppgaveResetAction } from '../state/actions';
 import { getJournalpost as getJournalpostAction } from '../state/reducers/FellesReducer';
-import OkGaaTilLosModal from './pleiepenger/OkGaaTilLosModal';
+import { OkGaaTilLosModal } from './pleiepenger/OkGaaTilLosModal';
 import { ConflictErrorComponent } from '../components/ConflictErrorComponent';
 import './journalpostLoader.less';
 

diff --git a/src/app/containers/omsorgspenger/korrigeringAvInntektsmelding/ErDuSikkerModal.tsx b/src/app/containers/omsorgspenger/korrigeringAvInntektsmelding/ErDuSikkerModal.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { WrappedComponentProps, injectIntl } from 'react-intl';
+import { useIntl } from 'react-intl';
 
 import { Button } from '@navikt/ds-react';
 
@@ -14,8 +14,9 @@ interface IErDuSikkerModalProps {
     submitKnappText: string;
 }
 
-const ErDuSikkerModal = (props: WrappedComponentProps & IErDuSikkerModalProps) => {
-    const { intl, melding, onSubmit, onClose, submitKnappText, extraInfo } = props;
+const ErDuSikkerModal = (props: IErDuSikkerModalProps) => {
+    const intl = useIntl();
+    const { melding, onSubmit, onClose, submitKnappText, extraInfo } = props;
 
     return (
         <div className="modal_content">
@@ -41,4 +42,4 @@ const ErDuSikkerModal = (props: WrappedComponentProps & IErDuSikkerModalProps) =
     );
 };
 
-export default injectIntl(ErDuSikkerModal);
+export default ErDuSikkerModal;
diff --git a/...ontainers/omsorgspenger/korrigeringAvInntektsmelding/KorrigeringAvInntektsmeldingForm.tsx b/...ontainers/omsorgspenger/korrigeringAvInntektsmelding/KorrigeringAvInntektsmeldingForm.tsx
@@ -226,7 +226,7 @@ const KorrigeringAvInntektsmeldingForm: React.FC<KorrigeringAvInntektsmeldingFor
                     </Form>
                     {visBekreftelsemodal && (
                         <Modal
-                            onBeforeClose={() => {
+                            onClose={() => {
                                 dispatch({ type: ActionType.SKJUL_BEKREFTELSEMODAL });
                             }}
                             aria-label="Er du sikker?"
@@ -245,7 +245,7 @@ const KorrigeringAvInntektsmeldingForm: React.FC<KorrigeringAvInntektsmeldingFor
                     )}
                     {visErDuSikkerModal && (
                         <Modal
-                            onBeforeClose={() => {
+                            onClose={() => {
                                 dispatch({ type: ActionType.SKJUL_ER_DU_SIKKER_MODAL });
                             }}
                             aria-label="Er du sikker?"

diff --git a/src/app/containers/pleiepenger/EksisterendeSoknader.tsx b/src/app/containers/pleiepenger/EksisterendeSoknader.tsx
@@ -160,7 +160,10 @@ export const EksisterendeSoknaderComponent: React.FC<IEksisterendeSoknaderProps>
             modaler.push(
                 <Modal
                     key={soknadId}
-                    onBeforeClose={() => {
+                    onCancel={() => {
+                        props.closeEksisterendeSoknadAction();
+                    }}
+                    onClose={() => {
                         props.closeEksisterendeSoknadAction();
                     }}
                     aria-label={soknadId}

diff --git a/src/app/containers/pleiepenger/ErDuSikkerModal.tsx b/src/app/containers/pleiepenger/ErDuSikkerModal.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react';
-import { WrappedComponentProps, injectIntl } from 'react-intl';
+import React from 'react';
+import { useIntl } from 'react-intl';
 
 import { Button } from '@navikt/ds-react';
 
@@ -14,8 +14,9 @@ interface IErDuSikkerModalProps {
     submitKnappText: string;
 }
 
-const ErDuSikkerModal = (props: WrappedComponentProps & IErDuSikkerModalProps) => {
-    const { intl, melding, onSubmit, onClose, submitKnappText, extraInfo } = props;
+const ErDuSikkerModal = (props: IErDuSikkerModalProps) => {
+    const intl = useIntl();
+    const { melding, onSubmit, onClose, submitKnappText, extraInfo } = props;
 
     return (
         <div className="modal_content">
@@ -42,4 +43,4 @@ const ErDuSikkerModal = (props: WrappedComponentProps & IErDuSikkerModalProps) =
     );
 };
 
-export default injectIntl(ErDuSikkerModal);
+export default ErDuSikkerModal;
diff --git a/src/app/containers/pleiepenger/Fordeling/Fordeling.tsx b/src/app/containers/pleiepenger/Fordeling/Fordeling.tsx
@@ -37,7 +37,7 @@ import { IFellesState, kopierJournalpost, resetBarnAction } from '../../../state
 import { finnForkortelseForDokumenttype, finnVisningsnavnForSakstype } from '../../../utils';
 import { Sakstyper } from '../../SakstypeImpls';
 import HåndterInntektsmeldingUtenKrav from '../HåndterInntektsmeldingUtenKrav';
-import OkGaaTilLosModal from '../OkGaaTilLosModal';
+import { OkGaaTilLosModal } from '../OkGaaTilLosModal';
 import FagsakSelect from './FagsakSelect';
 import AnnenPart from './Komponenter/AnnenPart';
 import DokumentTypeVelger from './Komponenter/DokumentTypeVelger';
@@ -310,7 +310,7 @@ const FordelingComponent: React.FunctionComponent<IFordelingProps> = (props: IFo
         return (
             <Modal
                 key="opprettigosysokmodal"
-                onBeforeClose={() => {
+                onClose={() => {
                     resetOmfordelAction();
                     setVisGaaTilLos(false);
                 }}
@@ -330,7 +330,7 @@ const FordelingComponent: React.FunctionComponent<IFordelingProps> = (props: IFo
         return (
             <Modal
                 key="lukkoppgaveokmodal"
-                onBeforeClose={() => {
+                onClose={() => {
                     lukkOppgaveReset();
                 }}
                 aria-label="settpaaventokmodal"

diff --git a/src/app/containers/pleiepenger/Fordeling/Komponenter/KlassifiserModal.tsx b/src/app/containers/pleiepenger/Fordeling/Komponenter/KlassifiserModal.tsx
@@ -40,7 +40,7 @@ export default function KlassifiserModal({ lukkModal }: OwnProps) {
 
     return (
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        <Modal open onBeforeClose={lukkModal} aria-labelledby="modal-heading">
+        <Modal open onClose={lukkModal} aria-labelledby="modal-heading">
             <Modal.Header closeButton={!disabled}>
                 <Heading level="1" size="small" id="modal-heading">
                     Lagre sakstype på journalpost