@beinformed/ui 1.33.0-beta.4 → 1.33.0-beta.5

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.33.0-beta.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.33.0-beta.4...v1.33.0-beta.5) (2023-08-28)
+
 ## [1.33.0-beta.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.33.0-beta.3...v1.33.0-beta.4) (2023-08-28)
 
 

package/esm/models/filters/BaseFilterModel.js

@@ -41,6 +41,13 @@ export default class BaseFilterModel extends BaseModel {
     });
   }
 
+  /**
+   * Inidiates if filter is multiplechoice
+   */
+  get isMultiple() {
+    return this.getContribution("multiplechoice", false);
+  }
+
   /**
    * Getting context data
    */
@@ -130,6 +137,13 @@ export default class BaseFilterModel extends BaseModel {
     return this.attribute?.value;
   }
 
+  /**
+   * Getting the inputvalue of the filter
+   */
+  get inputvalue() {
+    return this.attribute?.inputvalue;
+  }
+
   /**
    * Reset the value of this filter to undefined
    */
@@ -178,5 +192,12 @@ export default class BaseFilterModel extends BaseModel {
     }
     return "";
   }
+
+  /**
+   * Get assistant message
+   */
+  get assistantMessage() {
+    return this.getContribution("assistant");
+  }
 }
 //# sourceMappingURL=BaseFilterModel.js.map

