Showing correct min and max files validation text

andreasnp · andreasnp · commit 57dbfdfe5974 · 2025-01-15T15:21:12.000+01:00
diff --git a/preview/resources/referoResources.ts b/preview/resources/referoResources.ts
@@ -64,7 +64,8 @@ export const getResources = (language: string): Resources => {
       previousStep: 'Previous',
       attachmentError_required: 'Upload file',
       attachmentError_minFiles: 'Add at least {0} file(s)',
-      attachmentError_maxFiles: 'Maximum of {0} file(s) are allowed',
+      attachmentError_maxFiles: 'Maximum of {1} file(s) are allowed',
+      attachmentError_minFiles_and_maxFiles: 'At least {0} file(s) and a maximum of {1} file(s) are allowed',
       attachmentError_fileSize: 'File size must be less than {0}MB',
       attachmentError_fileType: 'Allowed file types are:',
       dateError_invalid: 'Invalid date',
@@ -152,7 +153,8 @@ export const getResources = (language: string): Resources => {
       previousStep: 'Précédent',
       attachmentError_required: 'Upload file',
       attachmentError_minFiles: 'Add at least {0} file(s)',
-      attachmentError_maxFiles: 'Maximum of {0} file(s) are allowed',
+      attachmentError_maxFiles: 'Maximum of {1} file(s) are allowed',
+      attachmentError_minFiles_and_maxFiles: 'At least {0} file(s) and a maximum of {1} file(s) are allowed',
       attachmentError_fileSize: 'File size must be less than {0}MB',
       attachmentError_fileType: 'Allowed file types are:',
       dateError_invalid: 'Invalid date',
@@ -239,7 +241,8 @@ export const getResources = (language: string): Resources => {
     previousStep: 'Forrige',
     attachmentError_required: 'Last opp fil',
     attachmentError_minFiles: 'Legg til minst {0} fil(er)',
-    attachmentError_maxFiles: 'Maks {0} fil(er) er tillatt',
+    attachmentError_maxFiles: 'Maks {1} fil(er) er tillatt',
+    attachmentError_minFiles_and_maxFiles: 'Minst {0} fil(er) og maks {1} fil(er) er tillatt',
     attachmentError_fileSize: 'Filstørrelse må være mindre enn {0}MB',
     attachmentError_fileType: 'Tillatte filtyper er:',
     dateError_invalid: 'Ugyldig dato',
diff --git a/preview/skjema/q.json b/preview/skjema/q.json
@@ -59,158 +59,28 @@
       }
     }
   ],
