@beinformed/ui 1.21.3 → 1.21.6

package/lib/models/grouping/GroupingModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"GroupingModel.js","names":["GroupModel","constructor","group","context","contributions","_group","_context","_attributeCollection","AttributeCollection","attributes","grouping","_grouping","GroupingModel","dynamicschema","type","id","_id","label","attributeCollection","reference","hasAttributeByKey","key","getAttributeByKey","data","contexts","_prefix","prefix","getContextFromContributionsByPrefix","_groups","groups","hasGroups","length","some","groupByKey","getGroupByAttributeKey"],"sources":["../../../src/models/grouping/GroupingModel.js"],"sourcesContent":["// @flow\nimport AttributeCollection from \"../attributes/AttributeCollection\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Group information model\n * Put GroupModel here because of possible circular dependency with GroupingModel below\n */\nexport class GroupModel {\n  _group: Object;\n  _context: Object;\n  _attributeCollection: AttributeCollection;\n  _grouping: ?GroupingModel;\n\n  /**\n   */\n  constructor(group: Object, context: Object, contributions: Array<Object>) {\n    this._group = group;\n    this._context = context;\n\n    this._attributeCollection = new AttributeCollection(\n      group,\n      context.attributes\n    );\n\n    if (group.grouping) {\n      this._grouping = new GroupingModel(\n        { ...group.grouping, dynamicschema: group.dynamicschema },\n        contributions\n      );\n    }\n  }\n\n  /**\n   */\n  get type(): string {\n    return this._group.type;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this._group._id || \"unknown\";\n  }\n\n  /**\n   */\n  get label(): string {\n    return this._context.label;\n  }\n\n  /**\n   */\n  get attributeCollection(): AttributeCollection {\n    return this._attributeCollection;\n  }\n\n  /**\n   */\n  get grouping(): ?GroupingModel {\n    return this._grouping;\n  }\n\n  /**\n   * Retrieve array of reference id's\n   */\n  get reference(): Array<number> {\n    return this._group.reference || [];\n  }\n\n  /**\n   */\n  hasAttributeByKey(key: string): boolean {\n    if (this.attributeCollection.hasAttributeByKey(key)) {\n      return true;\n    }\n\n    if (this.grouping) {\n      return this.grouping.hasAttributeByKey(key);\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  getAttributeByKey(key: string): AttributeType | null {\n    if (this.attributeCollection.hasAttributeByKey(key)) {\n      return this.attributeCollection.getAttributeByKey(key);\n    }\n\n    if (this.grouping) {\n      return this.grouping.getAttributeByKey(key);\n    }\n\n    return null;\n  }\n}\n\ntype Context = {\n  prefix: string,\n  label: string,\n  metadata: Object,\n  attributes: Array<Object>,\n};\n\n/**\n * Grouping model to group lists\n */\nexport default class GroupingModel {\n  _prefix: string | null;\n  _groups: Array<GroupModel>;\n\n  /**\n   */\n  constructor(data: Object, contexts: Array<Context>) {\n    this._prefix = data && data.prefix ? data.prefix : null;\n\n    const context = this.getContextFromContributionsByPrefix(\n      contexts,\n      this._prefix\n    );\n\n    const dynamicschema = data && data.dynamicschema;\n    this._groups =\n      data && data.group\n        ? data.group.map(\n            (group) =>\n              new GroupModel({ ...group, dynamicschema }, context, contexts)\n          )\n        : [];\n  }\n\n  /**\n   * Retrieve groups of grouping\n   */\n  get groups(): Array<GroupModel> {\n    return this._groups;\n  }\n\n  /**\n   * Inidicates if Grouping has one or more groups\n   */\n  hasGroups(): boolean {\n    return this._groups.length > 0;\n  }\n\n  /**\n   * Get context of grouping\n   */\n  getContextFromContributionsByPrefix(\n    contexts: Array<Object>,\n    prefix: string | null\n  ): Object {\n    if (contexts && prefix !== null) {\n      return contexts.find((context) => context.prefix === prefix) || {};\n    }\n\n    return {};\n  }\n\n  /**\n   */\n  hasAttributeByKey(key: string): boolean {\n    return this.groups.some((group: GroupModel) =>\n      group.hasAttributeByKey(key)\n    );\n  }\n\n  /**\n   */\n  getAttributeByKey(key: string): AttributeType | null {\n    const groupByKey = this.groups.find((group: GroupModel) =>\n      group.hasAttributeByKey(key)\n    );\n\n    if (groupByKey) {\n      return groupByKey.getAttributeByKey(key);\n    }\n    return null;\n  }\n\n  /**\n   */\n  getGroupByAttributeKey(key: string): ?GroupModel {\n    return this.groups.find((group) => group.hasAttributeByKey(key));\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"GroupingModel.js","names":["GroupModel","constructor","group","context","contributions","_group","_context","_attributeCollection","AttributeCollection","attributes","grouping","_grouping","GroupingModel","dynamicschema","type","id","_id","label","attributeCollection","reference","hasAttributeByKey","key","getAttributeByKey","data","contexts","_prefix","prefix","_groups","createGroup","getContextFromContributionsByPrefix","getDynamicSchema","groups","hasGroups","length","some","groupByKey","getGroupByAttributeKey"],"sources":["../../../src/models/grouping/GroupingModel.js"],"sourcesContent":["// @flow\nimport AttributeCollection from \"../attributes/AttributeCollection\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Group information model\n * Put GroupModel here because of possible circular dependency with GroupingModel below\n */\nexport class GroupModel {\n  _group: Object;\n  _context: Object;\n  _attributeCollection: AttributeCollection;\n  _grouping: ?GroupingModel;\n\n  /**\n   */\n  constructor(group: Object, context: Object, contributions: Array<Object>) {\n    this._group = group;\n    this._context = context;\n\n    this._attributeCollection = new AttributeCollection(\n      group,\n      context.attributes\n    );\n\n    if (group.grouping) {\n      this._grouping = new GroupingModel(\n        { ...group.grouping, dynamicschema: group.dynamicschema },\n        contributions\n      );\n    }\n  }\n\n  /**\n   */\n  get type(): string {\n    return this._group.type;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this._group._id || \"unknown\";\n  }\n\n  /**\n   */\n  get label(): string {\n    return this._context.label;\n  }\n\n  /**\n   */\n  get attributeCollection(): AttributeCollection {\n    return this._attributeCollection;\n  }\n\n  /**\n   */\n  get grouping(): ?GroupingModel {\n    return this._grouping;\n  }\n\n  /**\n   * Retrieve array of reference id's\n   */\n  get reference(): Array<number> {\n    return this._group.reference || [];\n  }\n\n  /**\n   */\n  hasAttributeByKey(key: string): boolean {\n    if (this.attributeCollection.hasAttributeByKey(key)) {\n      return true;\n    }\n\n    if (this.grouping) {\n      return this.grouping.hasAttributeByKey(key);\n    }\n\n    return false;\n  }\n\n  /**\n   */\n  getAttributeByKey(key: string): AttributeType | null {\n    if (this.attributeCollection.hasAttributeByKey(key)) {\n      return this.attributeCollection.getAttributeByKey(key);\n    }\n\n    if (this.grouping) {\n      return this.grouping.getAttributeByKey(key);\n    }\n\n    return null;\n  }\n}\n\ntype Context = {\n  prefix: string,\n  label: string,\n  metadata: Object,\n  attributes: Array<Object>,\n};\n\n/**\n * Grouping model to group lists\n */\nexport default class GroupingModel {\n  _prefix: string | null;\n  _groups: Array<GroupModel> = [];\n\n  /**\n   */\n  constructor(data: Object, contexts: Array<Context>) {\n    this._prefix = data && data.prefix ? data.prefix : null;\n\n    if (data?.group) {\n      this._groups = this.createGroup(data, contexts);\n    }\n  }\n\n  /**\n   */\n  createGroup(data: Object, contributions: Array<Context>): Array<Object> {\n    const context = this.getContextFromContributionsByPrefix(\n      contributions,\n      this._prefix\n    );\n\n    return data.group.map((group) => {\n      const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);\n      return new GroupModel(\n        {\n          ...group,\n          dynamicschema,\n        },\n        context,\n        contributions\n      );\n    });\n  }\n\n  /**\n   * add grouped prefix to the dynamicschema\n   */\n  getDynamicSchema(group: Object, dynamicschema: Object): Object {\n    if (dynamicschema) {\n      if (\n        this._prefix &&\n        dynamicschema[group.type] &&\n        !dynamicschema[this._prefix + group.type]\n      ) {\n        dynamicschema[this._prefix + group.type] = dynamicschema[group.type];\n      }\n      return dynamicschema;\n    }\n    return null;\n  }\n\n  /**\n   * Retrieve groups of grouping\n   */\n  get groups(): Array<GroupModel> {\n    return this._groups;\n  }\n\n  /**\n   * Inidicates if Grouping has one or more groups\n   */\n  hasGroups(): boolean {\n    return this._groups.length > 0;\n  }\n\n  /**\n   * Get context of grouping\n   */\n  getContextFromContributionsByPrefix(\n    contexts: Array<Object>,\n    prefix: string | null\n  ): Object {\n    if (contexts && prefix !== null) {\n      return contexts.find((context) => context.prefix === prefix) || {};\n    }\n\n    return {};\n  }\n\n  /**\n   */\n  hasAttributeByKey(key: string): boolean {\n    return this.groups.some((group: GroupModel) =>\n      group.hasAttributeByKey(key)\n    );\n  }\n\n  /**\n   */\n  getAttributeByKey(key: string): AttributeType | null {\n    const groupByKey = this.groups.find((group: GroupModel) =>\n      group.hasAttributeByKey(key)\n    );\n\n    if (groupByKey) {\n      return groupByKey.getAttributeByKey(key);\n    }\n    return null;\n  }\n\n  /**\n   */\n  getGroupByAttributeKey(key: string): ?GroupModel {\n    return this.groups.find((group) => group.hasAttributeByKey(key));\n  }\n}\n"],"mappings":"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"}

package/package.json

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

package/src/models/attributes/AttributeModel.js

@@ -710,9 +710,9 @@ export default class AttributeModel
   addServerError(error: FormErrorAnchor) {
     this._errorCollection.addServerError(
       error.id,
-      error.layouthint,
       error.message,
-      error.properties
+      error.properties,
+      error.layouthint
     );
   }
 
@@ -813,9 +813,9 @@ export default class AttributeModel
         if (this.hasValue()) {
           this._errorCollection.addServerError(
             error.id,
-            error.layouthint,
             error.message,
-            this.formatParameters(error.properties)
+            this.formatParameters(error.properties),
+            error.layouthint
           );
         } else {
           this.addServerConstraint(

package/src/models/attributes/ChoiceAttributeModel.js

@@ -396,7 +396,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
    * Registers an error that was received from a server response
    */
   addServerError(error: FormErrorAnchor) {
-    const { id, layouthint, message, properties } = error;
+    const { id, message, properties, layouthint } = error;
 
     const ANSWER_OPTION_KEY = "answer-option-key";
 
@@ -412,7 +412,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
       }
     }
 
-    this._errorCollection.addServerError(id, layouthint, message, properties);
+    this._errorCollection.addServerError(id, message, properties, layouthint);
   }
 
   /**

package/src/models/attributes/DatetimeAttributeModel.js

@@ -425,12 +425,12 @@ class DatetimeAttributeModel extends StringAttributeModel {
    * Registers an error that was received from a server response
    */
   addServerError(error: FormErrorAnchor) {
-    const { id, layouthint, message, properties } = error;
+    const { id, message, properties, layouthint } = error;
     if (properties && has(properties, "format") && this.formatLabel) {
       properties.format = this.formatLabel;
     }
 
-    this._errorCollection.addServerError(id, layouthint, message, properties);
+    this._errorCollection.addServerError(id, message, properties, layouthint);
   }
 
   /**

package/src/models/error/ErrorCollection.js

@@ -43,9 +43,9 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
    */
   addError(
     id: string,
-    layouthint?: LayoutHintCollection,
     defaultMessage?: string,
-    parameters?: MessageParameters
+    parameters?: MessageParameters,
+    layouthint?: LayoutHintCollection
   ) {
     const itemIdx = this.findById(id);
 
@@ -68,14 +68,14 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
    */
   addServerError(
     id: string,
-    layouthint?: LayoutHintCollection,
     defaultMessage?: string,
-    parameters?: MessageParameters
+    parameters?: MessageParameters,
+    layouthint?: LayoutHintCollection
   ) {
     if (parameters) {
-      this.addError(id, layouthint, defaultMessage, parameters);
+      this.addError(id, defaultMessage, parameters, layouthint);
     } else {
-      this.addError(id, layouthint, defaultMessage);
+      this.addError(id, defaultMessage, undefined, layouthint);
     }
   }
 

package/src/models/form/FormModel.js

@@ -513,15 +513,16 @@ class FormModel extends ResourceModel {
     if (error.parameters) {
       this.errorCollection.addServerError(
         error.id,
-        error.layouthint,
         error.message,
-        error.parameters
+        error.parameters,
+        error.layouthint
       );
     } else {
       this.errorCollection.addServerError(
         error.id,
-        error.layouthint,
-        error.message
+        error.message,
+        undefined,
+        error.layouthint
       );
     }
   }
@@ -1003,7 +1004,8 @@ class FormModel extends ResourceModel {
         this.errorCollection.addServerError(
           error.id,
           error.message,
-          error.properties
+          error.properties,
+          error.layouthint
         );
       });
   }
