@beinformed/ui 1.31.1 → 1.31.4

package/src/models/contentconfiguration/__tests__/ContentConfigurationResults.spec.js

@@ -7,28 +7,28 @@ describe("contentConfigurationResults", () => {
     const contentConfigurationResults = new ContentConfigurationResults();
 
     expect(contentConfigurationResults).toBeInstanceOf(
-      ContentConfigurationResults
+      ContentConfigurationResults,
     );
     expect(contentConfigurationResults.label).toBeNull();
     expect(contentConfigurationResults.description).toBeNull();
     expect(contentConfigurationResults.attributes).toStrictEqual([]);
     expect(contentConfigurationResults.getFormConfigElement()).toBeInstanceOf(
-      ContentConfigurationElements
+      ContentConfigurationElements,
     );
     expect(contentConfigurationResults.calculatedResultElements).toBeInstanceOf(
-      ContentConfigurationElements
+      ContentConfigurationElements,
     );
     expect(contentConfigurationResults.positiveResultElements).toBeInstanceOf(
-      ContentConfigurationElements
+      ContentConfigurationElements,
     );
     expect(contentConfigurationResults.negativeResultElements).toBeInstanceOf(
-      ContentConfigurationElements
+      ContentConfigurationElements,
     );
     expect(contentConfigurationResults.resultElements).toBeInstanceOf(
-      ContentConfigurationElements
+      ContentConfigurationElements,
     );
     expect(contentConfigurationResults.layouthint).toBeInstanceOf(
-      LayoutHintCollection
+      LayoutHintCollection,
     );
   });
 
