@beinformed/ui 1.31.0 → 1.31.3

package/src/models/attributes/BooleanAttributeModel.js

@@ -29,7 +29,7 @@ export default class BooleanAttributeModel extends AttributeModel {
     this._options = ChoiceAttributeOptionCollection.create(
       attribute,
       attributeContributions,
-      this.referenceDate
+      this.referenceDate,
     );
   }
 
@@ -67,7 +67,7 @@ export default class BooleanAttributeModel extends AttributeModel {
   get choicetype(): "checkbox" | "radiobutton" | "combobox" | "toggle" {
     return (
       ["checkbox", "radiobutton", "combobox", "toggle"].find((hint) =>
-        this.layouthint.has(hint)
+        this.layouthint.has(hint),
       ) || "radiobutton"
     );
   }
@@ -125,7 +125,7 @@ export default class BooleanAttributeModel extends AttributeModel {
         }
 
         return optionElement;
-      }
+      },
     );
 
     return new ContentConfigurationElements(optionElementConfig);
@@ -144,7 +144,7 @@ export default class BooleanAttributeModel extends AttributeModel {
   get selected(): Array<string> {
     // $FlowFixMe[incompatible-call]
     return this.options.selected.map<string, ChoiceAttributeOptionModel>(
-      (option: ChoiceAttributeOptionModel) => option.code
+      (option: ChoiceAttributeOptionModel) => option.code,
     );
   }
 

package/src/models/attributes/ChoiceAttributeModel.js

@@ -34,7 +34,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
     this._options = ChoiceAttributeOptionCollection.create(
       attribute,
       attributeContributions,
-      this.referenceDate
+      this.referenceDate,
     );
 
     if (this.layouthint.has(SORT_OPTIONS)) {
@@ -95,7 +95,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
       this.concept = models.find(
         (model) =>
           model.type === "ConceptDetail" &&
-          model.selfhref.equalsWithParameters(conceptLinkHref)
+          model.selfhref.equalsWithParameters(conceptLinkHref),
       );
     }
 
@@ -151,7 +151,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
   get selected(): Array<string> {
     // $FlowFixMe[incompatible-call]
     return this.options.selected.map<string, ChoiceAttributeOptionModel>(
-      (option: ChoiceAttributeOptionModel) => option.code
+      (option: ChoiceAttributeOptionModel) => option.code,
     );
   }
 
@@ -323,7 +323,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
       values = [value];
     }
     values.forEach((val) => {
-      if (val instanceof ChoiceAttributeOptionModel) {
+      if (typeof val === "object" && val.isChoiceAttributeOptionModel) {
         // option does not exist in existing options, add it. This can happen when lookup list has other options then lookup options
         if (!this.options.some((option) => option.equals(val))) {
           this.options.add(val);
@@ -380,7 +380,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
         }
 
         return optionElement;
-      }
+      },
     );
 
     return new ContentConfigurationElements(optionElementConfig);
@@ -404,11 +404,11 @@ export default class ChoiceAttributeModel extends AttributeModel {
     if (properties && has(properties, ANSWER_OPTION_KEY)) {
       const optionKey = properties[ANSWER_OPTION_KEY];
       const foundOption = this.options.find(
-        (option) => option.code === optionKey
+        (option) => option.code === optionKey,
       );
       if (foundOption) {
         properties[ANSWER_OPTION_KEY] = foundOption.getContentConfiguredLabel(
-          this.contentConfiguration
+          this.contentConfiguration,
         );
       }
     }

package/src/models/attributes/ChoiceAttributeOptionCollection.js

@@ -34,7 +34,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   static create(
     data: Object = {},
     contributions: Object = {},
-    referenceDate: ISO_DATE = DateUtil.now()
+    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     const collection = new ChoiceAttributeOptionCollection();
 
@@ -71,7 +71,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
       selectedOptions.push(
         ...data.options
           .filter((option) => option.selected)
-          .map((option) => option.key)
+          .map((option) => option.key),
       );
     } else if (Array.isArray(data.value)) {
       selectedOptions.push(...data.value);
@@ -102,7 +102,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   addOptions(
     data: Object,
     contributions: Object,
-    referenceDate: ISO_DATE = DateUtil.now()
+    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     const selectedValues = this.getSelectedOptions(data);
 
@@ -115,7 +115,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
           ...optionContributions,
           count: this.getOptionCount(optionCode, data.options),
         },
-        referenceDate
+        referenceDate,
       );
     });
 
