Skip to content

Commit ff78ae9

Browse files
sirimyklandsirimykland
authored
Merge branch 'master' into chore/slett-ubrukt-los-kode
2 parents afeddf0 + 872b411 commit ff78ae9

File tree

9 files changed

+84
-62
lines changed

9 files changed

+84
-62
lines changed

‎.deploy/fp-frontend/dev-gcp-teamforeldrepenger.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
"kommentar": "veileder"
2525
}
2626
],
27+
"outboundRules": [
28+
{
29+
"application": "fpmottak"
30+
}
31+
],
2732
"externals": [
2833
"fpsak-api.dev-fss-pub.nais.io",
2934
"fplos.dev-fss-pub.nais.io",
30-
"fptilbake.dev-fss-pub.nais.io",
31-
"fpfordel.dev-fss-pub.nais.io"
35+
"fptilbake.dev-fss-pub.nais.io"
3236
],
3337
"proxyRedirects": [
3438
{
@@ -47,9 +51,9 @@
4751
"scope": "api://dev-fss.teamforeldrepenger.fplos/.default"
4852
},
4953
{
50-
"path": "/fpfordel/api",
51-
"url": "https://fpfordel.dev-fss-pub.nais.io",
52-
"scope": "api://dev-fss.teamforeldrepenger.fpfordel/.default"
54+
"path": "/fpmottak/api",
55+
"url": "http://fpmottak",
56+
"scope": "api://dev-gcp.teamforeldrepenger.fpmottak/.default"
5357
}
5458
]
5559
}

‎.deploy/fp-frontend/prod-gcp-teamforeldrepenger.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@
2424
"kommentar": "veileder"
2525
}
2626
],
27+
"outboundRules": [
28+
{
29+
"application": "fpmottak"
30+
}
31+
],
2732
"externals": [
2833
"fpsak-api.prod-fss-pub.nais.io",
2934
"fplos.prod-fss-pub.nais.io",
30-
"fptilbake.prod-fss-pub.nais.io",
31-
"fpfordel.prod-fss-pub.nais.io"
35+
"fptilbake.prod-fss-pub.nais.io"
3236
],
3337
"proxyRedirects": [
3438
{
@@ -47,9 +51,9 @@
4751
"scope": "api://prod-fss.teamforeldrepenger.fplos/.default"
4852
},
4953
{
50-
"path": "/fpfordel/api",
51-
"url": "https://fpfordel.prod-fss-pub.nais.io",
52-
"scope": "api://prod-fss.teamforeldrepenger.fpfordel/.default"
54+
"path": "/fpmottak/api",
55+
"url": "http://fpmottak",
56+
"scope": "api://prod-gcp.teamforeldrepenger.fpmottak/.default"
5357
}
5458
]
5559
}

‎.deploy/fp-journalforing/dev-gcp-teamforeldrepenger.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@
2020
"kommentar": "saksbehandler"
2121
}
2222
],
23+
"outboundRules": [
24+
{
25+
"application": "fpmottak"
26+
}
27+
],
2328
"externals": [
24-
"fpsak-api.dev-fss-pub.nais.io",
25-
"fpfordel.dev-fss-pub.nais.io"
29+
"fpsak-api.dev-fss-pub.nais.io"
2630
],
2731
"proxyRedirects": [
2832
{
@@ -31,9 +35,9 @@
3135
"scope": "api://dev-fss.teamforeldrepenger.fpsak/.default"
3236
},
3337
{
34-
"path": "/fpfordel/api",
35-
"url": "https://fpfordel.dev-fss-pub.nais.io",
36-
"scope": "api://dev-fss.teamforeldrepenger.fpfordel/.default"
38+
"path": "/fpmottak/api",
39+
"url": "http://fpmottak",
40+
"scope": "api://dev-gcp.teamforeldrepenger.fpmottak/.default"
3741
}
3842
]
3943
}

‎.deploy/fp-journalforing/prod-gcp-teamforeldrepenger.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@
2020
"kommentar": "saksbehandler"
2121
}
2222
],
23+
"outboundRules": [
24+
{
25+
"application": "fpmottak"
26+
}
27+
],
2328
"externals": [
24-
"fpsak-api.prod-fss-pub.nais.io",
25-
"fpfordel.prod-fss-pub.nais.io"
29+
"fpsak-api.prod-fss-pub.nais.io"
2630
],
2731
"proxyRedirects": [
2832
{
@@ -31,9 +35,9 @@
3135
"scope": "api://prod-fss.teamforeldrepenger.fpsak/.default"
3236
},
3337
{
34-
"path": "/fpfordel/api",
35-
"url": "https://fpfordel.prod-fss-pub.nais.io",
36-
"scope": "api://prod-fss.teamforeldrepenger.fpfordel/.default"
38+
"path": "/fpmottak/api",
39+
"url": "http://fpmottak",
40+
"scope": "api://prod-gcp.teamforeldrepenger.fpmottak/.default"
3741
}
3842
]
3943
}

