Skip to content

Commit

Permalink
Juster knapper Brev (#2388)
Browse files Browse the repository at this point in the history 
* Justere knapp 'Lukk oppgave' i brev til avsluttet sak

* Fiks tekst til formattert messages

* patch pkg upd

* minor pkg upd
  • Loading branch information
@poroshinaleksei
poroshinaleksei authored Jun 18, 2024
1 parent 4b22457 commit 8603437
Show file tree
Hide file tree
Showing 14 changed files with 721 additions and 618 deletions.
29 changes: 14 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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": [
Expand Down
47 changes: 28 additions & 19 deletions src/app/brevIAvsluttetSak/SendBrevIAvsluttetSak.tsx
View file
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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) {
Expand Down Expand Up @@ -56,12 +54,12 @@ const SendBrevIAvsluttetSak = () => {
<>
<div className="sendBrevIAvsluttetSak">
<Heading size="small" level="1">
Send brev i avsluttet sak
<FormattedMessage id={`sendBrevIAvsluttetSak.header`} />
</Heading>

<TextField
className="fnrInput"
label={intl.formatMessage({ id: 'SendBrevIAvsluttetSak.søkersFødselsnummer' })}
label={<FormattedMessage id={'sendBrevIAvsluttetSak.søkersFødselsnummer'} />}
type="text"
size="small"
inputMode="numeric"
Expand All @@ -81,56 +79,67 @@ const SendBrevIAvsluttetSak = () => {
}
}}
/>

{fødselsnummerError && (
<ErrorMessage>
{intl.formatMessage({
id: 'SendBrevIAvsluttetSak.UgyldigFødselsnummer',
})}
<FormattedMessage id={`sendBrevIAvsluttetSak.error.ugyldigFødselsnummer`} />
</ErrorMessage>
)}

{!fødselsnummerError && gyldigLengdePåSøkerId && (
<>
<div className="fagsagSelectContainer">
<Select
className="fagsakSelect"
label={intl.formatMessage({ id: 'SendBrevIAvsluttetSak.velgFagsak' })}
label={<FormattedMessage id={`sendBrevIAvsluttetSak.velgFagsak`} />}
disabled={fagsaker.length === 0}
onChange={(event) => setValgtFagsak(event.target.value)}
size="small"
>
<option value="">{intl.formatMessage({ id: 'SendBrevIAvsluttetSak.velg' })}</option>
<option value="">
<FormattedMessage id={`sendBrevIAvsluttetSak.velgFagsak.velg`} />
</option>

{fagsaker.map(({ fagsakId, sakstype }) => (
<option key={fagsakId} value={fagsakId}>
{`${fagsakId} (K9 ${finnVisningsnavnForSakstype(sakstype)})`}
<FormattedMessage
id={'sendBrevIAvsluttetSak.velgFagsak.options'}
values={{
fagsakId: fagsakId,
sakstypeNavn: finnVisningsnavnForSakstype(sakstype),
}}
/>
</option>
))}
</Select>

{isFetchingFagsaker && <Loader variant="neutral" size="small" title="venter..." />}
</div>

{henteFagsakFeilet && (
<ErrorMessage>
{intl.formatMessage({
id: 'SendBrevIAvsluttetSak.hentingAvFagsakFeilet',
})}
<FormattedMessage id={`sendBrevIAvsluttetSak.error.hentingAvFagsakFeilet`} />
</ErrorMessage>
)}

{valgtFagsak && (
<BrevComponent
søkerId={søkerId}
fagsakId={valgtFagsak}
sakstype={sakstypeForValgtFagsak()}
fagsakId={valgtFagsak}
brevSendtCallback={() => setVisLosModal(true)}
/>
)}
</>
)}
</div>

{visLosModal && (
<Modal open aria-label="Gå til LOS-modal" className="losModal" onClose={() => null}>
<div className="modalContent">
<SuccessIcon />
<Heading spacing size="xsmall" level="3">
Brevet er sendt. Du blir nå tatt til LOS.
<FormattedMessage id={`sendBrevIAvsluttetSak.gåTilLOSModal.header`} />
</Heading>
</div>
</Modal>
Expand Down
Loading

0 comments on commit 8603437

Please sign in to comment.