Skip to content

Commit c19aaa2

Browse files
Flytter sak-fagsak-profile inn i v2 (#7207)
* Flytter sak-fagsak-profile inn i v2 * Retter test
1 parent 248b687 commit c19aaa2

14 files changed

+131
-232
lines changed

packages/sak-app/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"dependencies": {
88
"@fpsak-frontend/assets": "1.0.0",
99
"@fpsak-frontend/kodeverk": "1.0.0",
10-
"@fpsak-frontend/sak-fagsak-profil": "1.0.0",
1110
"@fpsak-frontend/sak-historikk": "1.0.0",
1211
"@fpsak-frontend/sak-meny": "1.0.0",
1312
"@fpsak-frontend/sak-meny-endre-enhet": "1.0.0",

packages/sak-app/src/fagsakprofile/FagsakProfileIndex.spec.tsx

+40-24
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ import { MemoryRouter } from 'react-router';
55
import behandlingResultatType from '@fpsak-frontend/kodeverk/src/behandlingResultatType';
66
import behandlingStatus from '@fpsak-frontend/kodeverk/src/behandlingStatus';
77
import fagsakStatus from '@fpsak-frontend/kodeverk/src/fagsakStatus';
8+
import kodeverkTyper from '@fpsak-frontend/kodeverk/src/kodeverkTyper';
89
import { fagsakYtelsesType } from '@k9-sak-web/backend/k9sak/kodeverk/FagsakYtelsesType.js';
910
import { KodeverkTypeV2 } from '@k9-sak-web/lib/kodeverk/types.js';
10-
import kodeverkTyper from '@fpsak-frontend/kodeverk/src/kodeverkTyper';
1111
import { BehandlingAppKontekst, Fagsak } from '@k9-sak-web/types';
1212

1313
import { renderWithIntlAndReactQueryClient } from '@fpsak-frontend/utils-test/test-utils';
1414
import { behandlingType } from '@k9-sak-web/backend/k9sak/kodeverk/behandling/BehandlingType.js';
15+
import { KodeverkProvider } from '@k9-sak-web/gui/kodeverk/index.js';
16+
import alleKodeverkV2 from '@k9-sak-web/lib/kodeverk/mocks/alleKodeverkV2.json';
1517
import { K9sakApiKeys, requestApi } from '../data/k9sakApi';
1618
import { FagsakProfileIndex } from './FagsakProfileIndex';
1719

@@ -160,17 +162,24 @@ describe('<FagsakProfileIndex>', () => {
160162
requestApi.mock(K9sakApiKeys.LOS_HENTE_MERKNAD, {});
161163

162164
renderWithIntlAndReactQueryClient(
163-
<MemoryRouter>
164-
<IntlProvider locale="nb-NO">
165-
<FagsakProfileIndex
166-
fagsak={fagsak as Fagsak}
167-
alleBehandlinger={[forstegang, revurdering] as BehandlingAppKontekst[]}
168-
harHentetBehandlinger
169-
oppfriskBehandlinger={vi.fn()}
170-
fagsakRettigheter={fagsakRettigheter}
171-
/>
172-
</IntlProvider>
173-
</MemoryRouter>,
165+
<KodeverkProvider
166+
behandlingType={behandlingType.FØRSTEGANGSSØKNAD}
167+
kodeverk={alleKodeverkV2}
168+
klageKodeverk={{}}
169+
tilbakeKodeverk={{}}
170+
>
171+
<MemoryRouter>
172+
<IntlProvider locale="nb-NO">
173+
<FagsakProfileIndex
174+
fagsak={fagsak as Fagsak}
175+
alleBehandlinger={[forstegang, revurdering] as BehandlingAppKontekst[]}
176+
harHentetBehandlinger
177+
oppfriskBehandlinger={vi.fn()}
178+
fagsakRettigheter={fagsakRettigheter}
179+
/>
180+
</IntlProvider>
181+
</MemoryRouter>
182+
</KodeverkProvider>,
174183
);
175184

176185
expect(await screen.findByRole('button', { name: 'Behandlingsmeny' })).toBeInTheDocument();
@@ -194,18 +203,25 @@ describe('<FagsakProfileIndex>', () => {
194203
requestApi.mock(K9sakApiKeys.LOS_HENTE_MERKNAD, {});
195204

196205
renderWithIntlAndReactQueryClient(
197-
<MemoryRouter>
198-
<IntlProvider locale="nb-NO">
199-
<FagsakProfileIndex
200-
fagsak={fagsak as Fagsak}
201-
alleBehandlinger={[forstegang, revurdering] as BehandlingAppKontekst[]}
202-
harHentetBehandlinger
203-
oppfriskBehandlinger={vi.fn()}
204-
behandlingId={1}
205-
fagsakRettigheter={fagsakRettigheter}
206-
/>
207-
</IntlProvider>
208-
</MemoryRouter>,
206+
<KodeverkProvider
207+
behandlingType={behandlingType.FØRSTEGANGSSØKNAD}
208+
kodeverk={alleKodeverkV2}
209+
klageKodeverk={{}}
210+
tilbakeKodeverk={{}}
211+
>
212+
<MemoryRouter>
213+
<IntlProvider locale="nb-NO">
214+
<FagsakProfileIndex
215+
fagsak={fagsak as Fagsak}
216+
alleBehandlinger={[forstegang, revurdering] as BehandlingAppKontekst[]}
217+
harHentetBehandlinger
218+
oppfriskBehandlinger={vi.fn()}
219+
behandlingId={1}
220+
fagsakRettigheter={fagsakRettigheter}
221+
/>
222+
</IntlProvider>
223+
</MemoryRouter>
224+
</KodeverkProvider>,
209225
);
210226

211227
expect(await screen.findByRole('button', { name: 'Behandlingsmeny' })).toBeInTheDocument();

packages/sak-app/src/fagsakprofile/FagsakProfileIndex.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import FagsakProfilSakIndex from '@fpsak-frontend/sak-fagsak-profil';
21
import { LoadingPanel, requireProps } from '@fpsak-frontend/shared-components';
32
import { K9SakClientContext } from '@k9-sak-web/gui/app/K9SakClientContext.js';
43
import BehandlingVelgerBackendClient from '@k9-sak-web/gui/sak/behandling-velger/BehandlingVelgerK9BackendClient.js';
54
import BehandlingVelgerSakV2 from '@k9-sak-web/gui/sak/behandling-velger/BehandlingVelgerSakIndex.js';
5+
import FagsakProfilSakIndex from '@k9-sak-web/gui/sak/fagsak-profil/FagsakProfilSakIndex.js';
66
import FeatureTogglesContext from '@k9-sak-web/gui/utils/featureToggles/FeatureTogglesContext.js';
77
import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
88
import BehandlingVelgerSakIndex from '@k9-sak-web/sak-behandling-velger';
@@ -99,8 +99,7 @@ export const FagsakProfileIndex = ({
9999
<FagsakProfilSakIndex
100100
saksnummer={fagsak.saksnummer}
101101
fagsakYtelseType={fagsak.sakstype}
102-
fagsakStatus={fagsakStatusMedNavn}
103-
dekningsgrad={fagsak.dekningsgrad}
102+
fagsakStatus={fagsakStatusMedNavn.kode}
104103
renderBehandlingMeny={() => {
105104
if (!fagsakRettigheter || !behandlendeEnheter) {
106105
return <LoadingPanel />;

packages/sak-fagsak-profil/i18n/index.ts

-5
This file was deleted.

packages/sak-fagsak-profil/i18n/nb_NO.json

-3
This file was deleted.

packages/sak-fagsak-profil/index.ts

-1
This file was deleted.

packages/sak-fagsak-profil/package.json

-17
This file was deleted.

packages/sak-fagsak-profil/src/FagsakProfilSakIndex.stories.tsx

-26
This file was deleted.

packages/sak-fagsak-profil/src/components/FagsakProfile.tsx

-79
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import fagsakStatus from '@fpsak-frontend/kodeverk/src/fagsakStatus';
2+
import { behandlingType } from '@k9-sak-web/backend/k9sak/kodeverk/behandling/BehandlingType.js';
3+
import { fagsakYtelsesType } from '@k9-sak-web/backend/k9sak/kodeverk/FagsakYtelsesType.js';
4+
import { Button } from '@navikt/ds-react';
5+
import type { Meta, StoryObj } from '@storybook/react';
6+
import withKodeverkContext from '../../storybook/decorators/withKodeverkContext';
7+
import withMaxWidth from '../../storybook/decorators/withMaxWidth';
8+
import FagsakProfilSakIndex from './FagsakProfilSakIndex';
9+
10+
const meta = {
11+
title: 'gui/sak/fagsak-profil',
12+
component: FagsakProfilSakIndex,
13+
decorators: [withKodeverkContext({ behandlingType: behandlingType.FØRSTEGANGSSØKNAD }), withMaxWidth(600)],
14+
} satisfies Meta<typeof FagsakProfilSakIndex>;
15+
16+
export default meta;
17+
18+
export const Default: StoryObj<typeof meta> = {
19+
args: {
20+
saksnummer: '232341251',
21+
fagsakYtelseType: fagsakYtelsesType.PLEIEPENGER_SYKT_BARN,
22+
fagsakStatus: fagsakStatus.OPPRETTET,
23+
renderBehandlingMeny: () => <Button size="small">Meny (Placeholder)</Button>,
24+
renderBehandlingVelger: () => <div>Liste (placeholder)</div>,
25+
},
26+
};

packages/sak-fagsak-profil/src/FagsakProfilSakIndex.tsx packages/v2/gui/src/sak/fagsak-profil/FagsakProfilSakIndex.tsx

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
1-
import React, { ReactNode } from 'react';
1+
import { type FagsakYtelsesType } from '@k9-sak-web/backend/k9sak/kodeverk/FagsakYtelsesType.js';
2+
import { type ReactNode } from 'react';
23
import { createIntl, createIntlCache, RawIntlProvider } from 'react-intl';
3-
4-
import { FagsakYtelsesType } from '@k9-sak-web/backend/k9sak/kodeverk/FagsakYtelsesType.js';
5-
import { KodeverkMedNavn } from '@k9-sak-web/types';
6-
74
import FagsakProfile from './components/FagsakProfile';
8-
import messages from '../i18n/nb_NO.json';
95

106
const cache = createIntlCache();
117

128
const intl = createIntl(
139
{
1410
locale: 'nb-NO',
15-
messages,
1611
},
1712
cache,
1813
);
1914

2015
interface OwnProps {
2116
saksnummer: string;
2217
fagsakYtelseType: FagsakYtelsesType;
23-
fagsakStatus: KodeverkMedNavn;
18+
fagsakStatus: string;
2419
renderBehandlingMeny: () => ReactNode;
2520
renderBehandlingVelger: () => ReactNode;
26-
dekningsgrad?: number;
2721
}
2822

2923
const FagsakProfilSakIndex = ({
@@ -32,7 +26,6 @@ const FagsakProfilSakIndex = ({
3226
fagsakStatus,
3327
renderBehandlingMeny,
3428
renderBehandlingVelger,
35-
dekningsgrad,
3629
}: OwnProps) => (
3730
<RawIntlProvider value={intl}>
3831
<FagsakProfile
@@ -41,7 +34,6 @@ const FagsakProfilSakIndex = ({
4134
fagsakStatus={fagsakStatus}
4235
renderBehandlingMeny={renderBehandlingMeny}
4336
renderBehandlingVelger={renderBehandlingVelger}
44-
dekningsgrad={dekningsgrad}
4537
/>
4638
</RawIntlProvider>
4739
);

0 commit comments

Comments
 (0)