‎.deploy/naiserator.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ spec:
5353
- /logout
5454
accessPolicy:
5555
outbound:
56+
{{#if outboundRules}}
57+
rules:
58+
{{#each outboundRules as |outboundRule|}}
59+
- application: "{{outboundRule.application}}"
60+
{{/each }}
61+
{{/if}}
5662
external:
5763
{{#each externals as |external|}}
5864
- host: "{{external}}"

‎apps/fp-frontend/vite.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default mergeConfig(createSharedAppConfig(), {
2727
changeOrigin: false,
2828
secure: false,
2929
},
30-
'/fpfordel/api': {
30+
'/fpmottak/api': {
3131
target: 'http://127.0.0.1:9000',
3232
changeOrigin: false,
3333
secure: false,

‎apps/fp-journalforing/src/app/OppgaveJournalføringIndex.stories.tsx‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { http, HttpResponse } from 'msw';
33

44
import { withQueryClient, withRouter } from '@navikt/fp-storybook-utils';
55

6-
import { FpFordelUrl } from '../data/journalføringApi';
6+
import { FpmottakUrl } from '../data/journalføringApi';
77
import type { Journalpost, JournalpostTilstand } from '../typer/journalpostTsType';
88
import { erEndeligJournalført } from '../utils/journalpostTilstandUtils';
99
import { OppgaveJournalføringIndex } from './OppgaveJournalføringIndex';
@@ -116,7 +116,7 @@ export const ViseOppgaverIListe: Story = {
116116
parameters: {
117117
msw: {
118118
handlers: [
119-
http.get(FpFordelUrl.ALLE_JOURNAL_OPPGAVER, () =>
119+
http.get(FpmottakUrl.ALLE_JOURNAL_OPPGAVER, () =>
120120
HttpResponse.json([
121121
{
122122
journalpostId: '12345125',
@@ -153,14 +153,14 @@ export const ViseOppgaverIListe: Story = {
153153
},
154154
]),
155155
),
156-
http.get(FpFordelUrl.HENT_JOURNALPOST_DETALJER, () =>
156+
http.get(FpmottakUrl.HENT_JOURNALPOST_DETALJER, () =>
157157
HttpResponse.json(getDetaljertJournalpostMal(true, 'MOTTATT')),
158158
),
159-
http.post(FpFordelUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
160-
http.post(FpFordelUrl.HENT_BRUKER, () =>
159+
http.post(FpmottakUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
160+
http.post(FpmottakUrl.HENT_BRUKER, () =>
161161
HttpResponse.json({ navn: 'Søker Søkersen', fødselsnummer: '15529115072' }),
162162
),
163-
http.post(FpFordelUrl.OPPDATER_MED_BRUKER, () =>
163+
http.post(FpmottakUrl.OPPDATER_MED_BRUKER, () =>
164164
HttpResponse.json(getDetaljertJournalpostMal(true, 'MOTTATT')),
165165
),
166166
],
@@ -172,7 +172,7 @@ export const ViseOppgaverUtenBruker: Story = {
172172
parameters: {
173173
msw: {
174174
handlers: [
175-
http.get(FpFordelUrl.ALLE_JOURNAL_OPPGAVER, () =>
175+
http.get(FpmottakUrl.ALLE_JOURNAL_OPPGAVER, () =>
176176
HttpResponse.json([
177177
{
178178
journalpostId: '12345125',
@@ -209,14 +209,14 @@ export const ViseOppgaverUtenBruker: Story = {
209209
},
210210
]),
211211
),
212-
http.get(FpFordelUrl.HENT_JOURNALPOST_DETALJER, () =>
212+
http.get(FpmottakUrl.HENT_JOURNALPOST_DETALJER, () =>
213213
HttpResponse.json(getDetaljertJournalpostMal(false, 'MOTTATT')),
214214
),
215-
http.post(FpFordelUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
216-
http.post(FpFordelUrl.HENT_BRUKER, () =>
215+
http.post(FpmottakUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
216+
http.post(FpmottakUrl.HENT_BRUKER, () =>
217217
HttpResponse.json({ navn: 'Søker Søkersen', fødselsnummer: '15529115072' }),
218218
),
219-
http.post(FpFordelUrl.OPPDATER_MED_BRUKER, () =>
219+
http.post(FpmottakUrl.OPPDATER_MED_BRUKER, () =>
220220
HttpResponse.json(getDetaljertJournalpostMal(true, 'MOTTATT')),
221221
),
222222
],
@@ -228,11 +228,11 @@ export const SøkeOppJournalpostSomLiggerPåAnnenSak: Story = {
228228
parameters: {
229229
msw: {
230230
handlers: [
231-
http.get(FpFordelUrl.ALLE_JOURNAL_OPPGAVER, () => HttpResponse.json([])),
232-
http.get(FpFordelUrl.HENT_JOURNALPOST_DETALJER, () =>
231+
http.get(FpmottakUrl.ALLE_JOURNAL_OPPGAVER, () => HttpResponse.json([])),
232+
http.get(FpmottakUrl.HENT_JOURNALPOST_DETALJER, () =>
233233
HttpResponse.json(getDetaljertJournalpostMal(true, 'JOURNALFOERT')),
234234
),
235-
http.post(FpFordelUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
235+
http.post(FpmottakUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
236236
],
237237
},
238238
},
@@ -242,9 +242,9 @@ export const FinnerIkkeJournalpostVedSøkOgIngenOppgaver: Story = {
242242
parameters: {
243243
msw: {
244244
handlers: [
245-
http.get(FpFordelUrl.ALLE_JOURNAL_OPPGAVER, () => HttpResponse.json([])),
246-
http.get(FpFordelUrl.HENT_JOURNALPOST_DETALJER, () => HttpResponse.json(undefined)),
247-
http.post(FpFordelUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
245+
http.get(FpmottakUrl.ALLE_JOURNAL_OPPGAVER, () => HttpResponse.json([])),
246+
http.get(FpmottakUrl.HENT_JOURNALPOST_DETALJER, () => HttpResponse.json(undefined)),
247+
http.post(FpmottakUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
248248
],
249249
},
250250
},
@@ -254,13 +254,13 @@ export const IngenOppgaver: Story = {
254254
parameters: {
255255
msw: {
256256
handlers: [
257-
http.get(FpFordelUrl.ALLE_JOURNAL_OPPGAVER, () => HttpResponse.json([])),
258-
http.get(FpFordelUrl.HENT_JOURNALPOST_DETALJER, () => HttpResponse.json(undefined)),
259-
http.post(FpFordelUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
260-
http.post(FpFordelUrl.HENT_BRUKER, () =>
257+
http.get(FpmottakUrl.ALLE_JOURNAL_OPPGAVER, () => HttpResponse.json([])),
258+
http.get(FpmottakUrl.HENT_JOURNALPOST_DETALJER, () => HttpResponse.json(undefined)),
259+
http.post(FpmottakUrl.FERDIGSTILL_JOURNALFØRING, () => HttpResponse.json({ saksnummer: '12345678' })),
260+
http.post(FpmottakUrl.HENT_BRUKER, () =>
261261
HttpResponse.json({ navn: 'Søker Søkersen', fødselsnummer: '15529115072' }),
262262
),
263-
http.post(FpFordelUrl.OPPDATER_MED_BRUKER, () =>
263+
http.post(FpmottakUrl.OPPDATER_MED_BRUKER, () =>
264264
HttpResponse.json(getDetaljertJournalpostMal(true, 'MOTTATT')),
265265
),
266266
],

‎apps/fp-journalforing/src/data/journalføringApi.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,46 +26,46 @@ const kyExtended = ky.extend({
2626
const isTest = import.meta.env.MODE === 'test';
2727
const wrapUrl = (url: string) => (isTest ? `https://www.test.com${url}` : url);
2828

29-
export const FpFordelUrl = {
30-
ALLE_JOURNAL_OPPGAVER: wrapUrl('/fpfordel/api/journalfoering/oppgaver'),
31-
HENT_JOURNALPOST_DETALJER: wrapUrl('/fpfordel/api/journalfoering/oppgave/detaljer'),
32-
FERDIGSTILL_JOURNALFØRING: wrapUrl('/fpfordel/api/sak/ferdigstill'),
33-
KNYTT_JOURNALPOST_TIL_ANNEN_SAK: wrapUrl('/fpfordel/api/sak/knyttTilAnnenSak'),
34-
OPPDATER_MED_BRUKER: wrapUrl('/fpfordel/api/journalfoering/bruker/oppdater'),
35-
HENT_BRUKER: wrapUrl('/fpfordel/api/journalfoering/bruker/hent'),
36-
RESERVER_OPPGAVE: wrapUrl('/fpfordel/api/journalfoering/oppgave/reserver'),
37-
FLYTT_OPPGAVE_TIL_GOSYS: wrapUrl('/fpfordel/api/journalfoering/oppgave/tilgosys'),
29+
export const FpmottakUrl = {
30+
ALLE_JOURNAL_OPPGAVER: wrapUrl('/fpmottak/api/journalfoering/oppgaver'),
31+
HENT_JOURNALPOST_DETALJER: wrapUrl('/fpmottak/api/journalfoering/oppgave/detaljer'),
32+
FERDIGSTILL_JOURNALFØRING: wrapUrl('/fpmottak/api/sak/ferdigstill'),
33+
KNYTT_JOURNALPOST_TIL_ANNEN_SAK: wrapUrl('/fpmottak/api/sak/knyttTilAnnenSak'),
34+
OPPDATER_MED_BRUKER: wrapUrl('/fpmottak/api/journalfoering/bruker/oppdater'),
35+
HENT_BRUKER: wrapUrl('/fpmottak/api/journalfoering/bruker/hent'),
36+
RESERVER_OPPGAVE: wrapUrl('/fpmottak/api/journalfoering/oppgave/reserver'),
37+
FLYTT_OPPGAVE_TIL_GOSYS: wrapUrl('/fpmottak/api/journalfoering/oppgave/tilgosys'),
3838
};
3939

4040
export const hentAlleJournalOppgaver = (ident?: string) =>
4141
queryOptions({
42-
queryKey: [FpFordelUrl.ALLE_JOURNAL_OPPGAVER, ident],
42+
queryKey: [FpmottakUrl.ALLE_JOURNAL_OPPGAVER, ident],
4343
queryFn: () =>
44-
kyExtended.get(FpFordelUrl.ALLE_JOURNAL_OPPGAVER, { searchParams: { ident: ident ?? '' } }).json<Oppgave[]>(),
44+
kyExtended.get(FpmottakUrl.ALLE_JOURNAL_OPPGAVER, { searchParams: { ident: ident ?? '' } }).json<Oppgave[]>(),
4545
enabled: ident !== undefined,
4646
staleTime: Infinity,
4747
});
4848

4949
export const hentJournalpostDetaljer = (journalpostId: string) =>
50-
kyExtended.get(FpFordelUrl.HENT_JOURNALPOST_DETALJER, { searchParams: { journalpostId } }).json<Journalpost>();
50+
kyExtended.get(FpmottakUrl.HENT_JOURNALPOST_DETALJER, { searchParams: { journalpostId } }).json<Journalpost>();
5151

5252
export const ferdigstillJournalføring = (values: JournalførSubmitValue) =>
53-
kyExtended.post(FpFordelUrl.FERDIGSTILL_JOURNALFØRING, { json: values }).json<SaksnummerType>();
53+
kyExtended.post(FpmottakUrl.FERDIGSTILL_JOURNALFØRING, { json: values }).json<SaksnummerType>();
5454

5555
export const knyttJournalpostTilAnnenSak = (values: JournalførSubmitValue) =>
56-
kyExtended.post(FpFordelUrl.KNYTT_JOURNALPOST_TIL_ANNEN_SAK, { json: values }).json<SaksnummerType>();
56+
kyExtended.post(FpmottakUrl.KNYTT_JOURNALPOST_TIL_ANNEN_SAK, { json: values }).json<SaksnummerType>();
5757

5858
export const oppdaterMedBruker = (values: OppdaterMedBruker) =>
59-
kyExtended.post(FpFordelUrl.OPPDATER_MED_BRUKER, { json: values }).json<Journalpost>();
59+
kyExtended.post(FpmottakUrl.OPPDATER_MED_BRUKER, { json: values }).json<Journalpost>();
6060

6161
export const hentBruker = (fødselsnummer: string) =>
62-
kyExtended.post(FpFordelUrl.HENT_BRUKER, { json: { fødselsnummer } }).json<ForhåndsvisBrukerRespons>();
62+
kyExtended.post(FpmottakUrl.HENT_BRUKER, { json: { fødselsnummer } }).json<ForhåndsvisBrukerRespons>();
6363

6464
export const reserverBruker = (values: ReserverOppgaveType) =>
65-
kyExtended.post(FpFordelUrl.RESERVER_OPPGAVE, { json: values }).json<void>();
65+
kyExtended.post(FpmottakUrl.RESERVER_OPPGAVE, { json: values }).json<void>();
6666

6767
export const flyttOppgaveTilGosys = (journalpostId: string) =>
68-
kyExtended.post(FpFordelUrl.FLYTT_OPPGAVE_TIL_GOSYS, { json: { journalpostId } }).json<void>();
68+
kyExtended.post(FpmottakUrl.FLYTT_OPPGAVE_TIL_GOSYS, { json: { journalpostId } }).json<void>();
6969

7070
type BrukerInfo = {
7171
onPremisesSamAccountName: string;

‎apps/fp-journalforing/vite.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default mergeConfig(createSharedAppConfig(), {
2121
changeOrigin: false,
2222
secure: false,
2323
},
24-
'/fpfordel/api': {
24+
'/fpmottak/api': {
2525
target: 'http://127.0.0.1:9000',
2626
changeOrigin: false,
2727
secure: false,

0 commit comments

Comments
 (0)