Bruker nytt oppsett for feature toggles i ung (#7233)

hallvardastark · web-flow · commit ff86927f458c · 2025-03-20T09:00:43.000+01:00
* Bruker nytt oppsett for feature toggles i ung

* fiks formattering

* sync pakker og fiks test

* Fix story
diff --git a/deploy/ung/dev-gcp.yml b/deploy/ung/dev-gcp.yml
@@ -1,16 +1,16 @@
-apiVersion: "nais.io/v1alpha1"
-kind: "Application"
+apiVersion: 'nais.io/v1alpha1'
+kind: 'Application'
 metadata:
   name: ung-sak-web
   namespace: k9saksbehandling
   labels:
     team: k9saksbehandling
   annotations:
-    nais.io/run-as-user: "101" #nginx
-    nais.io/read-only-file-system: "false" #nginx
-    nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
-    nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
+    nais.io/run-as-user: '101' #nginx
+    nais.io/read-only-file-system: 'false' #nginx
+    nginx.ingress.kubernetes.io/proxy-buffer-size: '32k'
+    nginx.ingress.kubernetes.io/proxy-read-timeout: '600'
+    nginx.ingress.kubernetes.io/proxy-send-timeout: '600'
 spec:
   image: {{ image }}
   port: 9005
@@ -31,7 +31,7 @@ spec:
     limits:
       memory: 64Mi
   ingresses:
-    - "https://ung.intern.dev.nav.no"
+    - 'https://ung.intern.dev.nav.no'
   accessPolicy:
     outbound:
       rules:
@@ -40,61 +40,11 @@ spec:
     - name: APP_NAME
       value: ung-sak-web
     - name: APP_URL
-      value: "http://ung-sak"
+      value: 'http://ung-sak'
     - name: APP_PORT
-      value: "9005"
-
-    # Feature-flag
-    - name: KLAGE_KABAL
-      value: "true"
-    - name: VARSELTEKST
-      value: "true"
-    - name: DOKUMENTDATA
-      value: "true"
-    - name: UNNTAKSBEHANDLING
-      value: "true"
-    - name: KLAGEBEHANDLING
-      value: "true"
-    - name: TILBAKE
-      value: "true"
-    - name: SOKNADPERIODESTRIPE
-      value: "false"
-    - name: TYPE_MEDISINSKE_OPPLYSNINGER_BREV
-      value: "true"
-    - name: LOS_MARKER_BEHANDLING
-      value: "true"
-    - name: LOS_MARKER_BEHANDLING_SUBMIT
-      value: "true"
-    - name: AKSJONSPUNKT_9015
-      value: "true"
-    - name: ALDERSVILKAR_KRONISK_SYK
-      value: "true"
-    - name: FRITEKST_REDIGERING
-      value: "true"
-    - name: INKLUDER_KALENDER_PILS
-      value: "true"
-    - name: SKJUL_AVSLUTTET_ARBEIDSGIVER
-      value: "true"
-    - name: OMS_PUNSJSTRIPE
-      value: "true"
-    - name: OMSORGEN_FOR_PERIODISERT
-      value: "true"
-    - name: OVERSTYR_BEREGNING
-      value: "true"
-    - name: "BRUK_V2_MELDINGER"
-      value: "false"
-    - name: NYE_NOKKELTALL
-      value: "true"
-    - name: PROSESS_VILKAR_SOKNADSFRIST
-      value: "true"
-    - name: UTVIDET_VARSELFELT
-      value: "true"
-    - name: SKILL_UT_PRIVATPERSON
-      value: "true"
-    - name: AUTOMATISK_VURDERT_MEDLEMSKAP
-      value: "true"
-    - name: BRUK_V2_SAK_DOKUMENTER
-      value: "true"
-    - name: OPPTJENING_READ_ONLY_PERIODER
-      value: "true"
+      value: '9005'
 
+    # Setter flagg som bestemmer hvilket sett med feature toggles som skal brukes i frontend.
+    # Faktiske feature toggles for ulike miljø er satt i ulike filer i packages/v2/gui/src/featuretoggles
+    - name: FEATURE_TOGGLES_ENV
+      value: 'ung-sak-q'
diff --git a/envDir/ung/.env.development b/envDir/ung/.env.development
@@ -1,26 +1 @@
-VITE_BRUK_V2_MELDINGER=false
-VITE_KLAGE_KABAL=true
-VITE_VARSELTEKST=true
-VITE_DOKUMENTDATA=true
-VITE_UNNTAKSBEHANDLING=true
-VITE_UTENLANDSOPPHOLD=true
-VITE_TYPE_MEDISINSKE_OPPLYSNINGER_BREV=true
-VITE_LOS_MARKER_BEHANDLING=true
-VITE_LOS_MARKER_BEHANDLING_SUBMIT=true
-VITE_AKSJONSPUNKT_9014=true
-VITE_FRITEKST_REDIGERING=true
-VITE_FIX_SOKNADSFRIST_KALENDER_OG_READONLY=true
-VITE_INKLUDER_KALENDER_PILS=true
-VITE_NYE_NOKKELTALL=true
-VITE_PROSESS_VILKAR_SOKNADSFRIST=true
-VITE_SKILL_UT_PRIVATPERSON=true
-VITE_AUTOMATISK_VURDERT_MEDLEMSKAP=true
-VITE_BRUK_V2_SAK_DOKUMENTER=true
-VITE_OPPTJENING_READ_ONLY_PERIODER=true
-VITE_BRUK_INNTEKTSGRADERING_I_UTTAK=true
-VITE_AKSJONSPUNKT_OVERLAPPENDE_SAKER=true
-VITE_BRUK_V2_BEHANDLING_VELGER=true
-VITE_BRUK_V2_SAK_SOK=true
-VITE_HISTORIKK_V2_VIS=true
-VITE_BRUK_V2_VILKAR_OVERSTYRING=true
-VITE_SAK_MENY_V2=true
+VITE_FEATURE_TOGGLES_ENV=ung-sak-dev
diff --git a/loosely-type-checked-files.json b/loosely-type-checked-files.json
@@ -518,7 +518,6 @@
   "packages/tidslinje/src/Timeline.tsx",
   "packages/tidslinje/src/components/pleiepenger/Tidslinje.spec.tsx",
   "packages/tidslinje/src/components/pleiepenger/Tidslinje.tsx",
-  "packages/ung/sak-app/app/AppConfigResolver.tsx",
   "packages/ung/sak-app/app/components/Dekorator.tsx",
   "packages/ung/sak-app/app/paths.ts",
   "packages/ung/sak-app/app/useTrackRouteParam.tsx",
diff --git a/packages/behandling-ungdomsytelse/package.json b/packages/behandling-ungdomsytelse/package.json
@@ -18,6 +18,6 @@
     "@k9-sak-web/types": "1.0.0",
     "axios": "1.8.3",
     "react": "19.0.0",
-    "react-intl": "6.8.9"
+    "react-intl": "7.1.6"
   }
 }
