@beinformed/ui 1.31.1 → 1.31.4

package/src/models/form/FormModel.js

@@ -119,8 +119,8 @@ class FormModel extends ResourceModel {
   getInitialChildModelLinks(): Array<LinkModel> {
     const endResultChildLinks = flattenDeep(
       this.endResultFormObjects.map((endResultFormObject) =>
-        endResultFormObject.getInitialChildModelLinks()
-      )
+        endResultFormObject.getInitialChildModelLinks(),
+      ),
     );
 
     if (this.currentFormObject === null) {
@@ -162,7 +162,7 @@ class FormModel extends ResourceModel {
    * @returns button label from contributions;
    */
   getButtonLabel(
-    buttonType: "cancel" | "previous" | "next" | "finish"
+    buttonType: "cancel" | "previous" | "next" | "finish",
   ): string | null {
     // cancel button labels are defined on the form
     if (buttonType === "cancel") {
@@ -244,7 +244,7 @@ class FormModel extends ResourceModel {
       if (this.data.results) {
         const resultObject = this.data.results.find(
           (result) =>
-            result.objectid === anchor.objectid && "elements" in result
+            result.objectid === anchor.objectid && "elements" in result,
         );
 
         if (resultObject) {
@@ -277,7 +277,7 @@ class FormModel extends ResourceModel {
   /**
    */
   addEmptyFormObject(
-    formObjectModel: FormObjectModel | null = this.currentFormObject
+    formObjectModel: FormObjectModel | null = this.currentFormObject,
   ) {
     if (formObjectModel) {
       const emptyFormObject = FormObjectModel.createEmpty(formObjectModel);
@@ -295,7 +295,7 @@ class FormModel extends ResourceModel {
     return Math.max(
       ...this.allObjects
         .filter((formObject) => formObject.equals(formObjectModel, false))
-        .map((formObject) => formObject.repeatIndex)
+        .map((formObject) => formObject.repeatIndex),
     );
   }
 
@@ -322,7 +322,7 @@ class FormModel extends ResourceModel {
    */
   getFormObjectByLayoutHint(hint: string): ?FormObjectModel {
     return this.allObjects.find((formObject) =>
-      formObject.layouthint.has(hint)
+      formObject.layouthint.has(hint),
     );
   }
 
@@ -334,12 +334,12 @@ class FormModel extends ResourceModel {
     }
     if (formObjectModel.equals(this.currentFormObject)) {
       throw new IllegalArgumentException(
-        "Can not remove the current form object"
+        "Can not remove the current form object",
       );
     }
 
     this.completedFormObjects = this.completedFormObjects.filter(
-      (formObject) => !formObject.equals(formObjectModel)
+      (formObject) => !formObject.equals(formObjectModel),
     );
   }
 
@@ -408,8 +408,8 @@ class FormModel extends ResourceModel {
           (endResult) =>
             new FormObjectModel(
               endResult,
-              this.contributions.objects[endResult.objectid]
-            )
+              this.contributions.objects[endResult.objectid],
+            ),
         );
       }
     }
@@ -421,13 +421,13 @@ class FormModel extends ResourceModel {
    */
   get expectsEndResultFormObjects(): boolean {
     const endResultKeys = this.endResultFormObjects.map(
-      (endResult) => endResult.key
+      (endResult) => endResult.key,
     );
 
     return this.objectKeys.some(
       (objectKey) =>
         this.contributions.objects?.[objectKey]?.content?.results &&
-        !endResultKeys.includes(objectKey)
+        !endResultKeys.includes(objectKey),
     );
   }
 
@@ -441,7 +441,7 @@ class FormModel extends ResourceModel {
    */
   getEndResultFormObjects(): Array<FormObjectModel> {
     return this.endResultFormObjects.filter(
-      (endResult) => !this.previousEndResultKeys.includes(endResult.key)
+      (endResult) => !this.previousEndResultKeys.includes(endResult.key),
     );
   }
 
@@ -449,7 +449,7 @@ class FormModel extends ResourceModel {
    */
   set endResultFormObjects(endResultFormObjects: Array<FormObjectModel>) {
     this.previousEndResultKeys = this.endResultFormObjects.map(
-      (endResult) => endResult.key
+      (endResult) => endResult.key,
     );
     this._endResultFormObjects = endResultFormObjects;
   }
@@ -525,14 +525,14 @@ class FormModel extends ResourceModel {
         error.id,
         error.message,
         error.parameters,
-        error.layouthint
+        error.layouthint,
       );
     } else {
       this.errorCollection.addServerError(
         error.id,
         error.message,
         undefined,
-        error.layouthint
+        error.layouthint,
       );
     }
   }
@@ -638,7 +638,7 @@ class FormModel extends ResourceModel {
       resultdata[resultDataKey] = new AttributeSetModel(
         resultDataKey,
         successData[resultDataKey],
-        this.contributions.resultdata[resultDataKey]
+        this.contributions.resultdata[resultDataKey],
       );
     }
 
@@ -657,7 +657,7 @@ class FormModel extends ResourceModel {
   setParameters(modularuiResponse: ModularUIResponse): Array<Parameter> {
     const parameters = modularuiResponse?.parameters ?? [];
     return parameters.map(
-      (par) => new Parameter(par._prefix, par._name, par._value)
+      (par) => new Parameter(par._prefix, par._name, par._value),
     );
   }
 
@@ -680,7 +680,7 @@ class FormModel extends ResourceModel {
     selfhref.method = HTTP_METHODS.POST;
 
     selfhref.parameters = this.parameters.filter(
-      (parameter) => parameter.name !== "commit"
+      (parameter) => parameter.name !== "commit",
     );
 
     return selfhref;
@@ -763,7 +763,7 @@ class FormModel extends ResourceModel {
    */
   getFormDataObjects(
     validOnly: boolean = true,
-    validationData: boolean = false
+    validationData: boolean = false,
   ): Array<Object> {
     const formdata = [];
 
@@ -790,7 +790,7 @@ class FormModel extends ResourceModel {
       const existingObjectIndex = formdata.findIndex(
         (obj) =>
           obj.key === formObject.key &&
-          obj.repeatIndex === formObject.repeatIndex
+          obj.repeatIndex === formObject.repeatIndex,
       );
 
       /*
@@ -800,7 +800,7 @@ class FormModel extends ResourceModel {
       if (existingObjectIndex > -1) {
         formdata[existingObjectIndex].formdata = deepmerge(
           formdata[existingObjectIndex].formdata,
-          objectFormData
+          objectFormData,
         );
       } else {
         formdata.push({
@@ -819,7 +819,7 @@ class FormModel extends ResourceModel {
   getFormData(
     validOnly: boolean = true,
     withConcurrencyToken: boolean = true,
-    validationData: boolean = false
+    validationData: boolean = false,
   ): string {
     if (withConcurrencyToken && this.tokens.length > 0) {
       return JSON.stringify({
@@ -841,7 +841,7 @@ class FormModel extends ResourceModel {
 
     this.allObjects.forEach((formObject) => {
       formObject.attributeCollection.all.forEach((item: AttributeType) =>
-        item.setUseClientsideValidation(enabled)
+        item.setUseClientsideValidation(enabled),
       );
     });
   }
@@ -878,7 +878,7 @@ class FormModel extends ResourceModel {
       this.completedFormObjects.filter(
         (formObject) =>
           !formObject.isRepeatWithUnknownTotal ||
-          formObject.key !== currentFormObjectKey
+          formObject.key !== currentFormObjectKey,
       ).length > 0
     );
   }
@@ -912,10 +912,10 @@ class FormModel extends ResourceModel {
       .filter((formObjectKey) => formObjectKey !== this.currentFormObject?.key);
 
     this.endResultFormObjects = this._endResultFormObjects.filter((endResult) =>
-      completedFormObjectKeys.includes(endResult.key)
+      completedFormObjectKeys.includes(endResult.key),
     );
     this.previousEndResultKeys = this.endResultFormObjects.map(
-      (endResult) => endResult.key
+      (endResult) => endResult.key,
     );
 
     // while we are at the same repeating form object, go a step back
@@ -923,7 +923,7 @@ class FormModel extends ResourceModel {
       this.currentFormObject &&
       this.currentFormObject.equals(
         oldCurrentFormObject,
-        this.currentFormObject.hasFixedNrOfRepeats
+        this.currentFormObject.hasFixedNrOfRepeats,
       )
     ) {
       this.setPreviousObject();
@@ -953,7 +953,7 @@ class FormModel extends ResourceModel {
     }
 
     const currentObjectIndex = this.objectKeys.findIndex(
-      (objectKey) => objectKey === this.currentFormObject?.key
+      (objectKey) => objectKey === this.currentFormObject?.key,
     );
     const isLastObject = this.objectKeys.length - 1 === currentObjectIndex;
 
@@ -1071,7 +1071,7 @@ class FormModel extends ResourceModel {
           error.id,
           error.message,
           error.properties,
-          error.layouthint
+          error.layouthint,
         );
       });
   }
@@ -1094,7 +1094,7 @@ class FormModel extends ResourceModel {
             error.id,
             error.message,
             error.properties,
-            new LayoutHintCollection(error.layouthint)
+            new LayoutHintCollection(error.layouthint),
           );
         }
       });
@@ -1161,14 +1161,14 @@ class FormModel extends ResourceModel {
         this.previouslyEnteredFormObjects.filter((formObject) =>
           formObject.equals(
             receivedCurrentFormObject,
-            formObject.hasFixedNrOfRepeats
-          )
+            formObject.hasFixedNrOfRepeats,
+          ),
         );
 
       if (previouslyEnteredFormObjects.length > 0) {
         this.handlePreviouslyEnteredFormObjects(
           receivedCurrentFormObject,
-          previouslyEnteredFormObjects
+          previouslyEnteredFormObjects,
         );
       } else {
         this.completedFormObjects = [...this.allObjects];
@@ -1195,13 +1195,13 @@ class FormModel extends ResourceModel {
    */
   handlePreviouslyEnteredFormObjects(
     receivedCurrentFormObject: FormObjectModel,
-    previouslyEnteredFormObjects: Array<FormObjectModel>
+    previouslyEnteredFormObjects: Array<FormObjectModel>,
   ) {
     previouslyEnteredFormObjects.forEach((previouslyEnteredFormObject) => {
       const mergedObject = this.mergePreviouslyEnteredObjects
         ? this.mergeObjects(
             receivedCurrentFormObject,
-            previouslyEnteredFormObject
+            previouslyEnteredFormObject,
           )
         : receivedCurrentFormObject;
 
@@ -1213,7 +1213,7 @@ class FormModel extends ResourceModel {
       this.previouslyEnteredFormObjects.filter((formObject) => {
         const hasPreviouslyEnteredObject = previouslyEnteredFormObjects.find(
           (previouslyEnteredFormObject) =>
-            formObject.equals(previouslyEnteredFormObject)
+            formObject.equals(previouslyEnteredFormObject),
         );
 
         return !hasPreviouslyEnteredObject;
@@ -1224,7 +1224,7 @@ class FormModel extends ResourceModel {
    */
   mergeObjects(
     newObject: FormObjectModel,
-    oldObject: FormObjectModel
+    oldObject: FormObjectModel,
   ): FormObjectModel {
     const mergedFormObject = FormObjectModel.createEmpty(newObject);
 

package/src/models/form/FormObjectModel.js

@@ -32,14 +32,14 @@ export default class FormObjectModel extends BaseModel {
     if (object && this.getElements().length > 0) {
       this._attributeCollection = new AttributeCollection(
         this.getElements(),
-        this.getApplicableAttributeContributions()
+        this.getApplicableAttributeContributions(),
       );
     } else {
       this._attributeCollection = new AttributeCollection();
     }
 
     this._contentConfiguration = new ContentConfiguration(
-      objectContributions ? objectContributions.content : {}
+      objectContributions ? objectContributions.content : {},
     );
 
     this._errorCollection = new ErrorCollection("formobject");
@@ -49,7 +49,7 @@ export default class FormObjectModel extends BaseModel {
     }
 
     this.attributeCollection.indicateContentConfiguration(
-      this.contentConfiguration
+      this.contentConfiguration,
     );
   }
 
@@ -58,12 +58,12 @@ export default class FormObjectModel extends BaseModel {
   static createEmpty(formObjectModel: FormObjectModel): FormObjectModel {
     if (!formObjectModel) {
       throw new IllegalArgumentException(
-        "createEmpty method needs a FormObjectModel as input argument to create a new version of the object"
+        "createEmpty method needs a FormObjectModel as input argument to create a new version of the object",
       );
     }
     return new FormObjectModel(
       formObjectModel.data,
-      formObjectModel.contributions
+      formObjectModel.contributions,
     );
   }
 
@@ -78,7 +78,7 @@ export default class FormObjectModel extends BaseModel {
       .filter((attribute) => !attribute.isResult)
       .some(
         (attribute) =>
-          object && object.attributeCollection.hasAttributeByKey(attribute.key)
+          object && object.attributeCollection.hasAttributeByKey(attribute.key),
       );
 
     const hasSameRepeatIndex = withRepeatIndex
@@ -140,12 +140,12 @@ export default class FormObjectModel extends BaseModel {
   getApplicableAttributeContributions(): Array<Object> {
     if (this.data && this.contributions) {
       const dataElementIds = this.getElements().map(
-        (element) => element.elementid
+        (element) => element.elementid,
       );
 
       const contributions = this.getAttributesInData(
         dataElementIds,
-        this.contributions.attributes
+        this.contributions.attributes,
       );
 
       // set all attribute mandatory for dynamic object
@@ -173,13 +173,13 @@ export default class FormObjectModel extends BaseModel {
    */
   getAttributesInData(
     dataElementIds: Array<string>,
-    attributesContributions: Object
+    attributesContributions: Object,
   ): Array<Object> {
     return attributesContributions.filter((attributeContributions) => {
       const [attributeKey] = Object.keys(attributeContributions);
 
       return dataElementIds.some(
-        (dataElementId) => dataElementId.split(".")[0] === attributeKey
+        (dataElementId) => dataElementId.split(".")[0] === attributeKey,
       );
     });
   }
@@ -374,7 +374,7 @@ export default class FormObjectModel extends BaseModel {
   isChangedSince(timestamp: number): boolean {
     return (
       this.attributeCollection.find((attribute) =>
-        attribute.isChangedSince(timestamp)
+        attribute.isChangedSince(timestamp),
       ) !== null
     );
   }
@@ -405,7 +405,7 @@ export default class FormObjectModel extends BaseModel {
         error.id,
         error.message,
         error.properties,
-        error.layouthint
+        error.layouthint,
       );
     }
   }
@@ -432,7 +432,7 @@ export default class FormObjectModel extends BaseModel {
   get isValid(): boolean {
     return (
       this.attributeCollection.visible.every(
-        (attribute) => attribute.isValid
+        (attribute) => attribute.isValid,
       ) && !this.errorCollection.hasItems
     );
   }
@@ -462,7 +462,7 @@ export default class FormObjectModel extends BaseModel {
       message: string,
       properties: MessageParameters,
       layouthint: Array<string>,
-    }>
+    }>,
   ) {
     const attributeErrors = [];
 
@@ -475,7 +475,7 @@ export default class FormObjectModel extends BaseModel {
             error.id,
             error.message,
             error.properties,
-            new LayoutHintCollection(error.layouthint)
+            new LayoutHintCollection(error.layouthint),
           );
         }
       }
@@ -492,7 +492,7 @@ export default class FormObjectModel extends BaseModel {
       | {
           elements: Array<{ elementid: string }>,
         }
-      | { anchor: { elementid: string } }
+      | { anchor: { elementid: string } },
     >,
   }) {
     const attributeErrors = [];

package/src/models/form/__tests__/FormModel.instrument.spec.js

@@ -43,8 +43,8 @@ describe("formModel Instrument Questions", () => {
     expect(form.currentFormObject.attributeCollection).toHaveLength(3);
     expect(
       form.currentFormObject.attributeCollection.filter(
-        (attr) => !attr.isResult
-      )
+        (attr) => !attr.isResult,
+      ),
     ).toHaveLength(1);
   });
 
@@ -77,7 +77,7 @@ describe("formModel Instrument Questions", () => {
     expect(form.formdata).toBe(
       JSON.stringify({
         objects: [],
-      })
+      }),
     );
 
     const attr1 = form.currentFormObject.getAttributeByKey("KmhTeHard");
@@ -92,7 +92,7 @@ describe("formModel Instrument Questions", () => {
             },
           },
         ],
-      })
+      }),
     );
 
     const nextData = ModularUIResponse.create({
@@ -134,7 +134,7 @@ describe("formModel Instrument Questions", () => {
             },
           },
         ],
-      })
+      }),
     );
 
     const attr2 = updatedForm.currentFormObject.getAttributeByKey("GordelOm");
@@ -149,7 +149,7 @@ describe("formModel Instrument Questions", () => {
             },
           },
         ],
-      })
+      }),
     );
 
     const thirdForm = new FormModel({
@@ -196,7 +196,7 @@ describe("formModel Instrument Questions", () => {
             },
           },
         ],
-      })
+      }),
     );
   });
 });