@@ -128,7 +128,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   addDynamicSchema(
     data: Object,
     contributions: Object,
-    referenceDate: ISO_DATE = DateUtil.now()
+    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     const selectedValues = this.getSelectedOptions(data);
     data.dynamicschema.forEach((optionDynamicschema) => {
@@ -139,7 +139,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
           count: this.getOptionCount(optionDynamicschema.code, data.options),
           elementsContributions: contributions.children,
         },
-        referenceDate
+        referenceDate,
       );
     });
 
@@ -152,7 +152,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
     code: "true" | "false",
     defaultLabel: string,
     data: string | Array<string>,
-    options: Array<Object> = []
+    options: Array<Object> = [],
   ) {
     const foundOption = options.find((option) => option.code === code);
 
@@ -172,7 +172,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
    */
   addBooleanOptions(
     value: any,
-    contributions: Object
+    contributions: Object,
   ): ChoiceAttributeOptionCollection {
     const optionValue = value == null ? [] : [value.toString()];
 
@@ -187,12 +187,12 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   addOption(
     data: string | Array<string>,
     contributions: Object,
-    referenceDate: ISO_DATE = DateUtil.now()
+    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     const optionModel = new ChoiceAttributeOptionModel(
       Array.isArray(data) ? data : [data],
       contributions,
-      referenceDate
+      referenceDate,
     );
 
     this.add(optionModel);
@@ -306,20 +306,20 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
    */
   mergeOptions(
     withOptions: ChoiceAttributeOptionCollection,
-    addNotExistingOptions: boolean = false
+    addNotExistingOptions: boolean = false,
   ) {
     if (addNotExistingOptions) {
       this.collection = [
         ...this.collection,
         ...withOptions.filter(
-          (option) => !this.collection.some((opt) => opt.code === option.code)
+          (option) => !this.collection.some((opt) => opt.code === option.code),
         ),
       ];
     }
 
     this.collection.forEach((option) => {
       const foundOption = withOptions.find(
-        (withOption) => withOption.code === option.code
+        (withOption) => withOption.code === option.code,
       );
       if (foundOption) {
         option.mergeOption(foundOption);
@@ -333,9 +333,9 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
     callbackfn: (
       value: ChoiceAttributeOptionModel,
       index: number,
-      array: Array<ChoiceAttributeOptionModel>
+      array: Array<ChoiceAttributeOptionModel>,
     ) => any,
-    thisArg?: any
+    thisArg?: any,
   ): boolean {
     return this.collection.some((option, optionIndex, collectionArray) => {
       const result = callbackfn(option, optionIndex, collectionArray);

package/src/models/attributes/ChoiceAttributeOptionModel.js

@@ -38,7 +38,7 @@ class ChoiceAttributeOptionModel
   constructor(
     selectedValues: Array<string> = [],
     option: Object = {},
-    referenceDate: ISO_DATE = DateUtil.now()
+    referenceDate: ISO_DATE = DateUtil.now(),
   ) {
     super({}, option);
 
@@ -61,7 +61,7 @@ class ChoiceAttributeOptionModel
   /**
    */
   static createFromListItemModel(
-    listitem: ListItemModel
+    listitem: ListItemModel,
   ): ChoiceAttributeOptionModel {
     const option = new ChoiceAttributeOptionModel();
 
@@ -72,6 +72,14 @@ class ChoiceAttributeOptionModel
     return option;
   }
 
+  /**
+   * Indicates that this a choice attribute option model, used when adding options to a choice attribute
+   * @returns {boolean}
+   */
+  get isChoiceAttributeOptionModel(): boolean {
+    return true;
+  }
+
   /**
    */
   getInitialChildModelLinks(): Array<LinkModel> {
@@ -95,7 +103,7 @@ class ChoiceAttributeOptionModel
       const conceptHref = this.conceptLink.href;
 
       this.concept = models.find((model) =>
-        model.selfhref.equalsWithParameters(conceptHref)
+        model.selfhref.equalsWithParameters(conceptHref),
       );
     }
 
@@ -189,7 +197,7 @@ class ChoiceAttributeOptionModel
         .getLabelElementByIds(configuredLabelProperties)
         .filter(
           (configuredLabel) =>
-            configuredLabel.value && configuredLabel.value !== ""
+            configuredLabel.value && configuredLabel.value !== "",
         );
 
       if (configuredLabels.length > 0) {
@@ -197,14 +205,14 @@ class ChoiceAttributeOptionModel
           .filter((configuredLabelProperty) =>
             configuredLabels.some(
               (configuredLabel) =>
-                configuredLabel._id === configuredLabelProperty
-            )
+                configuredLabel._id === configuredLabelProperty,
+            ),
           )
           .map((configuredLabelProperty) =>
             configuredLabels.find(
               (configuredLabel) =>
-                configuredLabel._id === configuredLabelProperty
-            )
+                configuredLabel._id === configuredLabelProperty,
+            ),
           )[0].value;
       }
     }
@@ -238,7 +246,7 @@ class ChoiceAttributeOptionModel
   addChildren(
     selectedValues: Array<string> = [],
     option: Object = {},
-    referenceDate: ISO_DATE = DateUtil.now()
+    referenceDate: ISO_DATE = DateUtil.now(),
   ): ChoiceAttributeOptionCollection {
     // When contributions contain elements this is a list not nested options
     if (has(option, "elements")) {
@@ -250,7 +258,7 @@ class ChoiceAttributeOptionModel
         value: selectedValues,
       },
       { options: option?.children ?? [] },
-      referenceDate
+      referenceDate,
     );
   }
 
@@ -295,7 +303,7 @@ class ChoiceAttributeOptionModel
     if (conceptLink !== null) {
       conceptLink.href = conceptLink.href.addParameter(
         TIMEVERSION_FILTER_NAME,
-        this.referenceDate
+        this.referenceDate,
       );
 
       conceptLink.isCacheable = true;

package/src/models/attributes/CompositeAttributeChildCollection.js

@@ -14,7 +14,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
    */
   static create(
     data: Object,
-    contributions: Object
+    contributions: Object,
   ): CompositeAttributeChildCollection {
     if (
       data &&
@@ -28,13 +28,13 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
       if (isMultipleTableRows) {
         return CompositeAttributeChildCollection.createMultiData(
           data,
-          contributions
+          contributions,
         );
       }
 
       return CompositeAttributeChildCollection.createStandard(
         data,
-        contributions
+        contributions,
       );
     }
 
@@ -45,7 +45,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
    */
   static createStandard(
     data: Object,
-    contributions: Object
+    contributions: Object,
   ): CompositeAttributeChildCollection {
     const compositeChildCollection = new CompositeAttributeChildCollection();
 
@@ -75,7 +75,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
           {
             ...attributeContribution,
             readonly: attributeContribution.readonly || contributions.readonly,
-          }
+          },
         );
 
         if (attribute) {
@@ -96,7 +96,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
    */
   static createMultiData(
     data: Object,
-    contributions: Object
+    contributions: Object,
   ): CompositeAttributeChildCollection {
     const compositeChildCollection = new CompositeAttributeChildCollection();
 
@@ -106,8 +106,8 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
           ...data,
           children: childData,
         },
-        contributions
-      )
+        contributions,
+      ),
     );
 
     return compositeChildCollection;
@@ -167,7 +167,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
     if (this.first instanceof CompositeAttributeChildCollection) {
       // $FlowFixMe[missing-type-arg]
       return this.collection.map<Array<Object>>(
-        (collection) => collection.initvalue
+        (collection) => collection.initvalue,
       );
     }
 
@@ -230,7 +230,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
   updateValidations(prefix: string, errors: Object) {
     this.collection.forEach((child) => {
       const attributeErrors = errors.filter(
-        (error) => error.anchor?.elementid === `${prefix}${child.key}`
+        (error) => error.anchor?.elementid === `${prefix}${child.key}`,
       );
 
       child.updateValidations(attributeErrors);

package/src/models/attributes/CompositeAttributeModel.js

@@ -28,7 +28,7 @@ class CompositeAttributeModel extends AttributeModel {
 
     this._children = CompositeAttributeChildCollection.create(
       data,
-      contributions
+      contributions,
     );
 
     this.setChildrenOptionality();
@@ -135,7 +135,7 @@ class CompositeAttributeModel extends AttributeModel {
     super._useClientsideValidation = enabled;
 
     this.children.all.forEach((child) =>
-      child.setUseClientsideValidation(enabled)
+      child.setUseClientsideValidation(enabled),
     );
   }
 
@@ -174,11 +174,11 @@ class CompositeAttributeModel extends AttributeModel {
 
     if (this.isRange && this.mandatory && startAttribute !== null) {
       const allChildsOptional = this.children.every(
-        (child) => !child.mandatory
+        (child) => !child.mandatory,
       );
       if (allChildsOptional) {
         constraints.add(
-          new MandatoryRangeConstraint(startAttribute.type, this.children)
+          new MandatoryRangeConstraint(startAttribute.type, this.children),
         );
       }
     }
@@ -267,11 +267,11 @@ class CompositeAttributeModel extends AttributeModel {
    */
   update(
     value: string,
-    changedAttribute: ?AttributeType
+    changedAttribute: ?AttributeType,
   ): CompositeAttributeModel {
     if (!changedAttribute) {
       throw new IllegalArgumentException(
-        "Composite attribute needs changed attribute on update call"
+        "Composite attribute needs changed attribute on update call",
       );
     }
 
@@ -376,7 +376,7 @@ class CompositeAttributeModel extends AttributeModel {
         this.parentKey === otherAttribute.parentKey) ||
       this.children.some(
         //$FlowFixMe[method-unbinding]
-        (child) => child.equals && child.equals(otherAttribute)
+        (child) => child.equals && child.equals(otherAttribute),
       )
     );
   }

package/src/models/attributes/DatetimeAttributeModel.js

@@ -35,7 +35,7 @@ class DatetimeAttributeModel extends StringAttributeModel {
    */
   static isApplicableModel(contributions: Object): boolean {
     return ["date", "time", "datetime", "timestamp"].includes(
-      contributions.type
+      contributions.type,
     );
   }
 
@@ -406,18 +406,18 @@ class DatetimeAttributeModel extends StringAttributeModel {
       case "date":
         return new DateTimeDateFormatConstraint(
           this.dateInputFormat,
-          this.formatLabel
+          this.formatLabel,
         );
       case "time":
         return new DateTimeTimeFormatConstraint(
           this.timeInputFormat,
-          this.formatLabel
+          this.formatLabel,
         );
       default:
         return new DatetimeFormatConstraint(
           this.type,
           this.inputFormat,
-          this.formatLabel
+          this.formatLabel,
         );
     }
   }
@@ -436,8 +436,8 @@ class DatetimeAttributeModel extends StringAttributeModel {
           this.type,
           this.mindate,
           this.maxdate,
-          this.inputFormat
-        )
+          this.inputFormat,
+        ),
       );
     }
 

package/src/models/attributes/NumberAttributeModel.js

@@ -118,15 +118,15 @@ export default class NumberAttributeModel extends AttributeModel {
       new NumberFormatConstraint(
         this.groupingSeparator,
         this.decimalSeparator,
-        this.format
-      )
+        this.format,
+      ),
     );
     constraints.add(
       new NumberGroupingConstraint(
         this.groupingSeparator,
         this.decimalSeparator,
-        this.format
-      )
+        this.format,
+      ),
     );
     constraints.add(
       new NumberBoundaryConstraint(
@@ -134,8 +134,8 @@ export default class NumberAttributeModel extends AttributeModel {
         this.maxNumber,
         this.groupingSeparator,
         this.decimalSeparator,
-        this.format
-      )
+        this.format,
+      ),
     );
 
     return constraints;
@@ -159,7 +159,7 @@ export default class NumberAttributeModel extends AttributeModel {
       value,
       this.format,
       this.groupingSeparator,
-      this.decimalSeparator
+      this.decimalSeparator,
     );
   }
 
@@ -190,7 +190,7 @@ export default class NumberAttributeModel extends AttributeModel {
     const outputNumber = parseToNumber(
       value,
       this.groupingSeparator,
-      this.decimalSeparator
+      this.decimalSeparator,
     );
 
     this.value = isNaN(outputNumber) ? null : parseNumberToString(outputNumber);
@@ -227,7 +227,7 @@ export default class NumberAttributeModel extends AttributeModel {
       this.layouthint.has(
         INITIAL_TOTAL_FILESIZE,
         MAX_TOTAL_FILESIZE,
-        CASEVIEW_LINK
+        CASEVIEW_LINK,
       )
     );
   }

package/src/models/attributes/PasswordAttributeModel.js

@@ -105,7 +105,7 @@ export default class PasswordAttributeModel extends StringAttributeModel {
   getConfirmPasswordConstraints(): ConstraintCollection {
     const constraints = new ConstraintCollection();
     constraints.add(
-      new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)
+      new PasswordConfirmConstraint(this.confirmValue, this.otherLabel),
     );
     return constraints;
   }
@@ -123,24 +123,24 @@ export default class PasswordAttributeModel extends StringAttributeModel {
     if (this.maxSequenceOfIdenticalCharacters) {
       constraints.add(
         new PasswordThreeConsecutiveCharactersNotAllowedConstraint(
-          this.maxSequenceOfIdenticalCharacters
-        )
+          this.maxSequenceOfIdenticalCharacters,
+        ),
       );
     }
 
     if (this.minNumberOfNumericCharacters) {
       constraints.add(
         new PasswordMinNumericCharactersConstraint(
-          this.minNumberOfNumericCharacters
-        )
+          this.minNumberOfNumericCharacters,
+        ),
       );
     }
 
     if (this.minNumberOfSpecialCharacters) {
       constraints.add(
         new PasswordMinSpecialCharactersConstraint(
-          this.minNumberOfSpecialCharacters
-        )
+          this.minNumberOfSpecialCharacters,
+        ),
       );
     }
 
@@ -155,7 +155,7 @@ export default class PasswordAttributeModel extends StringAttributeModel {
       this.isConfirmPassword == null
     ) {
       constraints.add(
-        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel)
+        new PasswordConfirmConstraint(this.confirmValue, this.otherLabel),
       );
     }
 

package/src/models/attributes/StringAttributeModel.js

@@ -127,7 +127,7 @@ export default class StringAttributeModel extends AttributeModel {
           messageKey: "Constraint.ZipCode.InvalidFormat",
           defaultMessage: "Must be a valid Dutch ZIP code, e.g. 1234 AB",
           regex: this.regexp,
-        })
+        }),
       );
     } else if (this.isEmail() && this.regexp) {
       constraints.add(
@@ -135,7 +135,7 @@ export default class StringAttributeModel extends AttributeModel {
           messageKey: "Constraint.Email.InvalidFormat",
           defaultMessage: "Must be a valid e-mail address",
           regex: new RegExp(this.regexp, "gi"),
-        })
+        }),
       );
     } else if (this.regexp) {
       constraints.add(
@@ -143,7 +143,7 @@ export default class StringAttributeModel extends AttributeModel {
           messageKey: "Constraint.String.InvalidRegex",
           defaultMessage: this.regexpvalidationmessage,
           regex: this.regexp,
-        })
+        }),
       );
     }
 

