From 8603437753e7c759b88389997b484c8df9bd1415 Mon Sep 17 00:00:00 2001 From: Aleksei Poroshin <69150024+poroshinaleksei@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:53:07 +0200 Subject: [PATCH] Juster knapper Brev (#2388) * Justere knapp 'Lukk oppgave' i brev til avsluttet sak * Fiks tekst til formattert messages * patch pkg upd * minor pkg upd --- package.json | 29 +- .../SendBrevIAvsluttetSak.tsx | 47 +- src/app/components/brev/BrevComponent.tsx | 77 +- .../brev/GenereltFritekstbrevMal.tsx | 18 +- .../brev/InnhentDokumentasjonMal.tsx | 14 +- src/app/components/brev/MalVelger.tsx | 14 +- src/app/components/brev/MottakerVelger.tsx | 52 +- .../{PreviewMessage.ts => previewMessage.ts} | 0 .../brev-fagsak/SendBrevP\303\245Fagsak.tsx" | 19 +- .../brev-fagsak/sendBrevP\303\245Fagsak.less" | 2 +- ...H\303\245ndterInntektsmeldingUtenKrav.tsx" | 2 +- .../sok/SendBrevIAvsluttetSakInngang.tsx | 17 +- src/app/i18n/nb.json | 62 +- yarn.lock | 986 +++++++++--------- 14 files changed, 721 insertions(+), 618 deletions(-) rename src/app/components/brev/{PreviewMessage.ts => previewMessage.ts} (100%) diff --git a/package.json b/package.json index ad523e1bd..dbc55f960 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@navikt/ft-plattform-komponenter": "2.5.10", "@popperjs/core": "2.11.8", "@redux-devtools/extension": "3.3.0", - "@sentry/react": "8.8.0", + "@sentry/react": "8.9.2", "@storybook/testing-react": "2.0.1", "@types/classnames": "2.3.1", "@types/redux-logger": "3.0.13", @@ -61,7 +61,6 @@ "react-collapse": "5.1.1", "react-day-picker": "7.4.10", "react-dom": "18.3.1", - "react-hook-form": "7.51.5", "react-intl": "6.6.8", "react-modal": "3.16.1", "react-popper": "2.3.0", @@ -113,12 +112,12 @@ "@babel/preset-typescript": "7.24.7", "@pmmmwh/react-refresh-webpack-plugin": "0.5.15", "@sentry/cli": "2.32.1", - "@storybook/addon-actions": "8.1.6", - "@storybook/addon-essentials": "8.1.6", - "@storybook/addon-interactions": "8.1.6", - "@storybook/addon-links": "8.1.6", - "@storybook/react": "8.1.6", - "@storybook/react-webpack5": "8.1.6", + "@storybook/addon-actions": "8.1.10", + "@storybook/addon-essentials": "8.1.10", + "@storybook/addon-interactions": "8.1.10", + "@storybook/addon-links": "8.1.10", + "@storybook/react": "8.1.10", + "@storybook/react-webpack5": "8.1.10", "@storybook/testing-library": "0.2.2", "@testing-library/cypress": "10.0.2", "@testing-library/jest-dom": "6.4.6", @@ -142,8 +141,8 @@ "@types/react-test-renderer": "18.3.0", "@types/redux-mock-store": "1.0.6", "@types/testing-library__cypress": "5.0.13", - "@typescript-eslint/eslint-plugin": "7.13.0", - "@typescript-eslint/parser": "7.13.0", + "@typescript-eslint/eslint-plugin": "7.13.1", + "@typescript-eslint/parser": "7.13.1", "@wojtekmaj/enzyme-adapter-react-17": "0.8.0", "autoprefixer": "10.4.19", "babel-jest": "29.7.0", @@ -154,7 +153,7 @@ "cross-env": "7.0.3", "css-loader": "7.1.2", "enzyme": "3.11.0", - "eslint": "9.4.0", + "eslint": "9.5.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", "eslint-plugin-jsx-a11y": "6.8.0", @@ -172,7 +171,7 @@ "jest-mock": "29.7.0", "less": "4.2.0", "less-loader": "12.2.0", - "lint-staged": "15.2.5", + "lint-staged": "15.2.7", "msw": "2.3.1", "nav-frontend-ekspanderbartpanel-style": "2.0.2", "nav-frontend-skjema-style": "3.0.3", @@ -182,15 +181,15 @@ "prettier": "3.3.2", "react-refresh": "0.14.2", "regenerator-runtime": "0.14.1", - "storybook": "8.1.6", + "storybook": "8.1.10", "style-loader": "4.0.0", "stylelint": "16.6.1", "stylelint-config-prettier": "9.0.5", "stylelint-config-standard": "36.0.0", "terser-webpack-plugin": "5.3.10", - "ts-jest": "29.1.4", + "ts-jest": "29.1.5", "typescript": "5.4.5", - "webpack": "5.91.0", + "webpack": "5.92.0", "webpack-dev-server": "5.0.4" }, "browserslist": [ diff --git a/src/app/brevIAvsluttetSak/SendBrevIAvsluttetSak.tsx b/src/app/brevIAvsluttetSak/SendBrevIAvsluttetSak.tsx index fd4bc290e..a2de09476 100644 --- a/src/app/brevIAvsluttetSak/SendBrevIAvsluttetSak.tsx +++ b/src/app/brevIAvsluttetSak/SendBrevIAvsluttetSak.tsx @@ -1,13 +1,11 @@ import React, { useEffect, useState } from 'react'; -import { useIntl } from 'react-intl'; - +import { FormattedMessage } from 'react-intl'; import { ErrorMessage, Heading, Loader, Modal, Select, TextField } from '@navikt/ds-react'; - -import { finnFagsaker } from 'app/api/api'; import SuccessIcon from 'app/assets/SVG/SuccessIcon'; import BrevComponent from 'app/components/brev/BrevComponent'; -import { IdentRules } from 'app/rules'; +import { finnFagsaker } from 'app/api/api'; import Fagsak from 'app/types/Fagsak'; +import { IdentRules } from 'app/rules'; import { finnVisningsnavnForSakstype, getEnvironmentVariable } from 'app/utils'; import './sendBrevIAvsluttetSak.less'; @@ -20,8 +18,8 @@ const SendBrevIAvsluttetSak = () => { const [valgtFagsak, setValgtFagsak] = useState(''); const [visLosModal, setVisLosModal] = useState(false); const [fødselsnummerError, setFødselsnummerError] = useState(false); + const gyldigLengdePåSøkerId = søkerId.length === 11; - const intl = useIntl(); useEffect(() => { if (visLosModal) { @@ -56,12 +54,12 @@ const SendBrevIAvsluttetSak = () => { <>