From 35098111ac31e689fb23ffda4efde5c48a6af758 Mon Sep 17 00:00:00 2001
From: orangemug <info@orangemug.co.uk>
Date: Mon, 17 Feb 2020 13:41:11 +0000
Subject: [PATCH] Include missing errors from expressions UI.

---
 src/components/fields/_ExpressionProperty.jsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/fields/_ExpressionProperty.jsx b/src/components/fields/_ExpressionProperty.jsx
index 00470f39..f9214eff 100644
--- a/src/components/fields/_ExpressionProperty.jsx
+++ b/src/components/fields/_ExpressionProperty.jsx
@@ -62,7 +62,18 @@ export default class ExpressionProperty extends React.Component {
       </>
     );
 
-    const error = errors[fieldType+"."+fieldName];
+    const fieldError = errors[fieldType+"."+fieldName];
+    const errorKeyStart = `${fieldType}.${fieldName}[`;
+    const foundErrors = Object.entries(errors).filter(([key, error]) => {
+      return key.startsWith(errorKeyStart);
+    });
+    let message = foundErrors.map(([key, error]) => {
+      return error.message;
+    }).join("");
+    if (fieldError) {
+      message = fieldError.message + message;
+    }
+    const error = message ? {message} : undefined;
 
     return <InputBlock
       error={error}