Skip to content

Commit

Permalink
Renamet fakta omsorgsdager (#5501)
Browse files Browse the repository at this point in the history
  • Loading branch information
hallvardastark authored Jan 4, 2024
1 parent 32c61e4 commit f075f96
Show file tree
Hide file tree
Showing 84 changed files with 49 additions and 53 deletions.
2 changes: 1 addition & 1 deletion packages/behandling-utvidet-rett/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/behandling-felles": "1.0.0",
"@k9-sak-web/fakta-barn-oms": "1.0.0",
"@k9-sak-web/fakta-omsorgsdager": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-aarskvantum-oms": "1.0.0",
"@k9-sak-web/prosess-omsorgsdager": "1.0.0",
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FormState } from '@fpsak-frontend/form';
import { Omsorgsdager } from '@navikt/k9-fe-omsorgsdager';
import { Omsorgsdager as LokalOmsorgsdager } from '@k9-sak-web/fakta-omsorgsdager';
import { Omsorgsdager as LokalOmsorgsdager } from '@k9-sak-web/prosess-omsorgsdager';
import React from 'react';
import KartleggePropertyTilOmsorgenForMikrofrontendKomponent from './KartleggePropertyTilOmsorgenForMikrofrontendKomponent';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Omsorgsdager } from '@navikt/k9-fe-omsorgsdager';
import { Omsorgsdager as LokalOmsorgsdager } from '@k9-sak-web/fakta-omsorgsdager';
import { Omsorgsdager as LokalOmsorgsdager } from '@k9-sak-web/prosess-omsorgsdager';
import React from 'react';
import KartleggePropertyTilUtvidetRettMikrofrontendKomponent from './KartleggePropertyTilUtvidetRettMikrofrontendKomponent';

Expand Down
2 changes: 1 addition & 1 deletion packages/prosess-aarskvantum-oms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"@fpsak-frontend/kodeverk": "1.0.0",
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/fakta-omsorgsdager": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-omsorgsdager": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"classnames": "2.3.2",
"lodash": "4.17.21",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FormState } from '@fpsak-frontend/form/index';
import { Omsorgsdager } from '@navikt/k9-fe-omsorgsdager';
import { Omsorgsdager as LokalOmsorgsdager } from '@k9-sak-web/fakta-omsorgsdager';
import { Omsorgsdager as LokalOmsorgsdager } from '@k9-sak-web/prosess-omsorgsdager';
import React from 'react';
import KartleggePropertyTilSaerligeSmittevernhensynMikrofrontend from './KartleggePropertyTilSaerligeSmittevernhensynMikrofrontend';

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@k9-sak-web/fakta-omsorgsdager",
"name": "@k9-sak-web/prosess-omsorgsdager",
"version": "1.0.0",
"module": "index.ts",
"keywords": [],
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/sak-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
"@k9-sak-web/fakta-medisinsk-vilkar": "1.0.0",
"@k9-sak-web/fakta-om-barnet": "1.0.0",
"@k9-sak-web/fakta-omsorgen-for": "1.0.0",
"@k9-sak-web/fakta-omsorgsdager": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
"@k9-sak-web/prosess-omsorgsdager": "1.0.0",
"@k9-sak-web/prosess-uttak": "1.0.0",
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
Expand Down
12 changes: 4 additions & 8 deletions packages/sak-meldinger/src/components/Messages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ const createValidateRecipient = recipients => value =>
: [{ id: 'ValidationMessage.InvalidRecipient' }];

const createTredjepartsmottaker = (orgnr: string): Mottaker => ({
id: orgnr,
type: 'ORGNR',
});
id: orgnr,
type: 'ORGNR',
});

