From 3a4de769eeedc7aff29f34d629213bf190dcb8fc Mon Sep 17 00:00:00 2001
From: Anagh Hegde <anagh@appsmith.com>
Date: Fri, 16 Jul 2021 15:40:27 +0530
Subject: [PATCH] Call the WidgetSuggestion method before processing data
 types. (#5907)

---
 .../appsmith/server/services/NewActionServiceImpl.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
index 37dd7df91d..c53e44a1af 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
@@ -684,6 +684,11 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
     }
 
     private ActionExecutionResult addDataTypesAndSetSuggestedWidget(ActionExecutionResult result, Boolean viewMode) {
+
+        if(FALSE.equals(viewMode)) {
+            result.setSuggestedWidgets(getSuggestedWidget(result.getBody()));
+        }
+
         /*
          * - Do not process if data types are already present.
          * - It means that data types have been added by specific plugin.
@@ -695,10 +700,6 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
 
         result.setDataTypes(getDisplayDataTypes(result.getBody()));
 
-        if(FALSE.equals(viewMode)) {
-            result.setSuggestedWidgets(getSuggestedWidget(result.getBody()));
-        }
-
         return result;
     }