Skip to content

Commit c217b1e

Browse files
hallvardastarkhallvardastark
committed
Prøver å sette rett path for msw i deployed storybook
1 parent 6154565 commit c217b1e

10 files changed

+74
-56
lines changed

‎packages/fakta-medisinsk-vilkår/mock/api-mock-livets-sluttfase.ts

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import cors from 'cors';
33
import express from 'express';
44
import { Dokumenttype } from '../src/types/Dokument';
55
import { createLivetsSluttfaseVurdering } from './apiUtils';
6+
import { mockUrlPrepend } from './constants';
67
import createMockedVurderingselementLinks from './mocked-data/createMockedVurderingselementLinks';
78
import createStrukturertDokument from './mocked-data/createStrukturertDokument';
89
import mockedDokumentliste from './mocked-data/mockedDokumentliste';
@@ -23,7 +24,7 @@ app.use(
2324

2425
let mockedNyeDokumenter = [...mockedNyeDokumenterList];
2526

26-
app.use('/mock/status', (req, res) => {
27+
app.use(`${mockUrlPrepend}/mock/status`, (req, res) => {
2728
const harUklassifiserteDokumenter = mockedDokumentoversikt.dokumenter.some(
2829
({ type }) => type === Dokumenttype.UKLASSIFISERT,
2930
);
@@ -47,14 +48,14 @@ app.use('/mock/status', (req, res) => {
4748
});
4849
});
4950

50-
app.use('/mock/vurdering', (req, res) => {
51+
app.use(`${mockUrlPrepend}/mock/vurdering`, (req, res) => {
5152
const vurderingId = req.query.sykdomVurderingId;
5253
const alleVurderinger = [...livetsSluttfaseVurderingerMock];
5354
const vurdering = alleVurderinger.find(({ id }) => id === vurderingId);
5455
res.send(vurdering);
5556
});
5657

57-
app.use('/mock/opprett-vurdering', (req, res) => {
58+
app.use(`${mockUrlPrepend}/mock/opprett-vurdering`, (req, res) => {
5859
if (req.body.dryRun === true) {
5960
res.send({
6061
perioderMedEndringer: [
@@ -74,7 +75,7 @@ app.use('/mock/opprett-vurdering', (req, res) => {
7475
}
7576
});
7677

77-
app.use('/mock/endre-vurdering', (req, res) => {
78+
app.use(`${mockUrlPrepend}/mock/endre-vurdering`, (req, res) => {
7879
if (req.body.dryRun === true) {
7980
res.send({
8081
perioderMedEndringer: [
@@ -120,7 +121,7 @@ app.use('/mock/endre-vurdering', (req, res) => {
120121
}
121122
});
122123

123-
app.use('/mock/livets-sluttfase/vurderingsoversikt', (req, res) => {
124+
app.use(`${mockUrlPrepend}/mock/livets-sluttfase/vurderingsoversikt`, (req, res) => {
124125
const harGyldigSignatur = mockedDokumentoversikt.dokumenter.some(({ type }) => type === Dokumenttype.LEGEERKLÆRING);
125126
res.send({
126127
...livetsSluttfaseVurderingsoversiktMock,
@@ -131,24 +132,24 @@ app.use('/mock/livets-sluttfase/vurderingsoversikt', (req, res) => {
131132
});
132133
});
133134

134-
app.use('/mock/dokumentoversikt', (req, res) => {
135+
app.use(`${mockUrlPrepend}/mock/dokumentoversikt`, (req, res) => {
135136
res.send(mockedDokumentoversikt);
136137
});
137138

138-
app.use('/mock/endre-dokument', (req, res) => {
139+
app.use(`${mockUrlPrepend}/mock/endre-dokument`, (req, res) => {
139140
createStrukturertDokument(req.body);
140141
res.send(mockedDokumentoversikt);
141142
});
142143

143-
app.use('/mock/data-til-vurdering', (req, res) => {
144+
app.use(`${mockUrlPrepend}/mock/data-til-vurdering`, (req, res) => {
144145
res.send(mockedDokumentliste);
145146
});
146147

147-
app.get('/mock/nye-dokumenter', (req, res) => {
148+
app.get(`${mockUrlPrepend}/mock/nye-dokumenter`, (req, res) => {
148149
res.send(mockedNyeDokumenter);
149150
});
150151

151-
app.post('/mock/nye-dokumenter', (req, res) => {
152+
app.post(`${mockUrlPrepend}/mock/nye-dokumenter`, (req, res) => {
152153
mockedNyeDokumenter = [];
153154
res.send({});
154155
});

‎packages/fakta-medisinsk-vilkår/mock/constants.ts

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const { VITE_LOCAL_STORYBOOK } = import.meta.env;
2+
const mockUrlPrepend = VITE_LOCAL_STORYBOOK ? '' : '/k9-sak-web';
3+
4+
export { mockUrlPrepend };

‎packages/fakta-medisinsk-vilkår/mock/handlers.ts

+27-19
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Dokument, { Dokumenttype } from '../src/types/Dokument';
55
import NyVurderingsversjon from '../src/types/NyVurderingsversjon';
66
import Vurderingstype from '../src/types/Vurderingstype';
77
import { createKontinuerligTilsynVurdering, createToOmsorgspersonerVurdering } from './apiUtils';
8+
import { mockUrlPrepend } from './constants';
89
import createMockedVurderingselementLinks from './mocked-data/createMockedVurderingselementLinks';
910
import createStrukturertDokument from './mocked-data/createStrukturertDokument';
1011
import mockedDiagnosekoderesponse from './mocked-data/mockedDiagnosekodeResponse';
@@ -34,7 +35,7 @@ type EndreInnleggelsesperioderRequestBody = {
3435
};
3536

3637
export const handlers = [
37-
http.get('/mock/status', () => {
38+
http.get(`${mockUrlPrepend}/mock/status`, () => {
3839
const harUklassifiserteDokumenter = mockedDokumentoversikt.dokumenter.some(
3940
({ type }) => type === Dokumenttype.UKLASSIFISERT,
4041
);
@@ -72,15 +73,15 @@ export const handlers = [
7273
);
7374
}),
7475

75-
http.get('/mock/vurdering', ({ request }) => {
76+
http.get(`${mockUrlPrepend}/mock/vurdering`, ({ request }) => {
7677
const url = new URL(request.url);
7778
const vurderingId = url.searchParams.get('sykdomVurderingId');
7879
const alleVurderinger = [...mockedTilsynsbehovVurderinger, ...mockedToOmsorgspersonerVurderinger];
7980
const vurdering = alleVurderinger.find(({ id }) => id === vurderingId);
8081
return HttpResponse.json(vurdering, { status: 200 });
8182
}),
8283

83-
http.post<undefined, NyVurderingsversjon>('/mock/opprett-vurdering', async ({ request }) => {
84+
http.post<undefined, NyVurderingsversjon>(`${mockUrlPrepend}/mock/opprett-vurdering`, async ({ request }) => {
8485
const body = await request.json();
8586
if (body.dryRun === true) {
8687
return HttpResponse.json(
@@ -107,7 +108,7 @@ export const handlers = [
107108
return HttpResponse.json(null, { status: 201 });
108109
}),
109110

110-
http.post<undefined, EndreVurderingRequestBody>('/mock/endre-vurdering', async ({ request }) => {
111+
http.post<undefined, EndreVurderingRequestBody>(`${mockUrlPrepend}/mock/endre-vurdering`, async ({ request }) => {
111112
const body = await request.json();
112113
if (body.dryRun === true) {
113114
return HttpResponse.json(
@@ -157,7 +158,7 @@ export const handlers = [
157158
return HttpResponse.json(null, { status: 201 });
158159
}),
159160

160-
http.get('/mock/kontinuerlig-tilsyn-og-pleie/vurderingsoversikt', () => {
161+
http.get(`${mockUrlPrepend}/mock/kontinuerlig-tilsyn-og-pleie/vurderingsoversikt`, () => {
161162
const harGyldigSignatur = mockedDokumentoversikt.dokumenter.some(({ type }) => type === Dokumenttype.LEGEERKLÆRING);
162163
return HttpResponse.json(
163164
{
@@ -171,7 +172,7 @@ export const handlers = [
171172
);
172173
}),
173174

174-
http.get('/mock/to-omsorgspersoner/vurderingsoversikt', () => {
175+
http.get(`${mockUrlPrepend}/mock/to-omsorgspersoner/vurderingsoversikt`, () => {
175176
const harGyldigSignatur = mockedDokumentoversikt.dokumenter.some(({ type }) => type === Dokumenttype.LEGEERKLÆRING);
176177
return HttpResponse.json(
177178
{
@@ -185,28 +186,35 @@ export const handlers = [
185186
);
186187
}),
187188

188-
http.get('/mock/dokumentoversikt', () => HttpResponse.json(mockedDokumentoversikt, { status: 200 })),
189+
http.get(`${mockUrlPrepend}/mock/dokumentoversikt`, () => HttpResponse.json(mockedDokumentoversikt, { status: 200 })),
189190

190-
http.post<undefined, Dokument>('/mock/endre-dokument', async ({ request }) => {
191+
http.post<undefined, Dokument>(`${mockUrlPrepend}/mock/endre-dokument`, async ({ request }) => {
191192
const body = await request.json();
192193
createStrukturertDokument(body);
193194
return HttpResponse.json(mockedDokumentoversikt, { status: 201 });
194195
}),
195196

196-
http.get('/mock/data-til-vurdering', () => HttpResponse.json(mockedDokumentliste, { status: 200 })),
197+
http.get(`${mockUrlPrepend}/mock/data-til-vurdering`, () => HttpResponse.json(mockedDokumentliste, { status: 200 })),
197198

198-
http.get('/mock/diagnosekoder', () => HttpResponse.json(mockedDiagnosekoderesponse, { status: 200 })),
199+
http.get(`${mockUrlPrepend}/mock/diagnosekoder`, () =>
200+
HttpResponse.json(mockedDiagnosekoderesponse, { status: 200 }),
201+
),
199202

200-
http.post<undefined, EndreDiagnosekoderRequestBody>('/mock/endre-diagnosekoder', async ({ request }) => {
201-
const body = await request.json();
202-
mockedDiagnosekoderesponse.diagnosekoder = body.diagnosekoder || [];
203-
return HttpResponse.json({}, { status: 201 });
204-
}),
203+
http.post<undefined, EndreDiagnosekoderRequestBody>(
204+
`${mockUrlPrepend}/mock/endre-diagnosekoder`,
205+
async ({ request }) => {
206+
const body = await request.json();
207+
mockedDiagnosekoderesponse.diagnosekoder = body.diagnosekoder || [];
208+
return HttpResponse.json({}, { status: 201 });
209+
},
210+
),
205211

206-
http.get('/mock/innleggelsesperioder', () => HttpResponse.json(mockedInnleggelsesperioder, { status: 200 })),
212+
http.get(`${mockUrlPrepend}/mock/innleggelsesperioder`, () =>
213+
HttpResponse.json(mockedInnleggelsesperioder, { status: 200 }),
214+
),
207215

208216
http.post<undefined, EndreInnleggelsesperioderRequestBody>(
209-
'/mock/endre-innleggelsesperioder',
217+
`${mockUrlPrepend}/mock/endre-innleggelsesperioder`,
210218
async ({ request }) => {
211219
const body = await request.json();
212220
if (body.dryRun === true) {
@@ -217,9 +225,9 @@ export const handlers = [
217225
},
218226
),
219227

220-
http.get('/mock/nye-dokumenter', () => HttpResponse.json(mockedNyeDokumenter, { status: 200 })),
228+
http.get(`${mockUrlPrepend}/mock/nye-dokumenter`, () => HttpResponse.json(mockedNyeDokumenter, { status: 200 })),
221229

222-
http.post('/mock/nye-dokumenter', () => {
230+
http.post(`${mockUrlPrepend}/mock/nye-dokumenter`, () => {
223231
mockedNyeDokumenter = [];
224232
return HttpResponse.json({}, { status: 201 });
225233
}),

‎packages/fakta-medisinsk-vilkår/mock/mocked-data/createMockedDokumentelementLinks.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import LinkRel from '../../src/constants/LinkRel';
22
import Link from '../../src/types/Link';
3+
import { mockUrlPrepend } from '../constants';
34

45
const createMockedDokumentelementLinks = (id: string): Link[] => [
56
{
67
rel: LinkRel.ENDRE_DOKUMENT,
78
type: 'POST',
8-
href: `/mock/endre-dokument?dokumentId=${id}`,
9+
href: `${mockUrlPrepend}/mock/endre-dokument?dokumentId=${id}`,
910
versjon: null,
1011
},
1112
{

‎packages/fakta-medisinsk-vilkår/mock/mocked-data/createMockedVurderingselementLinks.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import LinkRel from '../../src/constants/LinkRel';
22
import Link from '../../src/types/Link';
3+
import { mockUrlPrepend } from '../constants';
34

45
function createMockedVurderingselementLinks(id): Link[] {
56
return [
67
{
78
rel: LinkRel.HENT_VURDERING,
89
type: 'GET',
9-
href: `/mock/vurdering?sykdomVurderingId=${id}`,
10+
href: `${mockUrlPrepend}/mock/vurdering?sykdomVurderingId=${id}`,
1011
versjon: null,
1112
},
1213
{
1314
rel: LinkRel.ENDRE_VURDERING,
1415
type: 'POST',
15-
href: `/mock/endre-vurdering?sykdomVurderingId=${id}`,
16+
href: `${mockUrlPrepend}/mock/endre-vurdering?sykdomVurderingId=${id}`,
1617
versjon: null,
1718
requestPayload: {
1819
behandlingUuid: '123',

‎packages/fakta-medisinsk-vilkår/mock/mocked-data/mockedDiagnosekodeResponse.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import LinkRel from '../../src/constants/LinkRel';
2+
import { mockUrlPrepend } from '../constants';
23

34
export default {
45
diagnosekoder: ['A001', 'B04'],
56
links: [
67
{
78
rel: LinkRel.ENDRE_DIAGNOSEKODER,
89
type: 'POST',
9-
href: '/mock/endre-diagnosekoder',
10+
href: `${mockUrlPrepend}/mock/endre-diagnosekoder`,
1011
behandlingUuid: 'HER_ER_BEHANDLINGSID',
1112
versjon: null,
1213
},

‎packages/fakta-medisinsk-vilkår/mock/mocked-data/mockedInnleggelsesperioder.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import LinkRel from '../../src/constants/LinkRel';
2+
import { mockUrlPrepend } from '../constants';
23

34
export default {
45
perioder: [
@@ -10,7 +11,7 @@ export default {
1011
{
1112
rel: LinkRel.ENDRE_INNLEGGELSESPERIODER,
1213
type: 'POST',
13-
href: '/mock/endre-innleggelsesperioder',
14+
href: `${mockUrlPrepend}/mock/endre-innleggelsesperioder`,
1415
requestPayload: {
1516
behandlingUuid: 'HER_ER_BEHANDLINGSID',
1617
versjon: null,

‎packages/fakta-medisinsk-vilkår/mock/mocked-data/mockedVurderingsoversiktLinks.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import LinkRel from '../../src/constants/LinkRel';
22
import Link from '../../src/types/Link';
3+
import { mockUrlPrepend } from '../constants';
34

45
const links: Link[] = [
56
{
67
rel: LinkRel.OPPRETT_VURDERING,
78
type: 'POST',
8-
href: '/mock/opprett-vurdering',
9+
href: `${mockUrlPrepend}/mock/opprett-vurdering`,
910
versjon: null,
1011
requestPayload: {
1112
behandlingUuid: 'HER_ER_BEHANDLINGSID',
@@ -14,7 +15,7 @@ const links: Link[] = [
1415
{
1516
rel: LinkRel.DATA_TIL_VURDERING,
1617
type: 'GET',
17-
href: '/mock/data-til-vurdering',
18+
href: `${mockUrlPrepend}/mock/data-til-vurdering`,
1819
versjon: null,
1920
},
2021
];

‎packages/fakta-medisinsk-vilkår/src/dev/app.ts

+10-11
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ interface ExtendedWindow extends Window {
1212

1313
const data = {
1414
endpoints: {
15-
vurderingsoversiktKontinuerligTilsynOgPleie:
16-
'http://localhost:8082/mock/kontinuerlig-tilsyn-og-pleie/vurderingsoversikt',
17-
vurderingsoversiktBehovForToOmsorgspersoner: 'http://localhost:8082/mock/to-omsorgspersoner/vurderingsoversikt',
18-
dokumentoversikt: 'http://localhost:8082/mock/dokumentoversikt',
19-
dataTilVurdering: 'http://localhost:8082/mock/data-til-vurdering',
20-
innleggelsesperioder: 'http://localhost:8082/mock/innleggelsesperioder',
21-
diagnosekoder: 'http://localhost:8082/mock/diagnosekoder',
22-
diagnosekodeSearch: 'http://localhost:8082/mock/diagnosekode-search',
23-
status: 'http://localhost:8082/mock/status',
24-
nyeDokumenter: 'http://localhost:8082/mock/nye-dokumenter',
25-
vurderingsoversiktLivetsSluttfase: 'http://localhost:8082/mock/livets-sluttfase/vurderingsoversikt',
15+
vurderingsoversiktKontinuerligTilsynOgPleie: '/mock/kontinuerlig-tilsyn-og-pleie/vurderingsoversikt',
16+
vurderingsoversiktBehovForToOmsorgspersoner: '/mock/to-omsorgspersoner/vurderingsoversikt',
17+
dokumentoversikt: '/mock/dokumentoversikt',
18+
dataTilVurdering: '/mock/data-til-vurdering',
19+
innleggelsesperioder: '/mock/innleggelsesperioder',
20+
diagnosekoder: '/mock/diagnosekoder',
21+
diagnosekodeSearch: '/mock/diagnosekode-search',
22+
status: '/mock/status',
23+
nyeDokumenter: '/mock/nye-dokumenter',
24+
vurderingsoversiktLivetsSluttfase: '/mock/livets-sluttfase/vurderingsoversikt',
2625
},
2726
behandlingUuid: '123',
2827
readOnly: false,

‎packages/fakta-medisinsk-vilkår/src/ui/MainComponent.stories.tsx

+10-9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import type { Meta, StoryObj } from '@storybook/react';
33
import { expect, userEvent, waitFor, within } from '@storybook/test';
44
import React, { useEffect } from 'react';
5+
import { mockUrlPrepend } from '../../mock/constants';
56
import { handlers } from '../../mock/handlers';
67
import BehandlingType from '../constants/BehandlingType';
78
import FagsakYtelseType from '../constants/FagsakYtelseType';
@@ -13,15 +14,15 @@ const meta: Meta<typeof MainComponent> = {
1314
args: {
1415
data: {
1516
endpoints: {
16-
vurderingsoversiktKontinuerligTilsynOgPleie: '/mock/kontinuerlig-tilsyn-og-pleie/vurderingsoversikt',
17-
vurderingsoversiktBehovForToOmsorgspersoner: '/mock/to-omsorgspersoner/vurderingsoversikt',
18-
dokumentoversikt: '/mock/dokumentoversikt',
19-
dataTilVurdering: '/mock/data-til-vurdering',
20-
innleggelsesperioder: '/mock/innleggelsesperioder',
21-
diagnosekoder: '/mock/diagnosekoder',
22-
status: '/mock/status',
23-
nyeDokumenter: '/mock/nye-dokumenter',
24-
vurderingsoversiktLivetsSluttfase: '/mock/livets-sluttfase/vurderingsoversikt',
17+
vurderingsoversiktKontinuerligTilsynOgPleie: `${mockUrlPrepend}/mock/kontinuerlig-tilsyn-og-pleie/vurderingsoversikt`,
18+
vurderingsoversiktBehovForToOmsorgspersoner: `${mockUrlPrepend}/mock/to-omsorgspersoner/vurderingsoversikt`,
19+
dokumentoversikt: `${mockUrlPrepend}/mock/dokumentoversikt`,
20+
dataTilVurdering: `${mockUrlPrepend}/mock/data-til-vurdering`,
21+
innleggelsesperioder: `${mockUrlPrepend}/mock/innleggelsesperioder`,
22+
diagnosekoder: `${mockUrlPrepend}/mock/diagnosekoder`,
23+
status: `${mockUrlPrepend}/mock/status`,
24+
nyeDokumenter: `${mockUrlPrepend}/mock/nye-dokumenter`,
25+
vurderingsoversiktLivetsSluttfase: `${mockUrlPrepend}/mock/livets-sluttfase/vurderingsoversikt`,
2526
},
2627
behandlingUuid: '123',
2728
readOnly: false,

0 commit comments

Comments
 (0)