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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/esm/models/attributes/CompositeAttributeModel.js +4 -3
  3. package/esm/models/attributes/CompositeAttributeModel.js.map +1 -1
  4. package/esm/models/attributes/StringAttributeModel.js +14 -32
  5. package/esm/models/attributes/StringAttributeModel.js.map +1 -1
  6. package/esm/models/filters/BaseFilterModel.js +0 -12
  7. package/esm/models/filters/BaseFilterModel.js.map +1 -1
  8. package/esm/models/filters/FilterCollection.js +5 -1
  9. package/esm/models/filters/FilterCollection.js.map +1 -1
  10. package/esm/models/filters/StringFilterModel.js +109 -0
  11. package/esm/models/filters/StringFilterModel.js.map +1 -0
  12. package/esm/models/href/Href.js +1 -1
  13. package/esm/models/href/Href.js.map +1 -1
  14. package/esm/utils/helpers/sanitizeHtml.js +8 -6
  15. package/esm/utils/helpers/sanitizeHtml.js.map +1 -1
  16. package/lib/models/attributes/CompositeAttributeModel.js +4 -3
  17. package/lib/models/attributes/CompositeAttributeModel.js.flow +4 -3
  18. package/lib/models/attributes/CompositeAttributeModel.js.map +1 -1
  19. package/lib/models/attributes/StringAttributeModel.js +14 -32
  20. package/lib/models/attributes/StringAttributeModel.js.flow +14 -51
  21. package/lib/models/attributes/StringAttributeModel.js.map +1 -1
  22. package/lib/models/attributes/__tests__/StringAttributeModel.spec.js.flow +0 -13
  23. package/lib/models/filters/BaseFilterModel.js +0 -12
  24. package/lib/models/filters/BaseFilterModel.js.flow +4 -16
  25. package/lib/models/filters/BaseFilterModel.js.map +1 -1
  26. package/lib/models/filters/FilterCollection.js +5 -1
  27. package/lib/models/filters/FilterCollection.js.flow +6 -1
  28. package/lib/models/filters/FilterCollection.js.map +1 -1
  29. package/lib/models/filters/StringFilterModel.js +117 -0
  30. package/lib/models/filters/StringFilterModel.js.flow +119 -0
  31. package/lib/models/filters/StringFilterModel.js.map +1 -0
  32. package/lib/models/filters/__tests__/ZipcodeFilter.spec.js.flow +12 -12
  33. package/lib/models/href/Href.js +1 -1
  34. package/lib/models/href/Href.js.flow +1 -1
  35. package/lib/models/href/Href.js.map +1 -1
  36. package/lib/utils/helpers/__tests__/sanitizeHTML.spec.js.flow +35 -1
  37. package/lib/utils/helpers/sanitizeHtml.js +8 -6
  38. package/lib/utils/helpers/sanitizeHtml.js.flow +7 -6
  39. package/lib/utils/helpers/sanitizeHtml.js.map +1 -1
  40. package/package.json +20 -20
  41. package/src/models/attributes/CompositeAttributeModel.js +4 -3
  42. package/src/models/attributes/StringAttributeModel.js +14 -51
  43. package/src/models/attributes/__tests__/StringAttributeModel.spec.js +0 -13
  44. package/src/models/filters/BaseFilterModel.js +4 -16
  45. package/src/models/filters/FilterCollection.js +6 -1
  46. package/src/models/filters/StringFilterModel.js +119 -0
  47. package/src/models/filters/__tests__/ZipcodeFilter.spec.js +12 -12
  48. package/src/models/href/Href.js +1 -1
  49. package/src/utils/helpers/__tests__/sanitizeHTML.spec.js +35 -1
  50. package/src/utils/helpers/sanitizeHtml.js +7 -6
