@beinformed/ui 1.27.0 → 1.27.2

package/lib/models/attributes/CaptchaAttributeModel.js.flow

@@ -5,6 +5,8 @@ import AttributeModel from "./AttributeModel";
  * Password attribute
  */
 export default class CaptchaAttributeModel extends AttributeModel {
+  _answer: string = "";
+
   /**
    */
   static isApplicableModel(contributions: Object): boolean {
@@ -27,6 +29,20 @@ export default class CaptchaAttributeModel extends AttributeModel {
     return this;
   }
 
+  /**
+   */
+  setAnswer(answer: string) {
+    this._answer = answer;
+  }
+
+  /**
+   * Retrieve the given answer for the captcha
+   * The value of this attribute is the token id of the captcha
+   */
+  getAnswer(): string {
+    return this._answer;
+  }
+
   /**
    */
   get hasDynamicValidationData(): boolean {

package/lib/models/attributes/CaptchaAttributeModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"CaptchaAttributeModel.js","names":["CaptchaAttributeModel","AttributeModel","isApplicableModel","contributions","type","update","value","updateLastModification","inputvalue","hasDynamicValidationData"],"sources":["../../../src/models/attributes/CaptchaAttributeModel.js"],"sourcesContent":["// @flow\nimport AttributeModel from \"./AttributeModel\";\n\n/**\n * Password attribute\n */\nexport default class CaptchaAttributeModel extends AttributeModel {\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    return contributions.type === \"captcha\";\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"captcha\";\n  }\n\n  /**\n   * Update the attribute by name and value\n   */\n  update(value: string): this {\n    this.updateLastModification();\n    this.inputvalue = value;\n\n    return this;\n  }\n\n  /**\n   */\n  get hasDynamicValidationData(): boolean {\n    return false;\n  }\n}\n"],"mappings":";;;;;;;AACA;AAEA;AACA;AACA;AACe,MAAMA,qBAAqB,SAASC,uBAAc,CAAC;EAChE;AACF;EACE,OAAOC,iBAAiB,CAACC,aAAqB,EAAW;IACvD,OAAOA,aAAa,CAACC,IAAI,KAAK,SAAS;EACzC;;EAEA;AACF;EACE,IAAIA,IAAI,GAAW;IACjB,OAAO,SAAS;EAClB;;EAEA;AACF;AACA;EACEC,MAAM,CAACC,KAAa,EAAQ;IAC1B,IAAI,CAACC,sBAAsB,EAAE;IAC7B,IAAI,CAACC,UAAU,GAAGF,KAAK;IAEvB,OAAO,IAAI;EACb;;EAEA;AACF;EACE,IAAIG,wBAAwB,GAAY;IACtC,OAAO,KAAK;EACd;AACF;AAAC"}
+{"version":3,"file":"CaptchaAttributeModel.js","names":["CaptchaAttributeModel","AttributeModel","isApplicableModel","contributions","type","update","value","updateLastModification","inputvalue","setAnswer","answer","_answer","getAnswer","hasDynamicValidationData"],"sources":["../../../src/models/attributes/CaptchaAttributeModel.js"],"sourcesContent":["// @flow\nimport AttributeModel from \"./AttributeModel\";\n\n/**\n * Password attribute\n */\nexport default class CaptchaAttributeModel extends AttributeModel {\n  _answer: string = \"\";\n\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    return contributions.type === \"captcha\";\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"captcha\";\n  }\n\n  /**\n   * Update the attribute by name and value\n   */\n  update(value: string): this {\n    this.updateLastModification();\n    this.inputvalue = value;\n\n    return this;\n  }\n\n  /**\n   */\n  setAnswer(answer: string) {\n    this._answer = answer;\n  }\n\n  /**\n   * Retrieve the given answer for the captcha\n   * The value of this attribute is the token id of the captcha\n   */\n  getAnswer(): string {\n    return this._answer;\n  }\n\n  /**\n   */\n  get hasDynamicValidationData(): boolean {\n    return false;\n  }\n}\n"],"mappings":";;;;;;;;AACA;AAEA;AACA;AACA;AACe,MAAMA,qBAAqB,SAASC,uBAAc,CAAC;EAAA;IAAA;IAAA,+CAC9C,EAAE;EAAA;EAEpB;AACF;EACE,OAAOC,iBAAiB,CAACC,aAAqB,EAAW;IACvD,OAAOA,aAAa,CAACC,IAAI,KAAK,SAAS;EACzC;;EAEA;AACF;EACE,IAAIA,IAAI,GAAW;IACjB,OAAO,SAAS;EAClB;;EAEA;AACF;AACA;EACEC,MAAM,CAACC,KAAa,EAAQ;IAC1B,IAAI,CAACC,sBAAsB,EAAE;IAC7B,IAAI,CAACC,UAAU,GAAGF,KAAK;IAEvB,OAAO,IAAI;EACb;;EAEA;AACF;EACEG,SAAS,CAACC,MAAc,EAAE;IACxB,IAAI,CAACC,OAAO,GAAGD,MAAM;EACvB;;EAEA;AACF;AACA;AACA;EACEE,SAAS,GAAW;IAClB,OAAO,IAAI,CAACD,OAAO;EACrB;;EAEA;AACF;EACE,IAAIE,wBAAwB,GAAY;IACtC,OAAO,KAAK;EACd;AACF;AAAC"}

package/lib/models/attributes/__tests__/ChoiceAttributeModel.spec.js.flow

@@ -130,6 +130,9 @@ describe("choiceAttributeModel", () => {
     expect(attribute.format).toBeNull();
 
     expect(attribute.options).toHaveLength(4);
+
+    const clonedAttribute = attribute.clone();
+    expect(clonedAttribute).toStrictEqual(attribute);
   });
 
   it("handles sort-options hint", () => {

package/lib/models/attributes/__tests__/CompositeAttributeModel.spec.js.flow

@@ -202,6 +202,9 @@ describe("compositeAttributeModel", () => {
       PrintingHouse: "Printers united",
       Title: "Matilda",
     });
+
+    const clonedAttribute = attribute.clone();
+    expect(clonedAttribute).toStrictEqual(attribute);
   });
 
   it("creates a composite attribute for a choice attribute with a table codemap on a list, multiple choice", () => {

package/lib/models/attributes/_createAttribute.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+var _full = require("klona/full");
 var _objects = require("../../utils/helpers/objects");
 var _LayoutHintRuleCollection = _interopRequireDefault(require("./layouthint-rules/LayoutHintRuleCollection"));
 var _CaptchaAttributeModel = _interopRequireDefault(require("./CaptchaAttributeModel"));
@@ -67,7 +67,7 @@ const updateContributions = (key, data, contributions) => {
  * @private
  */
 const updateData = (key, data, contributions) => {
-  const newData = (0, _cloneDeep.default)(data);
+  const newData = (0, _full.klona)(data);
   if (contributions.dynamicschemaId) {
     newData.dynamicschemaId = contributions.dynamicschemaId;
   }

package/lib/models/attributes/_createAttribute.js.flow

@@ -1,5 +1,5 @@
 // @flow
-import cloneDeep from "lodash/cloneDeep";
+import { klona } from "klona/full";
 
 import { has, isPlainObject } from "../../utils/helpers/objects";
 
@@ -105,7 +105,7 @@ const updateData = (
   data: Object,
   contributions: Object
 ): Object => {
-  const newData = cloneDeep(data);
+  const newData = klona(data);
 
   if (contributions.dynamicschemaId) {
     newData.dynamicschemaId = contributions.dynamicschemaId;

package/lib/models/attributes/_createAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"_createAttribute.js","names":["getChildrenKeys","children","child","childKey","isComposite","type","key","dynamicschemaId","undefined","getAttributeModel","contributions","ATTRIBUTE_MODELS","ChoiceAttributeModel","BooleanAttributeModel","HelptextAttributeModel","LabelAttributeModel","XMLAttributeModel","MemoAttributeModel","StringAttributeModel","DatetimeAttributeModel","MoneyAttributeModel","NumberAttributeModel","PasswordAttributeModel","UploadAttributeModel","CompositeAttributeModel","CaptchaAttributeModel","model","isApplicableModel","updateContributions","data","has","isPlainObject","Array","isArray","updateData","newData","cloneDeep","createAttribute","updatedContributions","updatedData","Model","Error","childrenKeys","dataHelper","AttributeDataHelper","getData","attribute","LayoutHintRuleCollection","setLayoutHintRules"],"sources":["../../../src/models/attributes/_createAttribute.js"],"sourcesContent":["// @flow\nimport cloneDeep from \"lodash/cloneDeep\";\n\nimport { has, isPlainObject } from \"../../utils/helpers/objects\";\n\nimport LayoutHintRuleCollection from \"./layouthint-rules/LayoutHintRuleCollection\";\n\nimport CaptchaAttributeModel from \"./CaptchaAttributeModel\";\nimport ChoiceAttributeModel from \"./ChoiceAttributeModel\";\nimport DatetimeAttributeModel from \"./DatetimeAttributeModel\";\nimport HelptextAttributeModel from \"./HelptextAttributeModel\";\nimport LabelAttributeModel from \"./LabelAttributeModel\";\nimport MemoAttributeModel from \"./MemoAttributeModel\";\nimport MoneyAttributeModel from \"./MoneyAttributeModel\";\nimport NumberAttributeModel from \"./NumberAttributeModel\";\nimport PasswordAttributeModel from \"./PasswordAttributeModel\";\nimport CompositeAttributeModel from \"./CompositeAttributeModel\";\nimport StringAttributeModel from \"./StringAttributeModel\";\nimport UploadAttributeModel from \"./UploadAttributeModel\";\nimport XMLAttributeModel from \"./XMLAttributeModel\";\nimport BooleanAttributeModel from \"./BooleanAttributeModel\";\n\nimport AttributeDataHelper from \"./AttributeDataHelper\";\n\nimport type { AttributeType } from \"../types\";\n\n/**\n * @private\n */\nconst getChildrenKeys = (children: Array<Object>): Array<Object> => {\n  if (children) {\n    return children.map((child) => {\n      const [childKey] = Object.keys(child);\n      const isComposite =\n        child[childKey].type === \"range\" ||\n        child[childKey].type === \"composite\";\n\n      return {\n        key: childKey,\n        dynamicschemaId: child[childKey]?.dynamicschemaId || undefined,\n        children: isComposite ? getChildrenKeys(child[childKey]?.children) : [],\n      };\n    });\n  }\n\n  return [];\n};\n\n/**\n * @private\n */\nconst getAttributeModel = (contributions: Object): ?Class<AttributeType> => {\n  const ATTRIBUTE_MODELS = [\n    ChoiceAttributeModel,\n    BooleanAttributeModel,\n\n    HelptextAttributeModel,\n    LabelAttributeModel,\n\n    XMLAttributeModel,\n    MemoAttributeModel,\n    StringAttributeModel,\n\n    DatetimeAttributeModel,\n\n    MoneyAttributeModel,\n    NumberAttributeModel,\n    PasswordAttributeModel,\n\n    UploadAttributeModel,\n    CompositeAttributeModel,\n    CaptchaAttributeModel,\n  ];\n\n  return ATTRIBUTE_MODELS.find((model) =>\n    model.isApplicableModel(contributions)\n  );\n};\n\n/**\n * @private\n */\nconst updateContributions = (\n  key: string,\n  data: Object,\n  contributions: Object\n): Object => {\n  const isComposite =\n    contributions.type === \"array\" &&\n    has(contributions, \"children\") &&\n    isPlainObject(data) &&\n    Array.isArray(data[key]);\n\n  return {\n    ...contributions,\n    type: isComposite ? \"composite\" : contributions.type,\n  };\n};\n\n/**\n * @private\n */\nconst updateData = (\n  key: string,\n  data: Object,\n  contributions: Object\n): Object => {\n  const newData = cloneDeep(data);\n\n  if (contributions.dynamicschemaId) {\n    newData.dynamicschemaId = contributions.dynamicschemaId;\n  }\n\n  return newData;\n};\n\n/**\n * Create an attribute based on data and contributions\n */\nconst createAttribute = (\n  key: string,\n  data: Object | Array<Object>,\n  contributions: Object\n): AttributeType => {\n  const updatedContributions = updateContributions(key, data, contributions);\n  const updatedData = updateData(key, data, contributions);\n\n  const Model = getAttributeModel(updatedContributions);\n\n  if (!Model) {\n    throw new Error(\"Could not find model\");\n  }\n\n  const childrenKeys = getChildrenKeys(updatedContributions.children ?? []);\n  const dataHelper = new AttributeDataHelper(\n    updatedData,\n    key,\n    childrenKeys\n  ).getData();\n\n  const attribute = new Model(dataHelper, updatedContributions);\n\n  return LayoutHintRuleCollection.setLayoutHintRules(attribute);\n};\n\nexport default createAttribute;\n"],"mappings":"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"}
+{"version":3,"file":"_createAttribute.js","names":["getChildrenKeys","children","child","childKey","isComposite","type","key","dynamicschemaId","undefined","getAttributeModel","contributions","ATTRIBUTE_MODELS","ChoiceAttributeModel","BooleanAttributeModel","HelptextAttributeModel","LabelAttributeModel","XMLAttributeModel","MemoAttributeModel","StringAttributeModel","DatetimeAttributeModel","MoneyAttributeModel","NumberAttributeModel","PasswordAttributeModel","UploadAttributeModel","CompositeAttributeModel","CaptchaAttributeModel","model","isApplicableModel","updateContributions","data","has","isPlainObject","Array","isArray","updateData","newData","klona","createAttribute","updatedContributions","updatedData","Model","Error","childrenKeys","dataHelper","AttributeDataHelper","getData","attribute","LayoutHintRuleCollection","setLayoutHintRules"],"sources":["../../../src/models/attributes/_createAttribute.js"],"sourcesContent":["// @flow\nimport { klona } from \"klona/full\";\n\nimport { has, isPlainObject } from \"../../utils/helpers/objects\";\n\nimport LayoutHintRuleCollection from \"./layouthint-rules/LayoutHintRuleCollection\";\n\nimport CaptchaAttributeModel from \"./CaptchaAttributeModel\";\nimport ChoiceAttributeModel from \"./ChoiceAttributeModel\";\nimport DatetimeAttributeModel from \"./DatetimeAttributeModel\";\nimport HelptextAttributeModel from \"./HelptextAttributeModel\";\nimport LabelAttributeModel from \"./LabelAttributeModel\";\nimport MemoAttributeModel from \"./MemoAttributeModel\";\nimport MoneyAttributeModel from \"./MoneyAttributeModel\";\nimport NumberAttributeModel from \"./NumberAttributeModel\";\nimport PasswordAttributeModel from \"./PasswordAttributeModel\";\nimport CompositeAttributeModel from \"./CompositeAttributeModel\";\nimport StringAttributeModel from \"./StringAttributeModel\";\nimport UploadAttributeModel from \"./UploadAttributeModel\";\nimport XMLAttributeModel from \"./XMLAttributeModel\";\nimport BooleanAttributeModel from \"./BooleanAttributeModel\";\n\nimport AttributeDataHelper from \"./AttributeDataHelper\";\n\nimport type { AttributeType } from \"../types\";\n\n/**\n * @private\n */\nconst getChildrenKeys = (children: Array<Object>): Array<Object> => {\n  if (children) {\n    return children.map((child) => {\n      const [childKey] = Object.keys(child);\n      const isComposite =\n        child[childKey].type === \"range\" ||\n        child[childKey].type === \"composite\";\n\n      return {\n        key: childKey,\n        dynamicschemaId: child[childKey]?.dynamicschemaId || undefined,\n        children: isComposite ? getChildrenKeys(child[childKey]?.children) : [],\n      };\n    });\n  }\n\n  return [];\n};\n\n/**\n * @private\n */\nconst getAttributeModel = (contributions: Object): ?Class<AttributeType> => {\n  const ATTRIBUTE_MODELS = [\n    ChoiceAttributeModel,\n    BooleanAttributeModel,\n\n    HelptextAttributeModel,\n    LabelAttributeModel,\n\n    XMLAttributeModel,\n    MemoAttributeModel,\n    StringAttributeModel,\n\n    DatetimeAttributeModel,\n\n    MoneyAttributeModel,\n    NumberAttributeModel,\n    PasswordAttributeModel,\n\n    UploadAttributeModel,\n    CompositeAttributeModel,\n    CaptchaAttributeModel,\n  ];\n\n  return ATTRIBUTE_MODELS.find((model) =>\n    model.isApplicableModel(contributions)\n  );\n};\n\n/**\n * @private\n */\nconst updateContributions = (\n  key: string,\n  data: Object,\n  contributions: Object\n): Object => {\n  const isComposite =\n    contributions.type === \"array\" &&\n    has(contributions, \"children\") &&\n    isPlainObject(data) &&\n    Array.isArray(data[key]);\n\n  return {\n    ...contributions,\n    type: isComposite ? \"composite\" : contributions.type,\n  };\n};\n\n/**\n * @private\n */\nconst updateData = (\n  key: string,\n  data: Object,\n  contributions: Object\n): Object => {\n  const newData = klona(data);\n\n  if (contributions.dynamicschemaId) {\n    newData.dynamicschemaId = contributions.dynamicschemaId;\n  }\n\n  return newData;\n};\n\n/**\n * Create an attribute based on data and contributions\n */\nconst createAttribute = (\n  key: string,\n  data: Object | Array<Object>,\n  contributions: Object\n): AttributeType => {\n  const updatedContributions = updateContributions(key, data, contributions);\n  const updatedData = updateData(key, data, contributions);\n\n  const Model = getAttributeModel(updatedContributions);\n\n  if (!Model) {\n    throw new Error(\"Could not find model\");\n  }\n\n  const childrenKeys = getChildrenKeys(updatedContributions.children ?? []);\n  const dataHelper = new AttributeDataHelper(\n    updatedData,\n    key,\n    childrenKeys\n  ).getData();\n\n  const attribute = new Model(dataHelper, updatedContributions);\n\n  return LayoutHintRuleCollection.setLayoutHintRules(attribute);\n};\n\nexport default createAttribute;\n"],"mappings":"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"}

package/lib/models/base/BaseCollection.js

@@ -11,8 +11,7 @@ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _sort = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/sort"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-var _clone = _interopRequireDefault(require("lodash/clone"));
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+var _full = require("klona/full");
 /**
  * Base class for collections of models
  */
@@ -177,15 +176,10 @@ class BaseCollection {
   }
 
   /**
-   * Returns a clone of the model (this is not a deep copy)
+   * Returns a clone of the model
    */
   clone() {
-    let deepcopy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    // deepcopy can be expensive, use with care!
-    if (deepcopy) {
-      return (0, _cloneDeep.default)(this);
-    }
-    return (0, _clone.default)(this);
+    return (0, _full.klona)(this);
   }
 }
 var _default = BaseCollection;

package/lib/models/base/BaseCollection.js.flow

@@ -1,6 +1,5 @@
 // @flow
-import clone from "lodash/clone";
-import cloneDeep from "lodash/cloneDeep";
+import { klona } from "klona/full";
 
 /**
  * Base class for collections of models
@@ -182,15 +181,10 @@ class BaseCollection<T> {
   }
 
   /**
-   * Returns a clone of the model (this is not a deep copy)
+   * Returns a clone of the model
    */
-  clone(deepcopy: boolean = false): this {
-    // deepcopy can be expensive, use with care!
-    if (deepcopy) {
-      return cloneDeep(this);
-    }
-
-    return clone(this);
+  clone(): this {
+    return klona(this);
   }
 }
 

package/lib/models/base/BaseCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseCollection.js","names":["BaseCollection","constructor","initCollection","collection","_collection","add","items","all","Array","isArray","removeByIndex","itemIndex","hasItems","length","isEmpty","size","first","last","get","index","find","callbackfn","thisArg","filter","some","every","map","forEach","sort","compareFn","sorted","clone","deepcopy","cloneDeep"],"sources":["../../../src/models/base/BaseCollection.js"],"sourcesContent":["// @flow\nimport clone from \"lodash/clone\";\nimport cloneDeep from \"lodash/cloneDeep\";\n\n/**\n * Base class for collections of models\n */\nclass BaseCollection<T> {\n  _collection: Array<T>;\n\n  /**\n   * Construct base collection\n   */\n  constructor(initCollection: Array<T> = []) {\n    this.collection = initCollection;\n  }\n\n  /**\n   * Retrieve current collection\n   */\n  get collection(): Array<T> {\n    return this._collection;\n  }\n\n  /**\n   * Replace current collection with a new collection\n   */\n  set collection(collection: Array<T>) {\n    this._collection = collection;\n  }\n\n  /**\n   * Add an other collection, array of items or single item to this collection;\n   */\n  add(items: BaseCollection<T> | Array<T> | T): BaseCollection<T> {\n    if (items instanceof BaseCollection) {\n      this.collection = [...this.collection, ...items.all];\n    } else if (Array.isArray(items)) {\n      // $FlowExpectedError[incompatible-type]\n      this.collection = [...this.collection, ...items];\n    } else {\n      this.collection = [...this.collection, items];\n    }\n\n    return this;\n  }\n\n  /**\n   * Remove an item from the collection by it's index.\n   */\n  removeByIndex(itemIndex: number) {\n    if (itemIndex > -1) {\n      this.collection = [\n        ...this.collection.slice(0, itemIndex),\n        ...this.collection.slice(itemIndex + 1),\n      ];\n    }\n  }\n\n  /**\n   * Indicates if the collection has items\n   */\n  get hasItems(): boolean {\n    return this.length > 0;\n  }\n\n  /**\n   * Indicates if collection is empty\n   */\n  get isEmpty(): boolean {\n    return !this.hasItems;\n  }\n\n  /**\n   * Retrieve all items in collection\n   */\n  get all(): Array<T> {\n    return this.collection;\n  }\n\n  /**\n   * Get the size of this collection\n   */\n  get size(): number {\n    return this.length;\n  }\n\n  /**\n   * Get the size of this collection\n   */\n  get length(): number {\n    return this.collection.length;\n  }\n\n  /**\n   * Return first link in collection\n   */\n  get first(): T | null {\n    return this.collection[0] ?? null;\n  }\n\n  /**\n   */\n  get last(): T | null {\n    return this.collection[this.collection.length - 1] ?? null;\n  }\n\n  /**\n   */\n  get(index: number): T | null {\n    return this.collection[index] ?? null;\n  }\n\n  /**\n   * Find item\n   */\n  find(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): T | null {\n    return this.collection.find(callbackfn, thisArg) ?? null;\n  }\n\n  /**\n   * Filter items\n   */\n  filter(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): Array<T> {\n    return this.collection.filter(callbackfn, thisArg);\n  }\n\n  /**\n   * Check if at least one item occurs\n   */\n  some(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): boolean {\n    return this.collection.some(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  every(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): boolean {\n    return this.collection.every(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  map<U>(\n    callbackfn: (value: T, index: number, array: Array<T>) => U,\n    thisArg?: T\n  ): Array<U> {\n    return this.collection.map<U, ?T>(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  forEach(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ) {\n    this.collection.forEach(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  sort(compareFn?: (a: T, b: T) => number): Array<T> {\n    return this.collection.sort(compareFn);\n  }\n\n  /**\n   * Retrieve an alphabetically sorted array of items\n   */\n  get sorted(): Array<T> {\n    return this.collection.sort();\n  }\n\n  /**\n   * Returns a clone of the model (this is not a deep copy)\n   */\n  clone(deepcopy: boolean = false): this {\n    // deepcopy can be expensive, use with care!\n    if (deepcopy) {\n      return cloneDeep(this);\n    }\n\n    return clone(this);\n  }\n}\n\nexport default BaseCollection;\n"],"mappings":"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"}
+{"version":3,"file":"BaseCollection.js","names":["BaseCollection","constructor","initCollection","collection","_collection","add","items","all","Array","isArray","removeByIndex","itemIndex","hasItems","length","isEmpty","size","first","last","get","index","find","callbackfn","thisArg","filter","some","every","map","forEach","sort","compareFn","sorted","clone","klona"],"sources":["../../../src/models/base/BaseCollection.js"],"sourcesContent":["// @flow\nimport { klona } from \"klona/full\";\n\n/**\n * Base class for collections of models\n */\nclass BaseCollection<T> {\n  _collection: Array<T>;\n\n  /**\n   * Construct base collection\n   */\n  constructor(initCollection: Array<T> = []) {\n    this.collection = initCollection;\n  }\n\n  /**\n   * Retrieve current collection\n   */\n  get collection(): Array<T> {\n    return this._collection;\n  }\n\n  /**\n   * Replace current collection with a new collection\n   */\n  set collection(collection: Array<T>) {\n    this._collection = collection;\n  }\n\n  /**\n   * Add an other collection, array of items or single item to this collection;\n   */\n  add(items: BaseCollection<T> | Array<T> | T): BaseCollection<T> {\n    if (items instanceof BaseCollection) {\n      this.collection = [...this.collection, ...items.all];\n    } else if (Array.isArray(items)) {\n      // $FlowExpectedError[incompatible-type]\n      this.collection = [...this.collection, ...items];\n    } else {\n      this.collection = [...this.collection, items];\n    }\n\n    return this;\n  }\n\n  /**\n   * Remove an item from the collection by it's index.\n   */\n  removeByIndex(itemIndex: number) {\n    if (itemIndex > -1) {\n      this.collection = [\n        ...this.collection.slice(0, itemIndex),\n        ...this.collection.slice(itemIndex + 1),\n      ];\n    }\n  }\n\n  /**\n   * Indicates if the collection has items\n   */\n  get hasItems(): boolean {\n    return this.length > 0;\n  }\n\n  /**\n   * Indicates if collection is empty\n   */\n  get isEmpty(): boolean {\n    return !this.hasItems;\n  }\n\n  /**\n   * Retrieve all items in collection\n   */\n  get all(): Array<T> {\n    return this.collection;\n  }\n\n  /**\n   * Get the size of this collection\n   */\n  get size(): number {\n    return this.length;\n  }\n\n  /**\n   * Get the size of this collection\n   */\n  get length(): number {\n    return this.collection.length;\n  }\n\n  /**\n   * Return first link in collection\n   */\n  get first(): T | null {\n    return this.collection[0] ?? null;\n  }\n\n  /**\n   */\n  get last(): T | null {\n    return this.collection[this.collection.length - 1] ?? null;\n  }\n\n  /**\n   */\n  get(index: number): T | null {\n    return this.collection[index] ?? null;\n  }\n\n  /**\n   * Find item\n   */\n  find(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): T | null {\n    return this.collection.find(callbackfn, thisArg) ?? null;\n  }\n\n  /**\n   * Filter items\n   */\n  filter(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): Array<T> {\n    return this.collection.filter(callbackfn, thisArg);\n  }\n\n  /**\n   * Check if at least one item occurs\n   */\n  some(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): boolean {\n    return this.collection.some(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  every(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ): boolean {\n    return this.collection.every(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  map<U>(\n    callbackfn: (value: T, index: number, array: Array<T>) => U,\n    thisArg?: T\n  ): Array<U> {\n    return this.collection.map<U, ?T>(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  forEach(\n    callbackfn: (value: T, index: number, array: Array<T>) => any,\n    thisArg?: any\n  ) {\n    this.collection.forEach(callbackfn, thisArg);\n  }\n\n  /**\n   */\n  sort(compareFn?: (a: T, b: T) => number): Array<T> {\n    return this.collection.sort(compareFn);\n  }\n\n  /**\n   * Retrieve an alphabetically sorted array of items\n   */\n  get sorted(): Array<T> {\n    return this.collection.sort();\n  }\n\n  /**\n   * Returns a clone of the model\n   */\n  clone(): this {\n    return klona(this);\n  }\n}\n\nexport default BaseCollection;\n"],"mappings":"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"}

package/lib/models/base/BaseModel.js

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-var _clone = _interopRequireDefault(require("lodash/clone"));
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+var _full = require("klona/full");
 var _LayoutHintCollection = _interopRequireDefault(require("../layouthint/LayoutHintCollection"));
 /**
  * Base model, this is the foundation of a model,
@@ -117,12 +116,7 @@ class BaseModel {
    * Returns a clone of the model
    */
   clone() {
-    let deepcopy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    // deepcopy can be expensive, use with care!
-    if (deepcopy) {
-      return (0, _cloneDeep.default)(this);
-    }
-    return (0, _clone.default)(this);
+    return (0, _full.klona)(this);
   }
 }
 var _default = BaseModel;

package/lib/models/base/BaseModel.js.flow

@@ -1,6 +1,5 @@
 // @flow
-import clone from "lodash/clone";
-import cloneDeep from "lodash/cloneDeep";
+import { klona } from "klona/full";
 
 import LayoutHintCollection from "../layouthint/LayoutHintCollection";
 
@@ -118,13 +117,8 @@ class BaseModel {
   /**
    * Returns a clone of the model
    */
-  clone(deepcopy: boolean = false): any {
-    // deepcopy can be expensive, use with care!
-    if (deepcopy) {
-      return cloneDeep(this);
-    }
-
-    return clone(this);
+  clone(): any {
+    return klona(this);
   }
 }
 

package/lib/models/base/BaseModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseModel.js","names":["BaseModel","constructor","data","contributions","_data","_contributions","_layouthint","LayoutHintCollection","getContribution","getData","propName","defaultValue","layouthint","hasData","length","connectKey","key","_connectKey","dehydrate","rehydrate","clone","deepcopy","cloneDeep"],"sources":["../../../src/models/base/BaseModel.js"],"sourcesContent":["// @flow\nimport clone from \"lodash/clone\";\nimport cloneDeep from \"lodash/cloneDeep\";\n\nimport LayoutHintCollection from \"../layouthint/LayoutHintCollection\";\n\nexport type BaseDehydrateData = {\n  +data: Object,\n  +contributions: Object,\n  connectKey: string,\n  ...\n};\n\n/**\n * Base model, this is the foundation of a model,\n * it contains data that is needed for all models like, data, contributions and layout hint\n *\n * Extend this for non modular ui resources, for modular ui resource start with the resourceModel\n */\nclass BaseModel {\n  _data: Object;\n  _contributions: Object;\n  _layouthint: LayoutHintCollection;\n  _connectKey: string;\n\n  /**\n   * constructor\n   */\n  constructor(data: Object, contributions: Object) {\n    this._data = data;\n    this._contributions = contributions;\n    this._layouthint = new LayoutHintCollection(\n      this.getContribution(\"layouthint\", [])\n    );\n  }\n\n  /**\n   * Retrieve data\n   */\n  get data(): Object {\n    return this._data || {};\n  }\n\n  /**\n   * Retrieve property from the data object of the model, mostly used internal\n   */\n  getData(propName: string, defaultValue: any = null): any {\n    return this.data[propName] ?? defaultValue;\n  }\n\n  /**\n   * Retrieve contributions\n   */\n  get contributions(): Object {\n    return this._contributions || {};\n  }\n\n  /**\n   * Retrieve property from the contributions of the model, mostly used internal\n   */\n  getContribution(propName: string, defaultValue: any = null): any {\n    return this.contributions[propName] ?? defaultValue;\n  }\n\n  /**\n   * Getting the layouthint\n   */\n  get layouthint(): LayoutHintCollection {\n    return this._layouthint;\n  }\n\n  /**\n   * Set the layouthint\n   */\n  set layouthint(layouthint: Array<string>) {\n    this._layouthint = new LayoutHintCollection(layouthint);\n  }\n\n  /**\n   * Indicates if the model has data\n   */\n  get hasData(): boolean {\n    return Object.keys(this.data).length > 0;\n  }\n\n  /**\n   * Set the unique key for this model\n   */\n  set connectKey(key: string) {\n    this._connectKey = key;\n  }\n\n  /**\n   * Get the unique key of this model\n   */\n  get connectKey(): string {\n    return this._connectKey;\n  }\n\n  /**\n   * Dehydrate internal data, returns the information that is needed to recreate the model\n   */\n  dehydrate(): BaseDehydrateData {\n    return {\n      data: this._data,\n      contributions: this._contributions,\n      connectKey: this._connectKey,\n    };\n  }\n\n  /**\n   * Recreate the model with the given data\n   */\n  rehydrate(data: BaseDehydrateData) {\n    this._connectKey = data.connectKey;\n  }\n\n  /**\n   * Returns a clone of the model\n   */\n  clone(deepcopy: boolean = false): any {\n    // deepcopy can be expensive, use with care!\n    if (deepcopy) {\n      return cloneDeep(this);\n    }\n\n    return clone(this);\n  }\n}\n\nexport default BaseModel;\n"],"mappings":";;;;;;;;;AACA;AACA;AAEA;AASA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,SAAS,CAAC;EAMd;AACF;AACA;EACEC,WAAW,CAACC,IAAY,EAAEC,aAAqB,EAAE;IAAA;IAAA;IAAA;IAAA;IAC/C,IAAI,CAACC,KAAK,GAAGF,IAAI;IACjB,IAAI,CAACG,cAAc,GAAGF,aAAa;IACnC,IAAI,CAACG,WAAW,GAAG,IAAIC,6BAAoB,CACzC,IAAI,CAACC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,CACvC;EACH;;EAEA;AACF;AACA;EACE,IAAIN,IAAI,GAAW;IACjB,OAAO,IAAI,CAACE,KAAK,IAAI,CAAC,CAAC;EACzB;;EAEA;AACF;AACA;EACEK,OAAO,CAACC,QAAgB,EAAiC;IAAA,IAA/BC,YAAiB,uEAAG,IAAI;IAChD,OAAO,IAAI,CAACT,IAAI,CAACQ,QAAQ,CAAC,IAAIC,YAAY;EAC5C;;EAEA;AACF;AACA;EACE,IAAIR,aAAa,GAAW;IAC1B,OAAO,IAAI,CAACE,cAAc,IAAI,CAAC,CAAC;EAClC;;EAEA;AACF;AACA;EACEG,eAAe,CAACE,QAAgB,EAAiC;IAAA,IAA/BC,YAAiB,uEAAG,IAAI;IACxD,OAAO,IAAI,CAACR,aAAa,CAACO,QAAQ,CAAC,IAAIC,YAAY;EACrD;;EAEA;AACF;AACA;EACE,IAAIC,UAAU,GAAyB;IACrC,OAAO,IAAI,CAACN,WAAW;EACzB;;EAEA;AACF;AACA;EACE,IAAIM,UAAU,CAACA,UAAyB,EAAE;IACxC,IAAI,CAACN,WAAW,GAAG,IAAIC,6BAAoB,CAACK,UAAU,CAAC;EACzD;;EAEA;AACF;AACA;EACE,IAAIC,OAAO,GAAY;IACrB,OAAO,mBAAY,IAAI,CAACX,IAAI,CAAC,CAACY,MAAM,GAAG,CAAC;EAC1C;;EAEA;AACF;AACA;EACE,IAAIC,UAAU,CAACC,GAAW,EAAE;IAC1B,IAAI,CAACC,WAAW,GAAGD,GAAG;EACxB;;EAEA;AACF;AACA;EACE,IAAID,UAAU,GAAW;IACvB,OAAO,IAAI,CAACE,WAAW;EACzB;;EAEA;AACF;AACA;EACEC,SAAS,GAAsB;IAC7B,OAAO;MACLhB,IAAI,EAAE,IAAI,CAACE,KAAK;MAChBD,aAAa,EAAE,IAAI,CAACE,cAAc;MAClCU,UAAU,EAAE,IAAI,CAACE;IACnB,CAAC;EACH;;EAEA;AACF;AACA;EACEE,SAAS,CAACjB,IAAuB,EAAE;IACjC,IAAI,CAACe,WAAW,GAAGf,IAAI,CAACa,UAAU;EACpC;;EAEA;AACF;AACA;EACEK,KAAK,GAAiC;IAAA,IAAhCC,QAAiB,uEAAG,KAAK;IAC7B;IACA,IAAIA,QAAQ,EAAE;MACZ,OAAO,IAAAC,kBAAS,EAAC,IAAI,CAAC;IACxB;IAEA,OAAO,IAAAF,cAAK,EAAC,IAAI,CAAC;EACpB;AACF;AAAC,eAEcpB,SAAS;AAAA"}
+{"version":3,"file":"BaseModel.js","names":["BaseModel","constructor","data","contributions","_data","_contributions","_layouthint","LayoutHintCollection","getContribution","getData","propName","defaultValue","layouthint","hasData","length","connectKey","key","_connectKey","dehydrate","rehydrate","clone","klona"],"sources":["../../../src/models/base/BaseModel.js"],"sourcesContent":["// @flow\nimport { klona } from \"klona/full\";\n\nimport LayoutHintCollection from \"../layouthint/LayoutHintCollection\";\n\nexport type BaseDehydrateData = {\n  +data: Object,\n  +contributions: Object,\n  connectKey: string,\n  ...\n};\n\n/**\n * Base model, this is the foundation of a model,\n * it contains data that is needed for all models like, data, contributions and layout hint\n *\n * Extend this for non modular ui resources, for modular ui resource start with the resourceModel\n */\nclass BaseModel {\n  _data: Object;\n  _contributions: Object;\n  _layouthint: LayoutHintCollection;\n  _connectKey: string;\n\n  /**\n   * constructor\n   */\n  constructor(data: Object, contributions: Object) {\n    this._data = data;\n    this._contributions = contributions;\n    this._layouthint = new LayoutHintCollection(\n      this.getContribution(\"layouthint\", [])\n    );\n  }\n\n  /**\n   * Retrieve data\n   */\n  get data(): Object {\n    return this._data || {};\n  }\n\n  /**\n   * Retrieve property from the data object of the model, mostly used internal\n   */\n  getData(propName: string, defaultValue: any = null): any {\n    return this.data[propName] ?? defaultValue;\n  }\n\n  /**\n   * Retrieve contributions\n   */\n  get contributions(): Object {\n    return this._contributions || {};\n  }\n\n  /**\n   * Retrieve property from the contributions of the model, mostly used internal\n   */\n  getContribution(propName: string, defaultValue: any = null): any {\n    return this.contributions[propName] ?? defaultValue;\n  }\n\n  /**\n   * Getting the layouthint\n   */\n  get layouthint(): LayoutHintCollection {\n    return this._layouthint;\n  }\n\n  /**\n   * Set the layouthint\n   */\n  set layouthint(layouthint: Array<string>) {\n    this._layouthint = new LayoutHintCollection(layouthint);\n  }\n\n  /**\n   * Indicates if the model has data\n   */\n  get hasData(): boolean {\n    return Object.keys(this.data).length > 0;\n  }\n\n  /**\n   * Set the unique key for this model\n   */\n  set connectKey(key: string) {\n    this._connectKey = key;\n  }\n\n  /**\n   * Get the unique key of this model\n   */\n  get connectKey(): string {\n    return this._connectKey;\n  }\n\n  /**\n   * Dehydrate internal data, returns the information that is needed to recreate the model\n   */\n  dehydrate(): BaseDehydrateData {\n    return {\n      data: this._data,\n      contributions: this._contributions,\n      connectKey: this._connectKey,\n    };\n  }\n\n  /**\n   * Recreate the model with the given data\n   */\n  rehydrate(data: BaseDehydrateData) {\n    this._connectKey = data.connectKey;\n  }\n\n  /**\n   * Returns a clone of the model\n   */\n  clone(): any {\n    return klona(this);\n  }\n}\n\nexport default BaseModel;\n"],"mappings":";;;;;;;;;AACA;AAEA;AASA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,SAAS,CAAC;EAMd;AACF;AACA;EACEC,WAAW,CAACC,IAAY,EAAEC,aAAqB,EAAE;IAAA;IAAA;IAAA;IAAA;IAC/C,IAAI,CAACC,KAAK,GAAGF,IAAI;IACjB,IAAI,CAACG,cAAc,GAAGF,aAAa;IACnC,IAAI,CAACG,WAAW,GAAG,IAAIC,6BAAoB,CACzC,IAAI,CAACC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,CACvC;EACH;;EAEA;AACF;AACA;EACE,IAAIN,IAAI,GAAW;IACjB,OAAO,IAAI,CAACE,KAAK,IAAI,CAAC,CAAC;EACzB;;EAEA;AACF;AACA;EACEK,OAAO,CAACC,QAAgB,EAAiC;IAAA,IAA/BC,YAAiB,uEAAG,IAAI;IAChD,OAAO,IAAI,CAACT,IAAI,CAACQ,QAAQ,CAAC,IAAIC,YAAY;EAC5C;;EAEA;AACF;AACA;EACE,IAAIR,aAAa,GAAW;IAC1B,OAAO,IAAI,CAACE,cAAc,IAAI,CAAC,CAAC;EAClC;;EAEA;AACF;AACA;EACEG,eAAe,CAACE,QAAgB,EAAiC;IAAA,IAA/BC,YAAiB,uEAAG,IAAI;IACxD,OAAO,IAAI,CAACR,aAAa,CAACO,QAAQ,CAAC,IAAIC,YAAY;EACrD;;EAEA;AACF;AACA;EACE,IAAIC,UAAU,GAAyB;IACrC,OAAO,IAAI,CAACN,WAAW;EACzB;;EAEA;AACF;AACA;EACE,IAAIM,UAAU,CAACA,UAAyB,EAAE;IACxC,IAAI,CAACN,WAAW,GAAG,IAAIC,6BAAoB,CAACK,UAAU,CAAC;EACzD;;EAEA;AACF;AACA;EACE,IAAIC,OAAO,GAAY;IACrB,OAAO,mBAAY,IAAI,CAACX,IAAI,CAAC,CAACY,MAAM,GAAG,CAAC;EAC1C;;EAEA;AACF;AACA;EACE,IAAIC,UAAU,CAACC,GAAW,EAAE;IAC1B,IAAI,CAACC,WAAW,GAAGD,GAAG;EACxB;;EAEA;AACF;AACA;EACE,IAAID,UAAU,GAAW;IACvB,OAAO,IAAI,CAACE,WAAW;EACzB;;EAEA;AACF;AACA;EACEC,SAAS,GAAsB;IAC7B,OAAO;MACLhB,IAAI,EAAE,IAAI,CAACE,KAAK;MAChBD,aAAa,EAAE,IAAI,CAACE,cAAc;MAClCU,UAAU,EAAE,IAAI,CAACE;IACnB,CAAC;EACH;;EAEA;AACF;AACA;EACEE,SAAS,CAACjB,IAAuB,EAAE;IACjC,IAAI,CAACe,WAAW,GAAGf,IAAI,CAACa,UAAU;EACpC;;EAEA;AACF;AACA;EACEK,KAAK,GAAQ;IACX,OAAO,IAAAC,WAAK,EAAC,IAAI,CAAC;EACpB;AACF;AAAC,eAEcrB,SAAS;AAAA"}

package/lib/models/base/__tests__/BaseModel.spec.js.flow

@@ -11,7 +11,8 @@ describe("baseModel", () => {
     expect(model.contributions).toStrictEqual({});
     expect(model.hasData).toBeFalsy();
 
-    expect(model.clone()).toStrictEqual(model);
+    const clonedModel = model.clone();
+    expect(clonedModel).toStrictEqual(model);
   });
 
   it("should handle data without contributions", () => {
@@ -72,12 +73,7 @@ describe("baseModel", () => {
       },
     });
 
-    const shallowClone = model.clone();
-    expect(model).not.toBe(shallowClone);
-    expect(model.data.prop).toBe(shallowClone.data.prop);
-    expect(model.data.prop.child).toBe(shallowClone.data.prop.child);
-
-    const deepClone = model.clone(true);
+    const deepClone = model.clone();
     expect(model).not.toBe(deepClone);
     expect(model.data.prop === deepClone.data.prop).toBeFalsy();
     expect(model.data.prop.child).toBe(deepClone.data.prop.child);

package/lib/modularui/CaptchaRequest.js

@@ -13,19 +13,32 @@ var _constants = require("../constants");
 class CaptchaRequest {
   constructor() {
     (0, _defineProperty2.default)(this, "_tokenId", void 0);
+    (0, _defineProperty2.default)(this, "_image", void 0);
   }
   /**
    */
+  captchaResponse(response) {
+    this._tokenId = response.tokenId ?? this._tokenId;
+    this._image = response.image ?? this._image;
+    return {
+      tokenId: this._tokenId,
+      image: this._image,
+      valid: response.valid ?? false,
+      error: response.error ?? null
+    };
+  }
+
+  /**
+   * Initiate the captcha request
+   */
   init() {
     return (0, _xhr.default)({
       url: (0, _constants.getCaptchaPath)()
-    }).then(response => {
-      this._tokenId = response.tokenId;
-      return response;
-    });
+    }).then(response => this.captchaResponse(response));
   }
 
   /**
+   * Answer the captcha
    */
   send(answer) {
     return (0, _xhr.default)({
@@ -35,10 +48,14 @@ class CaptchaRequest {
         tokenId: this._tokenId ?? "",
         answer: answer ?? ""
       }
-    }).catch(error => {
-      this._tokenId = error.response.tokenId;
-      return error.response;
-    });
+    }).then(response => this.captchaResponse(response)).catch(error => this.captchaResponse(error.response));
+  }
+
+  /**
+   * Reset the captcha and receive a new token and image
+   */
+  refresh() {
+    return this.init();
   }
 }
 var _default = CaptchaRequest;

package/lib/modularui/CaptchaRequest.js.flow

@@ -2,30 +2,65 @@
 import xhr from "../utils/fetch/xhr";
 import { getCaptchaPath, HTTP_METHODS } from "../constants";
 
+type CaptchaInitialResponse = {
+  tokenId: string,
+  image: string,
+};
+
+type CaptchaValidResponse = {
+  valid: boolean,
+};
+
+type CaptchaInvalidResponse = {
+  tokenId: string,
+  image: string,
+  valid: boolean,
+  error: { id: string },
+};
+
 type CaptchaResponse = {
   tokenId: string,
-  image: any,
+  image: string,
   valid: boolean,
+  error: { id: string } | null,
 };
 
 /**
  */
 class CaptchaRequest {
   _tokenId: string;
+  _image: string;
 
   /**
    */
+  captchaResponse(
+    response:
+      | CaptchaInitialResponse
+      | CaptchaValidResponse
+      | CaptchaInvalidResponse
+  ): CaptchaResponse {
+    this._tokenId = response.tokenId ?? this._tokenId;
+    this._image = response.image ?? this._image;
+
+    return {
+      tokenId: this._tokenId,
+      image: this._image,
+      valid: response.valid ?? false,
+      error: response.error ?? null,
+    };
+  }
+
+  /**
+   * Initiate the captcha request
+   */
   init(): Promise<CaptchaResponse> {
     return xhr({
       url: getCaptchaPath(),
-    }).then((response) => {
-      this._tokenId = response.tokenId;
-
-      return response;
-    });
+    }).then((response) => this.captchaResponse(response));
   }
 
   /**
+   * Answer the captcha
    */
   send(answer?: string): Promise<CaptchaResponse> {
     return xhr({
@@ -35,10 +70,16 @@ class CaptchaRequest {
         tokenId: this._tokenId ?? "",
         answer: answer ?? "",
       },
-    }).catch((error) => {
-      this._tokenId = error.response.tokenId;
-      return error.response;
-    });
+    })
+      .then((response) => this.captchaResponse(response))
+      .catch((error) => this.captchaResponse(error.response));
+  }
+
+  /**
+   * Reset the captcha and receive a new token and image
+   */
+  refresh(): Promise<CaptchaResponse> {
+    return this.init();
   }
 }
 

