fix: Validate max file size for attachments

CHANGES

@@ -1,3 +1,9 @@
+## 13.2.4-beta02
+
+---
+
+- Bug fix: Max size on attachments set in questionaire-extention is used to validate the file in stead of hard coded value of 4MB
+
 ## 13.2.2
 
 ---

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helsenorge/refero",
-  "version": "13.2.3",
+  "version": "13.2.4-beta02",
   "engines": {
     "node": "^18.0.0",
     "npm": ">=9.0.0"

src/components/formcomponents/attachment/__tests__/attachment-spec.tsx

@@ -0,0 +1,29 @@
+import { QuestionnaireItem } from '../../../../types/fhir';
+import { getMaxSizeExtensionValue } from '../../../../util/extension';
+
+describe('Attachment form component', () => {
+  const questionExtention: QuestionnaireItem = {
+    linkId: '4c71df6e-d743-46ba-d81f-f62777ffddb4',
+    type: 'attachment',
+    text: '5mb',
+    extension: [
+      {
+        url: 'http://hl7.org/fhir/StructureDefinition/maxSize',
+        valueDecimal: 5,
+      },
+    ],
+  };
+  it('Should give back right value from extention in MB', () => {
+    const test = getMaxSizeExtensionValue(questionExtention);
+    expect(test).toBe(5);
+  });
+  const question: QuestionnaireItem = {
+    linkId: '4c71df6e-d743-46ba-d81f-f62777ffddb4',
+    type: 'attachment',
+    text: 'No extention',
+  };
+  it('Should fail to undefined without extention', () => {
+    const test = getMaxSizeExtensionValue(question);
+    expect(test).toBe(undefined);
+  });
+});

src/components/formcomponents/attachment/attachmenthtml.tsx

@@ -11,7 +11,7 @@ import { sizeIsValid, mimeTypeIsValid } from '@helsenorge/file-upload/components
 import Validation, { ValidationProps } from '@helsenorge/form/components/form/validation';
 
 import constants, { VALID_FILE_TYPES } from '../../../constants';
-import { getValidationTextExtension } from '../../../util/extension';
+import { getMaxSizeExtensionValue, getValidationTextExtension } from '../../../util/extension';
 import { Resources } from '../../../util/resources';
 
 interface Props {
@@ -65,7 +65,12 @@ const attachmentHtml: React.SFC<Props & ValidationProps> = ({
   children,
   ...other
 }) => {
-  const maxFilesize = attachmentMaxFileSize ? attachmentMaxFileSize : constants.MAX_FILE_SIZE;
+  const maxValueFromQuestionaire = getMaxSizeExtensionValue(item);
+  const maxFilesize = maxValueFromQuestionaire
+    ? maxValueFromQuestionaire * 1024 * 1024
+    : attachmentMaxFileSize
+    ? attachmentMaxFileSize
+    : constants.MAX_FILE_SIZE;
   const validFileTypes = attachmentValidTypes ? attachmentValidTypes : VALID_FILE_TYPES;
   const deleteText = resources ? resources.deleteAttachmentText : undefined;
 
@@ -118,7 +123,7 @@ function getErrorMessage(
     if (!mimeTypeIsValid(file, validFileTypes)) {
       return resources.validationFileType;
     } else if (!sizeIsValid(file, maxFileSize)) {
-      return resources.validationFileMax;
+      return resources.validationFileMax.replace('25', (maxFileSize / 1024 / 1024).toString());
     }
   }
 

src/constants/extensions.ts

@@ -12,6 +12,7 @@ export default {
   MARKDOWN_URL: 'http://hl7.org/fhir/StructureDefinition/rendering-markdown',
   QUESTIONNAIRE_HIDDEN: 'http://hl7.org/fhir/StructureDefinition/questionnaire-hidden',
   ORDINAL_VALUE: 'http://hl7.org/fhir/StructureDefinition/ordinalValue',
+  MAX_SIZE_URL: 'http://hl7.org/fhir/StructureDefinition/maxSize',
 
   VALIDATIONTEXT_URL: 'http://ehelse.no/fhir/StructureDefinition/validationtext',
   REPEATSTEXT_URL: 'http://ehelse.no/fhir/StructureDefinition/repeatstext',

src/util/extension.ts

@@ -103,6 +103,17 @@ export function getQuestionnaireUnitExtensionValue(item: QuestionnaireItem): Cod
   return extension.valueCoding;
 }
 
+export function getMaxSizeExtensionValue(item: QuestionnaireItem): number | undefined {
+  const maxValue = getExtension(ExtensionConstants.MAX_SIZE_URL, item);
+  if (maxValue && maxValue.valueDecimal !== null && maxValue.valueDecimal !== undefined) {
+    return Number(maxValue.valueDecimal);
+  }
+  if (maxValue && maxValue.valueInteger !== null && maxValue.valueInteger !== undefined) {
+    return Number(maxValue.valueInteger);
+  }
+  return undefined;
+}
+
 export function getMaxValueExtensionValue(item: QuestionnaireItem): number | undefined {
   const maxValue = getExtension(ExtensionConstants.MAX_VALUE_URL, item);
   if (maxValue && maxValue.valueDecimal !== null && maxValue.valueDecimal !== undefined) {