package/src/models/attributes/UploadAttributeModel.js

@@ -112,12 +112,12 @@ export default class UploadAttributeModel extends StringAttributeModel {
   } {
     const mimeTypes = this.contributions.allowedMimeTypes
       ? this.contributions.allowedMimeTypes.filter(
-          (mimeType) => mimeType !== "[...]"
+          (mimeType) => mimeType !== "[...]",
         )
       : [];
     const extensions = this.contributions.allowedExtensions
       ? this.contributions.allowedExtensions.filter(
-          (extension) => extension !== "[...]"
+          (extension) => extension !== "[...]",
         )
       : [];
 
@@ -144,7 +144,7 @@ export default class UploadAttributeModel extends StringAttributeModel {
   get acceptedFiles(): Array<string> {
     const mimeTypes = this.contributions.allowedMimeTypes
       ? this.contributions.allowedMimeTypes.filter(
-          (mimeType) => mimeType !== "[...]"
+          (mimeType) => mimeType !== "[...]",
         )
       : [];
     const extensions = this.contributions.allowedExtensions
@@ -164,7 +164,7 @@ export default class UploadAttributeModel extends StringAttributeModel {
 
     if (this.uploadConstraints.fileTypes.length > 0) {
       constraints.add(
-        new FileExtensionConstraint(this.uploadConstraints.fileTypes)
+        new FileExtensionConstraint(this.uploadConstraints.fileTypes),
       );
     }
 
@@ -174,7 +174,7 @@ export default class UploadAttributeModel extends StringAttributeModel {
 
     if (hasFilesizeConstraint) {
       constraints.add(
-        new FileSizeConstraint(this.uploadConstraints.maxFileSize)
+        new FileSizeConstraint(this.uploadConstraints.maxFileSize),
       );
     }