package/lib/modularui/CaptchaRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"CaptchaRequest.js","names":["CaptchaRequest","init","xhr","url","getCaptchaPath","then","response","_tokenId","tokenId","send","answer","method","HTTP_METHODS","POST","data","catch","error"],"sources":["../../src/modularui/CaptchaRequest.js"],"sourcesContent":["// @flow\nimport xhr from \"../utils/fetch/xhr\";\nimport { getCaptchaPath, HTTP_METHODS } from \"../constants\";\n\ntype CaptchaResponse = {\n  tokenId: string,\n  image: any,\n  valid: boolean,\n};\n\n/**\n */\nclass CaptchaRequest {\n  _tokenId: string;\n\n  /**\n   */\n  init(): Promise<CaptchaResponse> {\n    return xhr({\n      url: getCaptchaPath(),\n    }).then((response) => {\n      this._tokenId = response.tokenId;\n\n      return response;\n    });\n  }\n\n  /**\n   */\n  send(answer?: string): Promise<CaptchaResponse> {\n    return xhr({\n      url: getCaptchaPath(),\n      method: HTTP_METHODS.POST,\n      data: {\n        tokenId: this._tokenId ?? \"\",\n        answer: answer ?? \"\",\n      },\n    }).catch((error) => {\n      this._tokenId = error.response.tokenId;\n      return error.response;\n    });\n  }\n}\n\nexport default CaptchaRequest;\n"],"mappings":";;;;;;;;AACA;AACA;AAQA;AACA;AACA,MAAMA,cAAc,CAAC;EAAA;IAAA;EAAA;EAGnB;AACF;EACEC,IAAI,GAA6B;IAC/B,OAAO,IAAAC,YAAG,EAAC;MACTC,GAAG,EAAE,IAAAC,yBAAc;IACrB,CAAC,CAAC,CAACC,IAAI,CAAEC,QAAQ,IAAK;MACpB,IAAI,CAACC,QAAQ,GAAGD,QAAQ,CAACE,OAAO;MAEhC,OAAOF,QAAQ;IACjB,CAAC,CAAC;EACJ;;EAEA;AACF;EACEG,IAAI,CAACC,MAAe,EAA4B;IAC9C,OAAO,IAAAR,YAAG,EAAC;MACTC,GAAG,EAAE,IAAAC,yBAAc,GAAE;MACrBO,MAAM,EAAEC,uBAAY,CAACC,IAAI;MACzBC,IAAI,EAAE;QACJN,OAAO,EAAE,IAAI,CAACD,QAAQ,IAAI,EAAE;QAC5BG,MAAM,EAAEA,MAAM,IAAI;MACpB;IACF,CAAC,CAAC,CAACK,KAAK,CAAEC,KAAK,IAAK;MAClB,IAAI,CAACT,QAAQ,GAAGS,KAAK,CAACV,QAAQ,CAACE,OAAO;MACtC,OAAOQ,KAAK,CAACV,QAAQ;IACvB,CAAC,CAAC;EACJ;AACF;AAAC,eAEcN,cAAc;AAAA"}
+{"version":3,"file":"CaptchaRequest.js","names":["CaptchaRequest","captchaResponse","response","_tokenId","tokenId","_image","image","valid","error","init","xhr","url","getCaptchaPath","then","send","answer","method","HTTP_METHODS","POST","data","catch","refresh"],"sources":["../../src/modularui/CaptchaRequest.js"],"sourcesContent":["// @flow\nimport xhr from \"../utils/fetch/xhr\";\nimport { getCaptchaPath, HTTP_METHODS } from \"../constants\";\n\ntype CaptchaInitialResponse = {\n  tokenId: string,\n  image: string,\n};\n\ntype CaptchaValidResponse = {\n  valid: boolean,\n};\n\ntype CaptchaInvalidResponse = {\n  tokenId: string,\n  image: string,\n  valid: boolean,\n  error: { id: string },\n};\n\ntype CaptchaResponse = {\n  tokenId: string,\n  image: string,\n  valid: boolean,\n  error: { id: string } | null,\n};\n\n/**\n */\nclass CaptchaRequest {\n  _tokenId: string;\n  _image: string;\n\n  /**\n   */\n  captchaResponse(\n    response:\n      | CaptchaInitialResponse\n      | CaptchaValidResponse\n      | CaptchaInvalidResponse\n  ): CaptchaResponse {\n    this._tokenId = response.tokenId ?? this._tokenId;\n    this._image = response.image ?? this._image;\n\n    return {\n      tokenId: this._tokenId,\n      image: this._image,\n      valid: response.valid ?? false,\n      error: response.error ?? null,\n    };\n  }\n\n  /**\n   * Initiate the captcha request\n   */\n  init(): Promise<CaptchaResponse> {\n    return xhr({\n      url: getCaptchaPath(),\n    }).then((response) => this.captchaResponse(response));\n  }\n\n  /**\n   * Answer the captcha\n   */\n  send(answer?: string): Promise<CaptchaResponse> {\n    return xhr({\n      url: getCaptchaPath(),\n      method: HTTP_METHODS.POST,\n      data: {\n        tokenId: this._tokenId ?? \"\",\n        answer: answer ?? \"\",\n      },\n    })\n      .then((response) => this.captchaResponse(response))\n      .catch((error) => this.captchaResponse(error.response));\n  }\n\n  /**\n   * Reset the captcha and receive a new token and image\n   */\n  refresh(): Promise<CaptchaResponse> {\n    return this.init();\n  }\n}\n\nexport default CaptchaRequest;\n"],"mappings":";;;;;;;;AACA;AACA;AAyBA;AACA;AACA,MAAMA,cAAc,CAAC;EAAA;IAAA;IAAA;EAAA;EAInB;AACF;EACEC,eAAe,CACbC,QAG0B,EACT;IACjB,IAAI,CAACC,QAAQ,GAAGD,QAAQ,CAACE,OAAO,IAAI,IAAI,CAACD,QAAQ;IACjD,IAAI,CAACE,MAAM,GAAGH,QAAQ,CAACI,KAAK,IAAI,IAAI,CAACD,MAAM;IAE3C,OAAO;MACLD,OAAO,EAAE,IAAI,CAACD,QAAQ;MACtBG,KAAK,EAAE,IAAI,CAACD,MAAM;MAClBE,KAAK,EAAEL,QAAQ,CAACK,KAAK,IAAI,KAAK;MAC9BC,KAAK,EAAEN,QAAQ,CAACM,KAAK,IAAI;IAC3B,CAAC;EACH;;EAEA;AACF;AACA;EACEC,IAAI,GAA6B;IAC/B,OAAO,IAAAC,YAAG,EAAC;MACTC,GAAG,EAAE,IAAAC,yBAAc;IACrB,CAAC,CAAC,CAACC,IAAI,CAAEX,QAAQ,IAAK,IAAI,CAACD,eAAe,CAACC,QAAQ,CAAC,CAAC;EACvD;;EAEA;AACF;AACA;EACEY,IAAI,CAACC,MAAe,EAA4B;IAC9C,OAAO,IAAAL,YAAG,EAAC;MACTC,GAAG,EAAE,IAAAC,yBAAc,GAAE;MACrBI,MAAM,EAAEC,uBAAY,CAACC,IAAI;MACzBC,IAAI,EAAE;QACJf,OAAO,EAAE,IAAI,CAACD,QAAQ,IAAI,EAAE;QAC5BY,MAAM,EAAEA,MAAM,IAAI;MACpB;IACF,CAAC,CAAC,CACCF,IAAI,CAAEX,QAAQ,IAAK,IAAI,CAACD,eAAe,CAACC,QAAQ,CAAC,CAAC,CAClDkB,KAAK,CAAEZ,KAAK,IAAK,IAAI,CAACP,eAAe,CAACO,KAAK,CAACN,QAAQ,CAAC,CAAC;EAC3D;;EAEA;AACF;AACA;EACEmB,OAAO,GAA6B;IAClC,OAAO,IAAI,CAACZ,IAAI,EAAE;EACpB;AACF;AAAC,eAEcT,cAAc;AAAA"}

