Merge branch 'master' into upgrade-navikt-ds

Author: akgagnat

mocks/mocks/data/formio-api/test-mellomlagring.json

@@ -1101,6 +1101,95 @@
           "id": "e3vwglb",
           "defaultValue": null,
           "navId": "edqy1v"
+        },
+        {
+          "label": "Ønskeliste",
+          "key": "datagrid",
+          "input": false,
+          "tableView": false,
+          "validateOn": "blur",
+          "validate": {
+            "required": false,
+            "custom": "",
+            "customPrivate": false,
+            "strictDateValidation": false,
+            "multiple": false,
+            "unique": false
+          },
+          "type": "datagrid",
+          "isNavDataGrid": true,
+          "components": [
+            {
+              "validate": {
+                "required": false,
+                "custom": "",
+                "customPrivate": false,
+                "strictDateValidation": false,
+                "multiple": false,
+                "unique": false
+              },
+              "label": "Gaveønske",
+              "key": "tekstfelt",
+              "input": true,
+              "tableView": false,
+              "type": "textfield",
+              "navId": "e0tpgrm"
+            }
+          ],
+          "navId": "e5z29dy",
+          "placeholder": "",
+          "prefix": "",
+          "customClass": "",
+          "suffix": "",
+          "multiple": false,
+          "defaultValue": null,
+          "protected": false,
+          "unique": false,
+          "persistent": true,
+          "hidden": false,
+          "clearOnHide": true,
+          "refreshOn": "",
+          "redrawOn": "",
+          "modalEdit": false,
+          "dataGridLabel": false,
+          "labelPosition": "top",
+          "description": "",
+          "errorLabel": "",
+          "tooltip": "",
+          "hideLabel": false,
+          "tabindex": "",
+          "disabled": false,
+          "autofocus": false,
+          "dbIndex": false,
+          "customDefaultValue": "",
+          "calculateValue": "",
+          "calculateServer": false,
+          "widget": null,
+          "attributes": {},
+          "conditional": {
+            "show": null,
+            "when": null,
+            "eq": ""
+          },
+          "overlay": {
+            "style": "",
+            "left": "",
+            "top": "",
+            "width": "",
+            "height": ""
+          },
+          "allowCalculateOverride": false,
+          "encrypted": false,
+          "showCharCount": false,
+          "showWordCount": false,
+          "properties": {},
+          "allowMultipleMasks": false,
+          "addons": [],
+          "tree": true,
+          "lazyLoad": false,
+          "disableAddingRemovingRows": false,
+          "id": "euimv9",
+          "keyModified": true
         }
       ],
       "placeholder": "",

mocks/mocks/data/innsending-api/mellomlagring/getTestMellomlagring-valid-extra-values.json

@@ -0,0 +1,55 @@
+{
+  "brukerId": "19876898104",
+  "skjemanr": "testMellomlagring",
+  "tittel": "Test mellomlagring",
+  "tema": "BAR",
+  "spraak": "nb",
+  "hoveddokument": {
+    "vedleggsnr": "testMellomlagring",
+    "tittel": "Test mellomlagring",
+    "label": "Test mellomlagring",
+    "pakrevd": true,
+    "beskrivelse": null,
+    "mimetype": "application/pdf",
+    "document": null,
+    "propertyNavn": null,
+    "formioId": null
+  },
+  "hoveddokumentVariant": {
+    "vedleggsnr": "testMellomlagring",
+    "tittel": "Test mellomlagring",
+    "label": "Test mellomlagring",
+    "pakrevd": false,
+    "beskrivelse": null,
+    "mimetype": "application/json",
+    "document": {
+      "language": "nb-NO",
+      "data": {
+        "data": {
+          "hvaDrakkDuTilFrokost": "",
+          "hvaSpisteDuTilFrokost": "",
+          "hvaSyntesDuOmFrokosten": "Helt ok",
+          "slettetTekstfelt": "Verdi som skal fjernes",
+          "datagrid": [{"tekstfelt": "Hoppeslott", "tekstfelt1": "Grønn"}, {"tekstfelt": "Hund", "tekstfelt1": "Svart"}],
+          "datagrid1": [{"tekstfelt": "Katt", "tekstfelt1": "Blå"}, {"tekstfelt": "Kanarifugl", "tekstfelt1": "Gul"}],
+          "container.slettetTekstFelt": "Verdi fra container som skal fjernes",
+          "onskerDuAFaGavenInnpakket": "nei",
+          "hemmeligKode": "",
+          "kryssAvHvisDuOnskerDagligReklamePaEPost": false,
+          "hvordanOnskerDuAMottaPakken": {
+            "label": "På døra",
+            "value": "paDora"
+          }
+        }
+      }
+    },
+    "propertyNavn": null,
+    "formioId": null
+  },
+  "innsendingsId": "01234567-abcd-4ebd-90d4-34448ebaaaa2",
+  "status": "Opprettet",
+  "vedleggsListe": [],
+  "kanLasteOppAnnet": true,
+  "fristForEttersendelse": 14,
+  "endretDato": "2023-08-30T12:33:30.399543+02:00"
+}