-  "id": "a93bf3e9-d09c-4625-8b92-7c2b80e78ab2",
+  "id": "8eb85cb6-b384-43f3-ae49-7f6b263f26bf",
   "item": [
     {
-      "linkId": "3c1d0ce2-0092-47f5-80d9-49ee4c408e9a",
-      "type": "group",
-      "text": "Masse text",
-      "item": [
-        {
-          "linkId": "e92f2c98-7725-4054-8b8b-b1eedbfca679",
-          "type": "display",
-          "text": "Textenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfg",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-              "valueCodeableConcept": {
-                "coding": [
-                  {
-                    "system": "http://hl7.org/fhir/ValueSet/questionnaire-item-control",
-                    "code": "highlight"
-                  }
-                ]
-              }
-            }
-          ],
-          "required": false
-        },
-        {
-          "linkId": "cf760c67-e129-433a-8ba3-f2d0d390c561",
-          "type": "display",
-          "text": "Textenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfg",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-              "valueCodeableConcept": {
-                "coding": [
-                  {
-                    "system": "http://hl7.org/fhir/ValueSet/questionnaire-item-control",
-                    "code": "highlight"
-                  }
-                ]
-              }
-            }
-          ],
-          "required": false
-        },
-        {
-          "linkId": "5706c393-f1d3-4fa8-8c0e-b9cd12f926a4",
-          "type": "display",
-          "text": "Textenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfg",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-              "valueCodeableConcept": {
-                "coding": [
-                  {
-                    "system": "http://hl7.org/fhir/ValueSet/questionnaire-item-control",
-                    "code": "highlight"
-                  }
-                ]
-              }
-            }
-          ],
-          "required": false
-        },
-        {
-          "linkId": "d9934477-4e1a-432c-8926-44919f5e36bc",
-          "type": "display",
-          "text": "Textenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfg",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-              "valueCodeableConcept": {
-                "coding": [
-                  {
-                    "system": "http://hl7.org/fhir/ValueSet/questionnaire-item-control",
-                    "code": "highlight"
-                  }
-                ]
-              }
-            }
-          ],
-          "required": false
-        },
-        {
-          "linkId": "6002e306-9659-4fe8-8aa4-7aa43089ced9",
-          "type": "display",
-          "text": "Textenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfgTextenba sda adasdsdg sfsdgdfgdfb dsdssd f<sdf <dsfg sdfsfdsfsd gfsg dfghdfg dhdfh gdfh dfgsdfgd fg dfg dfgdfgd fgd gdfg dfg dfg dfg dfg dfg dfgdf gdfg dfg dfgd dfg dfg dfg dfg",
-          "extension": [
-            {
-              "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
-              "valueCodeableConcept": {
-                "coding": [
-                  {
-                    "system": "http://hl7.org/fhir/ValueSet/questionnaire-item-control",
-                    "code": "highlight"
-                  }
-                ]
-              }
-            }
-          ],
-          "required": false
-        }
-      ],
-      "required": false
-    },
-    {
-      "linkId": "6180d900-5082-4bea-879f-33b678656b2e",
+      "linkId": "6aa0c52a-67e4-4122-86ac-f45e454fbb87",
       "type": "attachment",
-      "text": "Mandatory",
+      "text": "Last opp et vedlegg",
       "extension": [
-        {
-          "url": "http://helsenorge.no/fhir/StructureDefinition/sdf-sublabel",
-          "valueMarkdown": "22323"
-        },
         {
           "url": "http://hl7.org/fhir/StructureDefinition/maxSize",
-          "valueDecimal": 3
-        }
-      ],
-      "required": true
-    },
-    {
-      "linkId": "c3dd9f35-00ad-4d4d-e256-7080ff9594fd",
-      "type": "attachment",
-      "text": "Mandatory 2",
-      "extension": [
-        {
-          "url": "http://helsenorge.no/fhir/StructureDefinition/sdf-sublabel",
-          "valueMarkdown": "22323"
+          "valueDecimal": 5
         },
         {
-          "url": "http://hl7.org/fhir/StructureDefinition/maxSize",
-          "valueDecimal": 3
-        }
-      ],
-      "required": true
-    },
-    {
-      "linkId": "ee1e9262-1371-45be-9c96-d53fe1d0dcbd",
-      "type": "attachment",
-      "text": "Mandatory 3",
-      "extension": [
-        {
-          "url": "http://helsenorge.no/fhir/StructureDefinition/sdf-sublabel",
-          "valueMarkdown": "22323"
+          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-minOccurs",
+          "valueInteger": 2
         },
         {
-          "url": "http://hl7.org/fhir/StructureDefinition/maxSize",
-          "valueDecimal": 3
+          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-maxOccurs",
+          "valueInteger": 3
         }
       ],
-      "required": true
+      "required": true,
+      "repeats": true
     }
   ]
 }
diff --git a/src/components/formcomponents/attachment/attachment-validation.ts b/src/components/formcomponents/attachment/attachment-validation.ts
@@ -4,6 +4,7 @@ import { UploadFile } from '@helsenorge/file-upload/components/file-upload';
 
 import { convertBytesToMBString } from './attachmentUtil';
 import { getValidationTextExtension } from '@/util/extension';