package/esm/models/filters/BaseFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseFilterModel.js","names":["BaseModel","createAttribute","PARAMETER_SEPARATOR","IllegalStateException","BaseFilterModel","constructor","data","contributions","_defineProperty","_attribute","type","param","listKey","listkey","replace","context","_context","contextLabel","label","_listKey","key","getContribution","name","attribute","params","value","reset","update","isQuickSearch","quicksearch","isActive","initvalue","isValid","readonlyvalue"],"sources":["../../../src/models/filters/BaseFilterModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport createAttribute from \"../attributes/_createAttribute\";\nimport { PARAMETER_SEPARATOR } from \"../../constants/Constants\";\n\nimport type { AttributeType, FilterType } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\n\n/**\n * Base class for filters\n */\nexport default class BaseFilterModel extends BaseModel {\n  _attribute: AttributeType | null = null;\n  _context: Object;\n  _listKey: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this._attribute = this.createAttribute(\n      this.type,\n      this.param,\n      this.data,\n      this.contributions,\n    );\n\n    if (this.contributions.listKey) {\n      this.listkey = this.contributions.listKey;\n    }\n  }\n\n  /**\n   * Get the type of a filter.\n   */\n  get type(): string {\n    return this.contributions.type\n      ? this.contributions.type.replace(\"filter\", \"\")\n      : \"string\";\n  }\n\n  /**\n   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix\n   */\n  createAttribute(\n    type: string,\n    param: string,\n    data: Object,\n    contributions: Object,\n  ): AttributeType | null {\n    if (type === \"assignment\") {\n      return null;\n    }\n\n    return createAttribute(param, data, {\n      ...contributions,\n      type: type,\n    });\n  }\n\n  /**\n   * Getting context data\n   */\n  get context(): Object {\n    return this._context;\n  }\n\n  /**\n   * Set context of filter\n   */\n  set context(context: Object) {\n    this._context = context;\n  }\n\n  /**\n   * Getting the context label\n   */\n  get contextLabel(): string {\n    return this.context?.label ?? \"\";\n  }\n\n  /**\n   * Getting key of the list these filters apply to\n   */\n  get listkey(): string {\n    return this._listKey;\n  }\n\n  /**\n   * Set key of list this filter belongs to\n   */\n  set listkey(key: string) {\n    this._listKey = key;\n  }\n\n  /**\n   * Getting the label of the filter\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the name of the filter\n   */\n  get name(): string {\n    if (this.listkey) {\n      return this.listkey + PARAMETER_SEPARATOR + this.param;\n    }\n\n    return this.param;\n  }\n\n  /**\n   * Getting the param name of the filter\n   */\n  get param(): string {\n    return this.data.param ?? this.data.name;\n  }\n\n  /**\n   * Get attribute of filter\n   */\n  get attribute(): AttributeType {\n    if (!this._attribute) {\n      throw new IllegalStateException(\n        `Missing filter attribute on filter model: ${this.label}`,\n      );\n    }\n    return this._attribute;\n  }\n\n  /**\n   * Retrieve the parameters with it's value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.attribute?.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this.attribute?.value;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    if (this.attribute) {\n      this.attribute.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   * Inidicates if filter is a quick search filter\n   */\n  isQuickSearch(): boolean {\n    return this.contributions.quicksearch === true;\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return this.attribute !== null && this.attribute.initvalue !== null;\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return this.attribute !== null && this.attribute.isValid;\n  }\n\n  /**\n   */\n  get readonlyvalue(): string {\n    if (this.attribute) {\n      return this.attribute.readonlyvalue;\n    }\n    return \"\";\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"BaseFilterModel.js","names":["BaseModel","createAttribute","PARAMETER_SEPARATOR","IllegalStateException","BaseFilterModel","constructor","data","contributions","_defineProperty","_attribute","type","param","listKey","listkey","replace","isMultiple","getContribution","context","_context","contextLabel","label","_listKey","key","name","attribute","params","value","inputvalue","reset","update","isQuickSearch","quicksearch","isActive","initvalue","isValid","readonlyvalue","assistantMessage"],"sources":["../../../src/models/filters/BaseFilterModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport createAttribute from \"../attributes/_createAttribute\";\nimport { PARAMETER_SEPARATOR } from \"../../constants/Constants\";\n\nimport type { AttributeType, FilterType } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\n\n/**\n * Base class for filters\n */\nexport default class BaseFilterModel extends BaseModel {\n  _attribute: AttributeType | null = null;\n  _context: Object;\n  _listKey: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this._attribute = this.createAttribute(\n      this.type,\n      this.param,\n      this.data,\n      this.contributions,\n    );\n\n    if (this.contributions.listKey) {\n      this.listkey = this.contributions.listKey;\n    }\n  }\n\n  /**\n   * Get the type of a filter.\n   */\n  get type(): string {\n    return this.contributions.type\n      ? this.contributions.type.replace(\"filter\", \"\")\n      : \"string\";\n  }\n\n  /**\n   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix\n   */\n  createAttribute(\n    type: string,\n    param: string,\n    data: Object,\n    contributions: Object,\n  ): AttributeType | null {\n    if (type === \"assignment\") {\n      return null;\n    }\n\n    return createAttribute(param, data, {\n      ...contributions,\n      type: type,\n    });\n  }\n\n  /**\n   * Inidiates if filter is multiplechoice\n   */\n  get isMultiple(): boolean {\n    return this.getContribution(\"multiplechoice\", false);\n  }\n\n  /**\n   * Getting context data\n   */\n  get context(): Object {\n    return this._context;\n  }\n\n  /**\n   * Set context of filter\n   */\n  set context(context: Object) {\n    this._context = context;\n  }\n\n  /**\n   * Getting the context label\n   */\n  get contextLabel(): string {\n    return this.context?.label ?? \"\";\n  }\n\n  /**\n   * Getting key of the list these filters apply to\n   */\n  get listkey(): string {\n    return this._listKey;\n  }\n\n  /**\n   * Set key of list this filter belongs to\n   */\n  set listkey(key: string) {\n    this._listKey = key;\n  }\n\n  /**\n   * Getting the label of the filter\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the name of the filter\n   */\n  get name(): string {\n    if (this.listkey) {\n      return this.listkey + PARAMETER_SEPARATOR + this.param;\n    }\n\n    return this.param;\n  }\n\n  /**\n   * Getting the param name of the filter\n   */\n  get param(): string {\n    return this.data.param ?? this.data.name;\n  }\n\n  /**\n   * Get attribute of filter\n   */\n  get attribute(): AttributeType {\n    if (!this._attribute) {\n      throw new IllegalStateException(\n        `Missing filter attribute on filter model: ${this.label}`,\n      );\n    }\n    return this._attribute;\n  }\n\n  /**\n   * Retrieve the parameters with it's value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.attribute?.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this.attribute?.value;\n  }\n\n  /**\n   * Getting the inputvalue of the filter\n   */\n  get inputvalue(): string {\n    return this.attribute?.inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    if (this.attribute) {\n      this.attribute.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   * Inidicates if filter is a quick search filter\n   */\n  isQuickSearch(): boolean {\n    return this.contributions.quicksearch === true;\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return this.attribute !== null && this.attribute.initvalue !== null;\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return this.attribute !== null && this.attribute.isValid;\n  }\n\n  /**\n   */\n  get readonlyvalue(): string {\n    if (this.attribute) {\n      return this.attribute.readonlyvalue;\n    }\n    return \"\";\n  }\n\n  /**\n   * Get assistant message\n   */\n  get assistantMessage(): string | null {\n    return this.getContribution(\"assistant\");\n  }\n}\n"],"mappings":"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"}