mocks/mocks/routes/innsending-api.js

@@ -1,6 +1,7 @@
 const responseWithInnsendingsId = require('../data/innsending-api/mellomlagring/responseWithInnsendingsId.json');
 const mellomlagringValid1 = require('../data/innsending-api/mellomlagring/getTestMellomlagring-valid-1.json');
 const mellomlagringValid2 = require('../data/innsending-api/mellomlagring/getTestMellomlagring-valid-2.json');
+const mellomlagringValidExtraValues = require('../data/innsending-api/mellomlagring/getTestMellomlagring-valid-extra-values.json');
 const prefillDataNames = require('../data/innsending-api/prefill-data/prefill-data-names.json');
 
 const paabegyntMellomlagringOgInnsendt = require('../data/innsending-api/active-tasks/mellomlagringOgEttersending.json');
@@ -162,6 +163,14 @@ module.exports = [
           body: convertToInnsendingApiResponse(mellomlagringValid2),
         },
       },
+      {
+        id: 'success-extra-values',
+        type: 'json',
+        options: {
+          status: 200,
+          body: convertToInnsendingApiResponse(mellomlagringValidExtraValues),
+        },
+      },
       {
         id: 'success-prefill-data',
         type: 'json',

packages/bygger/src/Forms/publish/PublishModalComponents.tsx

@@ -1,10 +1,10 @@
 import { ConfirmationModal, useModal } from '@navikt/skjemadigitalisering-shared-components';
-import { navFormUtils } from '@navikt/skjemadigitalisering-shared-domain';
+import { NavFormType, navFormUtils } from '@navikt/skjemadigitalisering-shared-domain';
 import { useEffect, useState } from 'react';
 import ConfirmPublishModal from './ConfirmPublishModal';
 import PublishSettingsModal from './PublishSettingsModal';
 
-const validateAttachments = (form) =>
+const validateAttachments = (form: NavFormType) =>
   navFormUtils
     .flattenComponents(form.components)
     .filter(navFormUtils.isAttachment)

packages/fyllut-backend/src/routers/api/helpers/sendInn.ts

@@ -17,7 +17,7 @@ interface HovedDokument {
   document: string | null;
 }
 
-export interface Attachment {
+interface Attachment {
   vedleggsnr: string;
   tittel: string;
   label: string;
@@ -28,7 +28,7 @@ export interface Attachment {
   vedleggskjema?: string;
 }
 
-export interface SendInnSoknadBody {
+interface SendInnSoknadBody {
   brukerId: string;
   skjemanr: string;
   skjemapath: string;
@@ -49,13 +49,13 @@ const isValidUuid = (innsendingsId: string): boolean => {
 };
 
 const DEFAULT_LANGUAGE = 'nb-NO';
-export const objectToByteArray = (obj: object) => Array.from(new TextEncoder().encode(JSON.stringify(obj)));
+const objectToByteArray = (obj: object) => Array.from(new TextEncoder().encode(JSON.stringify(obj)));
 
-export const byteArrayToObject = (byteArray?: Buffer) => JSON.parse(new TextDecoder().decode(byteArray));
+const byteArrayToObject = (byteArray?: Buffer) => JSON.parse(new TextDecoder().decode(byteArray));
 
-export const sanitizeInnsendingsId = (innsendingsId: string) => innsendingsId.replace(/[./]/g, '');
+const sanitizeInnsendingsId = (innsendingsId: string) => innsendingsId.replace(/[./]/g, '');
 
-export const validateInnsendingsId = (innsendingsId: string | undefined, supplementaryMessage?: string) => {
+const validateInnsendingsId = (innsendingsId: string | undefined, supplementaryMessage?: string) => {
   let errorMessage;
   if (!innsendingsId) {
     errorMessage = 'InnsendingsId mangler.';
@@ -71,7 +71,7 @@ export const validateInnsendingsId = (innsendingsId: string | undefined, supplem
   return errorMessage;
 };
 
-export const isMellomLagringEnabled = (featureToggles: FeatureTogglesMap) => {
+const isMellomLagringEnabled = (featureToggles: FeatureTogglesMap) => {
   if (!featureToggles?.enableMellomlagring) {
     logger.debug('Mellomlagring not enabled, returning data in body');
     return false;
@@ -84,7 +84,7 @@ export const isMellomLagringEnabled = (featureToggles: FeatureTogglesMap) => {
   return true;
 };
 
-export const assembleSendInnSoknadBody = (
+const assembleSendInnSoknadBody = (
   requestBody: {
     form: NavFormType;
     submission: Submission;
@@ -159,3 +159,18 @@ export const assembleSendInnSoknadBody = (
 
   return body;
 };
+
+const isNotFound = (response: { status: number }, responseError: Error | undefined) =>
+  response.status === 404 ||
+  responseError?.['http_response_body']?.errorCode === 'illegalAction.applicationSentInOrDeleted';
+
+export {
+  assembleSendInnSoknadBody,
+  byteArrayToObject,
+  isMellomLagringEnabled,
+  isNotFound,
+  objectToByteArray,
+  sanitizeInnsendingsId,
+  validateInnsendingsId,
+};
+export type { Attachment, SendInnSoknadBody };

packages/fyllut-backend/src/routers/api/send-inn-soknad.ts

@@ -10,6 +10,7 @@ import {
   assembleSendInnSoknadBody,
   byteArrayToObject,
   isMellomLagringEnabled,
+  isNotFound,
   sanitizeInnsendingsId,
   validateInnsendingsId,
 } from './helpers/sendInn';
@@ -57,12 +58,11 @@ const sendInnSoknad = {
           `Feil ved kall til SendInn. ${getErrorMessage}`,
           true,
         );
-        if (
-          sendInnResponse.status === 404 ||
-          responseError?.['http_response_body']?.errorCode === 'illegalAction.applicationSentInOrDeleted'
-        ) {
+        if (isNotFound(sendInnResponse, responseError)) {
+          logger.info(`${sanitizedInnsendingsId}: Not found. Failed to get`, responseError);
           return res.sendStatus(404);
         }
+
         logger.debug('Failed to fetch data from SendInn');
         return next(responseError);
       }
@@ -115,6 +115,7 @@ const sendInnSoknad = {
       next(err);
     }
   },
+
   put: async (req: Request, res: Response, next: NextFunction) => {
     try {
       const idportenPid = getIdportenPid(req);
@@ -152,8 +153,18 @@ const sendInnSoknad = {
         logger.debug('Successfylly updated data in SendInn');
         res.json(await sendInnResponse.json());
       } else {
+        const responseError = await responseToError(
+          sendInnResponse,
+          `Feil ved kall til SendInn. ${putErrorMessage}`,
+          true,
+        );
+        if (isNotFound(sendInnResponse, responseError)) {
+          logger.info(`${sanitizedInnsendingsId}: Not found. Failed to update`, responseError);
+          return res.sendStatus(404);
+        }
+
         logger.debug('Failed to update data in SendInn');
-        next(await responseToError(sendInnResponse, `Feil ved kall til SendInn. ${putErrorMessage}`, true));
+        next(responseError);
       }
     } catch (err) {
       next(err);
@@ -192,8 +203,18 @@ const sendInnSoknad = {
         const json = await sendInnResponse.json();
         res.json(json);
       } else {
+        const responseError = await responseToError(
+          sendInnResponse,
+          `Feil ved kall til SendInn. ${deleteErrorMessage}`,
+          true,
+        );
+        if (isNotFound(sendInnResponse, responseError)) {
+          logger.info(`${sanitizedInnsendingsId}: Not found. Failed to delete`, responseError);
+          return res.sendStatus(404);
+        }
+
         logger.debug(`Failed to delete soknad with innsendingsId ${sanitizedInnsendingsId}`);
-        next(await responseToError(sendInnResponse, `Feil ved kall til SendInn. ${deleteErrorMessage}`, true));
+        next(responseError);
       }
     } catch (err) {
       next(err);

packages/fyllut-backend/src/routers/api/send-inn-utfylt-soknad.ts

@@ -9,6 +9,7 @@ import { createPdfAsByteArray } from './helpers/pdfService';
 import {
   assembleSendInnSoknadBody,
   isMellomLagringEnabled,
+  isNotFound,
   sanitizeInnsendingsId,
   validateInnsendingsId,
 } from './helpers/sendInn';
@@ -74,8 +75,14 @@ const sendInnUtfyltSoknad = {
         });
         res.sendStatus(201);
       } else {
+        const responseError = await responseToError(sendInnResponse, 'Feil ved kall til SendInn', true);
+        if (isNotFound(sendInnResponse, responseError)) {
+          logger.info(`${sanitizedInnsendingsId}: Not found. Failed to submit`, responseError);
+          return res.sendStatus(404);
+        }
+
         logger.debug('Failed to post data to SendInn');
-        next(await responseToError(sendInnResponse, 'Feil ved kall til SendInn', true));
+        next(responseError);
       }
     } catch (err) {
       next(err);