From 9d9803a3d342b78b680d8fb2ccddf4577cd7696b Mon Sep 17 00:00:00 2001
From: Apeksha Bhosale <7846888+ApekshaBhosale@users.noreply.github.com>
Date: Tue, 5 Apr 2022 13:16:11 +0530
Subject: [PATCH] added sanity check to avoid unexpected eval error (#12506)

---
 app/client/src/workers/DataTreeEvaluator.ts | 24 +++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/client/src/workers/DataTreeEvaluator.ts b/app/client/src/workers/DataTreeEvaluator.ts
index 28d4742f13..fa7426ade4 100644
--- a/app/client/src/workers/DataTreeEvaluator.ts
+++ b/app/client/src/workers/DataTreeEvaluator.ts
@@ -706,17 +706,19 @@ export default class DataTreeEvaluator {
                 "config",
                 "actionConfiguration",
               );
-              const validationConfig = this.allActionValidationConfig[
-                entity.actionId
-              ][configProperty];
-              this.validateActionProperty(
-                fullPropertyPath,
-                entity,
-                currentTree,
-                evalPropertyValue,
-                unEvalPropertyValue,
-                validationConfig,
-              );
+              const validationConfig =
+                !!this.allActionValidationConfig[entity.actionId] &&
+                this.allActionValidationConfig[entity.actionId][configProperty];
+              if (!!validationConfig && !_.isEmpty(validationConfig)) {
+                this.validateActionProperty(
+                  fullPropertyPath,
+                  entity,
+                  currentTree,
+                  evalPropertyValue,
+                  unEvalPropertyValue,
+                  validationConfig,
+                );
+              }
             }
             const safeEvaluatedValue = removeFunctions(evalPropertyValue);
             _.set(