Fix tests for forsteside

Author: lotorvik

packages/shared-components/src/util/forsteside/forsteside.test.ts

@@ -1,4 +1,9 @@
-import { ForstesideRequestBody, Mottaksadresse, NavFormType } from '@navikt/skjemadigitalisering-shared-domain';
+import {
+  ForstesideRequestBody,
+  Mottaksadresse,
+  NavFormType,
+  SubmissionDefault,
+} from '@navikt/skjemadigitalisering-shared-domain';
 import { genererFoerstesideData } from './forsteside';
 import { genererAdresse, genererPersonalia } from './forstesideDepricatedUtils';
 import { getAttachmentLabels, getAttachments, getAttachmentTitles, getRecipients, getTitle } from './forstesideUtils';
@@ -347,7 +352,7 @@ describe('forsteside', () => {
 
     describe('Språkkode', () => {
       const defaultForm = { properties: { skjemanummer: 'TST 10.11-12' }, components: [] };
-      const defaultSubmission = {};
+      const defaultSubmission = {} as SubmissionDefault;
 
       it('Bokmål brukes dersom språk ikke er valgt', () => {
         const forstesideRequest = genererFoerstesideData(defaultForm, defaultSubmission, undefined);

packages/shared-components/src/util/forsteside/forsteside.ts

@@ -1,9 +1,4 @@
-import {
-  ForstesideRequestBody,
-  Mottaksadresse,
-  Submission,
-  SubmissionDefault,
-} from '@navikt/skjemadigitalisering-shared-domain';
+import { ForstesideRequestBody, Mottaksadresse, SubmissionDefault } from '@navikt/skjemadigitalisering-shared-domain';
 import {
   getAttachmentLabels,
   getAttachmentTitles,
@@ -15,7 +10,7 @@ import {
 
 const genererFoerstesideData = (
   form,
-  submission: Submission,
+  submission: SubmissionDefault,
   language = 'nb-NO',
   recipients: Mottaksadresse[] = [],
   unitNumber?: string,

packages/shared-components/src/util/forsteside/forstesideUtils.ts

@@ -4,7 +4,6 @@ import {
   MottaksadresseData,
   NavFormType,
   navFormUtils,
-  Submission,
   SubmissionAttachmentValue,
   SubmissionDefault,
   UkjentBruker,
@@ -54,15 +53,15 @@ const getUserData = (submission: SubmissionDefault): BrukerInfo => {
   }
 };
 
-const getAttachmentTitles = (form: NavFormType, submission: Submission): string[] => {
+const getAttachmentTitles = (form: NavFormType, submission: SubmissionDefault): string[] => {
   return getAttachments(submission, form).map((component) => component.properties!.vedleggstittel!);
 };
 
-const getAttachmentLabels = (form: NavFormType, submission: Submission): string[] => {
+const getAttachmentLabels = (form: NavFormType, submission: SubmissionDefault): string[] => {
   return getAttachments(submission, form).map((component) => component.label);
 };
 
-const getAttachments = (submission: Submission, form: NavFormType) => {
+const getAttachments = (submission: SubmissionDefault, form: NavFormType) => {
   return navFormUtils
     .flattenComponents(form.components)
     .filter((component) => component.properties && !!component.properties.vedleggskode)

packages/shared-domain/src/submission/submission.ts

@@ -2,6 +2,7 @@ import SubmissionAddress from './address';
 import SubmissionIdentity from './identity';
 
 interface SubmissionDefault {
+  [key: string]: any;
   fornavn?: string;
   etternavn?: string;
   identitet?: SubmissionIdentity;