package/esm/models/filters/StringFilterModel.js

@@ -16,14 +16,7 @@ export default class StringFilterModel extends BaseFilterModel {
     this.update(this.attribute, data.value ?? "");
 
     // when formatted value set this to initial input value
-    this._inputvalue = this._value;
-  }
-
-  /**
-   * Inidiates if filter is multiplechoice
-   */
-  get isMultiple() {
-    return this.getContribution("multiplechoice");
+    this._inputvalue = this._value ?? "";
   }
 
   /**
@@ -56,7 +49,7 @@ export default class StringFilterModel extends BaseFilterModel {
    * Reset the value of this filter to undefined
    */
   reset() {
-    this._inputvalue = null;
+    this._inputvalue = "";
     this._value = null;
     return this;
   }
@@ -80,9 +73,9 @@ export default class StringFilterModel extends BaseFilterModel {
         const formattedValue = this.formatValue(val);
         if (formattedValue !== "") {
           outputValues.push(formattedValue);
-
-          // $FlowIssue[unsafe-arithmetic]
-          this._isValid &= this.attribute.validate(formattedValue);
+          if (!this.attribute.validate(formattedValue)) {
+            this._isValid = false;
+          }
         }
       }
       this._value = outputValues.join(",");

package/esm/models/filters/StringFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"StringFilterModel.js","names":["BaseFilterModel","StringFilterModel","constructor","data","contributions","_defineProperty","update","attribute","value","_inputvalue","_value","isMultiple","getContribution","params","param","name","inputvalue","reset","isValid","_isValid","toString","operator","_context","_context2","values","_mapInstanceProperty","split","call","val","_trimInstanceProperty","outputValues","formattedValue","formatValue","push","validate","join"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string | null;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value;\n  }\n\n  /**\n   * Inidiates if filter is multiplechoice\n   */\n  get isMultiple(): boolean {\n    return this.getContribution(\"multiplechoice\");\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string | null {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = null;\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          // $FlowIssue[unsafe-arithmetic]\n          this._isValid &= this.attribute.validate(formattedValue);\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"StringFilterModel.js","names":["BaseFilterModel","StringFilterModel","constructor","data","contributions","_defineProperty","update","attribute","value","_inputvalue","_value","params","param","name","inputvalue","reset","isValid","_isValid","toString","operator","_context","_context2","values","isMultiple","_mapInstanceProperty","split","call","val","_trimInstanceProperty","outputValues","formattedValue","formatValue","push","validate","join","getContribution"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value ?? \"\";\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = \"\";\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          if (!this.attribute.validate(formattedValue)) {\n            this._isValid = false;\n          }\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n}\n"],"mappings":"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"}

package/lib/models/filters/BaseFilterModel.js

@@ -47,6 +47,13 @@ class BaseFilterModel extends _BaseModel.default {
     });
   }
 
+  /**
+   * Inidiates if filter is multiplechoice
+   */
+  get isMultiple() {
+    return this.getContribution("multiplechoice", false);
+  }
+
   /**
    * Getting context data
    */
@@ -136,6 +143,13 @@ class BaseFilterModel extends _BaseModel.default {
     return this.attribute?.value;
   }
 
+  /**
+   * Getting the inputvalue of the filter
+   */
+  get inputvalue() {
+    return this.attribute?.inputvalue;
+  }
+
   /**
    * Reset the value of this filter to undefined
    */
@@ -184,6 +198,13 @@ class BaseFilterModel extends _BaseModel.default {
     }
     return "";
   }
+
+  /**
+   * Get assistant message
+   */
+  get assistantMessage() {
+    return this.getContribution("assistant");
+  }
 }
 exports.default = BaseFilterModel;
 //# sourceMappingURL=BaseFilterModel.js.map

package/lib/models/filters/BaseFilterModel.js.flow

@@ -59,6 +59,13 @@ export default class BaseFilterModel extends BaseModel {
     });
   }
 
