Merge pull request #975 from navikt/feature/toggle-create-mellomlagring

Feature/toggle create mellomlagring
navikt · Jan 19, 2024 · cd33216 · cd33216
2 parents fd30dc3 + 464f64b
commit cd33216
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 8 deletions.
diff --git a/.nais/fyllut/dev-delingslenke.yaml b/.nais/fyllut/dev-delingslenke.yaml
@@ -2,7 +2,7 @@ app-name: skjemautfylling-delingslenke
 ingresses:
   - "https://skjemadelingslenke.ekstern.dev.nav.no/fyllut"
 fyllut-frontend-url: "https://skjemadelingslenke.ekstern.dev.nav.no/fyllut"
-enabled-features: translations,autoComplete,sendInnIntegration,mellomlagring
+enabled-features: translations,autoComplete,sendInnIntegration,mellomlagring=true,createMellomlagring=true
 foersteside-url: https://www.nav.no/soknader/api/forsteside
 dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf

diff --git a/.nais/fyllut/dev.yaml b/.nais/fyllut/dev.yaml
@@ -2,7 +2,7 @@ app-name: skjemautfylling
 ingresses:
   - "https://skjemautfylling-formio.intern.dev.nav.no/fyllut"
 fyllut-frontend-url: "https://skjemautfylling-formio.intern.dev.nav.no/fyllut"
-enabled-features: translations,sendInnIntegration
+enabled-features: translations,sendInnIntegration,mellomlagring=false,createMellomlagring=true
 foersteside-url: https://www.nav.no/soknader/api/forsteside
 dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf

diff --git a/.nais/fyllut/preprod-alt.yaml b/.nais/fyllut/preprod-alt.yaml
@@ -2,7 +2,7 @@ app-name: skjemautfylling-preprod-alt
 ingresses:
   - "https://fyllut-preprod-alt.intern.dev.nav.no/fyllut"
 fyllut-frontend-url: "https://fyllut-preprod-alt.intern.dev.nav.no/fyllut"
-enabled-features: translations,sendInnIntegration
+enabled-features: translations,sendInnIntegration,mellomlagring=false,createMellomlagring=true
 foersteside-url: https://www.nav.no/soknader/api/forsteside
 dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf

diff --git a/.nais/fyllut/preprod.yaml b/.nais/fyllut/preprod.yaml
@@ -2,7 +2,7 @@ app-name: skjemautfylling-preprod
 ingresses:
   - "https://fyllut-preprod.intern.dev.nav.no/fyllut"
 fyllut-frontend-url: "https://fyllut-preprod.intern.dev.nav.no/fyllut"
-enabled-features: translations,sendInnIntegration,mellomlagring
+enabled-features: translations,sendInnIntegration,mellomlagring=true,createMellomlagring=true
 foersteside-url: https://www.nav.no/soknader/api/forsteside
 dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf

diff --git a/.nais/fyllut/prod.yaml b/.nais/fyllut/prod.yaml
@@ -2,7 +2,7 @@ app-name: skjemautfylling
 ingresses:
   - "https://www.nav.no/fyllut"
 fyllut-frontend-url: "https://www.nav.no/fyllut"
-enabled-features: translations,autoComplete,sendInnIntegration
+enabled-features: translations,autoComplete,sendInnIntegration,mellomlagring=false,createMellomlagring=true
 foersteside-url: https://www.nav.no/soknader/api/forsteside
 dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 031863f2-9881-44af-ace5-6b5ab52afeb1

diff --git a/packages/fyllut-backend/.env.test b/packages/fyllut-backend/.env.test
@@ -1,4 +1,4 @@
-ENABLED_FEATURES="translations,mellomlagring,sendInnIntegration"
+ENABLED_FEATURES="translations,sendInnIntegration,mellomlagring=true,createMellomlagring=true"
 SKJEMABYGGING_PROXY_CLIENT_ID=564s78e2-d6k3-3564-1564-554ed32bafwf
 SKJEMABYGGING_PROXY_URL=http://127.0.0.1:3300/skjemabygging-proxy
 AZURE_OPENID_CONFIG_TOKEN_ENDPOINT=http://127.0.0.1:3300/azure-openid/oauth2/v2.0/token

diff --git a/packages/fyllut-backend/src/test/test.env b/packages/fyllut-backend/src/test/test.env
@@ -6,7 +6,7 @@ AZURE_OPENID_CONFIG_TOKEN_ENDPOINT=http://azureopenid-token-test.nav.no/c76419c0
 AZURE_APP_CLIENT_ID=fyllut-client-id
 FORMS_SOURCE=formioapi
 NAIS_CLUSTER_NAME=local-cluster
-ENABLED_FEATURES=translations,sendInnIntegration,mellomlagring
+ENABLED_FEATURES=translations,sendInnIntegration,mellomlagring=true,createMellomlagring=true"
 SEND_INN_HOST=https://innsending-api.unittest.nav.no
 SEND_INN_TOKEN_X_CLIENT_ID=test-gcp:soknad:send-inn
 

diff --git a/packages/shared-components/src/context/sendInn/sendInnContext.test.tsx b/packages/shared-components/src/context/sendInn/sendInnContext.test.tsx
@@ -44,7 +44,7 @@ describe('sendInnContext', () => {
         <AppConfigProvider
           app={'fyllut'}
           submissionMethod={submissionMethod}
-          featureToggles={{ enableMellomlagring: true }}
+          featureToggles={{ enableMellomlagring: true, enableCreateMellomlagring: true }}
           http={mockHttp as unknown as typeof http}
           baseUrl={'http://test.example.no'}
           config={{ isTest: true }}

diff --git a/packages/shared-components/src/context/sendInn/sendInnContext.tsx b/packages/shared-components/src/context/sendInn/sendInnContext.tsx
@@ -156,6 +156,13 @@ const SendInnProvider = ({
       return;
     }
 
+    // Complete the initialization before creating if createMellomlagring is not enabled
+    // Makes it possible to turn off NEW creations of mellomlagring, by setting createMellomlagring=false in ENABLED_FEATURES, without affecting existing ones
+    if (!featureToggles?.enableCreateMellomlagring) {
+      setIsMellomlagringReady(true);
+      return;
+    }
+
     try {
       setIsCreateStarted(true);
       const currentLanguage = getLanguageFromSearchParams();