@beinformed/ui 1.21.2 → 1.21.3

package/src/models/error/ErrorResponse.js

@@ -133,7 +133,7 @@ export default class ErrorResponse {
    *  Return response error redirect text
    */
   get redirectText(): RedirectTextObject {
-    return this.response.redirect?.text || null;
+    return this.response?.redirect?.text || null;
   }
 
   /**
@@ -162,7 +162,7 @@ export default class ErrorResponse {
    */
   get redirectHref(): Href {
     if (this.response.redirect?.href) {
-      return new Href(this.response.redirect.href);
+      return new Href(this.response.redirect?.href);
     }
     return new Href();
   }
@@ -171,13 +171,13 @@ export default class ErrorResponse {
    * Return error response layouthint
    */
   get layouthint(): LayoutHintCollection {
-    return new LayoutHintCollection(this.response.layouthint);
+    return new LayoutHintCollection(this.response?.layouthint);
   }
 
   /**
    */
   get response(): Object {
-    return this.error.response.error || {};
+    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,