@beinformed/ui 1.21.4 → 1.21.7

package/src/models/attributes/AttributeModel.js

@@ -92,7 +92,8 @@ export default class AttributeModel
       this._errorCollection.addServerError(
         attribute.message.id,
         attribute.message.message,
-        attribute.message.parameters
+        attribute.message.parameters,
+        attribute.message.layouthint
       );
     }
 
@@ -710,9 +711,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 +814,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/error/ErrorResponse.js

@@ -92,7 +92,7 @@ export default class ErrorResponse {
    * Return response error message
    */
   get responseMessage(): string {
-    return this.response.message || this.id;
+    return this.response.message || null;
   }
 
   /**

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
             );
           }
         }