@@ -1 +1 @@
1
- {"version":3,"file":"Href.js","names":["_constants","require","_Parameter","_interopRequireDefault","_exceptions","Href","constructor","href","resourcetype","_defineProperty2","default","HTTP_METHODS","GET","setFromHref","setFromString","setFromLocationOrObject","path","parameters","hash","state","pathname","_path","search","addParametersFromString","Array","isArray","_parameters","_context","_map","call","param","addParameter","_name","_value","_prefix","getHashFromString","_hash","_state","getPathFromString","isChangePassword","_context2","_includes","isCamelRoute","_startsWith","checkAbsoluteUrl","checkAbsolute","RegExp","test","isExternal","decodedHref","decodeURI","hrefNoHash","substr","indexOf","split","arguments","length","undefined","forEach","paramFromString","Parameter","fromString","setParameter","name","value","prefix","removeParameter","push","getParameter","_context3","_find","hasParameter","method","_method","_context4","valueToRemove","newValue","filter","val","join","_context5","_filter","getQuerystring","_context6","_context7","withPrefix","toQuerystring","getQuerystringForModularUI","_context8","_context9","isModUIParameter","querystring","setState","_resourcetype","absolutepath","getBasePath","absolutehref","absolutehrefPrefixedQuerystring","startsWith","thisPath","otherPath","equals","equalsWithParameters","_context10","thisParams","toString","every","IllegalArgumentException","isContent","_context11","CONTENT_PATH","toLocation","_default","exports"],"sources":["../../../src/models/href/Href.js"],"sourcesContent":["// @flow\nimport { getBasePath, HTTP_METHODS, CONTENT_PATH } from \"../../constants\";\n\nimport Parameter from \"../parameter/Parameter\";\nimport { IllegalArgumentException } from \"../../exceptions\";\n\nimport type { LocationShape } from \"react-router\";\n\ntype HrefObject = {\n _path: string,\n _hash: string,\n _parameters: Array<Parameter>,\n _resourcetype: string,\n _method: $Keys<typeof HTTP_METHODS>,\n _state: ?{ [key: string]: any },\n pathname: ?string,\n};\n\nexport type HrefInput = Href | HrefObject | LocationShape | string;\n\n/**\n * Defines a Href with the parameters\n */\nclass Href {\n _path: string = \"\";\n _hash: string = \"\";\n _parameters: Array<Parameter> = [];\n _resourcetype: string = \"\";\n _method: $Keys<typeof HTTP_METHODS> = HTTP_METHODS.GET;\n _state: any = null;\n\n /**\n * Create a Href\n */\n constructor(href?: HrefInput, resourcetype?: string) {\n this.resourcetype = resourcetype ?? \"\";\n\n if (href instanceof Href) {\n this.setFromHref(href);\n } else if (typeof href === \"string\") {\n this.setFromString(href);\n } else if (typeof href === \"object\") {\n this.setFromLocationOrObject(href);\n }\n }\n\n /**\n * Set parameters from Href model input\n */\n setFromHref(href: Href) {\n this.path = href.path;\n this.parameters = href.parameters;\n this.hash = href.hash;\n this.state = href.state;\n }\n\n /**\n */\n setFromLocationOrObject(href: LocationShape | HrefObject) {\n if (typeof href[\"pathname\"] === \"string\") {\n this.path = href.pathname;\n } else if (typeof href._path === \"string\") {\n this.path = href._path;\n }\n\n if (href.search) {\n this.addParametersFromString(href.search);\n } else if (Array.isArray(href._parameters)) {\n // $FlowExpectedError[incompatible-call]\n href._parameters.map((param: Parameter) =>\n this.addParameter(param._name, param._value, param._prefix),\n );\n }\n\n if (href.hash) {\n this.hash = Href.getHashFromString(href.hash);\n } else if (typeof href._hash === \"string\") {\n this.hash = href._hash;\n }\n\n if (href.state) {\n this.state = href.state || null;\n } else if (typeof href._state === \"object\") {\n this.state = href._state;\n }\n }\n\n /**\n * Set parameters from string input\n */\n setFromString(href: string) {\n this.path = Href.getPathFromString(href);\n this.addParametersFromString(href);\n this.hash = Href.getHashFromString(href);\n }\n\n /**\n */\n get isChangePassword(): boolean {\n return this._path.includes(\"/change-password\");\n }\n\n /**\n * check if the path is referencing a camel route\n */\n static isCamelRoute(path: string): boolean {\n return (\n path.startsWith(\"/restServices\") && !path.startsWith(\"/restServices/ui\")\n );\n }\n\n /**\n */\n static checkAbsoluteUrl(href: string): boolean {\n const checkAbsolute = new RegExp(\"^(?:[a-z]+:)?//\", \"i\");\n return checkAbsolute.test(href);\n }\n\n // Check if url is relative (not checking for absolute urls with same domain)\n /**\n */\n get isExternal(): boolean {\n return Href.checkAbsoluteUrl(this.path);\n }\n\n /**\n * Retrieve the relative path part of a href string, e.g. https://www.beinformed.com/BeInformed/tab/view?q=url => /tab/view\n */\n static getPathFromString(href: string): string {\n const decodedHref = decodeURI(href);\n\n const hrefNoHash = decodedHref.includes(\"#\")\n ? decodedHref.substr(0, decodedHref.indexOf(\"#\"))\n : decodedHref;\n\n return hrefNoHash.includes(\"?\") ? hrefNoHash.split(\"?\")[0] : hrefNoHash;\n }\n\n /**\n * Retrieve hash of href string\n */\n static getHashFromString(href: string = \"\"): string {\n return href.includes(\"#\") ? href.substr(href.indexOf(\"#\") + 1) : \"\";\n }\n\n /**\n * Add a parameter for each parameter found in the querystring of an URL string, e.g. https://www.beinformed.com?q=url => q=url\n */\n addParametersFromString(href: string): Href {\n if (href.includes(\"?\")) {\n href\n .split(\"?\")[1]\n .split(\"&\")\n .forEach((param) => {\n const paramFromString = Parameter.fromString(param);\n if (paramFromString) {\n this.setParameter(\n paramFromString.name,\n paramFromString.value,\n paramFromString.prefix,\n );\n }\n });\n }\n\n return this;\n }\n\n /**\n * Add a querystring parameter to the parameter collection of this Href, skips parameters that have a value of null\n */\n addParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value !== null) {\n this.removeParameter(name, prefix);\n this._parameters.push(new Parameter(prefix, name, value));\n }\n\n return this;\n }\n\n /**\n * Adds or overwrites a parameter when it exists and value is not null.\n * Removes the parameter when the value is null\n */\n setParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value === null) {\n this.removeParameter(name, prefix);\n } else {\n this.addParameter(name, value, prefix);\n }\n\n return this;\n }\n\n /**\n * Retrieve a parameter by it's name and (optionally) prefix\n */\n getParameter(name: string, prefix: ?string): ?Parameter {\n return this._parameters.find(\n (param) => param.prefix === prefix && param.name === name,\n );\n }\n\n /**\n */\n hasParameter(name: string, prefix: ?string): boolean {\n return this.getParameter(name, prefix) !== undefined;\n }\n\n /**\n * Get request method\n */\n get method(): $Keys<typeof HTTP_METHODS> {\n return this._method;\n }\n\n /**\n * Set request method\n */\n set method(method: $Keys<typeof HTTP_METHODS>) {\n this._method = method || HTTP_METHODS.GET;\n }\n\n /**\n * Retrieve all paremters\n */\n get parameters(): Array<Parameter> {\n return this._parameters;\n }\n\n /**\n * Replace parameters of Href\n */\n set parameters(parameters: Array<Parameter>) {\n this._parameters = parameters;\n }\n\n /**\n * Remove a parameter from the parameter collection\n */\n removeParameter(name: string, prefix: ?string, value: ?string): Href {\n if (value !== undefined) {\n const valueToRemove = value;\n\n this._parameters = this._parameters.map((param) => {\n if (param.prefix === prefix && param.name === name) {\n const newValue = param.value\n ?.split(\",\")\n .filter((val) => val !== valueToRemove)\n .join(\",\");\n return new Parameter(param.prefix, param.name, newValue);\n }\n return param;\n });\n } else {\n this._parameters = this._parameters.filter(\n (param) => param.prefix !== prefix || param.name !== name,\n );\n }\n\n return this;\n }\n\n /**\n * Get the parameters as a querystring, e.g. param1=value1&param2=value2, optionally with prefix\n */\n getQuerystring(withPrefix: boolean = false): string {\n return this.parameters\n .filter((param) => param.value != null)\n .map((param) => param.toQuerystring(withPrefix))\n .join(\"&\");\n }\n\n /**\n * Retrieve a querystring that only contains parameter that can be send to the modular ui, parameters are filtered by prefix\n */\n getQuerystringForModularUI(prefix: string = \"\"): string {\n return this.parameters\n .filter(\n (param) =>\n param.isModUIParameter &&\n (!prefix || !param.prefix || param.prefix === prefix) &&\n param.value != null,\n )\n .map((param) => param.toQuerystring(false))\n .join(\"&\");\n }\n\n /**\n * Retrieve all parameters from the parameter collection in a querystring style name1=value1&name2=value2, without the prefix\n */\n get querystring(): string {\n return this.getQuerystring(false);\n }\n\n /**\n * Set the path of the Href, the part before the querystring question mark\n */\n set path(path: string) {\n this._path = path;\n }\n\n /**\n * Retrieve the path\n */\n get path(): string {\n return this._path || \"\";\n }\n\n /**\n * Set hash\n */\n set hash(hash: string) {\n this._hash = hash;\n }\n\n /**\n * Retrieve hash\n */\n get hash(): string {\n return this._hash;\n }\n\n /**\n */\n set state(state: any) {\n this._state = state;\n }\n\n /**\n */\n get state(): any {\n return this._state;\n }\n\n /**\n */\n setState(state: any): Href {\n this.state = state;\n\n return this;\n }\n\n /**\n * Set resourctype\n */\n set resourcetype(resourcetype: string) {\n this._resourcetype = resourcetype;\n }\n\n /**\n * Retrieve resourceType\n */\n get resourcetype(): string {\n return this._resourcetype;\n }\n\n /**\n * Retrieve the path combined with the base path (context-path) of the application, e.g. /BeInformed\n */\n get absolutepath(): string {\n if (this.isExternal) {\n return this.path;\n }\n\n return getBasePath() + this.path;\n }\n\n /**\n * Retrieves the combination of the path and the querystring\n */\n get href(): string {\n return this.querystring.length > 0\n ? [this.path, this.querystring].join(\"?\")\n : this.path;\n }\n\n /**\n * Getting the URL including the base path, querystring is prefixed\n */\n get absolutehref(): string {\n const querystring = this.getQuerystring(false);\n\n return querystring.length > 0\n ? [this.absolutepath, querystring].join(\"?\")\n : this.absolutepath;\n }\n\n /**\n * Getting the URL including the base path, the querystring is prefixed\n */\n get absolutehrefPrefixedQuerystring(): string {\n const querystring = this.getQuerystring(true);\n\n return querystring.length > 0\n ? [this.absolutepath, querystring].join(\"?\")\n : this.absolutepath;\n }\n\n /**\n * Checks if the URL starts within the given href\n */\n startsWith(href: Href | string): boolean {\n const thisPath = `${this.path}/`;\n const otherPath = href instanceof Href ? `${href.path}/` : href;\n\n return thisPath.startsWith(otherPath);\n }\n\n /**\n * Checks if the given Href equals this Href\n */\n equals(href: Href | string): boolean {\n if (href instanceof Href) {\n return this.path === href.path;\n }\n\n return this.path === href;\n }\n\n /**\n */\n equalsWithParameters(href: Href): boolean {\n if (!this.equals(href)) {\n return false;\n }\n\n if (href instanceof Href) {\n if (this.parameters.length !== href.parameters.length) {\n return false;\n }\n\n if (this.parameters.length === 0 && href.parameters.length === 0) {\n return true;\n }\n\n const thisParams = this.parameters.map((param) => param.toString());\n\n return href.parameters.every((param) =>\n thisParams.includes(param.toString()),\n );\n }\n\n throw new IllegalArgumentException(`${href} is not an instance of Href`);\n }\n\n /**\n * Indicates if the link is a content link\n */\n get isContent(): boolean {\n return this.absolutepath.startsWith(`${getBasePath()}${CONTENT_PATH}`);\n }\n\n /**\n * Returns a complete url from the Href\n */\n toString(): string {\n return this.href;\n }\n\n /**\n */\n toLocation(): LocationShape {\n return {\n pathname: this.path,\n search: this.querystring.length > 0 ? `?${this.querystring}` : \"\",\n hash: this.hash.length > 0 ? `#${this.hash}` : \"\",\n state: this.state,\n };\n }\n}\n\nexport default Href;\n"],"mappings":"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"}
1
+ {"version":3,"file":"Href.js","names":["_constants","require","_Parameter","_interopRequireDefault","_exceptions","Href","constructor","href","resourcetype","_defineProperty2","default","HTTP_METHODS","GET","setFromHref","setFromString","setFromLocationOrObject","path","parameters","hash","state","pathname","_path","search","addParametersFromString","Array","isArray","_parameters","_context","_map","call","param","addParameter","_name","_value","_prefix","getHashFromString","_hash","_state","getPathFromString","isChangePassword","_context2","_includes","isCamelRoute","_startsWith","checkAbsoluteUrl","checkAbsolute","RegExp","test","isExternal","decodedHref","decodeURI","hrefNoHash","substr","indexOf","split","arguments","length","undefined","forEach","paramFromString","Parameter","fromString","setParameter","name","value","prefix","removeParameter","push","getParameter","_context3","_find","hasParameter","method","_method","_context4","valueToRemove","newValue","filter","val","join","_context5","_filter","getQuerystring","_context6","_context7","withPrefix","toQuerystring","getQuerystringForModularUI","_context8","_context9","isModUIParameter","querystring","setState","_resourcetype","absolutepath","getBasePath","absolutehref","absolutehrefPrefixedQuerystring","startsWith","thisPath","otherPath","equals","equalsWithParameters","_context10","thisParams","toString","every","IllegalArgumentException","isContent","_context11","CONTENT_PATH","toLocation","_default","exports"],"sources":["../../../src/models/href/Href.js"],"sourcesContent":["// @flow\nimport { getBasePath, HTTP_METHODS, CONTENT_PATH } from \"../../constants\";\n\nimport Parameter from \"../parameter/Parameter\";\nimport { IllegalArgumentException } from \"../../exceptions\";\n\nimport type { LocationShape } from \"react-router\";\n\ntype HrefObject = {\n _path: string,\n _hash: string,\n _parameters: Array<Parameter>,\n _resourcetype: string,\n _method: $Keys<typeof HTTP_METHODS>,\n _state: ?{ [key: string]: any },\n pathname: ?string,\n};\n\nexport type HrefInput = Href | HrefObject | LocationShape | string;\n\n/**\n * Defines a Href with the parameters\n */\nclass Href {\n _path: string = \"\";\n _hash: string = \"\";\n _parameters: Array<Parameter> = [];\n _resourcetype: string = \"\";\n _method: $Keys<typeof HTTP_METHODS> = HTTP_METHODS.GET;\n _state: any = null;\n\n /**\n * Create a Href\n */\n constructor(href?: HrefInput, resourcetype?: string) {\n this.resourcetype = resourcetype ?? \"\";\n\n if (href instanceof Href) {\n this.setFromHref(href);\n } else if (typeof href === \"string\") {\n this.setFromString(href);\n } else if (typeof href === \"object\") {\n this.setFromLocationOrObject(href);\n }\n }\n\n /**\n * Set parameters from Href model input\n */\n setFromHref(href: Href) {\n this.path = href.path;\n this.parameters = href.parameters;\n this.hash = href.hash;\n this.state = href.state;\n }\n\n /**\n */\n setFromLocationOrObject(href: LocationShape | HrefObject) {\n if (typeof href[\"pathname\"] === \"string\") {\n this.path = href.pathname;\n } else if (typeof href._path === \"string\") {\n this.path = href._path;\n }\n\n if (href.search) {\n this.addParametersFromString(href.search);\n } else if (Array.isArray(href._parameters)) {\n // $FlowExpectedError[incompatible-call]\n href._parameters.map((param: Parameter) =>\n this.addParameter(param._name, param._value, param._prefix),\n );\n }\n\n if (href.hash) {\n this.hash = Href.getHashFromString(href.hash);\n } else if (typeof href._hash === \"string\") {\n this.hash = href._hash;\n }\n\n if (href.state) {\n this.state = href.state || null;\n } else if (typeof href._state === \"object\") {\n this.state = href._state;\n }\n }\n\n /**\n * Set parameters from string input\n */\n setFromString(href: string) {\n this.path = Href.getPathFromString(href);\n this.addParametersFromString(href);\n this.hash = Href.getHashFromString(href);\n }\n\n /**\n */\n get isChangePassword(): boolean {\n return this._path.includes(\"/change-password\");\n }\n\n /**\n * check if the path is referencing a camel route\n */\n static isCamelRoute(path: string): boolean {\n return (\n path.startsWith(\"/restServices\") && !path.startsWith(\"/restServices/ui\")\n );\n }\n\n /**\n */\n static checkAbsoluteUrl(href: string): boolean {\n const checkAbsolute = new RegExp(\"^(?:[a-z]+:)?//\", \"i\");\n return checkAbsolute.test(href);\n }\n\n // Check if url is relative (not checking for absolute urls with same domain)\n /**\n */\n get isExternal(): boolean {\n return Href.checkAbsoluteUrl(this.path);\n }\n\n /**\n * Retrieve the relative path part of a href string, e.g. https://www.beinformed.com/BeInformed/tab/view?q=url => /tab/view\n */\n static getPathFromString(href: string): string {\n const decodedHref = decodeURI(href);\n\n const hrefNoHash = decodedHref.includes(\"#\")\n ? decodedHref.substr(0, decodedHref.indexOf(\"#\"))\n : decodedHref;\n\n return hrefNoHash.includes(\"?\") ? hrefNoHash.split(\"?\")[0] : hrefNoHash;\n }\n\n /**\n * Retrieve hash of href string\n */\n static getHashFromString(href: string = \"\"): string {\n return href.includes(\"#\") ? href.substr(href.indexOf(\"#\") + 1) : \"\";\n }\n\n /**\n * Add a parameter for each parameter found in the querystring of an URL string, e.g. https://www.beinformed.com?q=url => q=url\n */\n addParametersFromString(href: string): Href {\n if (href.includes(\"?\")) {\n href\n .split(\"?\")[1]\n .split(\"&\")\n .forEach((param) => {\n const paramFromString = Parameter.fromString(param);\n if (paramFromString) {\n this.setParameter(\n paramFromString.name,\n paramFromString.value,\n paramFromString.prefix,\n );\n }\n });\n }\n\n return this;\n }\n\n /**\n * Add a querystring parameter to the parameter collection of this Href, skips parameters that have a value of null\n */\n addParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value !== null) {\n this.removeParameter(name, prefix);\n this._parameters.push(new Parameter(prefix, name, value));\n }\n\n return this;\n }\n\n /**\n * Adds or overwrites a parameter when it exists and value is not null.\n * Removes the parameter when the value is null\n */\n setParameter(name: string, value: ?string, prefix: ?string): Href {\n if (value === null) {\n this.removeParameter(name, prefix);\n } else {\n this.addParameter(name, value, prefix);\n }\n\n return this;\n }\n\n /**\n * Retrieve a parameter by it's name and (optionally) prefix\n */\n getParameter(name: string, prefix: ?string): ?Parameter {\n return this._parameters.find(\n (param) => param.prefix === prefix && param.name === name,\n );\n }\n\n /**\n */\n hasParameter(name: string, prefix: ?string): boolean {\n return this.getParameter(name, prefix) !== undefined;\n }\n\n /**\n * Get request method\n */\n get method(): $Keys<typeof HTTP_METHODS> {\n return this._method;\n }\n\n /**\n * Set request method\n */\n set method(method: $Keys<typeof HTTP_METHODS>) {\n this._method = method || HTTP_METHODS.GET;\n }\n\n /**\n * Retrieve all paremters\n */\n get parameters(): Array<Parameter> {\n return this._parameters;\n }\n\n /**\n * Replace parameters of Href\n */\n set parameters(parameters: Array<Parameter>) {\n this._parameters = parameters;\n }\n\n /**\n * Remove a parameter from the parameter collection\n */\n removeParameter(name: string, prefix: ?string, value: ?string): Href {\n if (value !== undefined) {\n const valueToRemove = value;\n\n this._parameters = this._parameters.map((param) => {\n if (param.prefix === prefix && param.name === name) {\n const newValue = param.value\n ?.split(\",\")\n .filter((val) => val !== valueToRemove)\n .join(\",\");\n return new Parameter(param.prefix, param.name, newValue);\n }\n return param;\n });\n } else {\n this._parameters = this._parameters.filter(\n (param) => param.prefix !== prefix || param.name !== name,\n );\n }\n\n return this;\n }\n\n /**\n * Get the parameters as a querystring, e.g. param1=value1&param2=value2, optionally with prefix\n */\n getQuerystring(withPrefix: boolean = false): string {\n return this.parameters\n .filter((param) => param.value != null && param.value !== \"\")\n .map((param) => param.toQuerystring(withPrefix))\n .join(\"&\");\n }\n\n /**\n * Retrieve a querystring that only contains parameter that can be send to the modular ui, parameters are filtered by prefix\n */\n getQuerystringForModularUI(prefix: string = \"\"): string {\n return this.parameters\n .filter(\n (param) =>\n param.isModUIParameter &&\n (!prefix || !param.prefix || param.prefix === prefix) &&\n param.value != null,\n )\n .map((param) => param.toQuerystring(false))\n .join(\"&\");\n }\n\n /**\n * Retrieve all parameters from the parameter collection in a querystring style name1=value1&name2=value2, without the prefix\n */\n get querystring(): string {\n return this.getQuerystring(false);\n }\n\n /**\n * Set the path of the Href, the part before the querystring question mark\n */\n set path(path: string) {\n this._path = path;\n }\n\n /**\n * Retrieve the path\n */\n get path(): string {\n return this._path || \"\";\n }\n\n /**\n * Set hash\n */\n set hash(hash: string) {\n this._hash = hash;\n }\n\n /**\n * Retrieve hash\n */\n get hash(): string {\n return this._hash;\n }\n\n /**\n */\n set state(state: any) {\n this._state = state;\n }\n\n /**\n */\n get state(): any {\n return this._state;\n }\n\n /**\n */\n setState(state: any): Href {\n this.state = state;\n\n return this;\n }\n\n /**\n * Set resourctype\n */\n set resourcetype(resourcetype: string) {\n this._resourcetype = resourcetype;\n }\n\n /**\n * Retrieve resourceType\n */\n get resourcetype(): string {\n return this._resourcetype;\n }\n\n /**\n * Retrieve the path combined with the base path (context-path) of the application, e.g. /BeInformed\n */\n get absolutepath(): string {\n if (this.isExternal) {\n return this.path;\n }\n\n return getBasePath() + this.path;\n }\n\n /**\n * Retrieves the combination of the path and the querystring\n */\n get href(): string {\n return this.querystring.length > 0\n ? [this.path, this.querystring].join(\"?\")\n : this.path;\n }\n\n /**\n * Getting the URL including the base path, querystring is prefixed\n */\n get absolutehref(): string {\n const querystring = this.getQuerystring(false);\n\n return querystring.length > 0\n ? [this.absolutepath, querystring].join(\"?\")\n : this.absolutepath;\n }\n\n /**\n * Getting the URL including the base path, the querystring is prefixed\n */\n get absolutehrefPrefixedQuerystring(): string {\n const querystring = this.getQuerystring(true);\n\n return querystring.length > 0\n ? [this.absolutepath, querystring].join(\"?\")\n : this.absolutepath;\n }\n\n /**\n * Checks if the URL starts within the given href\n */\n startsWith(href: Href | string): boolean {\n const thisPath = `${this.path}/`;\n const otherPath = href instanceof Href ? `${href.path}/` : href;\n\n return thisPath.startsWith(otherPath);\n }\n\n /**\n * Checks if the given Href equals this Href\n */\n equals(href: Href | string): boolean {\n if (href instanceof Href) {\n return this.path === href.path;\n }\n\n return this.path === href;\n }\n\n /**\n */\n equalsWithParameters(href: Href): boolean {\n if (!this.equals(href)) {\n return false;\n }\n\n if (href instanceof Href) {\n if (this.parameters.length !== href.parameters.length) {\n return false;\n }\n\n if (this.parameters.length === 0 && href.parameters.length === 0) {\n return true;\n }\n\n const thisParams = this.parameters.map((param) => param.toString());\n\n return href.parameters.every((param) =>\n thisParams.includes(param.toString()),\n );\n }\n\n throw new IllegalArgumentException(`${href} is not an instance of Href`);\n }\n\n /**\n * Indicates if the link is a content link\n */\n get isContent(): boolean {\n return this.absolutepath.startsWith(`${getBasePath()}${CONTENT_PATH}`);\n }\n\n /**\n * Returns a complete url from the Href\n */\n toString(): string {\n return this.href;\n }\n\n /**\n */\n toLocation(): LocationShape {\n return {\n pathname: this.path,\n search: this.querystring.length > 0 ? `?${this.querystring}` : \"\",\n hash: this.hash.length > 0 ? `#${this.hash}` : \"\",\n state: this.state,\n };\n }\n}\n\nexport default Href;\n"],"mappings":"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"}
@@ -12,7 +12,7 @@ describe("sanitizeHTML", () => {
12
12
 
13
13
  expect(
14
14
  removeUnwantedHtml(
15
- "<p>String with <b>allowed <i>html</i></b><br /> and <strong>NOT</strong> allowed html</p>",
15
+ "<p>String with <b>allowed <i>html</i></b><br /> and <blink>NOT</blink> allowed html</p>",
16
16
  ),
17
17
  ).toBe(
18
18
  "<p>String with <b>allowed <i>html</i></b><br /> and NOT allowed html</p>",
@@ -28,4 +28,38 @@ describe("sanitizeHTML", () => {
28
28
  ),
29
29
  ).toBe("<p>String <b>not allowed attribute</b> string</p>");
30
30
  });
31
+
32
+ it("Can convert html entities to numerical entities", () => {
33
+ expect(
34
+ removeUnwantedHtml("f&ouml;o &hearts; b&aring;r &#x1D306; baz"),
35
+ ).toBe("f&#246;o &#9829; b&#229;r &#119558; baz");
36
+ });
37
+
38
+ it("Can encode special charcaters to numerical characters", () => {
39
+ expect(removeUnwantedHtml("<p>foo © bar ≠ baz 𝌆 qux bla</p>")).toBe(
40
+ "<p>foo &#169; bar &#8800; baz &#119558; qux bla</p>",
41
+ );
42
+
43
+ expect(
44
+ removeUnwantedHtml(
45
+ "<p>foo &#169; bar &#8800; baz &#119558; qux &#160; bla</p>",
46
+ ),
47
+ ).toBe("<p>foo &#169; bar &#8800; baz &#119558; qux &#160; bla</p>");
48
+ });
49
+
50
+ it("Keeps brackets", () => {
51
+ expect(
52
+ removeUnwantedHtml(
53
+ "The list of children [ Peter, Steven, Susan ] is up to date.",
54
+ ),
55
+ ).toBe("The list of children [ Peter, Steven, Susan ] is up to date.");
56
+ });
57
+
58
+ it("Keeps curly brackets", () => {
59
+ expect(
60
+ removeUnwantedHtml(
61
+ "The list of children { Peter, Steven, Susan } is up to date.",
62
+ ),
63
+ ).toBe("The list of children { Peter, Steven, Susan } is up to date.");
64
+ });
31
65
  });
