Fix/missing translations for attachments

packages/bygger/src/translations/utils.test.ts

@@ -3,10 +3,13 @@ import {
   FormioTranslationMap,
   MockedComponentObjectForTest,
   NavFormType,
+  TEXTS,
 } from '@navikt/skjemadigitalisering-shared-domain';
 import { getFormTexts, getTextsAndTranslationsForForm, getTextsAndTranslationsHeaders } from './utils';
 
 const {
+  createDummyAttachment,
+  createDummyAttachmentValues,
   createDummyCheckbox,
   createDummyContainerElement,
   createDummyContentElement,
@@ -284,6 +287,44 @@ describe('testGetAllTextsAndTypeForForm', () => {
       { text: 'Juice', type: 'text' },
     ]);
   });
+
+  it('Test form with Attachment', () => {
+    const actual = getFormTexts(
+      createFormObject(
+        [
+          createPanelObject(
+            'Vedleggspanel',
+            [
+              createDummyAttachment(
+                'Mitt vedlegg',
+                { vedleggstittel: 'Vedleggstittel', vedleggskode: 'ABC' },
+                createDummyAttachmentValues([
+                  { key: 'leggerVedNaa' },
+                  { key: 'ettersender', label: 'Ettersending label', description: 'Ettersending description' },
+                  { key: 'harIkke', label: 'Har ikke label' },
+                ]),
+              ),
+            ],
+            'Vedleggspanel',
+          ),
+        ],
+        'title',
+      ),
+      true,
+    );
+    expect(actual).toEqual([
+      { text: 'title', type: 'text' },
+      { text: 'Vedleggspanel', type: 'text' },
+      { text: 'Mitt vedlegg', type: 'text' },
+      { text: TEXTS.statiske.attachment.leggerVedNaa, type: 'text' },
+      { text: TEXTS.statiske.attachment.ettersender, type: 'text' },
+      { text: 'Ettersending label', type: 'text' },
+      { text: 'Ettersending description', type: 'text' },
+      { text: TEXTS.statiske.attachment.harIkke, type: 'text' },
+      { text: 'Har ikke label', type: 'text' },
+    ]);
+  });
+
   it('Test form with button component', () => {
     const actual = getFormTexts(
       createFormObject(

packages/bygger/src/translations/utils.ts

@@ -17,6 +17,7 @@ import {
   NavFormType,
   navFormUtils,
   signatureUtils,
+  TEXTS,
 } from '@navikt/skjemadigitalisering-shared-domain';
 
 type TextObjectType = { text: string; type?: InputType };
@@ -183,10 +184,12 @@ const getAttachmentTexts = (attachmentValues?: AttachmentSettingValues): undefin
     return undefined;
   }
 
-  return Object.values(attachmentValues).flatMap((value: AttachmentSettingValue) => {
-    return value.additionalDocumentation
+  return Object.entries(attachmentValues).flatMap(([key, value]: [string, AttachmentSettingValue]) => {
+    const option = value.enabled ? [TEXTS.statiske.attachment[key]] : [];
+    const additionalDocumentation = value.additionalDocumentation
       ? [value?.additionalDocumentation?.label, value?.additionalDocumentation?.description]
       : [];
+    return [...option, ...additionalDocumentation];
   });
 };
 
@@ -205,11 +208,11 @@ const getFormTexts = (form?: NavFormType, withInputType = false): TextObjectType
   return simplifiedComponentObject
     .flatMap((component) =>
       Object.keys(component)
-        .filter((key) => component[key] !== undefined && key !== 'attachmentValues')
+        .filter((key) => component[key] !== undefined)
         .flatMap((key) => {
-          if (key === 'values' || key === 'data' || key === 'accordionValues') {
+          if (key === 'values' || key === 'data' || key === 'accordionValues' || key === 'attachmentValues') {
             return component[key]
-              .filter((value) => value !== '')
+              .filter((value) => !!value)
               .map((value) => textObject(withInputType, value)) as TextObjectType;
           }
           return textObject(withInputType, component[key]);

packages/shared-domain/src/summary/MockedComponentObjectForTest.ts

@@ -1,3 +1,4 @@
+import { AttachmentSettingValues } from '../attachment';
 import type { Component, ComponentProperties, FormPropertiesType, NavFormType } from '../form';
 import FormioUtils from '../utils/formio/FormioUtils';
 
@@ -70,38 +71,43 @@ const createDummyRadioPanel = (
     navId,
   }) as Component;
 
-const defaultAttachmentValues: RadioPanelOption[] = [
-  {
-    value: 'leggerVedNaa',
-    label: 'Jeg legger det ved denne søknaden (anbefalt)',
-  },
-  {
-    value: 'ettersender',
-    label:
-      'Jeg ettersender dokumentasjonen senere (jeg er klar over at NAV ikke kan behandle søknaden før jeg har levert dokumentasjonen)',
-  },
-  {
-    value: 'levertTidligere',
-    label: 'Jeg har levert denne dokumentasjonen tidligere',
-  },
-];
+const defaultAttachmentValues: AttachmentSettingValues = {
+  leggerVedNaa: { enabled: true },
+  ettersender: { enabled: true },
+  levertTidligere: { enabled: true },
+};
 
 const defaultAttachmentProperties: ComponentProperties = {
   vedleggstittel: 'Bekreftelse fra skole',
   vedleggskode: 'S1',
 };
 
+const createDummyAttachmentValues = (
+  values: Array<{ key: keyof AttachmentSettingValues; label?: string; description?: string; showDeadline?: boolean }>,
+): AttachmentSettingValues => {
+  return Object.fromEntries(
+    values.map(({ key, label, description, showDeadline }) => [
+      key,
+      {
+        enabled: true,
+        showDeadline,
+        ...{ additionalDocumentation: label || description ? { enabled: true, label, description } : undefined },
+      },
+    ]),
+  );
+};
+
 const createDummyAttachment = (
   label = 'Vedlegg1',
   properties: ComponentProperties = defaultAttachmentProperties,
-  values: RadioPanelOption[] = defaultAttachmentValues,
+  attachmentValues: AttachmentSettingValues = defaultAttachmentValues,
   navId: string = createNavId(),
 ): Component =>
   ({
     label,
     key: keyFromLabel(label),
-    type: 'radiopanel',
-    values,
+    type: 'attachment',
+    attachmentValues,
     properties,
     navId,
   }) as Component;
@@ -366,6 +372,7 @@ const mockedComponentObjectForTest = {
   createDummyEmail,
   createDummyRadioPanel,
   createDummyAttachment,
+  createDummyAttachmentValues,
   createDummyRadioPanelWithNumberValues,
   createDummySelectboxes,
   createDummyImage,