@@ -1024,9 +1026,9 @@ class FormModel extends ResourceModel {
         } else {
           this.errorCollection.addServerError(
             error.id,
-            new LayoutHintCollection(error.layouthint),
             error.message,
-            error.properties
+            error.properties,
+            new LayoutHintCollection(error.layouthint)
           );
         }
       });

package/src/models/form/FormObjectModel.js

@@ -401,9 +401,9 @@ export default class FormObjectModel extends BaseModel {
     } else {
       this._errorCollection.addServerError(
         error.id,
-        error.layouthint,
         error.message,
-        error.properties
+        error.properties,
+        error.layouthint
       );
     }
   }
@@ -463,7 +463,8 @@ export default class FormObjectModel extends BaseModel {
             this.errorCollection.addServerError(
               error.id,
               error.message,
-              error.properties
+              error.properties,
+              error.layouthint
             );
           }
         }

package/src/models/grouping/GroupingModel.js

@@ -109,26 +109,54 @@ type Context = {
  */
 export default class GroupingModel {
   _prefix: string | null;
-  _groups: Array<GroupModel>;
+  _groups: Array<GroupModel> = [];
 
   /**
    */
   constructor(data: Object, contexts: Array<Context>) {
     this._prefix = data && data.prefix ? data.prefix : null;
 
+    if (data?.group) {
+      this._groups = this.createGroup(data, contexts);
+    }
+  }
+
+  /**
+   */
+  createGroup(data: Object, contributions: Array<Context>): Array<Object> {
     const context = this.getContextFromContributionsByPrefix(
-      contexts,
+      contributions,
       this._prefix
     );
 
-    const dynamicschema = data && data.dynamicschema;
-    this._groups =
-      data && data.group
-        ? data.group.map(
-            (group) =>
-              new GroupModel({ ...group, dynamicschema }, context, contexts)
-          )
-        : [];
+    return data.group.map((group) => {
+      const dynamicschema = this.getDynamicSchema(group, data.dynamicschema);
+      return new GroupModel(
+        {
+          ...group,
+          dynamicschema,
+        },
+        context,
+        contributions
+      );
+    });
+  }
+
+  /**
+   * add grouped prefix to the dynamicschema
+   */
+  getDynamicSchema(group: Object, dynamicschema: Object): Object {
+    if (dynamicschema) {
+      if (
+        this._prefix &&
+        dynamicschema[group.type] &&
+        !dynamicschema[this._prefix + group.type]
+      ) {
+        dynamicschema[this._prefix + group.type] = dynamicschema[group.type];
+      }
+      return dynamicschema;
+    }
+    return null;
   }
 
   /**