package/src/models/form/__tests__/FormModel.repeating.spec.js

@@ -36,7 +36,7 @@ describe("formModel repeating objects", () => {
     expect(form.currentFormObject.repeatIndex).toBe(1);
 
     expect(form.currentFormObject.getAttributeByKey("Name").mandatory).toBe(
-      true
+      true,
     );
 
     form.addEmptyFormObject(form.currentFormObject);
@@ -52,7 +52,7 @@ describe("formModel repeating objects", () => {
 
     expect(() => form.removeFormObject()).toThrow(IllegalArgumentException);
     expect(() => form.removeFormObject(form.currentFormObject)).toThrow(
-      IllegalArgumentException
+      IllegalArgumentException,
     );
 
     form.removeFormObject(form.allObjects[0]);

package/src/models/form/__tests__/FormModel.selfhref.spec.js

@@ -41,7 +41,7 @@ describe("formModel selfhref", () => {
     const form = new FormModel(formData);
 
     expect(form.selfhref.toString()).toBe(
-      "/persons/persons/create-person?commit=false"
+      "/persons/persons/create-person?commit=false",
     );
   });
 

package/src/models/form/__tests__/FormModel.spec.js

@@ -73,7 +73,7 @@ describe("formModel", () => {
 
     setTimeout(() => {
       expect(form.currentFormObject.attributeCollection.first.value).toBe(
-        "test"
+        "test",
       );
       expect(form.isChanged()).toBeTruthy();
     }, 2);
@@ -249,8 +249,8 @@ describe("formModel", () => {
               type: "ErrorType",
             },
           },
-        })
-      )
+        }),
+      ),
     );
 
     expect(form.errorCollection).toHaveLength(1);
