@beinformed/ui 1.27.1 → 1.27.3

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/Authenticate.js

@@ -27,13 +27,13 @@ class Authenticate {
    */
   get authenticationType() {
     const type = (0, _constants.loginType)();
-    if (!type || type === "JAAS") {
-      return "JAAS";
+    if (!type || type === _constants.INTERNAL_LOGIN_TYPE.JAAS) {
+      return _constants.INTERNAL_LOGIN_TYPE.JAAS;
     }
     if ((0, _includes.default)(type).call(type, "FormClient")) {
-      return "PAC4J_FORM";
+      return _constants.INTERNAL_LOGIN_TYPE.PAC4J_FORM;
     } else if ((0, _includes.default)(type).call(type, "BasicClient")) {
-      return "PAC4J_BASIC";
+      return _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
     }
     throw new Error(`Unsupported login type found: ${type}`);
   }
@@ -41,7 +41,7 @@ class Authenticate {
   /**
    */
   get isBasicAuthentication() {
-    return this._isBasic || this.authenticationType === "PAC4J_BASIC";
+    return this._isBasic || this.authenticationType === _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
   }
 
   /**
@@ -84,9 +84,9 @@ class Authenticate {
    */
   login(username, password) {
     switch (this.authenticationType) {
-      case "PAC4J_FORM":
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return this.doFormLogin(username, password);
-      case "PAC4J_BASIC":
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
         return this.doBasicAuthentication(username, password);
       default:
         return this.doJaasAuthentication(username, password);
@@ -97,8 +97,8 @@ class Authenticate {
    */
   getFormLoginUrl() {
     switch (this.authenticationType) {
-      case "PAC4J_BASIC":
-      case "PAC4J_FORM":
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${(0, _constants.getBasePath)()}${(0, _constants.loginPath)()}`;
       default:
         return `${(0, _constants.getBasePath)()}/j_security_check`;
@@ -111,8 +111,8 @@ class Authenticate {
     const encodedUsername = encodeURIComponent(username);
     const encodedPassword = encodeURIComponent(password);
     switch (this.authenticationType) {
-      case "PAC4J_BASIC":
-      case "PAC4J_FORM":
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${(0, _constants.loginUsernameField)()}=${encodedUsername}&${(0, _constants.loginPasswordField)()}=${encodedPassword}`;
       default:
         return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
@@ -151,11 +151,23 @@ class Authenticate {
     });
   }
 
+  /**
+   */
+  getLogoutUrl() {
+    switch (this.authenticationType) {
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case _constants.INTERNAL_LOGIN_TYPE.PAC4J_FORM:
+        return `${(0, _constants.getBasePath)()}${(0, _constants.logoutPath)()}`;
+      default:
+        return `${(0, _constants.getBasePath)()}/Logoff`;
+    }
+  }
+
   /**
    */
   logout() {
     return (0, _universalFetch.default)({
-      url: `${(0, _constants.getBasePath)()}${(0, _constants.logoutPath)()}`
+      url: this.getLogoutUrl()
     }).then(response => {
       // clear cache because of cached contributions
       _Cache.default.clear();

package/lib/modularui/Authenticate.js.flow

@@ -6,6 +6,7 @@ import Cache from "../utils/browser/Cache";
 
 import { UnauthorizedException } from "../exceptions";
 import {
+  INTERNAL_LOGIN_TYPE,
   loginType,
   loginPath,
   loginPasswordField,
@@ -27,16 +28,17 @@ class Authenticate {
 
   /**
    */
-  get authenticationType(): "JAAS" | "PAC4J_FORM" | "PAC4J_BASIC" {
+  get authenticationType(): $Keys<typeof INTERNAL_LOGIN_TYPE> {
     const type = loginType();
 
-    if (!type || type === "JAAS") {
-      return "JAAS";
+    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {
+      return INTERNAL_LOGIN_TYPE.JAAS;
     }
+
     if (type.includes("FormClient")) {
-      return "PAC4J_FORM";
+      return INTERNAL_LOGIN_TYPE.PAC4J_FORM;
     } else if (type.includes("BasicClient")) {
-      return "PAC4J_BASIC";
+      return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
     }
 
     throw new Error(`Unsupported login type found: ${type}`);
@@ -45,7 +47,10 @@ class Authenticate {
   /**
    */
   get isBasicAuthentication(): boolean {
-    return this._isBasic || this.authenticationType === "PAC4J_BASIC";
+    return (
+      this._isBasic ||
+      this.authenticationType === INTERNAL_LOGIN_TYPE.PAC4J_BASIC
+    );
   }
 
   /**
@@ -90,9 +95,9 @@ class Authenticate {
    */
   login(username: string, password: string): Promise<any> {
     switch (this.authenticationType) {
-      case "PAC4J_FORM":
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return this.doFormLogin(username, password);
-      case "PAC4J_BASIC":
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
         return this.doBasicAuthentication(username, password);
       default:
         return this.doJaasAuthentication(username, password);
@@ -103,8 +108,8 @@ class Authenticate {
    */
   getFormLoginUrl(): string {
     switch (this.authenticationType) {
-      case "PAC4J_BASIC":
-      case "PAC4J_FORM":
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${getBasePath()}${loginPath()}`;
       default:
         return `${getBasePath()}/j_security_check`;
@@ -118,8 +123,8 @@ class Authenticate {
     const encodedPassword = encodeURIComponent(password);
 
     switch (this.authenticationType) {
-      case "PAC4J_BASIC":
-      case "PAC4J_FORM":
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;
       default:
         return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
@@ -158,11 +163,23 @@ class Authenticate {
     });
   }
 
+  /**
+   */
+  getLogoutUrl(): string {
+    switch (this.authenticationType) {
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
+        return `${getBasePath()}${logoutPath()}`;
+      default:
+        return `${getBasePath()}/Logoff`;
+    }
+  }
+
   /**
    */
   logout(): Promise<any> {
     return universalFetch({
-      url: `${getBasePath()}${logoutPath()}`,
+      url: this.getLogoutUrl(),
     }).then((response) => {
       // clear cache because of cached contributions
       Cache.clear();

package/lib/modularui/Authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"Authenticate.js","names":["Authenticate","constructor","_isBasic","authenticationType","type","loginType","Error","isBasicAuthentication","requestLogin","universalFetch","url","getBasePath","method","HTTP_METHODS","GET","headers","Accept","initLogin","resolve","catch","error","UnauthorizedException","login","username","password","doFormLogin","doBasicAuthentication","doJaasAuthentication","getFormLoginUrl","loginPath","getFormLoginData","encodedUsername","encodeURIComponent","encodedPassword","loginUsernameField","loginPasswordField","POST","data","Cache","addItem","btoa","then","logout","logoutPath","response","clear"],"sources":["../../src/modularui/Authenticate.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport universalFetch from \"../utils/fetch/universalFetch\";\nimport Cache from \"../utils/browser/Cache\";\n\nimport { UnauthorizedException } from \"../exceptions\";\nimport {\n  loginType,\n  loginPath,\n  loginPasswordField,\n  loginUsernameField,\n  logoutPath,\n  getBasePath,\n} from \"../constants\";\n\n/**\n */\nclass Authenticate {\n  _isBasic: boolean;\n\n  /**\n   */\n  constructor() {\n    this._isBasic = false;\n  }\n\n  /**\n   */\n  get authenticationType(): \"JAAS\" | \"PAC4J_FORM\" | \"PAC4J_BASIC\" {\n    const type = loginType();\n\n    if (!type || type === \"JAAS\") {\n      return \"JAAS\";\n    }\n    if (type.includes(\"FormClient\")) {\n      return \"PAC4J_FORM\";\n    } else if (type.includes(\"BasicClient\")) {\n      return \"PAC4J_BASIC\";\n    }\n\n    throw new Error(`Unsupported login type found: ${type}`);\n  }\n\n  /**\n   */\n  get isBasicAuthentication(): boolean {\n    return this._isBasic || this.authenticationType === \"PAC4J_BASIC\";\n  }\n\n  /**\n   */\n  set isBasicAuthentication(isBasicAuthentication: boolean) {\n    this._isBasic = isBasicAuthentication;\n  }\n\n  /**\n   */\n  requestLogin(): Promise<any> {\n    return universalFetch({\n      url: `${getBasePath()}/login`,\n      method: HTTP_METHODS.GET,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n    });\n  }\n\n  /**\n   */\n  initLogin(initLogin: boolean): Promise<any> {\n    if (this.isBasicAuthentication || !initLogin) {\n      return Promise.resolve(true);\n    }\n\n    return this.requestLogin().catch((error) => {\n      // when an unauthorizedexception is received on a request to the login service,\n      // this indicates a basic authorization scenario\n      // in case of form based authentication other exceptions are thrown\n      if (error instanceof UnauthorizedException) {\n        this.isBasicAuthentication = true;\n      }\n\n      return Promise.resolve({});\n    });\n  }\n\n  /**\n   */\n  login(username: string, password: string): Promise<any> {\n    switch (this.authenticationType) {\n      case \"PAC4J_FORM\":\n        return this.doFormLogin(username, password);\n      case \"PAC4J_BASIC\":\n        return this.doBasicAuthentication(username, password);\n      default:\n        return this.doJaasAuthentication(username, password);\n    }\n  }\n\n  /**\n   */\n  getFormLoginUrl(): string {\n    switch (this.authenticationType) {\n      case \"PAC4J_BASIC\":\n      case \"PAC4J_FORM\":\n        return `${getBasePath()}${loginPath()}`;\n      default:\n        return `${getBasePath()}/j_security_check`;\n    }\n  }\n\n  /**\n   */\n  getFormLoginData(username: string, password: string): string {\n    const encodedUsername = encodeURIComponent(username);\n    const encodedPassword = encodeURIComponent(password);\n\n    switch (this.authenticationType) {\n      case \"PAC4J_BASIC\":\n      case \"PAC4J_FORM\":\n        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;\n      default:\n        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;\n    }\n  }\n\n  /**\n   */\n  doFormLogin(username: string, password: string): Promise<any> {\n    return universalFetch({\n      url: this.getFormLoginUrl(),\n      method: HTTP_METHODS.POST,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n      data: this.getFormLoginData(username, password),\n    });\n  }\n\n  /**\n   */\n  doBasicAuthentication(username: string, password: string): Promise<any> {\n    Cache.addItem(\"basic\", btoa(`${username}:${password}`));\n    return this.requestLogin();\n  }\n\n  /**\n   */\n  doJaasAuthentication(username: string, password: string): Promise<any> {\n    return this.initLogin(true).then(() => {\n      if (this.isBasicAuthentication) {\n        return this.doBasicAuthentication(username, password);\n      }\n      return this.doFormLogin(username, password);\n    });\n  }\n\n  /**\n   */\n  logout(): Promise<any> {\n    return universalFetch({\n      url: `${getBasePath()}${logoutPath()}`,\n    }).then((response) => {\n      // clear cache because of cached contributions\n      Cache.clear();\n      return response;\n    });\n  }\n}\n\nexport default Authenticate;\n"],"mappings":"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"}
+{"version":3,"file":"Authenticate.js","names":["Authenticate","constructor","_isBasic","authenticationType","type","loginType","INTERNAL_LOGIN_TYPE","JAAS","PAC4J_FORM","PAC4J_BASIC","Error","isBasicAuthentication","requestLogin","universalFetch","url","getBasePath","method","HTTP_METHODS","GET","headers","Accept","initLogin","resolve","catch","error","UnauthorizedException","login","username","password","doFormLogin","doBasicAuthentication","doJaasAuthentication","getFormLoginUrl","loginPath","getFormLoginData","encodedUsername","encodeURIComponent","encodedPassword","loginUsernameField","loginPasswordField","POST","data","Cache","addItem","btoa","then","getLogoutUrl","logoutPath","logout","response","clear"],"sources":["../../src/modularui/Authenticate.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport universalFetch from \"../utils/fetch/universalFetch\";\nimport Cache from \"../utils/browser/Cache\";\n\nimport { UnauthorizedException } from \"../exceptions\";\nimport {\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  loginPath,\n  loginPasswordField,\n  loginUsernameField,\n  logoutPath,\n  getBasePath,\n} from \"../constants\";\n\n/**\n */\nclass Authenticate {\n  _isBasic: boolean;\n\n  /**\n   */\n  constructor() {\n    this._isBasic = false;\n  }\n\n  /**\n   */\n  get authenticationType(): $Keys<typeof INTERNAL_LOGIN_TYPE> {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return INTERNAL_LOGIN_TYPE.JAAS;\n    }\n\n    if (type.includes(\"FormClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_FORM;\n    } else if (type.includes(\"BasicClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;\n    }\n\n    throw new Error(`Unsupported login type found: ${type}`);\n  }\n\n  /**\n   */\n  get isBasicAuthentication(): boolean {\n    return (\n      this._isBasic ||\n      this.authenticationType === INTERNAL_LOGIN_TYPE.PAC4J_BASIC\n    );\n  }\n\n  /**\n   */\n  set isBasicAuthentication(isBasicAuthentication: boolean) {\n    this._isBasic = isBasicAuthentication;\n  }\n\n  /**\n   */\n  requestLogin(): Promise<any> {\n    return universalFetch({\n      url: `${getBasePath()}/login`,\n      method: HTTP_METHODS.GET,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n    });\n  }\n\n  /**\n   */\n  initLogin(initLogin: boolean): Promise<any> {\n    if (this.isBasicAuthentication || !initLogin) {\n      return Promise.resolve(true);\n    }\n\n    return this.requestLogin().catch((error) => {\n      // when an unauthorizedexception is received on a request to the login service,\n      // this indicates a basic authorization scenario\n      // in case of form based authentication other exceptions are thrown\n      if (error instanceof UnauthorizedException) {\n        this.isBasicAuthentication = true;\n      }\n\n      return Promise.resolve({});\n    });\n  }\n\n  /**\n   */\n  login(username: string, password: string): Promise<any> {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return this.doFormLogin(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return this.doBasicAuthentication(username, password);\n      default:\n        return this.doJaasAuthentication(username, password);\n    }\n  }\n\n  /**\n   */\n  getFormLoginUrl(): string {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${getBasePath()}${loginPath()}`;\n      default:\n        return `${getBasePath()}/j_security_check`;\n    }\n  }\n\n  /**\n   */\n  getFormLoginData(username: string, password: string): string {\n    const encodedUsername = encodeURIComponent(username);\n    const encodedPassword = encodeURIComponent(password);\n\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;\n      default:\n        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;\n    }\n  }\n\n  /**\n   */\n  doFormLogin(username: string, password: string): Promise<any> {\n    return universalFetch({\n      url: this.getFormLoginUrl(),\n      method: HTTP_METHODS.POST,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n      data: this.getFormLoginData(username, password),\n    });\n  }\n\n  /**\n   */\n  doBasicAuthentication(username: string, password: string): Promise<any> {\n    Cache.addItem(\"basic\", btoa(`${username}:${password}`));\n    return this.requestLogin();\n  }\n\n  /**\n   */\n  doJaasAuthentication(username: string, password: string): Promise<any> {\n    return this.initLogin(true).then(() => {\n      if (this.isBasicAuthentication) {\n        return this.doBasicAuthentication(username, password);\n      }\n      return this.doFormLogin(username, password);\n    });\n  }\n\n  /**\n   */\n  getLogoutUrl(): string {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${getBasePath()}${logoutPath()}`;\n      default:\n        return `${getBasePath()}/Logoff`;\n    }\n  }\n\n  /**\n   */\n  logout(): Promise<any> {\n    return universalFetch({\n      url: this.getLogoutUrl(),\n    }).then((response) => {\n      // clear cache because of cached contributions\n      Cache.clear();\n      return response;\n    });\n  }\n}\n\nexport default Authenticate;\n"],"mappings":"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"}

package/lib/react/ErrorBoundaryFallback.js

@@ -8,9 +8,12 @@ exports.default = void 0;
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _spacers = require("../react-theme/utils/spacers");
 var _jsxRuntime = require("react/jsx-runtime");
+// $FlowFixMe
 const StyledBoundary = /*#__PURE__*/_styledComponents.default.div.withConfig({
   componentId: "sc-xsbtpo-0"
 })(["padding:", ";margin-bottom:", ";background-color:#e9ecef;border-radius:0.3em;"], (0, _spacers.spacers)(2, 1), (0, _spacers.spacer)(2));
+
+// $FlowFixMe
 const StyledStack = /*#__PURE__*/_styledComponents.default.pre.withConfig({
   componentId: "sc-xsbtpo-1"
 })(["display:block;font-size:87.5%;color:#212529;font-style:italic;"]);

package/lib/react/ErrorBoundaryFallback.js.flow

@@ -12,6 +12,7 @@ export type Props = {
   +error: Error,
 };
 
+// $FlowFixMe
 const StyledBoundary: StyledComponent<{}, Theme, *> = styled.div`
   padding: ${spacers(2, 1)};
   margin-bottom: ${spacer(2)};
@@ -19,6 +20,7 @@ const StyledBoundary: StyledComponent<{}, Theme, *> = styled.div`
   border-radius: 0.3em;
 `;
 
+// $FlowFixMe
 const StyledStack = styled.pre`
   display: block;
   font-size: 87.5%;

package/lib/react/ErrorBoundaryFallback.js.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorBoundaryFallback.js","names":["StyledBoundary","styled","div","spacers","spacer","StyledStack","pre","ErrorBoundaryFallback","className","componentStack","error","toString","displayName"],"sources":["../../src/react/ErrorBoundaryFallback.js"],"sourcesContent":["// @flow\nimport styled from \"styled-components\";\nimport { spacers, spacer } from \"../react-theme/utils/spacers\";\n\nimport type { StyledComponent } from \"styled-components\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { Node } from \"react\";\n\nexport type Props = {\n  +className?: string,\n  +componentStack: string,\n  +error: Error,\n};\n\nconst StyledBoundary: StyledComponent<{}, Theme, *> = styled.div`\n  padding: ${spacers(2, 1)};\n  margin-bottom: ${spacer(2)};\n  background-color: #e9ecef;\n  border-radius: 0.3em;\n`;\n\nconst StyledStack = styled.pre`\n  display: block;\n  font-size: 87.5%;\n  color: #212529;\n  font-style: italic;\n`;\n\n/**\n */\nconst ErrorBoundaryFallback = ({\n  className,\n  componentStack,\n  error,\n}: Props): Node => (\n  <StyledBoundary className={className}>\n    <h2>{error.toString()}</h2>\n    <StyledStack className=\"debug\">{componentStack}</StyledStack>\n  </StyledBoundary>\n);\n\nErrorBoundaryFallback.displayName = \"BI.ErrorBoundaryFallback\";\n\nexport default ErrorBoundaryFallback;\n"],"mappings":";;;;;;;AACA;AACA;AAA+D;AAY/D,MAAMA,cAA6C,gBAAGC,yBAAM,CAACC,GAAG;EAAA;AAAA,sFACnD,IAAAC,gBAAO,EAAC,CAAC,EAAE,CAAC,CAAC,EACP,IAAAC,eAAM,EAAC,CAAC,CAAC,CAG3B;AAED,MAAMC,WAAW,gBAAGJ,yBAAM,CAACK,GAAG;EAAA;AAAA,sEAK7B;;AAED;AACA;AACA,MAAMC,qBAAqB,GAAG;EAAA,IAAC;IAC7BC,SAAS;IACTC,cAAc;IACdC;EACK,CAAC;EAAA,oBACN,sBAAC,cAAc;IAAC,SAAS,EAAEF,SAAU;IAAA,wBACnC;MAAA,UAAKE,KAAK,CAACC,QAAQ;IAAE,EAAM,eAC3B,qBAAC,WAAW;MAAC,SAAS,EAAC,OAAO;MAAA,UAAEF;IAAc,EAAe;EAAA,EAC9C;AAAA,CAClB;AAEDF,qBAAqB,CAACK,WAAW,GAAG,0BAA0B;AAAC,eAEhDL,qBAAqB;AAAA"}
+{"version":3,"file":"ErrorBoundaryFallback.js","names":["StyledBoundary","styled","div","spacers","spacer","StyledStack","pre","ErrorBoundaryFallback","className","componentStack","error","toString","displayName"],"sources":["../../src/react/ErrorBoundaryFallback.js"],"sourcesContent":["// @flow\nimport styled from \"styled-components\";\nimport { spacers, spacer } from \"../react-theme/utils/spacers\";\n\nimport type { StyledComponent } from \"styled-components\";\nimport type { Theme } from \"../react-theme/types\";\nimport type { Node } from \"react\";\n\nexport type Props = {\n  +className?: string,\n  +componentStack: string,\n  +error: Error,\n};\n\n// $FlowFixMe\nconst StyledBoundary: StyledComponent<{}, Theme, *> = styled.div`\n  padding: ${spacers(2, 1)};\n  margin-bottom: ${spacer(2)};\n  background-color: #e9ecef;\n  border-radius: 0.3em;\n`;\n\n// $FlowFixMe\nconst StyledStack = styled.pre`\n  display: block;\n  font-size: 87.5%;\n  color: #212529;\n  font-style: italic;\n`;\n\n/**\n */\nconst ErrorBoundaryFallback = ({\n  className,\n  componentStack,\n  error,\n}: Props): Node => (\n  <StyledBoundary className={className}>\n    <h2>{error.toString()}</h2>\n    <StyledStack className=\"debug\">{componentStack}</StyledStack>\n  </StyledBoundary>\n);\n\nErrorBoundaryFallback.displayName = \"BI.ErrorBoundaryFallback\";\n\nexport default ErrorBoundaryFallback;\n"],"mappings":";;;;;;;AACA;AACA;AAA+D;AAY/D;AACA,MAAMA,cAA6C,gBAAGC,yBAAM,CAACC,GAAG;EAAA;AAAA,sFACnD,IAAAC,gBAAO,EAAC,CAAC,EAAE,CAAC,CAAC,EACP,IAAAC,eAAM,EAAC,CAAC,CAAC,CAG3B;;AAED;AACA,MAAMC,WAAW,gBAAGJ,yBAAM,CAACK,GAAG;EAAA;AAAA,sEAK7B;;AAED;AACA;AACA,MAAMC,qBAAqB,GAAG;EAAA,IAAC;IAC7BC,SAAS;IACTC,cAAc;IACdC;EACK,CAAC;EAAA,oBACN,sBAAC,cAAc;IAAC,SAAS,EAAEF,SAAU;IAAA,wBACnC;MAAA,UAAKE,KAAK,CAACC,QAAQ;IAAE,EAAM,eAC3B,qBAAC,WAAW;MAAC,SAAS,EAAC,OAAO;MAAA,UAAEF;IAAc,EAAe;EAAA,EAC9C;AAAA,CAClB;AAEDF,qBAAqB,CAACK,WAAW,GAAG,0BAA0B;AAAC,eAEhDL,qBAAqB;AAAA"}

package/lib/react-server/serverUtil.js

@@ -141,6 +141,7 @@ const setApplication = store => {
     const application = new _ModularUIRequest.default("/", {
       locale: locale
     }).fetchSync();
+    application.connectKey = `application(/)(${locale})`;
     store.dispatch((0, _redux.initModels)([{
       key: `application(/)(${locale})`,
       model: application

package/lib/react-server/serverUtil.js.flow

@@ -176,6 +176,8 @@ const setApplication = (store: ReduxStore) => {
       locale: locale,
     }).fetchSync();
 
+    application.connectKey = `application(/)(${locale})`;
+
     store.dispatch(
       initModels([
         {