Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flytting av fakta-medlemskap til v2 #7213

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Flytting av fakta-medlemskap til v2 #7213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6329d6
Flytting av fakta-medlemskap til v2
hallvardastark Mar 17, 2025
f7f8341
Ta panel i bruk
hallvardastark Mar 21, 2025
6a2715e
Merge branch 'master' into fakta-medlemskap-v2
hallvardastark Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/behandling-omsorgspenger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"dependencies": {
"@fpsak-frontend/fakta-arbeidsforhold": "1.0.0",
"@fpsak-frontend/fakta-inntekt-og-ytelser": "1.0.0",
"@fpsak-frontend/fakta-medlemskap": "1.0.0",
"@fpsak-frontend/fakta-opptjening-oms": "1.0.0",
"@fpsak-frontend/fakta-verge": "1.0.0",
"@fpsak-frontend/kodeverk": "1.0.0",
Expand Down
14 changes: 9 additions & 5 deletions ...ing-omsorgspenger/src/panelDefinisjoner/faktaPaneler/MedlemskapsvilkaretFaktaPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';

import { faktaPanelCodes } from '@k9-sak-web/konstanter';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import MedlemskapFaktaIndex from '@fpsak-frontend/fakta-medlemskap';
import { faktaPanelCodes } from '@k9-sak-web/konstanter';

import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';

import MedlemskapFaktaIndex from '@k9-sak-web/gui/fakta/medlemskap/MedlemskapFaktaIndex.js';
import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { OmsorgspengerBehandlingApiKeys } from '../../data/omsorgspengerBehandlingApi';

class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {
Expand All @@ -22,7 +22,11 @@ class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {

getEndepunkter = () => [OmsorgspengerBehandlingApiKeys.MEDLEMSKAP];

getKomponent = props => <MedlemskapFaktaIndex {...props} />;
getKomponent = props => {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <MedlemskapFaktaIndex {...props} {...deepCopyProps} />;
};

getOverstyrVisningAvKomponent = ({ personopplysninger, soknad }) => personopplysninger && soknad;

Expand Down
1 change: 0 additions & 1 deletion packages/behandling-opplaeringspenger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"dependencies": {
"@fpsak-frontend/fakta-arbeidsforhold": "1.0.0",
"@fpsak-frontend/fakta-direkte-overgang": "1.0.0",
"@fpsak-frontend/fakta-medlemskap": "1.0.0",
"@fpsak-frontend/fakta-opptjening-oms": "1.0.0",
"@fpsak-frontend/fakta-overstyr-beregning": "1.0.0",
"@fpsak-frontend/kodeverk": "1.0.0",
Expand Down
13 changes: 8 additions & 5 deletions ...opplaeringspenger/src/panelDefinisjoner/faktaPaneler/MedlemskapsvilkaretFaktaPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react';

import { faktaPanelCodes } from '@k9-sak-web/konstanter';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import MedlemskapFaktaIndex from '@fpsak-frontend/fakta-medlemskap';
import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import { faktaPanelCodes } from '@k9-sak-web/konstanter';

import MedlemskapFaktaIndex from '@k9-sak-web/gui/fakta/medlemskap/MedlemskapFaktaIndex.js';
import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { OpplaeringspengerBehandlingApiKeys } from '../../data/opplaeringspengerBehandlingApi';

class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {
Expand All @@ -22,7 +21,11 @@ class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {

getEndepunkter = () => [OpplaeringspengerBehandlingApiKeys.MEDLEMSKAP];

getKomponent = props => <MedlemskapFaktaIndex {...props} />;
getKomponent = props => {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <MedlemskapFaktaIndex {...props} {...deepCopyProps} />;
};

getOverstyrVisningAvKomponent = ({ personopplysninger, soknad }) => personopplysninger && soknad;

Expand Down
1 change: 0 additions & 1 deletion packages/behandling-pleiepenger-sluttfase/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"private": true,
"dependencies": {
"@fpsak-frontend/fakta-arbeidsforhold": "1.0.0",
"@fpsak-frontend/fakta-medlemskap": "1.0.0",
"@fpsak-frontend/fakta-opptjening-oms": "1.0.0",
"@fpsak-frontend/fakta-overstyr-beregning": "1.0.0",
"@fpsak-frontend/kodeverk": "1.0.0",
Expand Down
13 changes: 8 additions & 5 deletions ...epenger-sluttfase/src/panelDefinisjoner/faktaPaneler/MedlemskapsvilkaretFaktaPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react';

import { faktaPanelCodes } from '@k9-sak-web/konstanter';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import MedlemskapFaktaIndex from '@fpsak-frontend/fakta-medlemskap';
import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import MedlemskapFaktaIndex from '@k9-sak-web/gui/fakta/medlemskap/MedlemskapFaktaIndex.js';
import { faktaPanelCodes } from '@k9-sak-web/konstanter';

import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { PleiepengerSluttfaseBehandlingApiKeys } from '../../data/pleiepengerSluttfaseBehandlingApi';

class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {
Expand All @@ -22,7 +21,11 @@ class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {

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

getKomponent = props => <MedlemskapFaktaIndex {...props} />;
getKomponent = props => {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <MedlemskapFaktaIndex {...props} {...deepCopyProps} />;
};

getOverstyrVisningAvKomponent = ({ personopplysninger, soknad }) => personopplysninger && soknad;

Expand Down
1 change: 0 additions & 1 deletion packages/behandling-pleiepenger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"dependencies": {
"@fpsak-frontend/fakta-arbeidsforhold": "1.0.0",
"@fpsak-frontend/fakta-direkte-overgang": "1.0.0",
"@fpsak-frontend/fakta-medlemskap": "1.0.0",
"@fpsak-frontend/fakta-opptjening-oms": "1.0.0",
"@fpsak-frontend/fakta-overstyr-beregning": "1.0.0",
"@fpsak-frontend/kodeverk": "1.0.0",
Expand Down
13 changes: 8 additions & 5 deletions ...dling-pleiepenger/src/panelDefinisjoner/faktaPaneler/MedlemskapsvilkaretFaktaPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react';

import { faktaPanelCodes } from '@k9-sak-web/konstanter';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import MedlemskapFaktaIndex from '@fpsak-frontend/fakta-medlemskap';
import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import MedlemskapFaktaIndex from '@k9-sak-web/gui/fakta/medlemskap/MedlemskapFaktaIndex.js';
import { faktaPanelCodes } from '@k9-sak-web/konstanter';

import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { PleiepengerBehandlingApiKeys } from '../../data/pleiepengerBehandlingApi';

class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {
Expand All @@ -22,7 +21,11 @@ class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {

getEndepunkter = () => [PleiepengerBehandlingApiKeys.MEDLEMSKAP];

getKomponent = props => <MedlemskapFaktaIndex {...props} />;
getKomponent = props => {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <MedlemskapFaktaIndex {...props} {...deepCopyProps} />;
};

getOverstyrVisningAvKomponent = ({ personopplysninger, soknad }) => personopplysninger && soknad;

Expand Down
1 change: 0 additions & 1 deletion packages/behandling-unntak/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"@fpsak-frontend/assets": "1.0.0",
"@fpsak-frontend/fakta-arbeidsforhold": "1.0.0",
"@fpsak-frontend/fakta-inntekt-og-ytelser": "1.0.0",
"@fpsak-frontend/fakta-medlemskap": "1.0.0",
"@fpsak-frontend/fakta-opptjening-oms": "1.0.0",
"@fpsak-frontend/fakta-verge": "1.0.0",
"@fpsak-frontend/kodeverk": "1.0.0",
Expand Down
13 changes: 8 additions & 5 deletions ...behandling-unntak/src/panelDefinisjoner/faktaPaneler/MedlemskapsvilkaretFaktaPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react';

import { faktaPanelCodes } from '@k9-sak-web/konstanter';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import MedlemskapFaktaIndex from '@fpsak-frontend/fakta-medlemskap';
import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import MedlemskapFaktaIndex from '@k9-sak-web/gui/fakta/medlemskap/MedlemskapFaktaIndex.js';
import { faktaPanelCodes } from '@k9-sak-web/konstanter';

import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { UnntakBehandlingApiKeys } from '../../data/unntakBehandlingApi';

class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {
Expand All @@ -22,7 +21,11 @@ class MedlemskapsvilkaretFaktaPanelDef extends FaktaPanelDef {

getEndepunkter = () => [UnntakBehandlingApiKeys.MEDLEMSKAP];

getKomponent = props => <MedlemskapFaktaIndex {...props} />;
getKomponent = props => {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <MedlemskapFaktaIndex {...props} {...deepCopyProps} />;
};

getOverstyrVisningAvKomponent = ({ personopplysninger, soknad }) => personopplysninger && soknad;

Expand Down
1 change: 0 additions & 1 deletion packages/fakta-medlemskap/index.ts
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions packages/fakta-medlemskap/package.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/MerknaderFraBeslutter.ts
View file
Open in desktop

This file was deleted.

Loading
Loading