@@ -506,7 +506,7 @@ describe("formModel", () => {
             },
           },
         ],
-      })
+      }),
     );
 
     const nextData = ModularUIResponse.create({
@@ -547,7 +547,7 @@ describe("formModel", () => {
             },
           },
         ],
-      })
+      }),
     );
 
     const thirdData = ModularUIResponse.create({
@@ -583,7 +583,7 @@ describe("formModel", () => {
           { Details: { Address: null } },
           { Details: { Address: "Second address" } },
         ],
-      })
+      }),
     );
   });
 

package/src/models/form/__tests__/FormResultData.spec.js

@@ -79,7 +79,7 @@ describe("formModel with result data", () => {
     expect(resultData.out.attributeCollection.size).toBe(1);
     expect(resultData.out.attributeCollection.first.label).toBe("Money");
     expect(resultData.out.attributeCollection.first.readonlyvalue).toBe(
-      "10,00"
+      "10,00",
     );
     expect(resultData.out.attributeCollection.first.currencySymbol).toBe("€");
   });

package/src/models/form/__tests__/FormWithContent.spec.js

@@ -18,7 +18,7 @@ describe("forms with content in data service", () => {
     expect(form.currentFormObject.label).toBe("Beslis noodzaak onderzoek");
 
     const attribute = form.currentFormObject.getAttributeByKey(
-      "UitslagBlaastestType"
+      "UitslagBlaastestType",
     );
 
     expect(attribute.hasContentFromData).toBe(true);
@@ -40,7 +40,7 @@ describe("forms with content in data service", () => {
       },
     ]);
     expect(attribute.content.sections[0].body).toBe(
-      "<p>Vul hier de code in die het testapparaat op het display heeft getoond</p>"
+      "<p>Vul hier de code in die het testapparaat op het display heeft getoond</p>",
     );
 
     const firstOption = attribute.options.first;
@@ -65,7 +65,7 @@ describe("forms with content in data service", () => {
       },
     ]);
     expect(firstOption.content.sections[0].body).toBe(
-      "<p>De blaastest heeft geen alcohol constateerd (versie 2017)</p>"
+      "<p>De blaastest heeft geen alcohol constateerd (versie 2017)</p>",
     );
   });
 });