+  /**
+   * Inidiates if filter is multiplechoice
+   */
+  get isMultiple(): boolean {
+    return this.getContribution("multiplechoice", false);
+  }
+
   /**
    * Getting context data
    */
@@ -154,6 +161,13 @@ export default class BaseFilterModel extends BaseModel {
     return this.attribute?.value;
   }
 
+  /**
+   * Getting the inputvalue of the filter
+   */
+  get inputvalue(): string {
+    return this.attribute?.inputvalue;
+  }
+
   /**
    * Reset the value of this filter to undefined
    */
@@ -203,4 +217,11 @@ export default class BaseFilterModel extends BaseModel {
     }
     return "";
   }
+
+  /**
+   * Get assistant message
+   */
+  get assistantMessage(): string | null {
+    return this.getContribution("assistant");
+  }
 }

package/lib/models/filters/BaseFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseFilterModel.js","names":["_BaseModel","_interopRequireDefault","require","_createAttribute","_Constants","_exceptions","BaseFilterModel","BaseModel","constructor","data","contributions","_defineProperty2","default","_attribute","createAttribute","type","param","listKey","listkey","replace","context","_context","contextLabel","label","_listKey","key","getContribution","name","PARAMETER_SEPARATOR","attribute","IllegalStateException","params","value","reset","update","isQuickSearch","quicksearch","isActive","initvalue","isValid","readonlyvalue","exports"],"sources":["../../../src/models/filters/BaseFilterModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport createAttribute from \"../attributes/_createAttribute\";\nimport { PARAMETER_SEPARATOR } from \"../../constants/Constants\";\n\nimport type { AttributeType, FilterType } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\n\n/**\n * Base class for filters\n */\nexport default class BaseFilterModel extends BaseModel {\n  _attribute: AttributeType | null = null;\n  _context: Object;\n  _listKey: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this._attribute = this.createAttribute(\n      this.type,\n      this.param,\n      this.data,\n      this.contributions,\n    );\n\n    if (this.contributions.listKey) {\n      this.listkey = this.contributions.listKey;\n    }\n  }\n\n  /**\n   * Get the type of a filter.\n   */\n  get type(): string {\n    return this.contributions.type\n      ? this.contributions.type.replace(\"filter\", \"\")\n      : \"string\";\n  }\n\n  /**\n   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix\n   */\n  createAttribute(\n    type: string,\n    param: string,\n    data: Object,\n    contributions: Object,\n  ): AttributeType | null {\n    if (type === \"assignment\") {\n      return null;\n    }\n\n    return createAttribute(param, data, {\n      ...contributions,\n      type: type,\n    });\n  }\n\n  /**\n   * Getting context data\n   */\n  get context(): Object {\n    return this._context;\n  }\n\n  /**\n   * Set context of filter\n   */\n  set context(context: Object) {\n    this._context = context;\n  }\n\n  /**\n   * Getting the context label\n   */\n  get contextLabel(): string {\n    return this.context?.label ?? \"\";\n  }\n\n  /**\n   * Getting key of the list these filters apply to\n   */\n  get listkey(): string {\n    return this._listKey;\n  }\n\n  /**\n   * Set key of list this filter belongs to\n   */\n  set listkey(key: string) {\n    this._listKey = key;\n  }\n\n  /**\n   * Getting the label of the filter\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the name of the filter\n   */\n  get name(): string {\n    if (this.listkey) {\n      return this.listkey + PARAMETER_SEPARATOR + this.param;\n    }\n\n    return this.param;\n  }\n\n  /**\n   * Getting the param name of the filter\n   */\n  get param(): string {\n    return this.data.param ?? this.data.name;\n  }\n\n  /**\n   * Get attribute of filter\n   */\n  get attribute(): AttributeType {\n    if (!this._attribute) {\n      throw new IllegalStateException(\n        `Missing filter attribute on filter model: ${this.label}`,\n      );\n    }\n    return this._attribute;\n  }\n\n  /**\n   * Retrieve the parameters with it's value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.attribute?.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this.attribute?.value;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    if (this.attribute) {\n      this.attribute.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   * Inidicates if filter is a quick search filter\n   */\n  isQuickSearch(): boolean {\n    return this.contributions.quicksearch === true;\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return this.attribute !== null && this.attribute.initvalue !== null;\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return this.attribute !== null && this.attribute.isValid;\n  }\n\n  /**\n   */\n  get readonlyvalue(): string {\n    if (this.attribute) {\n      return this.attribute.readonlyvalue;\n    }\n    return \"\";\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"BaseFilterModel.js","names":["_BaseModel","_interopRequireDefault","require","_createAttribute","_Constants","_exceptions","BaseFilterModel","BaseModel","constructor","data","contributions","_defineProperty2","default","_attribute","createAttribute","type","param","listKey","listkey","replace","isMultiple","getContribution","context","_context","contextLabel","label","_listKey","key","name","PARAMETER_SEPARATOR","attribute","IllegalStateException","params","value","inputvalue","reset","update","isQuickSearch","quicksearch","isActive","initvalue","isValid","readonlyvalue","assistantMessage","exports"],"sources":["../../../src/models/filters/BaseFilterModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport createAttribute from \"../attributes/_createAttribute\";\nimport { PARAMETER_SEPARATOR } from \"../../constants/Constants\";\n\nimport type { AttributeType, FilterType } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\n\n/**\n * Base class for filters\n */\nexport default class BaseFilterModel extends BaseModel {\n  _attribute: AttributeType | null = null;\n  _context: Object;\n  _listKey: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this._attribute = this.createAttribute(\n      this.type,\n      this.param,\n      this.data,\n      this.contributions,\n    );\n\n    if (this.contributions.listKey) {\n      this.listkey = this.contributions.listKey;\n    }\n  }\n\n  /**\n   * Get the type of a filter.\n   */\n  get type(): string {\n    return this.contributions.type\n      ? this.contributions.type.replace(\"filter\", \"\")\n      : \"string\";\n  }\n\n  /**\n   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix\n   */\n  createAttribute(\n    type: string,\n    param: string,\n    data: Object,\n    contributions: Object,\n  ): AttributeType | null {\n    if (type === \"assignment\") {\n      return null;\n    }\n\n    return createAttribute(param, data, {\n      ...contributions,\n      type: type,\n    });\n  }\n\n  /**\n   * Inidiates if filter is multiplechoice\n   */\n  get isMultiple(): boolean {\n    return this.getContribution(\"multiplechoice\", false);\n  }\n\n  /**\n   * Getting context data\n   */\n  get context(): Object {\n    return this._context;\n  }\n\n  /**\n   * Set context of filter\n   */\n  set context(context: Object) {\n    this._context = context;\n  }\n\n  /**\n   * Getting the context label\n   */\n  get contextLabel(): string {\n    return this.context?.label ?? \"\";\n  }\n\n  /**\n   * Getting key of the list these filters apply to\n   */\n  get listkey(): string {\n    return this._listKey;\n  }\n\n  /**\n   * Set key of list this filter belongs to\n   */\n  set listkey(key: string) {\n    this._listKey = key;\n  }\n\n  /**\n   * Getting the label of the filter\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the name of the filter\n   */\n  get name(): string {\n    if (this.listkey) {\n      return this.listkey + PARAMETER_SEPARATOR + this.param;\n    }\n\n    return this.param;\n  }\n\n  /**\n   * Getting the param name of the filter\n   */\n  get param(): string {\n    return this.data.param ?? this.data.name;\n  }\n\n  /**\n   * Get attribute of filter\n   */\n  get attribute(): AttributeType {\n    if (!this._attribute) {\n      throw new IllegalStateException(\n        `Missing filter attribute on filter model: ${this.label}`,\n      );\n    }\n    return this._attribute;\n  }\n\n  /**\n   * Retrieve the parameters with it's value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.attribute?.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this.attribute?.value;\n  }\n\n  /**\n   * Getting the inputvalue of the filter\n   */\n  get inputvalue(): string {\n    return this.attribute?.inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    if (this.attribute) {\n      this.attribute.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   * Inidicates if filter is a quick search filter\n   */\n  isQuickSearch(): boolean {\n    return this.contributions.quicksearch === true;\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return this.attribute !== null && this.attribute.initvalue !== null;\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return this.attribute !== null && this.attribute.isValid;\n  }\n\n  /**\n   */\n  get readonlyvalue(): string {\n    if (this.attribute) {\n      return this.attribute.readonlyvalue;\n    }\n    return \"\";\n  }\n\n  /**\n   * Get assistant message\n   */\n  get assistantMessage(): string | null {\n    return this.getContribution(\"assistant\");\n  }\n}\n"],"mappings":"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"}

