Skip to content

Commit

Permalink
Tsf 3707/utenlandsopphold pils (#5165)
Browse files Browse the repository at this point in the history 
* kodeverk til utenlandsopphold i uttak

* pakkeoppdateringer i synk med fp-repo
  • Loading branch information
@vebnor
vebnor authored Oct 31, 2023
1 parent 1b3fe6f commit 441ec85
Show file tree
Hide file tree
Showing 37 changed files with 387 additions and 426 deletions.
16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
"@navikt/ds-react": "5.8.0",
"@navikt/ds-tailwind": "^5.8.0",
"@navikt/familie-endringslogg": "10.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"@popperjs/core": "2.11.8",
"@sentry/browser": "7.76.0",
"@sentry/browser": "7.77.0",
"@storybook/testing-react": "2.0.1",
"axios": "0.27.2",
"core-js": "3.33.1",
"core-js": "3.33.2",
"date-fns": "2.30.0",
"date-fns-tz": "2.0.0",
"dotenv": "16.3.1",
Expand All @@ -68,8 +68,8 @@
"react": "17.0.2",
"react-dom": "17.0.2",
"react-modal": "3.16.1",
"react-router": "6.17.0",
"react-router-dom": "6.17.0"
"react-router": "6.18.0",
"react-router-dom": "6.18.0"
},
"devDependencies": {
"@babel/core": "7.23.2",
Expand Down Expand Up @@ -100,15 +100,15 @@
"@types/chai": "4.3.9",
"@types/enzyme": "3.10.15",
"@types/history": "5.0.0",
"@types/jest": "29.5.6",
"@types/jest": "29.5.7",
"@types/prop-types": "15.7.9",
"@types/react": "17.0.69",
"@types/react-collapse": "5.0.3",
"@types/react-router-dom": "5.3.3",
"@types/redux-form": "8.3.8",
"@types/sinon": "10.0.20",
"@typescript-eslint/eslint-plugin": "6.9.0",
"@typescript-eslint/parser": "6.9.0",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
"autoprefixer": "^10.4.16",
"axios-mock-adapter": "1.22.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/behandling-felles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"@navikt/k9-fe-array-utils": "1.0.4",
"@navikt/k9-fe-bem-utils": "1.0.2",
"@navikt/k9-fe-date-utils": "1.0.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/behandling-frisinn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.9",
"@navikt/ft-fakta-beregning-redesign": "1.0.7",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.13",
"@navikt/ft-fakta-beregning": "5.0.10",
"@navikt/ft-fakta-beregning-redesign": "1.0.9",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.14",
"react": "17.0.2",
"react-intl": "6.5.1",
"react-redux": "8.1.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/behandling-omsorgspenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.9",
"@navikt/ft-fakta-beregning-redesign": "1.0.7",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.11",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.13",
"@navikt/ft-fakta-beregning": "5.0.10",
"@navikt/ft-fakta-beregning-redesign": "1.0.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.12",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.14",
"nav-frontend-popover": "2.0.4",
"react": "17.0.2",
"react-intl": "6.5.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/behandling-opplaeringspenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.9",
"@navikt/ft-fakta-beregning-redesign": "1.0.7",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.11",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.13",
"@navikt/ft-fakta-beregning": "5.0.10",
"@navikt/ft-fakta-beregning-redesign": "1.0.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.12",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.14",
"axios": "0.27.2",
"nav-frontend-alertstriper": "4.0.2",
"react": "17.0.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/behandling-pleiepenger-sluttfase/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.9",
"@navikt/ft-fakta-beregning-redesign": "1.0.7",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.11",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.13",
"@navikt/ft-fakta-beregning": "5.0.10",
"@navikt/ft-fakta-beregning-redesign": "1.0.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.12",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.14",
"axios": "0.27.2",
"nav-frontend-alertstriper": "4.0.2",
"react": "17.0.2",
Expand Down
7 changes: 6 additions & 1 deletion packages/behandling-pleiepenger-sluttfase/src/components/Uttak.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import aksjonspunktStatus from '@fpsak-frontend/kodeverk/src/aksjonspunktStatus';
import { MicroFrontend } from '@fpsak-frontend/utils';
import { Aksjonspunkt, ArbeidsgiverOpplysningerPerId } from '@k9-sak-web/types';
import { Aksjonspunkt, AlleKodeverk, ArbeidsgiverOpplysningerPerId } from '@k9-sak-web/types';
import React from 'react';

const initializeUttak = (
Expand All @@ -12,6 +12,7 @@ const initializeUttak = (
arbeidsforhold: ArbeidsgiverOpplysningerPerId,
aksjonspunktkoder: string[],
erFagytelsetypeLivetsSluttfase: boolean,
kodeverkUtenlandsoppholdÅrsak,
løsAksjonspunktVurderDatoNyRegelUttak: ({
begrunnelse,
virkningsdato,
Expand All @@ -29,6 +30,7 @@ const initializeUttak = (
arbeidsforhold,
aksjonspunktkoder,
erFagytelsetypeLivetsSluttfase,
kodeverkUtenlandsoppholdÅrsak,
løsAksjonspunktVurderDatoNyRegelUttak,
virkningsdatoUttakNyeRegler,
aksjonspunkter,
Expand All @@ -41,6 +43,7 @@ interface UttakProps {
utsattePerioder: string[];
arbeidsgiverOpplysningerPerId: ArbeidsgiverOpplysningerPerId;
aksjonspunkter: Aksjonspunkt[];
alleKodeverk: AlleKodeverk;
erFagytelsetypeLivetsSluttfase: boolean;
submitCallback: (data: { kode: string; begrunnelse: string; virkningsdato: string }[]) => void;
virkningsdatoUttakNyeRegler?: string;
Expand All @@ -53,6 +56,7 @@ export default ({
utsattePerioder,
arbeidsgiverOpplysningerPerId,
aksjonspunkter,
alleKodeverk,
erFagytelsetypeLivetsSluttfase,
submitCallback,
virkningsdatoUttakNyeRegler,
Expand Down Expand Up @@ -83,6 +87,7 @@ export default ({
arbeidsgiverOpplysningerPerId,
funnedeRelevanteAksjonspunktkoder,
erFagytelsetypeLivetsSluttfase,
alleKodeverk?.UtenlandsoppholdÅrsak,
løsAksjonspunktVurderDatoNyRegelUttak,
virkningsdatoUttakNyeRegler,
funnedeRelevanteAksjonspunkter,
Expand Down
5 changes: 4 additions & 1 deletion ...eiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/UttakProsessStegPanelDef.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class PanelDef extends ProsessStegPanelDef {
kvoteInfo,
arbeidsgiverOpplysningerPerId,
aksjonspunkter,
alleKodeverk,
erFagytelsetypeLivetsSluttfase,
submitCallback,
virkningsdatoUttakNyeRegler,
Expand All @@ -26,6 +27,7 @@ class PanelDef extends ProsessStegPanelDef {
uuid={behandling.uuid}
uttaksperioder={uttaksperioder}
utsattePerioder={utsattePerioder}
alleKodeverk={alleKodeverk}
arbeidsgiverOpplysningerPerId={arbeidsgiverOpplysningerPerId}
aksjonspunkter={aksjonspunkter}
erFagytelsetypeLivetsSluttfase={erFagytelsetypeLivetsSluttfase}
Expand Down Expand Up @@ -60,13 +62,14 @@ class PanelDef extends ProsessStegPanelDef {

getEndepunkter = () => [PleiepengerSluttfaseBehandlingApiKeys.ARBEIDSFORHOLD];

getData = ({ uttak, arbeidsgiverOpplysningerPerId, fagsak }) => ({
getData = ({ uttak, arbeidsgiverOpplysningerPerId, fagsak, alleKodeverk }) => ({
uttaksperioder: uttak?.uttaksplan?.perioder,
utsattePerioder: uttak?.utsattePerioder,
kvoteInfo: uttak?.uttaksplan?.kvoteInfo,
virkningsdatoUttakNyeRegler: uttak?.virkningsdatoUttakNyeRegler,
arbeidsgiverOpplysningerPerId,
erFagytelsetypeLivetsSluttfase: fagsak.sakstype.kode === fagsakYtelseType.PLEIEPENGER_SLUTTFASE,
alleKodeverk,
});
}

Expand Down
8 changes: 4 additions & 4 deletions packages/behandling-pleiepenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.9",
"@navikt/ft-fakta-beregning-redesign": "1.0.7",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.11",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.13",
"@navikt/ft-fakta-beregning": "5.0.10",
"@navikt/ft-fakta-beregning-redesign": "1.0.9",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.12",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.14",
"axios": "0.27.2",
"nav-frontend-alertstriper": "4.0.2",
"react": "17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/behandling-tilbakekreving/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-kodeverk": "^2.2.4",
"@navikt/ft-prosess-tilbakekreving-foreldelse": "^3.1.11",
"@navikt/ft-kodeverk": "^2.2.5",
"@navikt/ft-prosess-tilbakekreving-foreldelse": "^3.1.12",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"react": "17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-institusjon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@fpsak-frontend/form": "*",
"@k9-sak-web/types": "*",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"@navikt/k9-fe-form-utils": "1.0.10",
"@navikt/k9-fe-period-utils": "1.0.9",
"formik": "2.4.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-medlemskap/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/fakta-felles": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"i18n-iso-countries": "7.7.0",
"moment": "2.29.4",
"nav-frontend-core": "6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-opplaering/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@k9-sak-web/types": "*",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "5.8.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"@navikt/k9-fe-form-utils": "1.0.10",
"@navikt/k9-fe-period-utils": "1.0.9",
"classnames": "2.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/form/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@fpsak-frontend/assets": "1.0.0",
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"classnames": "2.3.2",
"formik": "2.4.5",
"lodash.throttle": "4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/prosess-aarskvantum-oms/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"react-dom": "17.0.2",
"react-intl": "6.5.1",
"react-redux": "8.1.3",
"react-router-dom": "6.17.0",
"react-router-dom": "6.18.0",
"redux-form": "8.3.10"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/prosess-vilkar-alder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-form-hooks": "4.2.11",
"@navikt/ft-form-validators": "^2.1.4",
"@navikt/ft-form-hooks": "4.2.12",
"@navikt/ft-form-validators": "^2.1.5",
"nav-frontend-core": "6.0.1",
"nav-frontend-grid": "2.0.2",
"nav-frontend-knapper": "3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/prosess-vilkar-opptjening-oms/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/prosess-felles": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"classnames": "2.3.2",
"dayjs": "1.11.10",
"lodash.isequal": "4.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/prosess-vilkar-overstyring/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"classnames": "2.3.2",
"moment": "2.29.4",
"nav-frontend-knapper": "3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/prosess-vilkar-soknadsfrist/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"classnames": "2.3.2",
"moment": "2.29.4",
"nav-frontend-knapper": "3.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/prosess-vilkar-sykdom/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@fpsak-frontend/kodeverk": "1.0.0",
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"classnames": "2.3.2",
"lodash.isequal": "4.5.0",
"nav-frontend-core": "6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/rest-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"private": true,
"dependencies": {
"@sentry/browser": "7.76.0",
"@sentry/browser": "7.77.0",
"axios": "0.27.2",
"node-cache": "5.1.2"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/sak-aktor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"nav-frontend-typografi-style": "2.0.2",
"react": "17.0.2",
"react-intl": "6.5.1",
"react-router-dom": "6.17.0"
"react-router-dom": "6.18.0"
}
}
16 changes: 8 additions & 8 deletions packages/sak-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@
"@k9-sak-web/sak-soknadsperiodestripe": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ds-react": "5.8.0",
"@navikt/ft-fakta-beregning": "5.0.9",
"@navikt/ft-fakta-beregning-redesign": "1.0.7",
"@navikt/ft-form-hooks": "4.2.11",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.13",
"@navikt/ft-ui-komponenter": "2.1.11",
"@sentry/browser": "7.76.0",
"@navikt/ft-fakta-beregning": "5.0.10",
"@navikt/ft-fakta-beregning-redesign": "1.0.9",
"@navikt/ft-form-hooks": "4.2.12",
"@navikt/ft-plattform-komponenter": "2.3.8",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.14",
"@navikt/ft-ui-komponenter": "2.1.12",
"@sentry/browser": "7.77.0",
"axios": "0.27.2",
"classnames": "2.3.2",
"history": "5.3.0",
Expand All @@ -81,7 +81,7 @@
"react-intl": "6.5.1",
"react-redux": "8.1.3",
"react-responsive": "9.0.2",
"react-router-dom": "6.17.0",
"react-router-dom": "6.18.0",
"redux": "4.2.1",
"redux-form": "8.3.10",
"redux-logger": "3.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/sak-behandling-velger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"react": "17.0.2",
"react-intl": "6.5.1",
"react-query": "3.39.3",
"react-router-dom": "6.17.0"
"react-router-dom": "6.18.0"
},
"devDependencies": {
"@fpsak-frontend/utils-test": "1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sak-dekorator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.7",
"@navikt/ft-plattform-komponenter": "2.3.8",
"@navikt/k9-fe-array-utils": "1.0.4",
"@navikt/k9-fe-bem-utils": "1.0.2",
"@navikt/k9-fe-date-utils": "1.0.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/sak-fagsak-profil/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"react": "17.0.2",
"react-intl": "6.5.1",
"react-redux": "8.1.3",
"react-router-dom": "6.17.0",
"react-router-dom": "6.18.0",
"redux-form": "8.3.10"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sak-historikk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"nav-frontend-typografi-style": "2.0.2",
"react": "17.0.2",
"react-intl": "6.5.1",
"react-router-dom": "6.17.0"
"react-router-dom": "6.18.0"
},
"devDependencies": {
"@fpsak-frontend/utils-test": "1.0.0",
Expand Down
Loading

0 comments on commit 441ec85

Please sign in to comment.