@beinformed/ui 1.21.0 → 1.21.3

package/src/models/attributes/AttributeModel.js

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

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, message, properties } = error;
+    const { id, layouthint, message, properties } = error;
 
     const ANSWER_OPTION_KEY = "answer-option-key";
 
@@ -412,7 +412,7 @@ export default class ChoiceAttributeModel extends AttributeModel {
       }
     }
 
-    this._errorCollection.addServerError(id, message, properties);
+    this._errorCollection.addServerError(id, layouthint, message, properties);
   }
 
   /**

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, message, properties } = error;
+    const { id, layouthint, message, properties } = error;
     if (properties && has(properties, "format") && this.formatLabel) {
       properties.format = this.formatLabel;
     }
 
-    this._errorCollection.addServerError(id, message, properties);
+    this._errorCollection.addServerError(id, layouthint, message, properties);
   }
 
   /**

package/src/models/error/ErrorCollection.js

@@ -4,6 +4,7 @@ import ErrorModel from "./ErrorModel";
 
 import type { MessageParameters } from "../../i18n/types";
 import type { IConstraintModel } from "../types";
+import LayoutHintCollection from "../layouthint/LayoutHintCollection";
 
 /**
  * Form Objects
@@ -42,6 +43,7 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
    */
   addError(
     id: string,
+    layouthint?: LayoutHintCollection,
     defaultMessage?: string,
     parameters?: MessageParameters
   ) {
@@ -51,7 +53,7 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
       this.removeByIndex(itemIdx);
     }
 
-    this.add(new ErrorModel(id, defaultMessage, parameters));
+    this.add(new ErrorModel(id, defaultMessage, parameters, false, layouthint));
   }
 
   /**
@@ -66,13 +68,14 @@ export default class ErrorCollection extends BaseCollection<ErrorModel> {
    */
   addServerError(
     id: string,
+    layouthint?: LayoutHintCollection,
     defaultMessage?: string,
     parameters?: MessageParameters
   ) {
     if (parameters) {
-      this.addError(id, defaultMessage, parameters);
+      this.addError(id, layouthint, defaultMessage, parameters);
     } else {
-      this.addError(id, defaultMessage);
+      this.addError(id, layouthint, defaultMessage);
     }
   }
 

package/src/models/error/ErrorModel.js

@@ -19,13 +19,16 @@ class ErrorModel {
     id: string,
     defaultMessage: ?string,
     parameters: ?MessageParameters,
-    isClientConstraint: boolean = false
+    isClientConstraint: boolean = false,
+    layouthint: LayoutHintCollection = new LayoutHintCollection()
   ) {
     this._id = id;
     this._parameters = parameters;
     this._defaultMessage = defaultMessage;
     this._isClientConstraint = isClientConstraint;
-    this._layouthint = new LayoutHintCollection();
+    this._layouthint = Array.isArray(layouthint)
+      ? new LayoutHintCollection(layouthint)
+      : layouthint;
   }
 
   /**
@@ -55,7 +58,7 @@ class ErrorModel {
 
   /**
    */
-  get layouthint(): ?LayoutHintCollection {
+  get layouthint(): LayoutHintCollection {
     return this._layouthint;
   }
 

package/src/models/error/ErrorResponse.js

@@ -89,88 +89,95 @@ export default class ErrorResponse {
   }
 
   /**
-   *  Return error title
+   * Return response error message
+   */
+  get responseMessage(): string {
+    return this.response.message || this.id;
+  }
+
+  /**
+   *  Return response error title
    */
   get title(): TitleObject {
-    return this.error.title || null;
+    return this.response.title || null;
   }
 
   /**
-   * Return error title message
+   * Return response error title message
    */
   get titleMessage(): string {
-    return this.error.title?.message || undefined;
+    return this.response.title?.message || undefined;
   }
 
   /**
-   * Return error title Id
+   * Return response error title Id
    */
   get titleId(): string {
-    return this.error.title?.id || undefined;
+    return this.response.title?.id || undefined;
   }
 
   /**
-   *  Return error title properties
+   *  Return response error title properties
    */
   get titleProperties(): Object {
-    return this.error.title?.properties || null;
+    return this.response.title?.properties || null;
   }
 
   /**
-   *  Return error redirect
+   *  Return response error redirect
    */
   get redirect(): RedirectObject {
-    return this.error.redirect || null;
+    return this.response.redirect || null;
   }
   /**
-   *  Return error redirect text
+   *  Return response error redirect text
    */
   get redirectText(): RedirectTextObject {
-    return this.error.redirect?.text || null;
+    return this.response?.redirect?.text || null;
   }
 
   /**
-   * Return error redirect text id
+   * Return response error redirect text id
    */
   get redirectTextID(): string {
-    return this.error.redirect?.text?.id || undefined;
+    return this.response.redirect?.text?.id || undefined;
   }
 
   /**
-   *  Return error redirect text properties
+   *  Return response error redirect text properties
    */
   get redirectTextProperties(): Object {
-    return this.error.redirect?.text?.properties || null;
+    return this.response.redirect?.text?.properties || null;
   }
 
   /**
-   * Return error redirect text message
+   * Return response error redirect text message
    */
   get redirectMessage(): string {
-    return this.error.redirect?.text?.message || undefined;
+    return this.response.redirect?.text?.message || undefined;
   }
 
   /**
-   *  Return error redirect href
+   *  Return response error redirect href
    */
   get redirectHref(): Href {
-    if (this.error.redirect?.href) {
-      return new Href(this.error.redirect.href);
+    if (this.response.redirect?.href) {
+      return new Href(this.response.redirect?.href);
     }
     return new Href();
   }
 
   /**
-   * Return error layouthint
+   * Return error response layouthint
    */
   get layouthint(): LayoutHintCollection {
-    return new LayoutHintCollection(this.error.layouthint);
+    return new LayoutHintCollection(this.response?.layouthint);
   }
 
   /**
    */
   get response(): Object {
-    return this.error.response || {};
+    return this.error?.response?.error || {};
   }
 
   /**

package/src/models/form/FormModel.js

@@ -26,6 +26,7 @@ import type { AttributeType, ModularUIModel } from "../types";
 import type { ModularUIResponse } from "../../modularui";
 import type ErrorResponse from "../error/ErrorResponse";
 import type LinkModel from "../links/LinkModel";
+import LayoutHintCollection from "../layouthint/LayoutHintCollection";
 
 /**
  */
@@ -512,11 +513,16 @@ class FormModel extends ResourceModel {
     if (error.parameters) {
       this.errorCollection.addServerError(
         error.id,
+        error.layouthint,
         error.message,
         error.parameters
       );
     } else {
-      this.errorCollection.addServerError(error.id, error.message);
+      this.errorCollection.addServerError(
+        error.id,
+        error.layouthint,
+        error.message
+      );
     }
   }
 
@@ -1018,6 +1024,7 @@ class FormModel extends ResourceModel {
         } else {
           this.errorCollection.addServerError(
             error.id,
+            new LayoutHintCollection(error.layouthint),
             error.message,
             error.properties
           );

package/src/models/form/FormObjectModel.js

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

package/src/models/types.js

@@ -109,7 +109,7 @@ export type FormErrorAnchor = {
     index?: number,
     "index-identifier"?: string,
   },
-  layouthint?: LayoutHintCollection,
+  layouthint: LayoutHintCollection,
   message: string,
   param?: {
     name: string,