package/lib/redux/actions/FormValidations.js

@@ -17,7 +17,7 @@ var _FormModel = _interopRequireDefault(require("../../models/form/FormModel"));
 const updateValidations = (form, formWithValidations) => (dispatch, getState) => {
   const currentForm = getState().modularui[form.connectKey];
   if (currentForm) {
-    const validatedForm = currentForm.model.clone(true);
+    const validatedForm = currentForm.model.clone();
     if (validatedForm instanceof _FormModel.default) {
       validatedForm.updateValidations(formWithValidations.data);
     }

package/lib/redux/actions/FormValidations.js.flow

@@ -25,7 +25,7 @@ const updateValidations =
     const currentForm = getState().modularui[form.connectKey];
 
     if (currentForm) {
-      const validatedForm = currentForm.model.clone(true);
+      const validatedForm = currentForm.model.clone();
       if (validatedForm instanceof FormModel) {
         validatedForm.updateValidations(formWithValidations.data);
       }

package/lib/redux/actions/FormValidations.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormValidations.js","names":["updateValidations","form","formWithValidations","dispatch","getState","currentForm","modularui","connectKey","validatedForm","model","clone","FormModel","data","updateModel","debouncedValidateFormObject","debounce","ModularUIRequest","selfhref","setParameter","method","HTTP_METHODS","POST","validationData","childmodels","isValidationRequest","locale","fetch","then","VALIDATE_DEBOUNCE_TIMEOUT","leading","trailing","validateFormObject"],"sources":["../../../src/redux/actions/FormValidations.js"],"sourcesContent":["// @flow\nimport debounce from \"lodash/debounce\";\n\nimport { updateModel } from \"../_modularui/ModularUIActions\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport {\n  HTTP_METHODS,\n  VALIDATE_DEBOUNCE_TIMEOUT,\n} from \"../../constants/Constants\";\n\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n * Update validations of the form currently in the reducer\n * because of the debounce timeout there might have been an update on the form during validation\n */\nconst updateValidations =\n  (form: FormModel, formWithValidations: ModularUIModel) =>\n  (dispatch: Dispatch, getState: GetState) => {\n    const currentForm = getState().modularui[form.connectKey];\n\n    if (currentForm) {\n      const validatedForm = currentForm.model.clone(true);\n      if (validatedForm instanceof FormModel) {\n        validatedForm.updateValidations(formWithValidations.data);\n      }\n\n      dispatch(updateModel(validatedForm));\n    }\n  };\n\n/**\n * Validates form objects debounced to prevent overloading the (form) service\n * When a form with new errors (or complete) arrives, we send the validations\n * to the current form model where the errors are processed\n * A new form with the new constraints is send to the store\n */\nconst debouncedValidateFormObject = debounce<\n  (dispatch: Dispatch, form: FormModel) => void\n>(\n  (dispatch, form: FormModel) => {\n    new ModularUIRequest(form.selfhref.setParameter(\"commit\", \"false\"), {\n      method: HTTP_METHODS.POST,\n      data: form.validationData,\n      childmodels: false,\n      isValidationRequest: true,\n      locale: form.locale,\n    })\n      .fetch()\n      .then((formWithValidations) =>\n        dispatch(updateValidations(form, formWithValidations))\n      );\n  },\n  VALIDATE_DEBOUNCE_TIMEOUT,\n  {\n    leading: true,\n    trailing: true,\n  }\n);\n\n/**\n */\nexport const validateFormObject =\n  (form: FormModel): ThunkAction =>\n  (dispatch) =>\n    debouncedValidateFormObject(dispatch, form);\n"],"mappings":";;;;;;;AACA;AAEA;AAEA;AAEA;AAKA;AAKA;AACA;AACA;AACA;AACA,MAAMA,iBAAiB,GACrB,CAACC,IAAe,EAAEC,mBAAmC,KACrD,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC1C,MAAMC,WAAW,GAAGD,QAAQ,EAAE,CAACE,SAAS,CAACL,IAAI,CAACM,UAAU,CAAC;EAEzD,IAAIF,WAAW,EAAE;IACf,MAAMG,aAAa,GAAGH,WAAW,CAACI,KAAK,CAACC,KAAK,CAAC,IAAI,CAAC;IACnD,IAAIF,aAAa,YAAYG,kBAAS,EAAE;MACtCH,aAAa,CAACR,iBAAiB,CAACE,mBAAmB,CAACU,IAAI,CAAC;IAC3D;IAEAT,QAAQ,CAAC,IAAAU,6BAAW,EAACL,aAAa,CAAC,CAAC;EACtC;AACF,CAAC;;AAEH;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,2BAA2B,GAAG,IAAAC,iBAAQ,EAG1C,CAACZ,QAAQ,EAAEF,IAAe,KAAK;EAC7B,IAAIe,yBAAgB,CAACf,IAAI,CAACgB,QAAQ,CAACC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;IAClEC,MAAM,EAAEC,uBAAY,CAACC,IAAI;IACzBT,IAAI,EAAEX,IAAI,CAACqB,cAAc;IACzBC,WAAW,EAAE,KAAK;IAClBC,mBAAmB,EAAE,IAAI;IACzBC,MAAM,EAAExB,IAAI,CAACwB;EACf,CAAC,CAAC,CACCC,KAAK,EAAE,CACPC,IAAI,CAAEzB,mBAAmB,IACxBC,QAAQ,CAACH,iBAAiB,CAACC,IAAI,EAAEC,mBAAmB,CAAC,CAAC,CACvD;AACL,CAAC,EACD0B,oCAAyB,EACzB;EACEC,OAAO,EAAE,IAAI;EACbC,QAAQ,EAAE;AACZ,CAAC,CACF;;AAED;AACA;AACO,MAAMC,kBAAkB,GAC5B9B,IAAe,IACfE,QAAQ,IACPW,2BAA2B,CAACX,QAAQ,EAAEF,IAAI,CAAC;AAAC"}
+{"version":3,"file":"FormValidations.js","names":["updateValidations","form","formWithValidations","dispatch","getState","currentForm","modularui","connectKey","validatedForm","model","clone","FormModel","data","updateModel","debouncedValidateFormObject","debounce","ModularUIRequest","selfhref","setParameter","method","HTTP_METHODS","POST","validationData","childmodels","isValidationRequest","locale","fetch","then","VALIDATE_DEBOUNCE_TIMEOUT","leading","trailing","validateFormObject"],"sources":["../../../src/redux/actions/FormValidations.js"],"sourcesContent":["// @flow\nimport debounce from \"lodash/debounce\";\n\nimport { updateModel } from \"../_modularui/ModularUIActions\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport {\n  HTTP_METHODS,\n  VALIDATE_DEBOUNCE_TIMEOUT,\n} from \"../../constants/Constants\";\n\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { Dispatch, GetState, ThunkAction } from \"../types\";\nimport type { ModularUIModel } from \"../../models\";\n\n/**\n * Update validations of the form currently in the reducer\n * because of the debounce timeout there might have been an update on the form during validation\n */\nconst updateValidations =\n  (form: FormModel, formWithValidations: ModularUIModel) =>\n  (dispatch: Dispatch, getState: GetState) => {\n    const currentForm = getState().modularui[form.connectKey];\n\n    if (currentForm) {\n      const validatedForm = currentForm.model.clone();\n      if (validatedForm instanceof FormModel) {\n        validatedForm.updateValidations(formWithValidations.data);\n      }\n\n      dispatch(updateModel(validatedForm));\n    }\n  };\n\n/**\n * Validates form objects debounced to prevent overloading the (form) service\n * When a form with new errors (or complete) arrives, we send the validations\n * to the current form model where the errors are processed\n * A new form with the new constraints is send to the store\n */\nconst debouncedValidateFormObject = debounce<\n  (dispatch: Dispatch, form: FormModel) => void\n>(\n  (dispatch, form: FormModel) => {\n    new ModularUIRequest(form.selfhref.setParameter(\"commit\", \"false\"), {\n      method: HTTP_METHODS.POST,\n      data: form.validationData,\n      childmodels: false,\n      isValidationRequest: true,\n      locale: form.locale,\n    })\n      .fetch()\n      .then((formWithValidations) =>\n        dispatch(updateValidations(form, formWithValidations))\n      );\n  },\n  VALIDATE_DEBOUNCE_TIMEOUT,\n  {\n    leading: true,\n    trailing: true,\n  }\n);\n\n/**\n */\nexport const validateFormObject =\n  (form: FormModel): ThunkAction =>\n  (dispatch) =>\n    debouncedValidateFormObject(dispatch, form);\n"],"mappings":";;;;;;;AACA;AAEA;AAEA;AAEA;AAKA;AAKA;AACA;AACA;AACA;AACA,MAAMA,iBAAiB,GACrB,CAACC,IAAe,EAAEC,mBAAmC,KACrD,CAACC,QAAkB,EAAEC,QAAkB,KAAK;EAC1C,MAAMC,WAAW,GAAGD,QAAQ,EAAE,CAACE,SAAS,CAACL,IAAI,CAACM,UAAU,CAAC;EAEzD,IAAIF,WAAW,EAAE;IACf,MAAMG,aAAa,GAAGH,WAAW,CAACI,KAAK,CAACC,KAAK,EAAE;IAC/C,IAAIF,aAAa,YAAYG,kBAAS,EAAE;MACtCH,aAAa,CAACR,iBAAiB,CAACE,mBAAmB,CAACU,IAAI,CAAC;IAC3D;IAEAT,QAAQ,CAAC,IAAAU,6BAAW,EAACL,aAAa,CAAC,CAAC;EACtC;AACF,CAAC;;AAEH;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,2BAA2B,GAAG,IAAAC,iBAAQ,EAG1C,CAACZ,QAAQ,EAAEF,IAAe,KAAK;EAC7B,IAAIe,yBAAgB,CAACf,IAAI,CAACgB,QAAQ,CAACC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE;IAClEC,MAAM,EAAEC,uBAAY,CAACC,IAAI;IACzBT,IAAI,EAAEX,IAAI,CAACqB,cAAc;IACzBC,WAAW,EAAE,KAAK;IAClBC,mBAAmB,EAAE,IAAI;IACzBC,MAAM,EAAExB,IAAI,CAACwB;EACf,CAAC,CAAC,CACCC,KAAK,EAAE,CACPC,IAAI,CAAEzB,mBAAmB,IACxBC,QAAQ,CAACH,iBAAiB,CAACC,IAAI,EAAEC,mBAAmB,CAAC,CAAC,CACvD;AACL,CAAC,EACD0B,oCAAyB,EACzB;EACEC,OAAO,EAAE,IAAI;EACbC,QAAQ,EAAE;AACZ,CAAC,CACF;;AAED;AACA;AACO,MAAMC,kBAAkB,GAC5B9B,IAAe,IACfE,QAAQ,IACPW,2BAA2B,CAACX,QAAQ,EAAEF,IAAI,CAAC;AAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.27.0",
+  "version": "1.27.2",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -82,10 +82,10 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.20.7",
+    "@babel/runtime-corejs3": "^7.20.13",
     "big.js": "^6.2.1",
     "date-fns": "^2.29.3",
-    "deepmerge": "^4.2.2",
+    "deepmerge": "^4.3.0",
     "dequal": "^2.0.3",
     "element-closest": "^3.0.2",
     "file-size": "^1.0.0",
@@ -94,6 +94,7 @@
     "he": "^1.2.0",
     "iban": "^0.0.14",
     "js-cookie": "^3.0.1",
+    "klona": "^2.0.6",
     "lodash": "^4.17.21",
     "reselect": "^4.1.7",
     "setimmediate": "^1.0.5"
@@ -113,29 +114,29 @@
     "@commitlint/config-conventional": "^17.4.2",
     "@testing-library/react": "^13.4.0",
     "auditjs": "^4.0.39",
-    "babel-jest": "^29.3.1",
+    "babel-jest": "^29.4.1",
     "babel-plugin-styled-components": "^2.0.7",
     "cherry-pick": "^0.5.0",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.1",
-    "eslint": "^8.32.0",
+    "eslint": "^8.33.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^2.0.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jsdoc": "^39.6.7",
-    "eslint-plugin-react": "^7.32.1",
+    "eslint-plugin-jsdoc": "^39.7.4",
+    "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
-    "flow-bin": "^0.197.0",
+    "flow-bin": "^0.198.2",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.8.0",
     "glob": "^8.1.0",
     "history": "^4.0.0",
     "husky": "^8.0.3",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
+    "jest": "^29.4.1",
+    "jest-environment-jsdom": "^29.4.1",
     "jest-junit": "^15.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.14.0",
@@ -148,10 +149,10 @@
     "react-redux": "^8.0.5",
     "react-router": "^5.0.0",
     "react-test-renderer": "^18.1.0",
-    "redux": "^4.0.0",
+    "redux": "^4.2.1",
     "redux-mock-store": "^1.5.4",
     "redux-thunk": "^2.4.2",
-    "rimraf": "^4.1.1",
+    "rimraf": "^4.1.2",
     "standard-version": "^9.5.0",
     "styled-components": "^5.3.6",
     "xhr-mock": "^2.5.1"