@@ -55,7 +55,7 @@ describe("contentConfigurationResults", () => {
     };
 
     const contentConfigurationResults = new ContentConfigurationResults(
-      contributions
+      contributions,
     );
 
     expect(contentConfigurationResults.label).toBe("Total cost of mortgage");
@@ -64,17 +64,17 @@ describe("contentConfigurationResults", () => {
       "TotalCostOfMortgage",
     ]);
     expect(
-      contentConfigurationResults.calculatedResultElements.hasConfig()
+      contentConfigurationResults.calculatedResultElements.hasConfig(),
     ).toBe(false);
     expect(contentConfigurationResults.positiveResultElements.hasConfig()).toBe(
-      false
+      false,
     );
     expect(contentConfigurationResults.negativeResultElements.hasConfig()).toBe(
-      false
+      false,
     );
     expect(contentConfigurationResults.resultElements.hasConfig()).toBe(true);
     expect(
-      contentConfigurationResults.resultElements.labelConfig
+      contentConfigurationResults.resultElements.labelConfig,
     ).toStrictEqual([
       {
         icon: "",

package/src/models/detail/DetailModel.js

@@ -51,7 +51,7 @@ export default class DetailModel extends ResourceModel {
       resourceType &&
       (resourceType.endsWith("DetailPanel") ||
         ["Detail", "CasePropertiesPanel", "CasePropertiesPanelDetail"].includes(
-          resourceType
+          resourceType,
         ))
     );
   }
@@ -95,7 +95,7 @@ export default class DetailModel extends ResourceModel {
     this.attributeCollection = new AttributeCollection(
       this.data,
       attributeContributions,
-      true
+      true,
     );
   }
 
@@ -116,7 +116,7 @@ export default class DetailModel extends ResourceModel {
    */
   get attributes(): Array<AttributeType> {
     return this.attributeCollection.all.filter(
-      (attribute) => !attribute.layouthint.has(TITLE) && !attribute.isHidden
+      (attribute) => !attribute.layouthint.has(TITLE) && !attribute.isHidden,
     );
   }
 
@@ -140,7 +140,7 @@ export default class DetailModel extends ResourceModel {
     this.metadataCollection = new AttributeCollection(
       this.data,
       metadataContributions,
-      true
+      true,
     );
   }
 
@@ -162,7 +162,7 @@ export default class DetailModel extends ResourceModel {
   createActionCollection() {
     this._actionCollection = new ActionCollection(
       this.data.actions,
-      this.contributions.actions
+      this.contributions.actions,
     );
   }
 

package/src/models/error/ErrorCollection.js

@@ -45,7 +45,7 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
     id: string,
     defaultMessage?: string,
     parameters?: MessageParameters,
-    layouthint?: LayoutHintCollection
+    layouthint?: LayoutHintCollection,
   ) {
     const itemIdx = this.findById(id);
 
@@ -70,7 +70,7 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
     id: string,
     defaultMessage?: string,
     parameters?: MessageParameters,
-    layouthint?: LayoutHintCollection
+    layouthint?: LayoutHintCollection,
   ) {
     if (parameters) {
       this.addError(id, defaultMessage, parameters, layouthint);
@@ -111,8 +111,8 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
             constraint.id,
             constraint.defaultMessage,
             constraint.parameters,
-            true
-          )
+            true,
+          ),
       ),
     ];
   }

package/src/models/error/ErrorModel.js

@@ -20,7 +20,7 @@ class ErrorModel {
     defaultMessage: ?string,
     parameters: ?MessageParameters,
     isClientConstraint: boolean = false,
-    layouthint: LayoutHintCollection = new LayoutHintCollection()
+    layouthint: LayoutHintCollection = new LayoutHintCollection(),
   ) {
     this._id = id;
     this._parameters = parameters;

package/src/models/error/__tests__/ErrorModel.spec.js

@@ -14,7 +14,7 @@ describe("errorModel", () => {
       {
         param1: "parameter 1",
       },
-      true
+      true,
     );
 
     expect(err2.defaultMessage).toBe("defaultMessage");

package/src/models/filters/AssignmentFilterModel.js

@@ -55,7 +55,7 @@ export default class AssignmentFilterModel extends BaseFilterModel {
 
     if (typeof assignmentTypeData === "undefined") {
       throw new IllegalStateException(
-        `Missing assignment type data for ${key}`
+        `Missing assignment type data for ${key}`,
       );
     }
 
@@ -75,7 +75,7 @@ export default class AssignmentFilterModel extends BaseFilterModel {
       "choice",
       assignmentTypeData.name || assignmentTypeData.param,
       assignmentTypeData,
-      assignmentTypeContributions
+      assignmentTypeContributions,
     );
   }
 
@@ -101,7 +101,7 @@ export default class AssignmentFilterModel extends BaseFilterModel {
       "choice",
       userData.name || userData.param,
       userData,
-      userContributions
+      userContributions,
     );
   }
 

package/src/models/filters/BaseFilterModel.js

@@ -101,6 +101,13 @@ export default class BaseFilterModel extends BaseModel {
     return this.getContribution("label", "");
   }
 
+  /**
+   * Inidiates if filter is multiplechoice
+   */
+  get isMultiple(): boolean {
+    return this.getContribution("multiplechoice");
+  }
+
   /**
    * Getting the name of the filter
    */
@@ -147,6 +154,18 @@ export default class BaseFilterModel extends BaseModel {
     ];
   }
 
+  /**
+   * Getting the value of the filter
+   */
+  get value(): string | Array<string> {
+    if (this.isMultiple) {
+      // Returns unique array
+      return [...new Set(this.attribute?.value.split(","))];
+    }
+
+    return this.attribute?.value;
+  }
+
   /**
    * Reset the value of this filter to undefined
    */

package/src/models/filters/FilterCollection.js

@@ -33,7 +33,7 @@ export default class FilterCollection extends BaseCollection<FilterType> {
               ...filterData,
               dynamicschema: contributions.dynamicschema,
             },
-            filterContributionByKey
+            filterContributionByKey,
           );
 
           if (contributions.listkey) {
@@ -42,7 +42,7 @@ export default class FilterCollection extends BaseCollection<FilterType> {
 
           if (contributions.contexts && filterContributionByKey.contextid) {
             const filterContext = contributions.contexts.find(
-              (context) => context.id === filterContributionByKey.contextid
+              (context) => context.id === filterContributionByKey.contextid,
             );
             if (filterContext) {
               filter.context = filterContext;
@@ -59,7 +59,7 @@ export default class FilterCollection extends BaseCollection<FilterType> {
   createFilter(
     filterKey: string,
     data: Object,
-    contributions: Object
+    contributions: Object,
   ): FilterType {
     const type = contributions.type || "stringfilter";
     if (type === "choicefilter" && filterKey === "index") {
@@ -93,7 +93,7 @@ export default class FilterCollection extends BaseCollection<FilterType> {
    */
   checkRangeFilterByAttributeKey(
     filter: RangeFilterModel,
-    key: string
+    key: string,
   ): boolean {
     const rangeAttribute = filter.attribute;
 
@@ -113,7 +113,7 @@ export default class FilterCollection extends BaseCollection<FilterType> {
    */
   checkAssignmentFilterByAttributeKey(
     filter: AssignmentFilterModel,
-    key: string
+    key: string,
   ): boolean {
     return (
       filter.key === key ||

package/src/models/filters/__tests__/AssignmentFilterModel.spec.js

@@ -64,14 +64,14 @@ describe("assignmentFilterModel", () => {
   it("should be able to create an AssignmentFilterModel", () => {
     const assignmentFilter = new AssignmentFilterModel(
       filterData,
-      filterContributions
+      filterContributions,
     );
 
     expect(assignmentFilter).toBeInstanceOf(AssignmentFilterModel);
     expect(assignmentFilter.user).toBeInstanceOf(ChoiceAttributeModel);
     expect(assignmentFilter.user.type === "lookup").toBeTruthy();
     expect(assignmentFilter.assignmenttype).toBeInstanceOf(
-      ChoiceAttributeModel
+      ChoiceAttributeModel,
     );
 
     expect(assignmentFilter.assignmenttype.options.size).toBe(1);
@@ -124,7 +124,7 @@ describe("assignmentFilterModel", () => {
           ],
         },
         contextid: "C1_1_",
-      }
+      },
     );
 
     expect(assignmentFilter).toBeInstanceOf(AssignmentFilterModel);
@@ -132,7 +132,7 @@ describe("assignmentFilterModel", () => {
     expect(assignmentFilter.user.type === "lookup").toBeTruthy();
     expect(assignmentFilter.user.options.size).toBe(1);
     expect(assignmentFilter.assignmenttype).toBeInstanceOf(
-      ChoiceAttributeModel
+      ChoiceAttributeModel,
     );
 
     expect(assignmentFilter.assignmenttype.options.size).toBe(2);

package/src/models/filters/__tests__/FilterCollection.spec.js

@@ -28,39 +28,39 @@ describe("models", () => {
         expect(collection.getFilterByAttributeKey("ASSIGNMENT")).toBeDefined();
 
         expect(collection.getFilterByAttributeKey("STRING").type).toBe(
-          "string"
+          "string",
         );
         expect(collection.getFilterByAttributeKey("CHECKBOX").type).toBe(
-          "choice"
+          "choice",
         );
         expect(collection.getFilterByAttributeKey("RADIO").type).toBe("choice");
         expect(collection.getFilterByAttributeKey("DATERANGE").type).toBe(
-          "daterange"
+          "daterange",
         );
         expect(collection.getFilterByAttributeKey("NUMBERRANGE").type).toBe(
-          "numberrange"
+          "numberrange",
         );
         expect(collection.getFilterByAttributeKey("USERKEY").type).toBe(
-          "assignment"
+          "assignment",
         );
 
         expect(collection.getFilterByAttributeKey("STRING").label).toBe(
-          "Stringfilter"
+          "Stringfilter",
         );
         expect(collection.getFilterByAttributeKey("CHECKBOX").label).toBe(
-          "Checkboxfilter"
+          "Checkboxfilter",
         );
         expect(collection.getFilterByAttributeKey("RADIO").label).toBe(
-          "Radiofilter"
+          "Radiofilter",
         );
         expect(collection.getFilterByAttributeKey("DATERANGE").label).toBe(
-          "Date range"
+          "Date range",
         );
         expect(collection.getFilterByAttributeKey("NUMBERRANGE").label).toBe(
-          "Number range"
+          "Number range",
         );
         expect(collection.getFilterByAttributeKey("USERKEY").label).toBe(
-          "Assignments"
+          "Assignments",
         );
       });
     });

package/src/models/filters/__tests__/FilterModel.spec.js

@@ -21,7 +21,7 @@ describe("filterModel", () => {
     expect(filter).toBeInstanceOf(FilterModel);
     expect(filter.label).toBe("");
     expect(filter.name).toBeUndefined();
-    expect(filter.value).toBeUndefined();
+    expect(filter.value).toBeNull();
     expect(filter.inputvalue).toBeUndefined();
     expect(filter.type).toBe("string");
     expect(filter.params).toStrictEqual([]);
@@ -33,7 +33,7 @@ describe("filterModel", () => {
     expect(filter).toBeInstanceOf(FilterModel);
     expect(filter.label).toBe("Stringfilter");
     expect(filter.name).toBe("stringfilter");
-    expect(filter.value).toBeUndefined();
+    expect(filter.value).toBeNull();
     expect(filter.inputvalue).toBeUndefined();
     expect(filter.type).toBe("string");
   });
@@ -45,7 +45,7 @@ describe("filterModel", () => {
 
     const filter = new FilterModel(
       stringFilterWithValue,
-      stringFilterContributions
+      stringFilterContributions,
     );
 
     expect(filter).toBeInstanceOf(FilterModel);

package/src/models/filters/__tests__/RangeFilterModel.spec.js

@@ -39,7 +39,7 @@ describe("rangeFilterModel", () => {
             },
           },
         ],
-      }
+      },
     );
 
     expect(rangeFilter).toBeInstanceOf(RangeFilterModel);