diff --git a/packages/ung/sak-app/app/AppConfigResolver.tsx b/packages/ung/sak-app/app/AppConfigResolver.tsx
@@ -3,8 +3,9 @@ import { ReactElement, useEffect } from 'react';
 import { LoadingPanel } from '@fpsak-frontend/shared-components';
 import { RestApiState, useRestApiErrorDispatcher } from '@k9-sak-web/rest-api-hooks';
 
-import FeatureTogglesContext from '@k9-sak-web/gui/utils/featureToggles/FeatureTogglesContext.js';
-import { useFeatureToggles } from '@k9-sak-web/gui/utils/featureToggles/useFeatureToggles.js';
+import FeatureTogglesContext from '@k9-sak-web/gui/featuretoggles/FeatureTogglesContext.js';
+import { qFeatureToggles } from '@k9-sak-web/gui/featuretoggles/ung/qFeatureToggles.js';
+import { useFeatureToggles } from '@k9-sak-web/gui/featuretoggles/useFeatureToggles.js';
 import { UngSakApiKeys, requestApi, restApiHooks } from '../data/ungsakApi';
 import useHentInitLenker from './useHentInitLenker';
 import useHentKodeverk from './useHentKodeverk';
@@ -49,7 +50,7 @@ const AppConfigResolver = ({ children }: OwnProps) => {
     !!featureToggles;
 
   return (
-    <FeatureTogglesContext.Provider value={featureToggles}>
+    <FeatureTogglesContext.Provider value={featureToggles ?? qFeatureToggles}>
       {harFeilet || erFerdig ? children : <LoadingPanel />}
     </FeatureTogglesContext.Provider>
   );
diff --git a/packages/ung/sak-app/behandling/BehandlingIndex.tsx b/packages/ung/sak-app/behandling/BehandlingIndex.tsx
@@ -5,7 +5,7 @@ import { NavigateFunction, useLocation, useNavigate } from 'react-router';
 import { LoadingPanel } from '@fpsak-frontend/shared-components';
 import { parseQueryString, replaceNorwegianCharacters } from '@fpsak-frontend/utils';
 import BehandlingUngdomsytelseIndex from '@k9-sak-web/behandling-ungdomsytelse/src/BehandlingUngdomsytelseIndex';
-import FeatureTogglesContext from '@k9-sak-web/gui/utils/featureToggles/FeatureTogglesContext.js';
+import FeatureTogglesContext from '@k9-sak-web/gui/featuretoggles/FeatureTogglesContext.js';
 import { useRestApiErrorDispatcher } from '@k9-sak-web/rest-api-hooks';
 import ErrorBoundary from '@k9-sak-web/sak-app/src/app/ErrorBoundary';
 import getAccessRights from '@k9-sak-web/sak-app/src/app/util/access';
diff --git a/packages/ung/sak-app/behandlingmenu/BehandlingMenuIndex.tsx b/packages/ung/sak-app/behandlingmenu/BehandlingMenuIndex.tsx
@@ -10,14 +10,14 @@ import MenyNyBehandlingIndex, {
 import MenySettPaVentIndex, { getMenytekst as getSettPaVentMenytekst } from '@fpsak-frontend/sak-meny-sett-pa-vent';
 import MenyTaAvVentIndex, { getMenytekst as getTaAvVentMenytekst } from '@fpsak-frontend/sak-meny-ta-av-vent';
 import KlagePart from '@k9-sak-web/behandling-klage/src/types/klagePartTsType';
+import FeatureTogglesContext from '@k9-sak-web/gui/featuretoggles/FeatureTogglesContext.js';
 import { MenySakIndex as MenySakIndexV2 } from '@k9-sak-web/gui/sak/meny/MenySakIndex.js';
 import MenyEndreBehandlendeEnhetIndexV2 from '@k9-sak-web/gui/sak/meny/endre-enhet/MenyEndreBehandlendeEnhetIndex.js';
 import MenyHenleggIndexV2 from '@k9-sak-web/gui/sak/meny/henlegg-behandling/MenyHenleggIndex.js';
 import MenyMarkerBehandlingV2 from '@k9-sak-web/gui/sak/meny/marker-behandling/MenyMarkerBehandling.js';
 import MenyNyBehandlingIndexV2 from '@k9-sak-web/gui/sak/meny/ny-behandling/MenyNyBehandlingIndex.js';
 import MenySettPaVentIndexV2 from '@k9-sak-web/gui/sak/meny/sett-paa-vent/MenySettPaVentIndex.js';
 import MenyTaAvVentIndexV2 from '@k9-sak-web/gui/sak/meny/ta-av-vent/MenyTaAvVentIndex.js';
-import FeatureTogglesContext from '@k9-sak-web/gui/utils/featureToggles/FeatureTogglesContext.js';
 import ApplicationContextPath from '@k9-sak-web/sak-app/src/app/ApplicationContextPath';
 import BehandlingRettigheter from '@k9-sak-web/sak-app/src/behandling/behandlingRettigheterTsType';
 import SakRettigheter from '@k9-sak-web/sak-app/src/fagsak/sakRettigheterTsType';
diff --git a/packages/ung/sak-app/behandlingsupport/historikk/HistorikkIndex.tsx b/packages/ung/sak-app/behandlingsupport/historikk/HistorikkIndex.tsx
@@ -7,10 +7,10 @@ import { LoadingPanel, usePrevious } from '@fpsak-frontend/shared-components';
 import { Historikkinnslag, KodeverkMedNavn } from '@k9-sak-web/types';
 
 import { Kjønn } from '@k9-sak-web/backend/k9sak/kodeverk/Kjønn.js';
+import FeatureTogglesContext from '@k9-sak-web/gui/featuretoggles/FeatureTogglesContext.js';
 import { useKodeverkContext } from '@k9-sak-web/gui/kodeverk/hooks/useKodeverkContext.js';
 import { HistorikkinnslagV2 } from '@k9-sak-web/gui/sak/historikk/historikkinnslagTsTypeV2.js';
 import { Snakkeboble } from '@k9-sak-web/gui/sak/historikk/snakkeboble/Snakkeboble.js';
-import FeatureTogglesContext from '@k9-sak-web/gui/utils/featureToggles/FeatureTogglesContext.js';
 import { isRequestNotDone } from '@k9-sak-web/rest-api-hooks/src/RestApiState';
 import ApplicationContextPath from '@k9-sak-web/sak-app/src/app/ApplicationContextPath';
 import { compareRenderedElementTexts } from '@k9-sak-web/sak-app/src/behandlingsupport/historikk/v1v2Sammenligningssjekk';
diff --git a/packages/ung/sak-app/fagsak/FagsakIndex.spec.tsx b/packages/ung/sak-app/fagsak/FagsakIndex.spec.tsx
@@ -126,6 +126,7 @@ describe('<FagsakIndex>', () => {
 
   it('skal hente alle behandlinger fra ungsak, tilbake og klage', () => {
     requestApi.mock(UngSakApiKeys.KODEVERK, kodeverk);
+    requestApi.mock(UngSakApiKeys.KODEVERK_TILBAKE, kodeverk);
     requestApi.mock(UngSakApiKeys.FETCH_FAGSAK, fagsak);
     requestApi.mock(UngSakApiKeys.SAK_BRUKER, {});
     requestApi.mock(UngSakApiKeys.SAK_RETTIGHETER, {
diff --git a/packages/ung/sak-app/fagsak/FagsakIndex.tsx b/packages/ung/sak-app/fagsak/FagsakIndex.tsx
@@ -11,9 +11,9 @@ import {
 import { useCallback, useContext, useMemo, useState } from 'react';
 import { Navigate, Route, Routes, useLocation } from 'react-router';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+import FeatureTogglesContext from '@k9-sak-web/gui/featuretoggles/FeatureTogglesContext.js';
 import { KodeverkProvider } from '@k9-sak-web/gui/kodeverk/index.js';
 import VisittkortPanel from '@k9-sak-web/gui/sak/visittkort/VisittkortPanel.js';
-import FeatureTogglesContext from '@k9-sak-web/gui/utils/featureToggles/FeatureTogglesContext.js';
 import { konverterKodeverkTilKode } from '@k9-sak-web/lib/kodeverk/konverterKodeverkTilKode.js';
 import { isRequestNotDone } from '@k9-sak-web/rest-api-hooks/src/RestApiState';
 import BehandlingRettigheter from '@k9-sak-web/sak-app/src/behandling/behandlingRettigheterTsType';
diff --git a/packages/ung/sak-app/package.json b/packages/ung/sak-app/package.json
@@ -31,9 +31,9 @@
     "@navikt/ft-form-hooks": "^6.2.4",
     "@navikt/ft-plattform-komponenter": "^7.2.8",
     "@navikt/ft-ui-komponenter": "^3.1.8",
-    "@sentry/browser": "9.5.0",
-    "@sentry/react": "^9.5.0",
-    "@tanstack/react-query": "^5.67.3",
+    "@sentry/browser": "9.6.0",
+    "@sentry/react": "^9.6.0",
+    "@tanstack/react-query": "^5.68.0",
     "axios": "1.8.3",
     "classnames": "2.5.1",
     "history": "5.3.0",
diff --git a/packages/v2/gui/src/featuretoggles/ung/devFeatureToggles.ts b/packages/v2/gui/src/featuretoggles/ung/devFeatureToggles.ts
@@ -0,0 +1,32 @@
+import type { FeatureToggles } from '../FeatureToggles.js';
+
+export const devFeatureToggles = {
+  BRUK_V2_MELDINGER: false,
+  KLAGE_KABAL: true,
+  VARSELTEKST: true,
+  DOKUMENTDATA: true,
+  UNNTAKSBEHANDLING: true,
+  TYPE_MEDISINSKE_OPPLYSNINGER_BREV: true,
+  LOS_MARKER_BEHANDLING: true,
+  LOS_MARKER_BEHANDLING_SUBMIT: true,
+  FRITEKST_REDIGERING: true,
+  FIX_SOKNADSFRIST_KALENDER_OG_READONLY: true,
+  NYE_NOKKELTALL: true,
+  SKILL_UT_PRIVATPERSON: true,
+  AUTOMATISK_VURDERT_MEDLEMSKAP: true,
+  OPPTJENING_READ_ONLY_PERIODER: true,
+  BRUK_INNTEKTSGRADERING_I_UTTAK: true,
+  SAK_MENY_V2: true,
+  AKSJONSPUNKT_OVERLAPPENDE_SAKER: true,
+  BRUK_V2_BEHANDLING_VELGER: true,
+  HISTORIKK_V2_VIS: true,
+  VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK: true,
+  NY_INNTEKT_EGET_PANEL: true,
+  BRUK_V2_FAKTA_INSTITUSJON: true,
+  BRUK_V2_VILKAR_OVERSTYRING: true,
+  OPPLAERINGSPENGER: false,
+  SKJUL_AVSLUTTET_ARBEIDSGIVER: false,
+  OVERSTYR_BEREGNING: false,
+  UTVIDET_VARSELFELT: false,
+  FJERN_BEGRUNNELSE_PROSESS_BEREGNING: true,
+} satisfies FeatureToggles;
diff --git a/packages/v2/gui/src/featuretoggles/ung/qFeatureToggles.ts b/packages/v2/gui/src/featuretoggles/ung/qFeatureToggles.ts
@@ -0,0 +1,32 @@
+import type { FeatureToggles } from '../FeatureToggles.js';
+
+export const qFeatureToggles = {
+  BRUK_V2_MELDINGER: false,
+  KLAGE_KABAL: true,
+  VARSELTEKST: true,
+  DOKUMENTDATA: true,
+  UNNTAKSBEHANDLING: true,
+  TYPE_MEDISINSKE_OPPLYSNINGER_BREV: true,
+  LOS_MARKER_BEHANDLING: true,
+  LOS_MARKER_BEHANDLING_SUBMIT: true,
+  FRITEKST_REDIGERING: true,
+  FIX_SOKNADSFRIST_KALENDER_OG_READONLY: true,
+  NYE_NOKKELTALL: true,
+  SKILL_UT_PRIVATPERSON: true,
+  AUTOMATISK_VURDERT_MEDLEMSKAP: true,
+  OPPTJENING_READ_ONLY_PERIODER: true,
+  BRUK_INNTEKTSGRADERING_I_UTTAK: true,
+  SAK_MENY_V2: true,
+  AKSJONSPUNKT_OVERLAPPENDE_SAKER: true,
+  BRUK_V2_BEHANDLING_VELGER: true,
+  HISTORIKK_V2_VIS: true,
+  VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK: true,
+  NY_INNTEKT_EGET_PANEL: true,
+  BRUK_V2_FAKTA_INSTITUSJON: true,
+  BRUK_V2_VILKAR_OVERSTYRING: true,
+  OPPLAERINGSPENGER: false,
+  SKJUL_AVSLUTTET_ARBEIDSGIVER: false,
+  OVERSTYR_BEREGNING: false,
+  UTVIDET_VARSELFELT: false,
+  FJERN_BEGRUNNELSE_PROSESS_BEREGNING: true,
+} satisfies FeatureToggles;
diff --git a/packages/v2/gui/src/featuretoggles/useFeatureToggles.ts b/packages/v2/gui/src/featuretoggles/useFeatureToggles.ts
@@ -1,9 +1,11 @@
 import { useQuery } from '@tanstack/react-query';
 import axios from 'axios';
 import { devFeatureToggles } from './devFeatureToggles.js';
-import { qFeatureToggles } from './qFeatureToggles.js';
-import { prodFeatureToggles } from './prodFeatureToggles.js';
 import type { FeatureToggles } from './FeatureToggles.js';
+import { prodFeatureToggles } from './prodFeatureToggles.js';
+import { qFeatureToggles } from './qFeatureToggles.js';
+import { devFeatureToggles as ungDevFeatureToggles } from './ung/devFeatureToggles.js';
+import { qFeatureToggles as ungQFeatureToggles } from './ung/qFeatureToggles.js';
 
 // feature-toggles/toggles.json returnerer array av {key: string, value: string} objekter
 const getKeyValueFromArray = (data: any, dataKey: string): string | undefined => {
@@ -36,6 +38,10 @@ export const useFeatureToggles = (): { featureToggles: FeatureToggles | undefine
     return { featureToggles: qFeatureToggles };
   } else if (featureTogglesEnv === 'k9-sak-prod') {
     return { featureToggles: prodFeatureToggles };
+  } else if (featureTogglesEnv === 'ung-sak-dev') {
+    return { featureToggles: ungDevFeatureToggles };
+  } else if (featureTogglesEnv === 'ung-sak-q') {
+    return { featureToggles: ungQFeatureToggles };
   } else {
     // If feature toggles are not resolved, log it, and return prodFeatureToggles as default
     if (isError) {
diff --git a/packages/v2/gui/src/sak/visittkort/VisittkortPanel.stories.tsx b/packages/v2/gui/src/sak/visittkort/VisittkortPanel.stories.tsx
@@ -55,9 +55,9 @@ export const Default: StoryObj<typeof VisittkortPanel> = {
     personopplysninger: personopplysningerSoker,
   },
   play: async ({ canvas }) => {
-    await expect(canvas.getByText(personopplysningerSoker.navn)).toBeInTheDocument();
+    await expect(canvas.getByText(personopplysningerSoker.navn, { exact: false })).toBeInTheDocument();
     await expect(canvas.getByText('987738 95')).toBeInTheDocument();
-    await expect(canvas.getByText(fagsakPerson.navn)).toBeInTheDocument();
+    await expect(canvas.getByText(`${fagsakPerson.navn} (80 år)`, { exact: false })).toBeInTheDocument();
   },
 };
 
@@ -67,7 +67,7 @@ export const ManglerPersonOpplysninger: StoryObj<typeof VisittkortPanel> = {
     personopplysninger: undefined,
   },
   play: async ({ canvas }) => {
-    await expect(canvas.getByText(fagsakPerson.navn)).toBeInTheDocument();
+    await expect(canvas.getByText(fagsakPerson.navn, { exact: false })).toBeInTheDocument();
     await expect(canvas.getByText('123456 7')).toBeInTheDocument();
   },
 };
diff --git a/ung.feature-toggles.json b/ung.feature-toggles.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`"@k9-sak-web/types": "1.0.0",`
`19`	`19`	`"axios": "1.8.3",`
`20`	`20`	`"react": "19.0.0",`
`21`		`- "react-intl": "6.8.9"`
	`21`	`+ "react-intl": "7.1.6"`
`22`	`22`	`}`
`23`	`23`	`}`