package/lib/models/filters/StringFilterModel.js

@@ -23,14 +23,7 @@ class StringFilterModel extends _BaseFilterModel.default {
     this.update(this.attribute, data.value ?? "");
 
     // when formatted value set this to initial input value
-    this._inputvalue = this._value;
-  }
-
-  /**
-   * Inidiates if filter is multiplechoice
-   */
-  get isMultiple() {
-    return this.getContribution("multiplechoice");
+    this._inputvalue = this._value ?? "";
   }
 
   /**
@@ -63,7 +56,7 @@ class StringFilterModel extends _BaseFilterModel.default {
    * Reset the value of this filter to undefined
    */
   reset() {
-    this._inputvalue = null;
+    this._inputvalue = "";
     this._value = null;
     return this;
   }
@@ -87,9 +80,9 @@ class StringFilterModel extends _BaseFilterModel.default {
         const formattedValue = this.formatValue(val);
         if (formattedValue !== "") {
           outputValues.push(formattedValue);
-
-          // $FlowIssue[unsafe-arithmetic]
-          this._isValid &= this.attribute.validate(formattedValue);
+          if (!this.attribute.validate(formattedValue)) {
+            this._isValid = false;
+          }
         }
       }
       this._value = outputValues.join(",");

package/lib/models/filters/StringFilterModel.js.flow

