From a4132d584578c46bd2e0abb41703fd4e08914e43 Mon Sep 17 00:00:00 2001
From: Arpit Mohan <arpit@appsmith.com>
Date: Tue, 16 Jun 2020 10:50:07 +0530
Subject: [PATCH] Adding the widget names set to the default layout for a page

---
 .../src/main/java/com/appsmith/server/constants/FieldName.java  | 1 +
 .../main/java/com/appsmith/server/services/PageServiceImpl.java | 2 ++
 .../test/java/com/appsmith/server/services/PageServiceTest.java | 1 +
 3 files changed, 4 insertions(+)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
index 3b4d6531d8..1a3c0b3a7c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
@@ -25,6 +25,7 @@ public class FieldName {
     public static String CATEGORY = "category";
     public static String PAGE = "page";
     public static String SIZE = "size";
+    public static String DEFAULT_WIDGET_NAME = "MainContainer";
     public static String DEFAULT_PAGE_LAYOUT = "{\n" +
             "        \"widgetName\": \"MainContainer\",\n" +
             "        \"backgroundColor\": \"none\",\n" +
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
index 1d76bdddb5..39d7a08ee9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
@@ -27,6 +27,7 @@ import reactor.core.scheduler.Scheduler;
 
 import javax.validation.Validator;
 import java.util.List;
+import java.util.Set;
 
 @Service
 @Slf4j
@@ -81,6 +82,7 @@ public class PageServiceImpl extends BaseService<PageRepository, Page, String> i
         layout.setId(id);
         try {
             layout.setDsl((JSONObject) new JSONParser(JSONParser.MODE_PERMISSIVE).parse(FieldName.DEFAULT_PAGE_LAYOUT));
+            layout.setWidgetNames(Set.of(FieldName.DEFAULT_WIDGET_NAME));
         } catch (ParseException e) {
             log.error("Unable to set the default page layout for id: {}", id);
         }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
index b58c5b94e2..4faae4f54f 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java
@@ -96,6 +96,7 @@ public class PageServiceTest {
                     assertThat("PageServiceTest TestApp".equals(page.getName()));
                     assertThat(page.getLayouts()).isNotEmpty();
                     assertThat(page.getLayouts().get(0).getDsl()).isEqualTo(parsedJson);
+                    assertThat(page.getLayouts().get(0).getWidgetNames()).isNotEmpty();
                 })
                 .verifyComplete();
     }