@@ -12,13 +12,15 @@ var _exceptions = require("../../exceptions");
12
12
  * When path is only one deep better use optional chaining
13
13
  */
14
14
  const properEntityEncoding = html => {
15
- const escapedGt = html.replace(/</g, "[");
16
- const escapedLt = escapedGt.replace(/>/g, "]");
17
- const properEntities = _he.default.encode(_he.default.decode(escapedLt), {
18
- decimal: true
15
+ const htmlDecoded = _he.default.decode(html, {
16
+ decimal: true,
17
+ allowUnsafeSymbols: true
19
18
  });
20
- const unescapedGt = properEntities.replace(/\[/g, "<");
21
- return unescapedGt.replace(/]/g, ">");
19
+ const htmlEncoded = _he.default.encode(htmlDecoded, {
20
+ decimal: true,
21
+ allowUnsafeSymbols: true
22
+ });
23
+ return htmlEncoded;
22
24
  };
23
25
 
24
26
  /**
@@ -12,16 +12,17 @@ type removeUnwantedHtmlOptions = {
12
12
  * When path is only one deep better use optional chaining
13
13
  */
14
14
  const properEntityEncoding = (html: string) => {
15
- const escapedGt = html.replace(/</g, "[");
16
- const escapedLt = escapedGt.replace(/>/g, "]");
17
-
18
- const properEntities = he.encode(he.decode(escapedLt), {
15
+ const htmlDecoded = he.decode(html, {
19
16
  decimal: true,
17
+ allowUnsafeSymbols: true,
20
18
  });
21
19
 
22
- const unescapedGt = properEntities.replace(/\[/g, "<");
20
+ const htmlEncoded = he.encode(htmlDecoded, {
21
+ decimal: true,
22
+ allowUnsafeSymbols: true,
23
+ });
23
24
 
24
- return unescapedGt.replace(/]/g, ">");
25
+ return htmlEncoded;
25
26
  };
26
27
 
27
28
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"sanitizeHtml.js","names":["_he","_interopRequireDefault","require","_exceptions","properEntityEncoding","html","escapedGt","replace","escapedLt","properEntities","he","encode","decode","decimal","unescapedGt","removeUnwantedHtml","options","arguments","length","undefined","allowedTags","IllegalArgumentException","correctEntityHtml","htmlWithoutAttributes","htmlWithCorrectBR","Array","isArray","join","pattern","regex","RegExp","exports"],"sources":["../../../src/utils/helpers/sanitizeHtml.js"],"sourcesContent":["// @flow\nimport he from \"he\";\n\nimport { IllegalArgumentException } from \"../../exceptions\";\n\ntype removeUnwantedHtmlOptions = {\n allowedTags?: Array<string>,\n};\n\n/**\n * Translates html entities to their correct decimal equivalent\n * When path is only one deep better use optional chaining\n */\nconst properEntityEncoding = (html: string) => {\n const escapedGt = html.replace(/</g, \"[\");\n const escapedLt = escapedGt.replace(/>/g, \"]\");\n\n const properEntities = he.encode(he.decode(escapedLt), {\n decimal: true,\n });\n\n const unescapedGt = properEntities.replace(/\\[/g, \"<\");\n\n return unescapedGt.replace(/]/g, \">\");\n};\n\n/**\n * removes unwanted html, this might result in incorrect html, as it removes all html that we don't except,\n * like <b style=\"font-weight: 400\">bold</b> will result in bold</b>\n */\nconst removeUnwantedHtml = (\n html: string,\n options: removeUnwantedHtmlOptions = {\n allowedTags: [\"p\", \"br\", \"b\", \"i\", \"u\", \"strike\"],\n },\n): string => {\n if (typeof html !== \"string\") {\n throw new IllegalArgumentException(\"sanitizeHTML method expects a string\");\n }\n\n const correctEntityHtml = properEntityEncoding(html);\n\n // remove attributes from html elements\n const htmlWithoutAttributes = correctEntityHtml.replace(\n /<(\\w+)(.|[\\r\\n])*?>/gi,\n \"<$1>\",\n );\n\n const htmlWithCorrectBR = htmlWithoutAttributes.replace(\n /<br\\s*>/gi,\n \"<br />\",\n );\n\n // remove not allowed tags\n const allowedTags = Array.isArray(options.allowedTags)\n ? options.allowedTags.join(\"|\")\n : \"\";\n const pattern = `<(?!\\\\/?(${allowedTags})(>|\\\\s\\\\/))[^<]+?>`;\n const regex = new RegExp(pattern, \"gi\");\n\n return htmlWithCorrectBR.replace(regex, \"\");\n};\n\nexport { removeUnwantedHtml };\n"],"mappings":";;;;;;;AACA,IAAAA,GAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAMA;AACA;AACA;AACA;AACA,MAAME,oBAAoB,GAAIC,IAAY,IAAK;EAC7C,MAAMC,SAAS,GAAGD,IAAI,CAACE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;EACzC,MAAMC,SAAS,GAAGF,SAAS,CAACC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;EAE9C,MAAME,cAAc,GAAGC,WAAE,CAACC,MAAM,CAACD,WAAE,CAACE,MAAM,CAACJ,SAAS,CAAC,EAAE;IACrDK,OAAO,EAAE;EACX,CAAC,CAAC;EAEF,MAAMC,WAAW,GAAGL,cAAc,CAACF,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,OAAOO,WAAW,CAACP,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;AACvC,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMQ,kBAAkB,GAAG,SAAAA,CACzBV,IAAY,EAID;EAAA,IAHXW,OAAkC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACnCG,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ;EAClD,CAAC;EAED,IAAI,OAAOf,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIgB,oCAAwB,CAAC,sCAAsC,CAAC;EAC5E;EAEA,MAAMC,iBAAiB,GAAGlB,oBAAoB,CAACC,IAAI,CAAC;;EAEpD;EACA,MAAMkB,qBAAqB,GAAGD,iBAAiB,CAACf,OAAO,CACrD,uBAAuB,EACvB,MACF,CAAC;EAED,MAAMiB,iBAAiB,GAAGD,qBAAqB,CAAChB,OAAO,CACrD,WAAW,EACX,QACF,CAAC;;EAED;EACA,MAAMa,WAAW,GAAGK,KAAK,CAACC,OAAO,CAACV,OAAO,CAACI,WAAW,CAAC,GAClDJ,OAAO,CAACI,WAAW,CAACO,IAAI,CAAC,GAAG,CAAC,GAC7B,EAAE;EACN,MAAMC,OAAO,GAAI,YAAWR,WAAY,qBAAoB;EAC5D,MAAMS,KAAK,GAAG,IAAIC,MAAM,CAACF,OAAO,EAAE,IAAI,CAAC;EAEvC,OAAOJ,iBAAiB,CAACjB,OAAO,CAACsB,KAAK,EAAE,EAAE,CAAC;AAC7C,CAAC;AAACE,OAAA,CAAAhB,kBAAA,GAAAA,kBAAA"}
1
+ {"version":3,"file":"sanitizeHtml.js","names":["_he","_interopRequireDefault","require","_exceptions","properEntityEncoding","html","htmlDecoded","he","decode","decimal","allowUnsafeSymbols","htmlEncoded","encode","removeUnwantedHtml","options","arguments","length","undefined","allowedTags","IllegalArgumentException","correctEntityHtml","htmlWithoutAttributes","replace","htmlWithCorrectBR","Array","isArray","join","pattern","regex","RegExp","exports"],"sources":["../../../src/utils/helpers/sanitizeHtml.js"],"sourcesContent":["// @flow\nimport he from \"he\";\n\nimport { IllegalArgumentException } from \"../../exceptions\";\n\ntype removeUnwantedHtmlOptions = {\n allowedTags?: Array<string>,\n};\n\n/**\n * Translates html entities to their correct decimal equivalent\n * When path is only one deep better use optional chaining\n */\nconst properEntityEncoding = (html: string) => {\n const htmlDecoded = he.decode(html, {\n decimal: true,\n allowUnsafeSymbols: true,\n });\n\n const htmlEncoded = he.encode(htmlDecoded, {\n decimal: true,\n allowUnsafeSymbols: true,\n });\n\n return htmlEncoded;\n};\n\n/**\n * removes unwanted html, this might result in incorrect html, as it removes all html that we don't except,\n * like <b style=\"font-weight: 400\">bold</b> will result in bold</b>\n */\nconst removeUnwantedHtml = (\n html: string,\n options: removeUnwantedHtmlOptions = {\n allowedTags: [\"p\", \"br\", \"b\", \"i\", \"u\", \"strike\"],\n },\n): string => {\n if (typeof html !== \"string\") {\n throw new IllegalArgumentException(\"sanitizeHTML method expects a string\");\n }\n\n const correctEntityHtml = properEntityEncoding(html);\n\n // remove attributes from html elements\n const htmlWithoutAttributes = correctEntityHtml.replace(\n /<(\\w+)(.|[\\r\\n])*?>/gi,\n \"<$1>\",\n );\n\n const htmlWithCorrectBR = htmlWithoutAttributes.replace(\n /<br\\s*>/gi,\n \"<br />\",\n );\n\n // remove not allowed tags\n const allowedTags = Array.isArray(options.allowedTags)\n ? options.allowedTags.join(\"|\")\n : \"\";\n const pattern = `<(?!\\\\/?(${allowedTags})(>|\\\\s\\\\/))[^<]+?>`;\n const regex = new RegExp(pattern, \"gi\");\n\n return htmlWithCorrectBR.replace(regex, \"\");\n};\n\nexport { removeUnwantedHtml };\n"],"mappings":";;;;;;;AACA,IAAAA,GAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AAMA;AACA;AACA;AACA;AACA,MAAME,oBAAoB,GAAIC,IAAY,IAAK;EAC7C,MAAMC,WAAW,GAAGC,WAAE,CAACC,MAAM,CAACH,IAAI,EAAE;IAClCI,OAAO,EAAE,IAAI;IACbC,kBAAkB,EAAE;EACtB,CAAC,CAAC;EAEF,MAAMC,WAAW,GAAGJ,WAAE,CAACK,MAAM,CAACN,WAAW,EAAE;IACzCG,OAAO,EAAE,IAAI;IACbC,kBAAkB,EAAE;EACtB,CAAC,CAAC;EAEF,OAAOC,WAAW;AACpB,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAME,kBAAkB,GAAG,SAAAA,CACzBR,IAAY,EAID;EAAA,IAHXS,OAAkC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACnCG,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ;EAClD,CAAC;EAED,IAAI,OAAOb,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIc,oCAAwB,CAAC,sCAAsC,CAAC;EAC5E;EAEA,MAAMC,iBAAiB,GAAGhB,oBAAoB,CAACC,IAAI,CAAC;;EAEpD;EACA,MAAMgB,qBAAqB,GAAGD,iBAAiB,CAACE,OAAO,CACrD,uBAAuB,EACvB,MACF,CAAC;EAED,MAAMC,iBAAiB,GAAGF,qBAAqB,CAACC,OAAO,CACrD,WAAW,EACX,QACF,CAAC;;EAED;EACA,MAAMJ,WAAW,GAAGM,KAAK,CAACC,OAAO,CAACX,OAAO,CAACI,WAAW,CAAC,GAClDJ,OAAO,CAACI,WAAW,CAACQ,IAAI,CAAC,GAAG,CAAC,GAC7B,EAAE;EACN,MAAMC,OAAO,GAAI,YAAWT,WAAY,qBAAoB;EAC5D,MAAMU,KAAK,GAAG,IAAIC,MAAM,CAACF,OAAO,EAAE,IAAI,CAAC;EAEvC,OAAOJ,iBAAiB,CAACD,OAAO,CAACM,KAAK,EAAE,EAAE,CAAC;AAC7C,CAAC;AAACE,OAAA,CAAAjB,kBAAA,GAAAA,kBAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@beinformed/ui",
3
- "version": "1.33.0-beta.2",
3
+ "version": "1.33.0-beta.4",
4
4
  "description": "Toolbox for be informed javascript layouts",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "bugs": "http://support.beinformed.com",
@@ -82,7 +82,7 @@
82
82
  "styled-components": "^5.0.0"
83
83
  },
84
84
  "dependencies": {
85
- "@babel/runtime-corejs3": "^7.22.6",
85
+ "@babel/runtime-corejs3": "^7.22.11",
86
86
  "big.js": "^6.2.1",
87
87
  "date-fns": "^2.30.0",
88
88
  "deepmerge": "^4.3.1",
@@ -98,50 +98,50 @@
98
98
  "setimmediate": "^1.0.5"
99
99
  },
100
100
  "devDependencies": {
101
- "@babel/cli": "^7.22.9",
102
- "@babel/core": "^7.22.9",
103
- "@babel/eslint-parser": "^7.22.9",
104
- "@babel/eslint-plugin": "^7.22.5",
101
+ "@babel/cli": "^7.22.10",
102
+ "@babel/core": "^7.22.11",
103
+ "@babel/eslint-parser": "^7.22.11",
104
+ "@babel/eslint-plugin": "^7.22.10",
105
105
  "@babel/plugin-proposal-class-properties": "^7.18.6",
106
106
  "@babel/plugin-syntax-dynamic-import": "^7.8.3",
107
- "@babel/plugin-transform-runtime": "^7.22.9",
108
- "@babel/preset-env": "^7.22.9",
107
+ "@babel/plugin-transform-runtime": "^7.22.10",
108
+ "@babel/preset-env": "^7.22.10",
109
109
  "@babel/preset-flow": "^7.22.5",
110
110
  "@babel/preset-react": "^7.22.5",
111
- "@commitlint/cli": "^17.6.7",
112
- "@commitlint/config-conventional": "^17.6.7",
111
+ "@commitlint/cli": "^17.7.1",
112
+ "@commitlint/config-conventional": "^17.7.0",
113
113
  "@testing-library/react": "^14.0.0",
114
114
  "auditjs": "^4.0.41",
115
- "babel-jest": "^29.6.2",
115
+ "babel-jest": "^29.6.4",
116
116
  "babel-plugin-styled-components": "^2.1.4",
117
117
  "cherry-pick": "^0.5.0",
118
- "commit-and-tag-version": "^11.2.2",
118
+ "commit-and-tag-version": "^11.2.3",
119
119
  "cross-env": "^7.0.3",
120
120
  "documentation": "^14.0.2",
121
- "eslint": "^8.46.0",
121
+ "eslint": "^8.48.0",
122
122
  "eslint-config-prettier": "^9.0.0",
123
123
  "eslint-plugin-babel": "^5.3.1",
124
124
  "eslint-plugin-ft-flow": "^3.0.0",
125
- "eslint-plugin-import": "^2.28.0",
125
+ "eslint-plugin-import": "^2.28.1",
126
126
  "eslint-plugin-jest": "^27.2.3",
127
- "eslint-plugin-jsdoc": "^46.4.6",
128
- "eslint-plugin-react": "^7.33.1",
127
+ "eslint-plugin-jsdoc": "^46.5.0",
128
+ "eslint-plugin-react": "^7.33.2",
129
129
  "eslint-plugin-react-hooks": "^4.5.0",
130
- "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
130
+ "eslint-plugin-you-dont-need-lodash-underscore": "^6.13.0",
131
131
  "flow-bin": "^0.200.1",
132
132
  "flow-copy-source": "^2.0.9",
133
133
  "flow-typed": "^3.9.0",
134
134
  "glob": "^10.3.3",
135
135
  "history": "^4.0.0",
136
136
  "husky": "^8.0.3",
137
- "jest": "^29.6.2",
138
- "jest-environment-jsdom": "^29.6.2",
137
+ "jest": "^29.6.4",
138
+ "jest-environment-jsdom": "^29.6.4",
139
139
  "jest-junit": "^16.0.0",
140
140
  "jest-sonar-reporter": "^2.0.0",
141
141
  "jscodeshift": "^0.15.0",
142
142
  "lint-staged": "^13.2.3",
143
143
  "polished": "^4.0.0",
144
- "prettier": "^3.0.1",
144
+ "prettier": "^3.0.2",
145
145
  "react": "^18.0.0",
146
146
  "react-dom": "^18.0.0",
147
147
  "react-helmet-async": "^1.0.0",
@@ -142,7 +142,8 @@ class CompositeAttributeModel extends AttributeModel {
142
142
  /**
143
143
  * Validate input
144
144
  */
145
- validate(): boolean {
145
+ // eslint-disable-next-line no-unused-vars
146
+ validate(value: string): boolean {
146
147
  // when client side validation is disabled, this attribute is always valid
147
148
  if (!this.useClientsideValidation()) {
148
149
  return true;
@@ -190,7 +191,7 @@ class CompositeAttributeModel extends AttributeModel {
190
191
  * Indicates if attribute input is valid
191
192
  */
192
193
  get isValid(): boolean {
193
- return this.validate();
194
+ return this.validate("");
194
195
  }
195
196
 
196
197
  /**
@@ -287,7 +288,7 @@ class CompositeAttributeModel extends AttributeModel {
287
288
 
288
289
  this.setChildrenOptionality();
289
290
 
290
- this.validate();
291
+ this.validate(value);
291
292
 
292
293
  return this;
293
294
  }
@@ -117,22 +117,11 @@ export default class StringAttributeModel extends AttributeModel {
117
117
 
118
118
  if (this.isBSN()) {
119
119
  constraints.add(new BSNConstraint());
120
- } else if (
121
- this.isIBAN() &&
122
- (this.operator === "" ||
123
- this.operator === "exactly" ||
124
- this.operator === "isNot")
125
- ) {
126
- // validate iban when no operator is set or exact or isNot
120
+ } else if (this.isIBAN()) {
127
121
  constraints.add(new IBANConstraint());
128
122
  }
129
123
 
130
- if (
131
- this.isZipcode() &&
132
- (this.operator === "" ||
133
- this.operator === "exactly" ||
134
- this.operator === "isNot")
135
- ) {
124
+ if (this.isZipcode()) {
136
125
  // validate zip when regex is set is set or exact or isNot
137
126
  constraints.add(
138
127
  new RegexConstraint({
@@ -174,16 +163,8 @@ export default class StringAttributeModel extends AttributeModel {
174
163
  formatIBAN(value: string): string {
175
164
  const noFormat = this.removeFormat(value);
176
165
 
177
- if (
178
- this.operator === "" ||
179
- this.operator === "exactly" ||
180
- this.operator === "isNot"
181
- ) {
182
- const groups = noFormat.replace(/\s/g, "").match(/.{1,4}/g);
183
- return groups == null ? "" : groups.join(" ");
184
- }
185
-
186
- return noFormat;
166
+ const groups = noFormat.replace(/\s/g, "").match(/.{1,4}/g);
167
+ return groups == null ? "" : groups.join(" ");
187
168
  }
188
169
 
189
170
  /**
@@ -215,25 +196,19 @@ export default class StringAttributeModel extends AttributeModel {
215
196
  return value;
216
197
  }
217
198
 
218
- const values = this.isMultiple ? value.split(",") : [value];
219
-
220
- return values
221
- .map((val) => {
222
- if (this.isIBAN()) {
223
- return this.formatIBAN(val);
224
- }
199
+ if (this.isIBAN()) {
200
+ return this.formatIBAN(value);
201
+ }
225
202
 
226
- if (this.isZipcode()) {
227
- return this.formatZipcode(val);
228
- }
203
+ if (this.isZipcode()) {
204
+ return this.formatZipcode(value);
205
+ }
229
206
 
230
- if (this.isBSN()) {
231
- return this.formatBSN(val);
232
- }
207
+ if (this.isBSN()) {
208
+ return this.formatBSN(value);
209
+ }
233
210
 
234
- return val;
235
- })
236
- .join(",");
211
+ return value.replace(/ {2}/gi, " \u00A0");
237
212
  }
238
213
 
239
214
  /**
@@ -270,11 +245,6 @@ export default class StringAttributeModel extends AttributeModel {
270
245
 
271
246
  if (value == null) {
272
247
  this.value = value;
273
- } else if (this.isMultiple) {
274
- this.value = value
275
- .split(",")
276
- .map((val) => this.removeFormat(val))
277
- .join(",");
278
248
  } else {
279
249
  this.value = this.removeFormat(value);
280
250
  }
@@ -322,11 +292,4 @@ export default class StringAttributeModel extends AttributeModel {
322
292
  // default value (also applied for email address + download attribute)
323
293
  return ATTRIBUTE_WIDTH.MEDIUM;
324
294
  }
325
-
326
- /**
327
- * Indicates if a value is multiple choice, used for filters
328
- */
329
- get isMultiple(): boolean {
330
- return this.getContribution("multiplechoice", false);
331
- }
332
295
  }
@@ -122,17 +122,4 @@ describe("stringAttributeModel", () => {
122
122
  expect(attribute.inputvalue).toBe("test test");
123
123
  expect(attribute.readonlyvalue).toBe("test \u00A0 \u00A0 test");
124
124
  });
125
-
126
- it("format isMultiple with escaped comma", () => {
127
- const attribute = new StringAttributeModel(
128
- {},
129
- { type: "string", multiplechoice: true },
130
- );
131
-
132
- attribute.update("test test");
133
-
134
- expect(attribute.value).toBe("test test");
135
- expect(attribute.inputvalue).toBe("test test");
136
- expect(attribute.readonlyvalue).toBe("test \u00A0 \u00A0 test");
137
- });
138
125
  });
@@ -23,7 +23,7 @@ export default class BaseFilterModel extends BaseModel {
23
23
  this.type,
24
24
  this.param,
25
25
  this.data,
26
- this.contributions
26
+ this.contributions,
27
27
  );
28
28
 
29
29
  if (this.contributions.listKey) {
@@ -47,7 +47,7 @@ export default class BaseFilterModel extends BaseModel {
47
47
  type: string,
48
48
  param: string,
49
49
  data: Object,
50
- contributions: Object
50
+ contributions: Object,
51
51
  ): AttributeType | null {
52
52
  if (type === "assignment") {
53
53
  return null;
@@ -101,13 +101,6 @@ export default class BaseFilterModel extends BaseModel {
101
101
  return this.getContribution("label", "");
102
102
  }
103
103
 
104
- /**
105
- * Inidiates if filter is multiplechoice
106
- */
107
- get isMultiple(): boolean {
108
- return this.getContribution("multiplechoice");
109
- }
110
-
111
104
  /**
112
105
  * Getting the name of the filter
113
106
  */
@@ -132,7 +125,7 @@ export default class BaseFilterModel extends BaseModel {
132
125
  get attribute(): AttributeType {
133
126
  if (!this._attribute) {
134
127
  throw new IllegalStateException(
135
- `Missing filter attribute on filter model: ${this.label}`
128
+ `Missing filter attribute on filter model: ${this.label}`,
136
129
  );
137
130
  }
138
131
  return this._attribute;
@@ -157,12 +150,7 @@ export default class BaseFilterModel extends BaseModel {
157
150
  /**
158
151
  * Getting the value of the filter
159
152
  */
160
- get value(): string | Array<string> {
161
- if (this.isMultiple) {
162
- // Returns unique array
163
- return [...new Set(this.attribute?.value.split(","))];
164
- }
165
-
153
+ get value(): string | null {
166
154
  return this.attribute?.value;
167
155
  }
168
156
 
@@ -1,11 +1,12 @@
1
1
  // @flow
2
2
  import BaseCollection from "../base/BaseCollection";
3
3
 
4
+ import StringFilterModel from "../filters/StringFilterModel";
4
5
  import RangeFilterModel from "../filters/RangeFilterModel";
5
6
  import AssignmentFilterModel from "../filters/AssignmentFilterModel";
6
- import FilterModel from "../filters/FilterModel";
7
7
  import ConceptIndexFilterModel from "../filters/ConceptIndexFilterModel";
8
8
  import CompositeAttributeModel from "../attributes/CompositeAttributeModel";
9
+ import FilterModel from "../filters/FilterModel";
9
10
 
10
11
  import type { AttributeType, FilterType } from "../types";
11
12
 
@@ -74,6 +75,10 @@ export default class FilterCollection extends BaseCollection<FilterType> {
74
75
  return new AssignmentFilterModel(data, contributions);
75
76
  }
76
77
 
78
+ if (type === "stringfilter") {
79
+ return new StringFilterModel(data, contributions);
80
+ }
81
+
77
82
  return new FilterModel(data, contributions);
78
83
  }
79
84