@@ -9,7 +9,7 @@ import type { AttributeType, FilterType } from "../types";
 export default class StringFilterModel extends BaseFilterModel {
   _isValid: boolean = true;
   _value: string | null;
-  _inputvalue: string | null;
+  _inputvalue: string;
 
   /**
    */
@@ -19,14 +19,7 @@ export default class StringFilterModel extends BaseFilterModel {
     this.update(this.attribute, data.value ?? "");
 
     // when formatted value set this to initial input value
-    this._inputvalue = this._value;
-  }
-
-  /**
-   * Inidiates if filter is multiplechoice
-   */
-  get isMultiple(): boolean {
-    return this.getContribution("multiplechoice");
+    this._inputvalue = this._value ?? "";
   }
 
   /**
@@ -54,7 +47,7 @@ export default class StringFilterModel extends BaseFilterModel {
 
   /**
    */
-  get inputvalue(): string | null {
+  get inputvalue(): string {
     return this._inputvalue;
   }
 
@@ -62,7 +55,7 @@ export default class StringFilterModel extends BaseFilterModel {
    * Reset the value of this filter to undefined
    */
   reset(): FilterType {
-    this._inputvalue = null;
+    this._inputvalue = "";
     this._value = null;
 
     return this;
@@ -91,8 +84,9 @@ export default class StringFilterModel extends BaseFilterModel {
         if (formattedValue !== "") {
           outputValues.push(formattedValue);
 
-          // $FlowIssue[unsafe-arithmetic]
-          this._isValid &= this.attribute.validate(formattedValue);
+          if (!this.attribute.validate(formattedValue)) {
+            this._isValid = false;
+          }
         }
       }
 

package/lib/models/filters/StringFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"StringFilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","StringFilterModel","BaseFilterModel","constructor","data","contributions","_defineProperty2","default","update","attribute","value","_inputvalue","_value","isMultiple","getContribution","params","param","name","inputvalue","reset","isValid","_isValid","toString","operator","_context","_context2","values","_map","split","call","val","_trim","outputValues","formattedValue","formatValue","push","validate","join","exports"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string | null;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value;\n  }\n\n  /**\n   * Inidiates if filter is multiplechoice\n   */\n  get isMultiple(): boolean {\n    return this.getContribution(\"multiplechoice\");\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string | null {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = null;\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          // $FlowIssue[unsafe-arithmetic]\n          this._isValid &= this.attribute.validate(formattedValue);\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"StringFilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","StringFilterModel","BaseFilterModel","constructor","data","contributions","_defineProperty2","default","update","attribute","value","_inputvalue","_value","params","param","name","inputvalue","reset","isValid","_isValid","toString","operator","_context","_context2","values","isMultiple","_map","split","call","val","_trim","outputValues","formattedValue","formatValue","push","validate","join","getContribution","exports"],"sources":["../../../src/models/filters/StringFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"./BaseFilterModel\";\n\nimport type { AttributeType, FilterType } from \"../types\";\n\n/**\n * StringFilterModel can handle string filters with multiple setting\n */\nexport default class StringFilterModel extends BaseFilterModel {\n  _isValid: boolean = true;\n  _value: string | null;\n  _inputvalue: string;\n\n  /**\n   */\n  constructor(data: Object, contributions: Object) {\n    super(data, contributions);\n\n    this.update(this.attribute, data.value ?? \"\");\n\n    // when formatted value set this to initial input value\n    this._inputvalue = this._value ?? \"\";\n  }\n\n  /**\n   * Retrieve the parameters with its value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this._value;\n  }\n\n  /**\n   */\n  get inputvalue(): string {\n    return this._inputvalue;\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    this._inputvalue = \"\";\n    this._value = null;\n\n    return this;\n  }\n\n  /**\n   */\n  get isValid(): boolean {\n    return this._isValid;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    this._inputvalue = typeof value !== \"string\" ? value.toString() : value;\n\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      const values = this.isMultiple\n        ? this._inputvalue.split(\",\").map((val) => val.trim())\n        : [this._inputvalue.trim()];\n\n      const outputValues = [];\n      for (const val of values) {\n        const formattedValue = this.formatValue(val);\n        if (formattedValue !== \"\") {\n          outputValues.push(formattedValue);\n\n          if (!this.attribute.validate(formattedValue)) {\n            this._isValid = false;\n          }\n        }\n      }\n\n      this._value = outputValues.join(\",\");\n    } else {\n      this._value = value;\n    }\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this.getContribution(\"operator\", \"\");\n  }\n\n  /**\n   */\n  formatValue(value: string): string {\n    if (this.operator === \"exactly\" || this.operator === \"isNot\") {\n      return this.attribute.formatValue(value);\n    }\n    return value;\n  }\n}\n"],"mappings":"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"}

package/lib/models/filters/__tests__/FilterModel.spec.js.flow

@@ -22,7 +22,7 @@ describe("filterModel", () => {
     expect(filter.label).toBe("");
     expect(filter.name).toBeUndefined();
     expect(filter.value).toBeNull();
-    expect(filter.inputvalue).toBeUndefined();
+    expect(filter.inputvalue).toBe("");
     expect(filter.type).toBe("string");
     expect(filter.params).toStrictEqual([]);
   });
@@ -34,7 +34,7 @@ describe("filterModel", () => {
     expect(filter.label).toBe("Stringfilter");
     expect(filter.name).toBe("stringfilter");
     expect(filter.value).toBeNull();
-    expect(filter.inputvalue).toBeUndefined();
+    expect(filter.inputvalue).toBe("");
     expect(filter.type).toBe("string");
   });
 

package/lib/models/filters/__tests__/ZipcodeFilter.spec.js.flow

@@ -26,7 +26,7 @@ describe("Zipcode Filter", () => {
     expect(filter.label).toBe("zipfilter");
     expect(filter.name).toBe("zipfilter");
     expect(filter.value).toBeNull();
-    expect(filter.inputvalue).toBeUndefined();
+    expect(filter.inputvalue).toBe("");
     expect(filter.type).toBe("string");
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.33.0-beta.4",
+  "version": "1.33.0-beta.5",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",

package/src/models/filters/BaseFilterModel.js

@@ -59,6 +59,13 @@ export default class BaseFilterModel extends BaseModel {
     });
   }
 
+  /**
+   * Inidiates if filter is multiplechoice
+   */
+  get isMultiple(): boolean {
+    return this.getContribution("multiplechoice", false);
+  }
+
   /**
    * Getting context data
    */
@@ -154,6 +161,13 @@ export default class BaseFilterModel extends BaseModel {
     return this.attribute?.value;
   }
 
+  /**
+   * Getting the inputvalue of the filter
+   */
+  get inputvalue(): string {
+    return this.attribute?.inputvalue;
+  }
+
   /**
    * Reset the value of this filter to undefined
    */
@@ -203,4 +217,11 @@ export default class BaseFilterModel extends BaseModel {
     }
     return "";
   }
+
+  /**
+   * Get assistant message
+   */
+  get assistantMessage(): string | null {
+    return this.getContribution("assistant");
+  }
 }

package/src/models/filters/StringFilterModel.js

@@ -9,7 +9,7 @@ import type { AttributeType, FilterType } from "../types";
 export default class StringFilterModel extends BaseFilterModel {
   _isValid: boolean = true;
   _value: string | null;
-  _inputvalue: string | null;
+  _inputvalue: string;
 
   /**
    */
@@ -19,14 +19,7 @@ export default class StringFilterModel extends BaseFilterModel {
     this.update(this.attribute, data.value ?? "");
 
     // when formatted value set this to initial input value
-    this._inputvalue = this._value;
-  }
-
-  /**
-   * Inidiates if filter is multiplechoice
-   */
-  get isMultiple(): boolean {
-    return this.getContribution("multiplechoice");
+    this._inputvalue = this._value ?? "";
   }
 
   /**
@@ -54,7 +47,7 @@ export default class StringFilterModel extends BaseFilterModel {
 
   /**
    */
-  get inputvalue(): string | null {
+  get inputvalue(): string {
     return this._inputvalue;
   }
 
@@ -62,7 +55,7 @@ export default class StringFilterModel extends BaseFilterModel {
    * Reset the value of this filter to undefined
    */
   reset(): FilterType {
-    this._inputvalue = null;
+    this._inputvalue = "";
     this._value = null;
 
     return this;
@@ -91,8 +84,9 @@ export default class StringFilterModel extends BaseFilterModel {
         if (formattedValue !== "") {
           outputValues.push(formattedValue);
 
-          // $FlowIssue[unsafe-arithmetic]
-          this._isValid &= this.attribute.validate(formattedValue);
+          if (!this.attribute.validate(formattedValue)) {
+            this._isValid = false;
+          }
         }
       }
 

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

@@ -22,7 +22,7 @@ describe("filterModel", () => {
     expect(filter.label).toBe("");
     expect(filter.name).toBeUndefined();
     expect(filter.value).toBeNull();
-    expect(filter.inputvalue).toBeUndefined();
+    expect(filter.inputvalue).toBe("");
     expect(filter.type).toBe("string");
     expect(filter.params).toStrictEqual([]);
   });
@@ -34,7 +34,7 @@ describe("filterModel", () => {
     expect(filter.label).toBe("Stringfilter");
     expect(filter.name).toBe("stringfilter");
     expect(filter.value).toBeNull();
-    expect(filter.inputvalue).toBeUndefined();
+    expect(filter.inputvalue).toBe("");
     expect(filter.type).toBe("string");
   });
 

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

@@ -26,7 +26,7 @@ describe("Zipcode Filter", () => {
     expect(filter.label).toBe("zipfilter");
     expect(filter.name).toBe("zipfilter");
     expect(filter.value).toBeNull();
-    expect(filter.inputvalue).toBeUndefined();
+    expect(filter.inputvalue).toBe("");
     expect(filter.type).toBe("string");
   });
 

package/types/constants/Constants.d.ts

@@ -121,17 +121,17 @@ export const INPUT_DEBOUNCE_TIMEOUT: 100;
  */
 export const VALIDATE_DEBOUNCE_TIMEOUT: 500;
 export namespace ATTRIBUTE_WIDTH {
-    const EXTRA_SMALL: string;
-    const SMALL: string;
-    const MEDIUM: string;
-    const LARGE: string;
-    const EXTRA_LARGE: string;
+    let EXTRA_SMALL: string;
+    let SMALL: string;
+    let MEDIUM: string;
+    let LARGE: string;
+    let EXTRA_LARGE: string;
 }
 export const ALL_CONTENT_IN_DATA_SETTING: "hasAllContentInData";
 export namespace INTERNAL_LOGIN_TYPE {
-    const JAAS: string;
-    const PAC4J_FORM: string;
-    const PAC4J_BASIC: string;
+    let JAAS: string;
+    let PAC4J_FORM: string;
+    let PAC4J_BASIC: string;
 }
 export const LOGIN_TYPE: "security.clients";
 export const LOGIN_PATH_SETTING: "FormClient.login_url";
@@ -139,7 +139,7 @@ export const LOGIN_USERNAME_SETTING: "FormClient.username_field_name";
 export const LOGIN_PASSWORD_SETTING: "FormClient.password_field_name";
 export const LOGOUT_PATH_SETTING: "FormClient.logout_url";
 export namespace DEFAULT_AUTHENTICATION_TYPE {
-    const name: string;
-    const authentication: string;
-    const isPrimary: boolean;
+    let name: string;
+    let authentication: string;
+    let isPrimary: boolean;
 }