const resolveOverstyrtMottaker = (
overstyrtMottaker: string,
Expand All @@ -118,11 +118,7 @@ const resolveOverstyrtMottaker = (
) {
return createTredjepartsmottaker(tredjepartsmottakerOrgnr);
}
if(
typeof tredjepartsmottakerOrgnr === 'string' &&
tredjepartsmottakerOrgnr.length > 0 &&
forPreview
) {
if (typeof tredjepartsmottakerOrgnr === 'string' && tredjepartsmottakerOrgnr.length > 0 && forPreview) {
// Spesialtilfelle. For forhåndsvisning ønsker vi å sende ufullstendig tredjepartsmottaker orgnr til backend
// slik at den kan levere tilbake valideringsfeil, sidan vi med redux-form ikkje klarer å trigge frontend
// validering utanom ved faktisk sending av brevet.
Expand Down
76 changes: 38 additions & 38 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4866,9 +4866,9 @@ __metadata:
"@fpsak-frontend/utils": 1.0.0
"@k9-sak-web/behandling-felles": 1.0.0
"@k9-sak-web/fakta-barn-oms": 1.0.0
"@k9-sak-web/fakta-omsorgsdager": 1.0.0
"@k9-sak-web/konstanter": 1.0.0
"@k9-sak-web/prosess-aarskvantum-oms": 1.0.0
"@k9-sak-web/prosess-omsorgsdager": 1.0.0
"@k9-sak-web/rest-api": 1.0.0
"@k9-sak-web/rest-api-hooks": 1.0.0
"@k9-sak-web/types": 1.0.0
Expand Down Expand Up @@ -5236,41 +5236,6 @@ __metadata:
languageName: unknown
linkType: soft

"@k9-sak-web/fakta-omsorgsdager@1.0.0, @k9-sak-web/fakta-omsorgsdager@workspace:packages/fakta-omsorgsdager":
version: 0.0.0-use.local
resolution: "@k9-sak-web/fakta-omsorgsdager@workspace:packages/fakta-omsorgsdager"
dependencies:
"@navikt/ds-css": 5.12.2
"@navikt/ds-react": 5.12.2
"@navikt/fnrvalidator": 1.3.3
classnames: 2.3.2
dayjs: 1.11.10
jest-axe: ^8.0.0
lodash: 4.17.21
nav-datovelger: 12.6.0
nav-frontend-alertstriper: 4.0.2
nav-frontend-alertstriper-style: 3.0.2
nav-frontend-core: 6.0.1
nav-frontend-ikoner-assets: 3.0.1
nav-frontend-js-utils: 1.0.20
nav-frontend-knapper: 3.1.3
nav-frontend-knapper-style: 2.1.2
nav-frontend-lenker: 2.0.2
nav-frontend-lenker-style: 2.0.2
nav-frontend-paneler-style: 2.0.2
nav-frontend-skjema: 4.0.6
nav-frontend-skjema-style: 3.0.3
nav-frontend-spinner: 3.0.1
nav-frontend-spinner-style: 1.0.2
nav-frontend-typografi: 4.0.2
nav-frontend-typografi-style: 2.0.2
react: 18.2.0
react-day-picker: 7.4.10
react-dom: 18.2.0
react-hook-form: 7.49.2
languageName: unknown
linkType: soft

"@k9-sak-web/fakta-opplaering@workspace:packages/fakta-opplaering":
version: 0.0.0-use.local
resolution: "@k9-sak-web/fakta-opplaering@workspace:packages/fakta-opplaering"
Expand Down Expand Up @@ -5382,8 +5347,8 @@ __metadata:
"@fpsak-frontend/shared-components": 1.0.0
"@fpsak-frontend/utils": 1.0.0
"@fpsak-frontend/utils-test": 1.0.0
"@k9-sak-web/fakta-omsorgsdager": 1.0.0
"@k9-sak-web/konstanter": 1.0.0
"@k9-sak-web/prosess-omsorgsdager": 1.0.0
"@k9-sak-web/types": 1.0.0
classnames: 2.3.2
enzyme: 3.11.0
Expand Down Expand Up @@ -5444,6 +5409,41 @@ __metadata:
languageName: unknown
linkType: soft

"@k9-sak-web/prosess-omsorgsdager@1.0.0, @k9-sak-web/prosess-omsorgsdager@workspace:packages/prosess-omsorgsdager":
version: 0.0.0-use.local
resolution: "@k9-sak-web/prosess-omsorgsdager@workspace:packages/prosess-omsorgsdager"
dependencies:
"@navikt/ds-css": 5.12.2
"@navikt/ds-react": 5.12.2
"@navikt/fnrvalidator": 1.3.3
classnames: 2.3.2
dayjs: 1.11.10
jest-axe: ^8.0.0
lodash: 4.17.21
nav-datovelger: 12.6.0
nav-frontend-alertstriper: 4.0.2
nav-frontend-alertstriper-style: 3.0.2
nav-frontend-core: 6.0.1
nav-frontend-ikoner-assets: 3.0.1
nav-frontend-js-utils: 1.0.20
nav-frontend-knapper: 3.1.3
nav-frontend-knapper-style: 2.1.2
nav-frontend-lenker: 2.0.2
nav-frontend-lenker-style: 2.0.2
nav-frontend-paneler-style: 2.0.2
nav-frontend-skjema: 4.0.6
nav-frontend-skjema-style: 3.0.3
nav-frontend-spinner: 3.0.1
nav-frontend-spinner-style: 1.0.2
nav-frontend-typografi: 4.0.2
nav-frontend-typografi-style: 2.0.2
react: 18.2.0
react-day-picker: 7.4.10
react-dom: 18.2.0
react-hook-form: 7.49.2
languageName: unknown
linkType: soft

"@k9-sak-web/prosess-unntak@1.0.0, @k9-sak-web/prosess-unntak@workspace:packages/prosess-unntak":
version: 0.0.0-use.local
resolution: "@k9-sak-web/prosess-unntak@workspace:packages/prosess-unntak"
Expand Down Expand Up @@ -5703,9 +5703,9 @@ __metadata:
"@k9-sak-web/fakta-medisinsk-vilkar": 1.0.0
"@k9-sak-web/fakta-om-barnet": 1.0.0
"@k9-sak-web/fakta-omsorgen-for": 1.0.0
"@k9-sak-web/fakta-omsorgsdager": 1.0.0
"@k9-sak-web/konstanter": 1.0.0
"@k9-sak-web/modal-sett-pa-vent": 1.0.0
"@k9-sak-web/prosess-omsorgsdager": 1.0.0
"@k9-sak-web/prosess-uttak": 1.0.0
"@k9-sak-web/rest-api": 1.0.0
"@k9-sak-web/rest-api-hooks": 1.0.0
Expand Down

0 comments on commit f075f96

Please sign in to comment.