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

v2-versjon av prosess-vilkar-opptjening #7175

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

v2-versjon av prosess-vilkar-opptjening #7175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cee7586
v2-versjon av prosess-vilkar-opptjening
hallvardastark Mar 6, 2025
4b3b250
Rydding
hallvardastark Mar 6, 2025
1c751d7
Merge branch 'master' into prosess-vilkar-opptjening-v2
hallvardastark Mar 6, 2025
1cd73d9
Feature toggler og tar nytt panel i bruk
hallvardastark Mar 6, 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
4 changes: 4 additions & 0 deletions _mocks/featureToggles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,8 @@ export const featureTogglesFactory = () => [
key: 'BRUK_V2_VILKAR_OVERSTYRING',
value: process.env.VITE_BRUK_V2_VILKAR_OVERSTYRING,
},
{
key: 'BRUK_V2_VILKAR_OPPTJENING',
value: process.env.VITE_BRUK_V2_VILKAR_OPPTJENING,
},
];
2 changes: 2 additions & 0 deletions deploy/dev-fss-k9saksbehandling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,5 @@ spec:
value: "true"
- name: BRUK_V2_VILKAR_OVERSTYRING
value: "true"
- name: BRUK_V2_VILKAR_OPPTJENING
value: "true"
2 changes: 2 additions & 0 deletions deploy/prod-fss-k9saksbehandling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,5 @@ spec:
value: "false"
- name: BRUK_V2_VILKAR_OVERSTYRING
value: "false"
- name: BRUK_V2_VILKAR_OPPTJENING
value: "false"
3 changes: 2 additions & 1 deletion envDir/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ VITE_HISTORIKK_V2_VIS=true
VITE_VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK=true
VITE_NY_INNTEKT_EGET_PANEL=true
VITE_BRUK_V2_FAKTA_INSTITUSJON=true
VITE_BRUK_V2_VILKAR_OVERSTYRING=true
VITE_BRUK_V2_VILKAR_OVERSTYRING=true
VITE_BRUK_V2_VILKAR_OPPTJENING=true
4 changes: 4 additions & 0 deletions feature-toggles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,9 @@
{
"key": "BRUK_V2_VILKAR_OVERSTYRING",
"value": "${BRUK_V2_VILKAR_OVERSTYRING}"
},
{
"key": "BRUK_V2_VILKAR_OPPTJENING",
"value": "${BRUK_V2_VILKAR_OPPTJENING}"
}
]
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"@testing-library/react": "16.2.0",
"@testing-library/user-event": "14.6.1",
"@types/history": "5.0.0",
"@types/lodash": "^4.17.16",
"@types/object-hash": "^3.0.6",
"@types/prop-types": "15.7.14",
"@types/react": "19.0.8",
Expand Down
17 changes: 12 additions & 5 deletions ...-omsorgspenger/src/panelDefinisjoner/prosessStegPaneler/OpptjeningProsessStegPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
import React from 'react';

import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import OpptjeningVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-opptjening-oms';
import { ProsessStegDef, ProsessStegOverstyringPanelDef, ProsessStegPanelDef } from '@k9-sak-web/behandling-felles';
import { prosessStegCodes } from '@k9-sak-web/konstanter';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import { ProsessStegDef, ProsessStegPanelDef, ProsessStegOverstyringPanelDef } from '@k9-sak-web/behandling-felles';

import OpptjeningVilkarProsessIndexV2 from '@k9-sak-web/gui/prosess/vilkar-opptjening/OpptjeningVilkarProsessIndexV2.js';
import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { OmsorgspengerBehandlingApiKeys } from '../../data/omsorgspengerBehandlingApi';

