Skip to content

Commit 954dd73

Browse files
hallvardastarkhallvardastark
committed
Merge branch 'master' into dev-ung
2 parents 4233b5e + 248b687 commit 954dd73

File tree

244 files changed

+6946
-4318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+6946
-4318
lines changed

‎_mocks/featureToggles.ts

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// This must be a "factory" function so that the values are not resoved too early in dev server startup, before vite
2+
23
// has resolved the env variables.
34
export const featureTogglesFactory = () => [
45
{
@@ -45,10 +46,6 @@ export const featureTogglesFactory = () => [
4546
key: 'OMS_PUNSJSTRIPE',
4647
value: process.env.VITE_OMS_PUNSJSTRIPE,
4748
},
48-
{
49-
key: 'OMSORGEN_FOR_PERIODISERT',
50-
value: process.env.VITE_OMSORGEN_FOR_PERIODISERT,
51-
},
5249
{
5350
key: 'OVERSTYR_BEREGNING',
5451
value: process.env.VITE_OVERSTYR_BEREGNING,
@@ -69,10 +66,6 @@ export const featureTogglesFactory = () => [
6966
key: 'AUTOMATISK_VURDERT_MEDLEMSKAP',
7067
value: process.env.AUTOMATISK_VURDERT_MEDLEMSKAP,
7168
},
72-
{
73-
key: 'BRUK_V2_SAK_DOKUMENTER',
74-
value: process.env.VITE_BRUK_V2_SAK_DOKUMENTER,
75-
},
7669
{
7770
key: 'OPPTJENING_READ_ONLY_PERIODER',
7871
value: process.env.VITE_OPPTJENING_READ_ONLY_PERIODER,
@@ -81,6 +74,10 @@ export const featureTogglesFactory = () => [
8174
key: 'BRUK_INNTEKTSGRADERING_I_UTTAK',
8275
value: process.env.VITE_BRUK_INNTEKTSGRADERING_I_UTTAK,
8376
},
77+
{
78+
key: 'SAK_MENY_V2',
79+
value: process.env.VITE_SAK_MENY_V2,
80+
},
8481
{
8582
key: 'AKSJONSPUNKT_OVERLAPPENDE_SAKER',
8683
value: process.env.VITE_AKSJONSPUNKT_OVERLAPPENDE_SAKER,
@@ -89,10 +86,6 @@ export const featureTogglesFactory = () => [
8986
key: 'BRUK_V2_BEHANDLING_VELGER',
9087
value: process.env.VITE_BRUK_V2_BEHANDLING_VELGER,
9188
},
92-
{
93-
key: 'BRUK_V2_SAK_SOK',
94-
value: process.env.VITE_BRUK_V2_SAK_SOK,
95-
},
9689
{
9790
key: 'HISTORIKK_V2_VIS',
9891
value: process.env.VITE_HISTORIKK_V2_VIS,
@@ -105,4 +98,12 @@ export const featureTogglesFactory = () => [
10598
key: 'NY_INNTEKT_EGET_PANEL',
10699
value: process.env.VITE_NY_INNTEKT_EGET_PANEL,
107100
},
101+
{
102+
key: 'BRUK_V2_FAKTA_INSTITUSJON',
103+
value: process.env.VITE_BRUK_V2_FAKTA_INSTITUSJON,
104+
},
105+
{
106+
key: 'BRUK_V2_VILKAR_OVERSTYRING',
107+
value: process.env.VITE_BRUK_V2_VILKAR_OVERSTYRING,
108+
},
108109
];

‎deploy/dev-fss-k9saksbehandling.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ spec:
8989
value: "true"
9090
- name: OMS_PUNSJSTRIPE
9191
value: "true"
92-
- name: OMSORGEN_FOR_PERIODISERT
93-
value: "true"
9492
- name: OVERSTYR_BEREGNING
9593
value: "true"
9694
- name: "BRUK_V2_MELDINGER"
@@ -103,21 +101,23 @@ spec:
103101
value: "true"
104102
- name: AUTOMATISK_VURDERT_MEDLEMSKAP
105103
value: "true"
106-
- name: BRUK_V2_SAK_DOKUMENTER
107-
value: "true"
108104
- name: OPPTJENING_READ_ONLY_PERIODER
109105
value: "true"
110106
- name: BRUK_INNTEKTSGRADERING_I_UTTAK
111107
value: "true"
108+
- name: SAK_MENY_V2
109+
value: "true"
112110
- name: AKSJONSPUNKT_OVERLAPPENDE_SAKER
113111
value: "true"
114112
- name: BRUK_V2_BEHANDLING_VELGER
115113
value: "true"
116-
- name: BRUK_V2_SAK_SOK
117-
value: "true"
118114
- name: HISTORIKK_V2_VIS
119115
value: "true"
120116
- name: VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK
121117
value: "true"
122118
- name: NY_INNTEKT_EGET_PANEL
123119
value: "true"
120+
- name: BRUK_V2_FAKTA_INSTITUSJON
121+
value: "true"
122+
- name: BRUK_V2_VILKAR_OVERSTYRING
123+
value: "true"

‎deploy/prod-fss-k9saksbehandling.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ spec:
8686
value: 'false'
8787
- name: OMS_PUNSJSTRIPE
8888
value: 'true'
89-
- name: OMSORGEN_FOR_PERIODISERT
90-
value: 'true'
9189
- name: OVERSTYR_BEREGNING
9290
value: 'false'
9391
- name: BRUK_V2_MELDINGER
@@ -100,21 +98,23 @@ spec:
10098
value: "true"
10199
- name: AUTOMATISK_VURDERT_MEDLEMSKAP
102100
value: "true"
103-
- name: "BRUK_V2_SAK_DOKUMENTER"
104-
value: "true"
105101
- name: OPPTJENING_READ_ONLY_PERIODER
106102
value: "true"
107103
- name: BRUK_INNTEKTSGRADERING_I_UTTAK
108104
value: "true"
105+
- name: SAK_MENY_V2
106+
value: "false"
109107
- name: AKSJONSPUNKT_OVERLAPPENDE_SAKER
110108
value: 'false'
111109
- name: BRUK_V2_BEHANDLING_VELGER
112110
value: 'false'
113-
- name: BRUK_V2_SAK_SOK
114-
value: 'false'
115111
- name: HISTORIKK_V2_VIS
116112
value: "true"
117113
- name: VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK
118114
value: "true"
119115
- name: NY_INNTEKT_EGET_PANEL
120116
value: "false"
117+
- name: BRUK_V2_FAKTA_INSTITUSJON
118+
value: "false"
119+
- name: BRUK_V2_VILKAR_OVERSTYRING
120+
value: "false"

‎envDir/k9/.env.development

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ VITE_NYE_NOKKELTALL=true
1515
VITE_PROSESS_VILKAR_SOKNADSFRIST=true
1616
VITE_SKILL_UT_PRIVATPERSON=true
1717
VITE_AUTOMATISK_VURDERT_MEDLEMSKAP=true
18-
VITE_BRUK_V2_SAK_DOKUMENTER=true
1918
VITE_OPPTJENING_READ_ONLY_PERIODER=true
2019
VITE_BRUK_INNTEKTSGRADERING_I_UTTAK=true
20+
VITE_SAK_MENY_V2=true
2121
VITE_AKSJONSPUNKT_OVERLAPPENDE_SAKER=true
2222
VITE_BRUK_V2_BEHANDLING_VELGER=true
23-
VITE_BRUK_V2_SAK_SOK=true
2423
VITE_HISTORIKK_V2_VIS=true
2524
VITE_VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK=true
2625
VITE_NY_INNTEKT_EGET_PANEL=true
26+
VITE_BRUK_V2_FAKTA_INSTITUSJON=true
27+
VITE_BRUK_V2_VILKAR_OVERSTYRING=true

‎feature-toggles.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
"key": "OMS_PUNSJSTRIPE",
5252
"value": "${OMS_PUNSJSTRIPE}"
5353
},
54-
{
55-
"key": "OMSORGEN_FOR_PERIODISERT",
56-
"value": "${OMSORGEN_FOR_PERIODISERT}"
57-
},
5854
{
5955
"key": "OVERSTYR_BEREGNING",
6056
"value": "${OVERSTYR_BEREGNING}"
@@ -75,10 +71,6 @@
7571
"key": "AUTOMATISK_VURDERT_MEDLEMSKAP",
7672
"value": "${AUTOMATISK_VURDERT_MEDLEMSKAP}"
7773
},
78-
{
79-
"key": "BRUK_V2_SAK_DOKUMENTER",
80-
"value": "${BRUK_V2_SAK_DOKUMENTER}"
81-
},
8274
{
8375
"key": "OPPTJENING_READ_ONLY_PERIODER",
8476
"value": "${OPPTJENING_READ_ONLY_PERIODER}"
@@ -87,6 +79,10 @@
8779
"key": "BRUK_INNTEKTSGRADERING_I_UTTAK",
8880
"value": "${BRUK_INNTEKTSGRADERING_I_UTTAK}"
8981
},
82+
{
83+
"key": "SAK_MENY_V2",
84+
"value": "${SAK_MENY_V2}"
85+
},
9086
{
9187
"key": "AKSJONSPUNKT_OVERLAPPENDE_SAKER",
9288
"value": "${AKSJONSPUNKT_OVERLAPPENDE_SAKER}"
@@ -95,10 +91,6 @@
9591
"key": "BRUK_V2_BEHANDLING_VELGER",
9692
"value": "${BRUK_V2_BEHANDLING_VELGER}"
9793
},
98-
{
99-
"key": "BRUK_V2_SAK_SOK",
100-
"value": "${BRUK_V2_SAK_SOK}"
101-
},
10294
{
10395
"key": "HISTORIKK_V2_VIS",
10496
"value": "${HISTORIKK_V2_VIS}"
@@ -110,5 +102,13 @@
110102
{
111103
"key": "NY_INNTEKT_EGET_PANEL",
112104
"value": "${NY_INNTEKT_EGET_PANEL}"
105+
},
106+
{
107+
"key": "BRUK_V2_FAKTA_INSTITUSJON",
108+
"value": "${BRUK_V2_FAKTA_INSTITUSJON}"
109+
},
110+
{
111+
"key": "BRUK_V2_VILKAR_OVERSTYRING",
112+
"value": "${BRUK_V2_VILKAR_OVERSTYRING}"
113113
}
114114
]

‎loosely-type-checked-files.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@
298298
"packages/form/src/TextAreaFormik.tsx",
299299
"packages/form/src/TextFieldFormik.tsx",
300300
"packages/form/src/behandlingForm.tsx",
301-
"packages/form/src/hook-form/Datepicker.tsx",
302301
"packages/form/src/hook-form/FaktaBegrunnelseTextFieldRHF.tsx",
303302
"packages/form/src/hook-form/PeriodpickerList.tsx",
304303
"packages/modal-sett-pa-vent/src/SettPaVentModalIndex.tsx",
@@ -424,9 +423,7 @@
424423
"packages/prosess-vilkar-opptjening-oms/src/components/VilkarField.tsx",
425424
"packages/prosess-vilkar-overstyring/src/components-periodisert/VilkarresultatMedBegrunnelse.tsx",
426425
"packages/prosess-vilkar-overstyring/src/components-periodisert/VilkarresultatMedOverstyringFormPeriodisert.tsx",
427-
"packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedBegrunnelse.tsx",
428-
"packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringForm.tsx",
429-
"packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringHeader.tsx",
426+
"packages/prosess-vilkar-overstyring/src/components-periodisert/VilkarresultatMedOverstyringHeader.tsx",
430427
"packages/rest-api-hooks/src/error/extractErrorInfo.ts",
431428
"packages/rest-api-hooks/src/error/useRestApiErrorDispatcher.tsx",
432429
"packages/rest-api-hooks/src/global-data/useGlobalStateRestApi.tsx",
@@ -454,7 +451,6 @@
454451
"packages/sak-app/src/behandlingmenu/BehandlingMenuIndex.tsx",
455452
"packages/sak-app/src/behandlingmenu/MenyKodeverk.ts",
456453
"packages/sak-app/src/behandlingsupport/BehandlingSupportIndex.tsx",
457-
"packages/sak-app/src/behandlingsupport/dokument/DokumentIndex.tsx",
458454
"packages/sak-app/src/behandlingsupport/melding/MeldingIndex.tsx",
459455
"packages/sak-app/src/behandlingsupport/totrinnskontroll/TotrinnskontrollIndex.spec.tsx",
460456
"packages/sak-app/src/behandlingsupport/totrinnskontroll/TotrinnskontrollIndex.tsx",
@@ -471,7 +467,6 @@
471467
"packages/sak-behandling-velger/src/components/BehandlingPickerItemContent.tsx",
472468
"packages/sak-behandling-velger/src/components/BehandlingSelected.tsx",
473469
"packages/sak-behandling-velger/src/components/behandlingVelgerUtils.tsx",
474-
"packages/sak-dokumenter/src/components/DocumentList.tsx",
475470
"packages/sak-historikk/src/HistorikkSakIndex.stories.tsx",
476471
"packages/sak-historikk/src/HistorikkSakIndex.tsx",
477472
"packages/sak-historikk/src/components/History.tsx",
@@ -504,10 +499,6 @@
504499
"packages/sak-meny-sett-pa-vent/src/MenySettPaVentIndex.tsx",
505500
"packages/sak-meny-ta-av-vent/src/MenyTaAvVentIndex.tsx",
506501
"packages/sak-meny-verge/src/MenyVergeIndex.tsx",
507-
"packages/sak-sok/src/components/FagsakList.spec.tsx",
508-
"packages/sak-sok/src/components/FagsakList.tsx",
509-
"packages/sak-sok/src/components/SearchForm.spec.tsx",
510-
"packages/sak-sok/src/components/SearchForm.tsx",
511502
"packages/sak-totrinnskontroll/src/TotrinnskontrollSakIndex.stories.tsx",
512503
"packages/sak-totrinnskontroll/src/TotrinnskontrollSakIndex.tsx",
513504
"packages/sak-totrinnskontroll/src/components/AksjonspunktGodkjenningFieldArray.tsx",

‎package.json

+35-35
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
],
5050
"dependencies": {
5151
"@hookform/error-message": "^2.0.1",
52-
"@navikt/aksel-icons": "7.13.0",
53-
"@navikt/ds-css": "7.13.0",
54-
"@navikt/ds-react": "7.13.0",
55-
"@navikt/ds-tailwind": "^7.13.0",
52+
"@navikt/aksel-icons": "7.17.2",
53+
"@navikt/ds-css": "7.17.2",
54+
"@navikt/ds-react": "7.17.2",
55+
"@navikt/ds-tailwind": "^7.17.0",
5656
"@navikt/familie-endringslogg": "14.0.0",
57-
"@navikt/ft-plattform-komponenter": "^7.2.5",
57+
"@navikt/ft-plattform-komponenter": "^7.2.8",
5858
"@popperjs/core": "2.11.8",
59-
"@sentry/browser": "9.1.0",
60-
"@sentry/react": "^9.1.0",
61-
"axios": "1.7.9",
59+
"@sentry/browser": "9.5.0",
60+
"@sentry/react": "^9.5.0",
61+
"axios": "1.8.3",
6262
"date-fns": "4.1.0",
6363
"date-fns-tz": "3.2.0",
6464
"history": "5.3.0",
@@ -71,19 +71,19 @@
7171
"vite-plugin-svgr": "4.3.0"
7272
},
7373
"devDependencies": {
74-
"@playwright/test": "^1.50.1",
75-
"@sentry/cli": "2.42.1",
76-
"@storybook/addon-a11y": "8.5.8",
77-
"@storybook/addon-actions": "8.5.8",
78-
"@storybook/addon-docs": "8.5.8",
79-
"@storybook/addon-essentials": "8.5.8",
80-
"@storybook/addon-interactions": "8.5.8",
81-
"@storybook/cli": "8.5.8",
82-
"@storybook/react": "8.5.8",
83-
"@storybook/react-vite": "8.5.8",
84-
"@storybook/test": "8.5.8",
85-
"@storybook/test-runner": "^0.21.3",
86-
"@storybook/theming": "8.5.8",
74+
"@playwright/test": "^1.51.0",
75+
"@sentry/cli": "2.42.2",
76+
"@storybook/addon-a11y": "8.6.4",
77+
"@storybook/addon-actions": "8.6.4",
78+
"@storybook/addon-docs": "8.6.4",
79+
"@storybook/addon-essentials": "8.6.4",
80+
"@storybook/addon-interactions": "8.6.4",
81+
"@storybook/cli": "8.6.4",
82+
"@storybook/react": "8.6.4",
83+
"@storybook/react-vite": "8.6.4",
84+
"@storybook/test": "8.6.4",
85+
"@storybook/test-runner": "^0.22.0",
86+
"@storybook/theming": "8.6.4",
8787
"@testing-library/dom": "10.4.0",
8888
"@testing-library/jest-dom": "^6.6.3",
8989
"@testing-library/react": "16.2.0",
@@ -95,35 +95,35 @@
9595
"@types/react-collapse": "5.0.4",
9696
"@types/redux-form": "8.3.11",
9797
"@vitejs/plugin-react": "^4.3.4",
98-
"autoprefixer": "^10.4.20",
98+
"autoprefixer": "^10.4.21",
9999
"axios-mock-adapter": "2.1.0",
100100
"cross-env": "7.0.3",
101-
"eslint": "9.20.1",
102-
"eslint-config-prettier": "10.0.1",
101+
"eslint": "9.22.0",
102+
"eslint-config-prettier": "10.1.1",
103103
"eslint-plugin-jsx-a11y": "6.10.2",
104104
"eslint-plugin-react": "7.37.4",
105-
"eslint-plugin-react-hooks": "^5.1.0",
105+
"eslint-plugin-react-hooks": "^5.2.0",
106106
"eslint-plugin-vitest": "~0.5.4",
107107
"globals": "^16.0.0",
108108
"husky": "9.1.7",
109109
"jsdom": "26.0.0",
110-
"lint-staged": "15.4.3",
110+
"lint-staged": "15.5.0",
111111
"loose-ts-check": "^2.0.0",
112-
"msw": "2.7.1",
112+
"msw": "2.7.3",
113113
"msw-storybook-addon": "^2.0.4",
114114
"postcss": "^8.5.3",
115-
"prettier": "3.5.1",
116-
"storybook": "8.5.8",
117-
"stylelint": "16.14.1",
118-
"stylelint-config-standard": "^36.0.1",
115+
"prettier": "3.5.3",
116+
"storybook": "8.6.4",
117+
"stylelint": "16.15.0",
118+
"stylelint-config-standard": "^37.0.0",
119119
"stylelint-order": "6.0.4",
120120
"tailwindcss": "^3.4.17",
121121
"typed-css-modules": "^0.9.1",
122-
"typescript": "5.7.3",
123-
"typescript-eslint": "^8.24.1",
124-
"vite": "^6.1.1",
122+
"typescript": "5.8.2",
123+
"typescript-eslint": "^8.26.1",
124+
"vite": "^6.2.1",
125125
"vite-plugin-html": "^3.2.2",
126-
"vitest": "3.0.6",
126+
"vitest": "3.0.8",
127127
"vitest-axe": "0.1.0"
128128
},
129129
"resolutions": {

‎packages/behandling-felles/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
1616
"@k9-sak-web/rest-api-hooks": "1.0.0",
1717
"@k9-sak-web/types": "1.0.0",
18-
"@navikt/ft-plattform-komponenter": "^7.2.5",
18+
"@navikt/ft-plattform-komponenter": "^7.2.8",
1919
"classnames": "2.5.1",
2020
"react": "19.0.0",
2121
"react-intl": "7.1.6",

‎packages/behandling-felles/src/util/prosessSteg/ProsessStegOverstyringPanelDef.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ProsessStegOverstyringPanelDef extends ProsessStegPanelDef {
4949
overrideReadOnly,
5050
kanOverstyreAccess,
5151
toggleOverstyring,
52+
featureToggles,
5253
}): any => ({
5354
avslagsarsaker: alleKodeverk[kodeverkTyper.AVSLAGSARSAK][vilkarForSteg[0].vilkarType.kode],
5455
erOverstyrt: overstyrteAksjonspunktKoder.some(o => this.getAksjonspunktKoder().some(a => a === o)),
@@ -60,6 +61,7 @@ class ProsessStegOverstyringPanelDef extends ProsessStegPanelDef {
6061
overrideReadOnly,
6162
kanOverstyreAccess,
6263
toggleOverstyring,
64+
featureToggles,
6365
});
6466
}
6567

0 commit comments

Comments
 (0)