+import { Resources } from '@/util/resources';
 
 export const validateMinFiles = (
   files: UploadFile[],
@@ -15,8 +16,8 @@ export const validateMinFiles = (
   if (!minFiles || (files && files.length >= minFiles)) {
     return true;
   }
-  if (getCustomValidationText(item, genericErrorText)) {
-    return getCustomValidationText(item, genericErrorText);
+  if (getValidationTextForAttachment(item, genericErrorText)) {
+    return getValidationTextForAttachment(item, genericErrorText);
   }
   return errorMessage ? errorMessage.replace('{0}', minFiles.toString()) : '';
 };
@@ -31,8 +32,8 @@ export const validateMaxFiles = (
   if (!maxFiles || (files && files.length <= maxFiles)) {
     return true;
   }
-  if (getCustomValidationText(item, genericErrorText)) {
-    return getCustomValidationText(item, genericErrorText);
+  if (getValidationTextForAttachment(item, genericErrorText)) {
+    return getValidationTextForAttachment(item, genericErrorText);
   }
   return errorMessage ? errorMessage.replace('{0}', maxFiles.toString()) : '';
 };
@@ -47,8 +48,8 @@ export const validateFileSize = (
   if (sizeIsValid(file, maxSize)) {
     return true;
   }
-  if (getCustomValidationText(item, genericErrorText)) {
-    return getCustomValidationText(item, genericErrorText);
+  if (getValidationTextForAttachment(item, genericErrorText)) {
+    return getValidationTextForAttachment(item, genericErrorText);
   }
   return errorMessage ? errorMessage.replace('{0}', convertBytesToMBString(maxSize)) : '';
 };
@@ -63,8 +64,8 @@ export const validateFileType = (
   if (mimeTypeIsValid(file, validTypes)) {
     return true;
   }
-  if (getCustomValidationText(item, genericErrorText)) {
-    return getCustomValidationText(item, genericErrorText);
+  if (getValidationTextForAttachment(item, genericErrorText)) {
+    return getValidationTextForAttachment(item, genericErrorText);
   }
   return errorMessage ? errorMessage + ` ${validTypes.join(', ')}.` : '';
 };
@@ -83,14 +84,36 @@ const sizeIsValid = (file: UploadFile, size: number): boolean => {
   return true;
 };
 
-export const getCustomValidationText = (item?: QuestionnaireItem, genericErrorText?: string): string => {
-  const validationText = getValidationTextExtension(item);
-  if (validationText) {
-    return validationText;
+export const getNumberOfFilesValidationText = (
+  item: QuestionnaireItem | undefined,
+  minFiles: number | undefined,
+  maxFiles: number | undefined,
+  resources: Resources | undefined
+): string => {
+  let validationText =
+    (minFiles && !maxFiles && resources?.attachmentError_minFiles) ||
+    (maxFiles && !minFiles && resources?.attachmentError_maxFiles) ||
+    (maxFiles && minFiles && resources?.attachmentError_minFiles_and_maxFiles) ||
+    undefined;
+
+  if (minFiles) {
+    validationText = validationText?.replace('{0}', minFiles?.toString());
+  }
+  if (maxFiles) {
+    validationText = validationText?.replace('{1}', maxFiles?.toString());
+  }
+
+  return getValidationTextForAttachment(item, validationText);
+};
+
+export const getValidationTextForAttachment = (item?: QuestionnaireItem, validationText?: string): string => {
+  const validationTextExtension = getValidationTextExtension(item);
+  if (validationTextExtension) {
+    return validationTextExtension;
   }
 
-  if (genericErrorText) {
-    return genericErrorText;
+  if (validationText) {
+    return validationText;
   }
   return '';
 };
diff --git a/src/components/formcomponents/attachment/attachmenthtml.tsx b/src/components/formcomponents/attachment/attachmenthtml.tsx
@@ -7,7 +7,7 @@ import NotificationPanel from '@helsenorge/designsystem-react/components/Notific
 import FileUpload, { MimeTypes, UploadFile } from '@helsenorge/file-upload/components/file-upload';
 import { useFileUpload } from '@helsenorge/file-upload/components/file-upload/useFileUpload';
 
-import { getCustomValidationText } from './attachment-validation';
+import { getNumberOfFilesValidationText, getValidationTextForAttachment } from './attachment-validation';
 import {
   validateNumberOfFiles,
   validateFileType,
@@ -20,12 +20,12 @@ import { getId, isReadOnly } from '@/util';
 import { Resources } from '@/util/resources';
 
 import { ReferoLabel } from '@/components/referoLabel/ReferoLabel';
-import { TextMessage } from '@/types/text-message';
 import { QuestionnaireComponentItemProps } from '@/components/createQuestionnaire/GenerateQuestionnaireComponents';
 import { ReadOnly } from '../read-only/readOnly';
 import { getErrorMessage } from '@/components/validation/rules';
 import { shouldValidate } from '@/components/validation/utils';
 import { useAttachmentSync } from './useAttachmentSync';
+import { TextMessage } from '@/types/text-message';
 
 type Props = QuestionnaireComponentItemProps & {
   onUpload: (files: UploadFile[]) => void;
@@ -78,18 +78,12 @@ const AttachmentHtml = (props: Props): JSX.Element | null => {
 
   const fieldState = getFieldState(idWithLinkIdAndItemIndex, formState);
   const { error } = fieldState;
-  const numberOfFilesMessage = getCustomValidationText(
-    item,
-    (minFiles && !maxFiles && resources?.attachmentError_minFiles) ||
-      (maxFiles && !minFiles && resources?.attachmentError_maxFiles) ||
-      (maxFiles && minFiles && resources?.attachmentError_minFiles) ||
-      undefined
-  );
-  const validationFileTypesMessage = getCustomValidationText(item, resources?.attachmentError_fileType);
+  const numberOfFilesValidationText = getNumberOfFilesValidationText(item, minFiles, maxFiles, resources);
+  const fileTypesValidationText = getValidationTextForAttachment(item, resources?.attachmentError_fileType);
   const maxValueBytes = getAttachmentMaxSizeBytesToUse(attachmentMaxFileSize, item);
 
   const validFileTypes: MimeTypes[] = attachmentValidTypes ? attachmentValidTypes : VALID_FILE_TYPES;
-  const filSizeErrorMessage = resources?.attachmentError_fileSize?.replace(
+  const filSizeValidationText = resources?.attachmentError_fileSize?.replace(
     '{0}',
     convertBytesToMBString(getAttachmentMaxSizeBytesToUse(attachmentMaxFileSize, item))
   );
@@ -102,12 +96,12 @@ const AttachmentHtml = (props: Props): JSX.Element | null => {
   } = useFileUpload(
     internalRegister,
     [
-      validateFileType(validFileTypes, validationFileTypesMessage),
-      validateFileSize(0, maxValueBytes, getCustomValidationText(item, filSizeErrorMessage || 'total file size')),
+      validateFileType(validFileTypes, fileTypesValidationText),
+      validateFileSize(0, maxValueBytes, getValidationTextForAttachment(item, filSizeValidationText || 'total file size')),
     ],
     [
-      validateNumberOfFiles(minFiles ?? 0, maxFiles ?? 20, numberOfFilesMessage || 'Number of files'),
-      validateTotalFileSize(0, maxValueBytes, getCustomValidationText(item, filSizeErrorMessage || 'total file size')),
+      validateNumberOfFiles(minFiles ?? 0, maxFiles ?? 20, numberOfFilesValidationText || 'Number of files'),
+      validateTotalFileSize(0, maxValueBytes, getValidationTextForAttachment(item, filSizeValidationText || 'total file size')),
     ]
   );
 
diff --git a/src/util/resources.ts b/src/util/resources.ts
@@ -244,9 +244,13 @@ export interface Resources {
    */
   attachmentError_minFiles?: string;
   /**
-   * Maks {0} fil(er) er tillatt
+   * Maks {1} fil(er) er tillatt
    */
   attachmentError_maxFiles?: string;
+  /**
+   * Minst {0} fil(er) og maks {1} fil(er) er tillatt
+   */
+  attachmentError_minFiles_and_maxFiles?: string;
   /**
    * Filstørrelse må være mindre enn {0}MB
    */
