Merge branch 'feature/merge-files' into feature/merge-files-spinner

Author: lotorvik

.nais/fyllut/config.yaml

@@ -89,6 +89,8 @@ spec:
       value: {{skjemabygging-proxy-client-id}}
     - name: GOTENBERG_URL
       value: {{gotenberg-url}}
+    - name: GOTENBERG_URL_EN
+      value: {{gotenberg-url-en}}
     - name: SEND_INN_TOKEN_X_CLIENT_ID
       value: {{send-inn-token-x-client-id}}
     - name: SEND_INN_HOST

.nais/fyllut/dev-delingslenke.yaml

@@ -9,6 +9,7 @@ dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf
 skjemabygging-proxy-url: https://skjemabygging-proxy.dev-fss-pub.nais.io
 gotenberg-url: http://upload-convert-to-pdf.fyllut-sendinn
+gotenberg-url-en: http://upload-convert-to-pdf-en.fyllut-sendinn
 send-inn-token-x-client-id: dev-gcp:team-soknad:innsending-api
 send-inn-host: http://innsending-api.team-soknad
 forms-api-url: https://forms-api.nav.no

.nais/fyllut/dev.yaml

@@ -10,6 +10,7 @@ dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf
 skjemabygging-proxy-url: https://skjemabygging-proxy.dev-fss-pub.nais.io
 gotenberg-url: http://upload-convert-to-pdf.fyllut-sendinn
+gotenberg-url-en: http://upload-convert-to-pdf-en.fyllut-sendinn
 send-inn-token-x-client-id: dev-gcp:team-soknad:innsending-api
 send-inn-host: http://innsending-api.team-soknad
 kodeverk:

.nais/fyllut/preprod-alt.yaml

@@ -10,6 +10,7 @@ dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf
 skjemabygging-proxy-url: https://skjemabygging-proxy.dev-fss-pub.nais.io
 gotenberg-url: http://upload-convert-to-pdf.fyllut-sendinn
+gotenberg-url-en: http://upload-convert-to-pdf-en.fyllut-sendinn
 send-inn-token-x-client-id: dev-gcp:team-soknad:innsending-api
 send-inn-host: http://innsending-api.team-soknad
 kodeverk:

.nais/fyllut/preprod.yaml

@@ -10,6 +10,7 @@ dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 95170319-b4d7-4190-8271-118ed19bafbf
 skjemabygging-proxy-url: https://skjemabygging-proxy.dev-fss-pub.nais.io
 gotenberg-url: http://upload-convert-to-pdf.fyllut-sendinn
+gotenberg-url-en: http://upload-convert-to-pdf-en.fyllut-sendinn
 send-inn-token-x-client-id: dev-gcp:team-soknad:innsending-api
 send-inn-host: http://innsending-api.team-soknad
 kodeverk:

.nais/fyllut/prod.yaml

@@ -9,6 +9,7 @@ dekorator-url: https://www.nav.no/dekoratoren?simple=true
 skjemabygging-proxy-client-id: 031863f2-9881-44af-ace5-6b5ab52afeb1
 skjemabygging-proxy-url: https://skjemabygging-proxy.prod-fss-pub.nais.io
 gotenberg-url: http://upload-convert-to-pdf.fyllut-sendinn
+gotenberg-url-en: http://upload-convert-to-pdf-en.fyllut-sendinn
 send-inn-token-x-client-id: prod-gcp:team-soknad:innsending-api
 send-inn-host: http://innsending-api.team-soknad
 kodeverk:

packages/fyllut-backend/src/config/config.ts

@@ -67,6 +67,7 @@ const localDevelopmentConfig: DefaultConfig = {
   decoratorUrl: 'https://www.nav.no/dekoratoren?simple=true',
   skjemabyggingProxyUrl: process.env.SKJEMABYGGING_PROXY_URL || 'https://skjemabygging-proxy.dev-fss-pub.nais.io',
   gotenbergUrl: process.env.GOTENBERG_URL || 'https://convert-to-pdf.intern.dev.nav.no',
+  gotenbergUrlEn: process.env.GOTENBERG_URL_EN || 'https://convert-to-pdf-en.intern.dev.nav.no',
   skjemabyggingProxyClientId: '95170319-b4d7-4190-8271-118ed19bafbf',
   azureOpenidTokenEndpoint:
     process.env.AZURE_OPENID_CONFIG_TOKEN_ENDPOINT ||
@@ -115,6 +116,7 @@ const defaultConfig: DefaultConfig = {
   skjemabyggingProxyUrl: process.env.SKJEMABYGGING_PROXY_URL!,
   skjemabyggingProxyClientId: process.env.SKJEMABYGGING_PROXY_CLIENT_ID!,
   gotenbergUrl: process.env.GOTENBERG_URL!,
+  gotenbergUrlEn: process.env.GOTENBERG_URL_EN!,
   azureOpenidTokenEndpoint: process.env.AZURE_OPENID_CONFIG_TOKEN_ENDPOINT!,
   clientId: process.env.AZURE_APP_CLIENT_ID!,
   skjemaDir: process.env.SKJEMA_DIR!,

packages/fyllut-backend/src/config/types.d.ts

@@ -40,6 +40,7 @@ export type DefaultConfig = {
   skjemabyggingProxyUrl: string;
   skjemabyggingProxyClientId: string;
   gotenbergUrl: string;
+  gotenbergUrlEn: string;
   azureOpenidTokenEndpoint: string;
   clientId: string;
   skjemaDir?: string;

packages/fyllut-backend/src/services/documents/gotenbergService.ts

@@ -5,7 +5,7 @@ import { logger } from '../../logger';
 import { synchronousResponseToError } from '../../utils/errorHandling';
 import fetchWithRetry from '../../utils/fetchWithRetry';
 
-const { gotenbergUrl } = config;
+const { gotenbergUrl, gotenbergUrlEn } = config;
 
 // Sette opp formdata til å merge en liste av PDFer
 export const mergeFiles = async (
@@ -42,20 +42,21 @@ export const mergeFiles = async (
 
   // Hvordan sette språk? En engelsk og en norsk Gotenberg installasjon?
   logger.info(`Skal kalle Gotenberg for å merge filer`);
-  return await callGotenberg('/forms/pdfengines/merge', formData);
+  return await callGotenberg(language, '/forms/pdfengines/merge', formData);
 };
 
 const formatPDFDate = (date: Date) => {
   return date.toISOString().replace(/\.\d{3}Z$/, ''); // Removes milliseconds & Zulu time
 };
 
 // Generisk metode for kall til mot Gotenberg gitt rute og preparert FormData
-export const callGotenberg = async (route: string, formData: FormData): Promise<any> => {
-  console.log(`Calling Gotenberg with url = ${gotenbergUrl}${route}`);
+export const callGotenberg = async (language: string, route: string, formData: FormData): Promise<any> => {
+  const url = language.toLowerCase().startsWith('en') ? gotenbergUrlEn : gotenbergUrl;
+  console.log(`Calling Gotenberg with url = ${url}/${route}`);
 
   try {
     // Send the request to Gotenberg
-    const gotenbergResponse = await fetchWithRetry(`${gotenbergUrl}${route}`, {
+    const gotenbergResponse = await fetchWithRetry(`${url}${route}`, {
       retry: 1,
       headers: {
         accept: 'application/pdf, text/plain',