package/src/models/grouping/GroupingModel.js

@@ -20,13 +20,13 @@ export class GroupModel {
 
     this._attributeCollection = new AttributeCollection(
       group,
-      context.attributes
+      context.attributes,
     );
 
     if (group.grouping) {
       this._grouping = new GroupingModel(
         { ...group.grouping, dynamicschema: group.dynamicschema },
-        contributions
+        contributions,
       );
     }
   }
@@ -126,7 +126,7 @@ export default class GroupingModel {
   createGroup(data: Object, contributions: Array<Context>): Array<Object> {
     const context = this.getContextFromContributionsByPrefix(
       contributions,
-      this._prefix
+      this._prefix,
     );
 
     return data.group.map((group) => {
@@ -137,7 +137,7 @@ export default class GroupingModel {
           dynamicschema,
         },
         context,
-        contributions
+        contributions,
       );
     });
   }
@@ -178,7 +178,7 @@ export default class GroupingModel {
    */
   getContextFromContributionsByPrefix(
     contexts: Array<Object>,
-    prefix: string | null
+    prefix: string | null,
   ): Object {
     if (contexts && prefix !== null) {
       return contexts.find((context) => context.prefix === prefix) || {};
@@ -191,7 +191,7 @@ export default class GroupingModel {
    */
   hasAttributeByKey(key: string): boolean {
     return this.groups.some((group: GroupModel) =>
-      group.hasAttributeByKey(key)
+      group.hasAttributeByKey(key),
     );
   }
 
@@ -199,7 +199,7 @@ export default class GroupingModel {
    */
   getAttributeByKey(key: string): AttributeType | null {
     const groupByKey = this.groups.find((group: GroupModel) =>
-      group.hasAttributeByKey(key)
+      group.hasAttributeByKey(key),
     );
 
     if (groupByKey) {

package/src/models/grouping/__tests__/GroupingModel.spec.js

@@ -63,11 +63,11 @@ describe("groupingModel", () => {
 
     expect(grouping.hasGroups()).toBe(true);
     expect(
-      grouping.getContextFromContributionsByPrefix(contributions, "G1_")
+      grouping.getContextFromContributionsByPrefix(contributions, "G1_"),
     ).toStrictEqual(contributions[0]);
     expect(grouping.hasAttributeByKey("G1_Name")).toBe(true);
     expect(grouping.getAttributeByKey("G1_Name")).toBeInstanceOf(
-      StringAttributeModel
+      StringAttributeModel,
     );
 
     const group = grouping.getGroupByAttributeKey("G1_Name");