Fikser kommentarer etter PR

Author: nurrebass1

package.json

@@ -30,7 +30,7 @@
     "preview:bygger": "yarn workspace @navikt/bygger-backend preview",
     "preview:fyllut": "yarn workspace @navikt/fyllut-backend preview",
     "test": "concurrently \"yarn workspace @navikt/bygger-frontend test\" \"yarn workspace @navikt/bygger-backend test\" \"yarn workspace @navikt/fyllut-frontend test\" \"yarn workspace @navikt/fyllut-backend test\" \"yarn workspace @navikt/skjemadigitalisering-shared-domain test\" \"yarn workspace @navikt/skjemadigitalisering-shared-components test\"",
-    "test:nowarning": "NODE_OPTIONS=--no-warnings yarn test",
+    "test:nowarnings": "NODE_OPTIONS=--no-warnings yarn test",
     "test:bygger": "concurrently \"yarn workspace @navikt/bygger-frontend test\" \"yarn workspace @navikt/bygger-backend test\"",
     "test:fyllut": "concurrently \"yarn workspace @navikt/fyllut-frontend test\" \"yarn workspace @navikt/fyllut-backend test\"",
     "test:shared-domain": "yarn workspace @navikt/skjemadigitalisering-shared-domain test",

packages/bygger-backend/src/migration/migrationScripts.test.ts

@@ -143,7 +143,7 @@ describe('Migration scripts', () => {
           properties: {
             ...originalForm.properties,
             submissionTypes: ['DIGITAL'],
-            subsequentSubmissionTypes: [],
+            subsequentSubmissionTypes: ['PAPER', 'DIGITAL'],
           },
         };
         const { migratedForm: actual } = migrateForm(
@@ -341,7 +341,7 @@ describe('Migration scripts', () => {
             ...originalForm.properties,
             skjemanummer: 'Form1',
             submissionTypes: ['DIGITAL'],
-            subsequentSubmissionTypes: [],
+            subsequentSubmissionTypes: ['PAPER', 'DIGITAL'],
           },
         };
 

packages/bygger-backend/src/services/utils/formsApiUtils.ts

@@ -11,6 +11,10 @@ const createHeaders = (accessToken?: string, revisionId?: number) => {
   };
 };
 
+/**
+ *
+ * Metoden er implementert kun for å støtte bakoverkompatibilitet og skal fjernes ved migrering
+ */
 export const removeInnsendingTypeFromForm = (form: Form): Form => {
   const formProperties = (({ innsending, ettersending, ...rest }) => rest)(form.properties);
   return {

packages/bygger/cypress/fixtures/form123456-published.json

@@ -3508,7 +3508,7 @@
     "skjemanummer": "TST-123456",
     "tema": "DAG",
     "submissionTypes": ["PAPER", "DIGITAL"],
-    "subsequentSubmissionTypes": [],
+    "subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
     "signatures": [
       {
         "label": "Lege",

packages/bygger/cypress/fixtures/form123456.json

@@ -3375,7 +3375,7 @@
     "skjemanummer": "TST-123456",
     "tema": "DAG",
     "submissionTypes": ["PAPER", "DIGITAL"],
-    "subsequentSubmissionTypes": [],
+    "subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
     "signatures": [
       {
         "label": "Lege",

packages/fyllut-backend/src/routers/api/form.ts

@@ -50,6 +50,7 @@ const mapLimitedForm = (form: NavFormType, translate: TranslateFunction) => {
     properties: {
       skjemanummer: form.properties.skjemanummer,
       tema: form.properties.tema,
+      innsending: form.properties.innsending,
       submissionTypes: form.properties.submissionTypes,
       ettersending: form.properties.ettersending,
       subsequentSubmissionTypes: form.properties.subsequentSubmissionTypes,

packages/fyllut-backend/src/routers/api/forms.ts

@@ -10,6 +10,7 @@ const mapForm = (form): FormsResponseForm => ({
   properties: {
     skjemanummer: form.skjemanummer ?? form.properties.skjemanummer,
     submissionTypes: form.properties.submissionTypes,
+    ettersending: form.properties.ettersending,
     subsequentSubmissionTypes: form.properties.subsequentSubmissionTypes,
   },
 });

packages/shared-domain/src/form/index.ts

@@ -5,6 +5,10 @@ import { TextSize } from '../text';
 
 export type DisplayType = 'wizard' | 'form';
 export type FormType = 'form' | 'resource';
+/**
+ *
+ * InnsendingType skal fjernes ved migrering
+ */
 export type InnsendingType = 'PAPIR_OG_DIGITAL' | 'KUN_PAPIR' | 'KUN_DIGITAL' | 'INGEN';
 export type SubmissionType = 'PAPER' | 'DIGITAL';
 export type SubmissionMethod = 'paper' | 'digital';
@@ -293,8 +297,15 @@ export interface NavFormType {
   status?: string;
 }
 
+/**
+ *
+ * Fjern ettersending ved migrering
+ */
 export interface FormsResponseForm extends Pick<NavFormType, '_id' | 'title' | 'path' | 'modified'> {
-  properties: Pick<FormPropertiesType, 'skjemanummer' | 'subsequentSubmissionTypes' | 'submissionTypes'>;
+  properties: Pick<
+    FormPropertiesType,
+    'skjemanummer' | 'ettersending' | 'subsequentSubmissionTypes' | 'submissionTypes'
+  >;
 }
 
 export type SubmissionData = Record<string, string | number | boolean | any[] | object>;

packages/shared-domain/src/utils/forms-api-backwards-compatibility/form.ts

@@ -18,6 +18,10 @@ const mapFormToNavForm = (form: Form): NavFormType => {
   };
 };
 
+/**
+ *
+ * Metoden er implementert kun for å støtte bakoverkompatibilitet og skal fjernes ved migrering
+ */
 const mapInnsendingTypeToSubmissionTypes = (innsendingType?: InnsendingType): SubmissionType[] => {
   if (!innsendingType) return [];
 
@@ -33,6 +37,10 @@ const mapInnsendingTypeToSubmissionTypes = (innsendingType?: InnsendingType): Su
   }
 };
 
+/**
+ *
+ * Metoden er implementert kun for å støtte bakoverkompatibilitet og skal fjernes ved migrering
+ */
 const removeInnsendingFromForm = (form: NavFormType): NavFormType => {
   const formProperties = (({ innsending, ettersending, ...rest }) => rest)(form.properties);
   return {