class PanelDef extends ProsessStegPanelDef {
getKomponent = props => <OpptjeningVilkarProsessIndex {...props} />;
getKomponent = props => {
if (props.featureToggles.BRUK_V2_VILKAR_OPPTJENING) {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <OpptjeningVilkarProsessIndexV2 {...props} {...deepCopyProps} />;
}
return <OpptjeningVilkarProsessIndex {...props} />;
};

getAksjonspunktKoder = () => [aksjonspunktCodes.VURDER_OPPTJENINGSVILKARET];

Expand Down
15 changes: 12 additions & 3 deletions ...ger/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/OpptjeningPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import OpptjeningVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-opptjening-oms';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import { ProsessStegPanelDef, ProsessStegOverstyringPanelDef } from '@k9-sak-web/behandling-felles';
import { ProsessStegOverstyringPanelDef, ProsessStegPanelDef } from '@k9-sak-web/behandling-felles';

import OpptjeningVilkarProsessIndexV2 from '@k9-sak-web/gui/prosess/vilkar-opptjening/OpptjeningVilkarProsessIndexV2.js';
import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { OmsorgspengerBehandlingApiKeys } from '../../../data/omsorgspengerBehandlingApi';

class OpptjeningPanelDef extends ProsessStegPanelDef {
getId = () => 'OPPTJENING';

getTekstKode = () => 'Behandlingspunkt.Opptjening';

getKomponent = props => <OpptjeningVilkarProsessIndex {...props} />;
getKomponent = props => {
if (props.featureToggles.BRUK_V2_VILKAR_OPPTJENING) {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <OpptjeningVilkarProsessIndexV2 {...props} {...deepCopyProps} />;
}
return <OpptjeningVilkarProsessIndex {...props} />;
};

getAksjonspunktKoder = () => [aksjonspunktCodes.VURDER_OPPTJENINGSVILKARET];

Expand Down
17 changes: 12 additions & 5 deletions ...rc/panelDefinisjoner/prosessStegPaneler/inngangsvilkarFortsPaneler/OpptjeningPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
import React from 'react';

import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import OpptjeningVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-opptjening-oms';

import { ProsessStegPanelDef, ProsessStegOverstyringPanelDef } from '@k9-sak-web/behandling-felles';
import { ProsessStegOverstyringPanelDef, ProsessStegPanelDef } from '@k9-sak-web/behandling-felles';

import OpptjeningVilkarProsessIndexV2 from '@k9-sak-web/gui/prosess/vilkar-opptjening/OpptjeningVilkarProsessIndexV2.js';
import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
import { OpplaeringspengerBehandlingApiKeys } from '../../../data/opplaeringspengerBehandlingApi';

class OpptjeningPanelDef extends ProsessStegPanelDef {
getKomponent = props => <OpptjeningVilkarProsessIndex {...props} />;
getKomponent = props => {
if (props.featureToggles.BRUK_V2_VILKAR_OPPTJENING) {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <OpptjeningVilkarProsessIndexV2 {...props} {...deepCopyProps} />;
}
return <OpptjeningVilkarProsessIndex {...props} />;
};

getTekstKode = () => 'Behandlingspunkt.Opptjening';

Expand Down
17 changes: 12 additions & 5 deletions ...rc/panelDefinisjoner/prosessStegPaneler/inngangsvilkarFortsPaneler/OpptjeningPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
import React from 'react';

import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import OpptjeningVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-opptjening-oms';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import { ProsessStegPanelDef, ProsessStegOverstyringPanelDef } from '@k9-sak-web/behandling-felles';
import { ProsessStegOverstyringPanelDef, ProsessStegPanelDef } from '@k9-sak-web/behandling-felles';

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

class OpptjeningPanelDef extends ProsessStegPanelDef {
getId = () => 'OPPTJENING';

getTekstKode = () => 'Behandlingspunkt.Opptjening';

getKomponent = props => <OpptjeningVilkarProsessIndex {...props} />;
getKomponent = props => {
if (props.featureToggles.BRUK_V2_VILKAR_OPPTJENING) {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
return <OpptjeningVilkarProsessIndexV2 {...props} {...deepCopyProps} />;
}
return <OpptjeningVilkarProsessIndex {...props} />;
};

getAksjonspunktKoder = () => [aksjonspunktCodes.VURDER_OPPTJENINGSVILKARET];

Expand Down
17 changes: 12 additions & 5 deletions ...rc/panelDefinisjoner/prosessStegPaneler/inngangsvilkarFortsPaneler/OpptjeningPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
import React from 'react';

import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import OpptjeningVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-opptjening-oms';

import { ProsessStegPanelDef, ProsessStegOverstyringPanelDef } from '@k9-sak-web/behandling-felles';
import { ProsessStegOverstyringPanelDef, ProsessStegPanelDef } from '@k9-sak-web/behandling-felles';

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

class OpptjeningPanelDef extends ProsessStegPanelDef {
getKomponent = props => <OpptjeningVilkarProsessIndex {...props} />;
getKomponent = props => {
if (props.featureToggles.BRUK_V2_VILKAR_OPPTJENING) {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
Copy link
Preview

Copilot AI Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deep cloning of props using JSON.parse(JSON.stringify(props)) is used here as well, which can be inefficient and error-prone with non-serializable values. It is recommended to use a specialized deep cloning function to improve reliability.

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

return <OpptjeningVilkarProsessIndexV2 {...props} {...deepCopyProps} />;
}
return <OpptjeningVilkarProsessIndex {...props} />;
};

getTekstKode = () => 'Behandlingspunkt.Opptjening';

Expand Down
17 changes: 12 additions & 5 deletions ...andling-unntak/src/panelDefinisjoner/prosessStegPaneler/OpptjeningProsessStegPanelDef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
import React from 'react';

import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import OpptjeningVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-opptjening-oms';
import { ProsessStegDef, ProsessStegOverstyringPanelDef, ProsessStegPanelDef } from '@k9-sak-web/behandling-felles';
import { prosessStegCodes } from '@k9-sak-web/konstanter';
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import { ProsessStegDef, ProsessStegPanelDef, ProsessStegOverstyringPanelDef } from '@k9-sak-web/behandling-felles';

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

class PanelDef extends ProsessStegPanelDef {
getKomponent = props => <OpptjeningVilkarProsessIndex {...props} />;
getKomponent = props => {
if (props.featureToggles.BRUK_V2_VILKAR_OPPTJENING) {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps, false);
Copy link
Preview

Copilot AI Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using JSON.parse(JSON.stringify(props)) for deep cloning may lead to performance issues or unexpected behavior with complex data types. Consider using a dedicated deep clone utility (e.g. lodash's cloneDeep) to ensure robustness.

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

return <OpptjeningVilkarProsessIndexV2 {...props} {...deepCopyProps} />;
}
return <OpptjeningVilkarProsessIndex {...props} />;
};

getAksjonspunktKoder = () => [aksjonspunktCodes.VURDER_OPPTJENINGSVILKARET];

Expand Down
1 change: 1 addition & 0 deletions packages/v2/gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"@tanstack/react-query": "^5.66.11",
"@types/object-hash": "^3.0.6",
"axios": "1.8.1",
"lodash": "4.17.21",
"object-hash": "^3.0.0",
"react": "19.0.0",
"react-hook-form": "7.54.2",
Expand Down
Loading
Loading