From 64a0a444460accf5b3b87a576d00a64641de9d7e Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:07:43 +0530
Subject: [PATCH 01/47] Remove table row alternating colors (#2552)

---
 .../designSystems/appsmith/TableStyledWrappers.tsx         | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
index 9f835ef8c7..3287362734 100644
--- a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
@@ -41,12 +41,7 @@ export const TableWrapper = styled.div<{
     }
     .tr {
       overflow: hidden;
-      :nth-child(even) {
-        background: ${Colors.ATHENS_GRAY_DARKER};
-      }
-      :nth-child(odd) {
-        background: ${Colors.WHITE};
-      }
+      background: ${Colors.WHITE};
       &.selected-row {
         background: ${Colors.POLAR};
         &:hover {

From 154a4d30c97b4554a01fb73a2e31414f56fe9dfa Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:08:48 +0530
Subject: [PATCH 02/47] Persist column sizes on resize in app viewer for the
 duration of the session (#2578)

---
 app/client/src/widgets/TableWidget.tsx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index dd86f8f347..7cf4345974 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -590,7 +590,14 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
             super.updateWidgetProperty("columnNameMap", columnNameMap);
           }}
           handleResizeColumn={(columnSizeMap: { [key: string]: number }) => {
-            super.updateWidgetProperty("columnSizeMap", columnSizeMap);
+            if (this.props.renderMode === RenderModes.CANVAS) {
+              super.updateWidgetProperty("columnSizeMap", columnSizeMap);
+            } else {
+              this.props.updateWidgetMetaProperty(
+                "columnSizeMap",
+                columnSizeMap,
+              );
+            }
           }}
           handleReorderColumn={(columnOrder: string[]) => {
             super.updateWidgetProperty("columnOrder", columnOrder);
@@ -607,11 +614,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
           }}
           compactMode={this.props.compactMode || CompactModeTypes.DEFAULT}
           updateCompactMode={(compactMode: CompactMode) => {
-            if (this.props.renderMode === RenderModes.CANVAS) {
-              this.props.updateWidgetMetaProperty("compactMode", compactMode);
-            } else {
-              this.props.updateWidgetMetaProperty("compactMode", compactMode);
-            }
+            this.props.updateWidgetMetaProperty("compactMode", compactMode);
           }}
           sortTableColumn={this.handleColumnSorting}
         />

From b1564c94522da1ec1b27a01ecf5c143af6663186 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Fri, 22 Jan 2021 15:10:42 +0530
Subject: [PATCH 03/47] Add Sentry token to enable Sentry integration (#2674)

---
 .github/workflows/client.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index f216705ee0..fb3e6c82a2 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -100,6 +100,7 @@ jobs:
           REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} \
             REACT_APP_FUSIONCHARTS_LICENSE_KEY=${{ secrets.APPSMITH_FUSIONCHARTS_LICENSE_KEY }} \
             REACT_APP_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} \
+            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
             REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \
             REACT_APP_VERSION_RELEASE_DATE=$(date +%Y-%m-%d) \
             yarn build

From ae276a93f84e5e6f6d50e699ac9783b17e5d287b Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:14:03 +0530
Subject: [PATCH 04/47] Fix - Boolean values comparison in Table widget
 filters(#2586)

- Display filter label instead of value
---
 .../src/components/designSystems/appsmith/CascadeFields.tsx     | 2 +-
 .../src/components/designSystems/appsmith/TableUtilities.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/client/src/components/designSystems/appsmith/CascadeFields.tsx b/app/client/src/components/designSystems/appsmith/CascadeFields.tsx
index 3151475c9f..17ad47fe3a 100644
--- a/app/client/src/components/designSystems/appsmith/CascadeFields.tsx
+++ b/app/client/src/components/designSystems/appsmith/CascadeFields.tsx
@@ -246,7 +246,7 @@ const RenderOptions = (props: {
         (i) => i.value === props.value,
       );
       if (selectedOptions && selectedOptions.length) {
-        selectValue(selectedOptions[0].value);
+        selectValue(selectedOptions[0].label);
       } else {
         selectValue(props.placeholder);
       }
diff --git a/app/client/src/components/designSystems/appsmith/TableUtilities.tsx b/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
index 9676f1a010..b51f2f9d30 100644
--- a/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
@@ -883,7 +883,7 @@ export const ConditionFunctions: {
   [key: string]: (a: any, b: any) => boolean;
 } = {
   isExactly: (a: any, b: any) => {
-    return a === b;
+    return a.toString() === b.toString();
   },
   empty: (a: any) => {
     return a === "" || a === undefined || a === null;

From a9e0b5b67897e26546a50c710d0699bca64d5a60 Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:15:14 +0530
Subject: [PATCH 05/47] Fix - `selectedRow` autocomplete suggestions when no
 row is selected (#2603)

---
 app/client/src/widgets/TableWidget.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index 7cf4345974..c7369b76d3 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -361,7 +361,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       const columnKeys: string[] = getAllTableColumnKeys(this.props.tableData);
       const selectedRow: { [key: string]: any } = {};
       for (let i = 0; i < columnKeys.length; i++) {
-        selectedRow[columnKeys[i]] = undefined;
+        selectedRow[columnKeys[i]] = "";
       }
       return selectedRow;
     }

From a3091076238e39e2cae7a3ef8d5c3f231ad4b969 Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:17:14 +0530
Subject: [PATCH 06/47] Fix - Remove delete icon when there are no filters in
 table widget (#2605)

---
 .../designSystems/appsmith/CascadeFields.tsx         | 10 ++++++++--
 .../designSystems/appsmith/TableFilters.tsx          | 12 ++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/client/src/components/designSystems/appsmith/CascadeFields.tsx b/app/client/src/components/designSystems/appsmith/CascadeFields.tsx
index 17ad47fe3a..256499c486 100644
--- a/app/client/src/components/designSystems/appsmith/CascadeFields.tsx
+++ b/app/client/src/components/designSystems/appsmith/CascadeFields.tsx
@@ -28,6 +28,9 @@ const StyledRemoveIcon = styled(
   padding: 0;
   position: relative;
   cursor: pointer;
+  &.hide-icon {
+    display: none;
+  }
 `;
 
 const LabelWrapper = styled.div`
@@ -290,6 +293,7 @@ type CascadeFieldProps = {
   value: any;
   operator: Operator;
   index: number;
+  hasAnyFilters: boolean;
   applyFilter: (filter: ReactTableFilter, index: number) => void;
   removeFilter: (index: number) => void;
 };
@@ -447,7 +451,7 @@ const CascadeField = (props: CascadeFieldProps) => {
 };
 
 const Fields = (props: CascadeFieldProps & { state: CascadeFieldState }) => {
-  const { index, removeFilter, applyFilter } = props;
+  const { index, removeFilter, applyFilter, hasAnyFilters } = props;
   const [state, dispatch] = React.useReducer(CaseCaseFieldReducer, props.state);
   const handleRemoveFilter = () => {
     dispatch({ type: CascadeFieldActionTypes.DELETE_FILTER });
@@ -515,7 +519,9 @@ const Fields = (props: CascadeFieldProps & { state: CascadeFieldState }) => {
         height={16}
         width={16}
         color={Colors.RIVER_BED}
-        className="t--table-filter-remove-btn"
+        className={`t--table-filter-remove-btn ${
+          hasAnyFilters ? "" : "hide-icon"
+        }`}
       />
       {index === 1 ? (
         <DropdownWrapper width={75}>
diff --git a/app/client/src/components/designSystems/appsmith/TableFilters.tsx b/app/client/src/components/designSystems/appsmith/TableFilters.tsx
index 6b72968a42..c0fea4d46f 100644
--- a/app/client/src/components/designSystems/appsmith/TableFilters.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableFilters.tsx
@@ -151,8 +151,11 @@ const TableFilters = (props: TableFilterProps) => {
       };
     },
   );
-  const showAddFilter =
-    filters.length >= 1 && filters[0].column && filters[0].condition;
+  const hasAnyFilters = !!(
+    filters.length >= 1 &&
+    filters[0].column &&
+    filters[0].condition
+  );
   return (
     <Popover
       minimal
@@ -170,7 +173,7 @@ const TableFilters = (props: TableFilterProps) => {
         className="t--table-filter-toggle-btn"
         selected={selected}
         icon={
-          showAddFilter ? (
+          hasAnyFilters ? (
             <SelectedFilterWrapper>{filters.length}</SelectedFilterWrapper>
           ) : null
         }
@@ -194,6 +197,7 @@ const TableFilters = (props: TableFilterProps) => {
                 condition={filter.condition}
                 value={filter.value}
                 columns={columns}
+                hasAnyFilters={hasAnyFilters}
                 applyFilter={(filter: ReactTableFilter, index: number) => {
                   const updatedFilters = props.filters
                     ? [...props.filters]
@@ -215,7 +219,7 @@ const TableFilters = (props: TableFilterProps) => {
               />
             );
           })}
-          {showAddFilter ? (
+          {hasAnyFilters ? (
             <ButtonWrapper className={Classes.POPOVER_DISMISS}>
               <Button
                 intent="primary"

From 828a9ae3082080df157a74f36d6f94f1d23f1d57 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Fri, 22 Jan 2021 15:18:12 +0530
Subject: [PATCH 07/47] Add message re telemetry during installation (#2621)

---
 deploy/install.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/deploy/install.sh b/deploy/install.sh
index 3c5d0eea8a..3544dd081e 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -68,7 +68,7 @@ install_docker() {
             sudo SUSEConnect -p sle-module-containers/$os_sp/$os_arch -r ''
         fi
         $zypper_cmd install docker docker-runc containerd
-        sudo systemctl enable docker.service 
+        sudo systemctl enable docker.service
     else
         yum_cmd="sudo yum --assumeyes --quiet"
         $yum_cmd install yum-utils
@@ -179,7 +179,7 @@ overwrite_file() {
     fi
 }
 
-# This function prompts the user for an input for a non-empty Mongo root password. 
+# This function prompts the user for an input for a non-empty Mongo root password.
 read_mongo_password() {
     read -srp 'Set the mongo password: ' mongo_root_password
     while [[ -z $mongo_root_password ]]; do
@@ -190,10 +190,10 @@ read_mongo_password() {
         echo "++++++++++++++++++++++++++++++++++++++++"
         echo ""
         read -srp 'Set the mongo password: ' mongo_root_password
-    done 
+    done
 }
 
-# This function prompts the user for an input for a non-empty Mongo username. 
+# This function prompts the user for an input for a non-empty Mongo username.
 read_mongo_username() {
     read -rp 'Set the mongo root user: ' mongo_root_user
     while [[ -z $mongo_root_user ]]; do
@@ -384,6 +384,7 @@ ask_telemetry() {
         disable_telemetry="false"
     else
         disable_telemetry="true"
+        echo "Please note that even though telemetry is disabled, your Appsmith server will connect to cloud to fetch release notes and to check for updates."
     fi
     echo "++++++++++++++++++++++++++++++++++++++++++++"
 

From c9cee45f51773a6deaea6bf0cc4a6bc4ad1cfe4a Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:19:02 +0530
Subject: [PATCH 08/47] Fix - Wrap contents of the table cell tooltip (#2629)

---
 .../designSystems/appsmith/AutoToolTipComponent.tsx | 13 ++++++++++++-
 .../designSystems/appsmith/TableUtilities.tsx       |  7 ++++++-
 app/client/src/widgets/TableWidget.tsx              |  8 +++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/client/src/components/designSystems/appsmith/AutoToolTipComponent.tsx b/app/client/src/components/designSystems/appsmith/AutoToolTipComponent.tsx
index 0617567cb9..a742989e1b 100644
--- a/app/client/src/components/designSystems/appsmith/AutoToolTipComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/AutoToolTipComponent.tsx
@@ -1,11 +1,18 @@
 import React, { createRef, useEffect, useState } from "react";
 import { Tooltip } from "@blueprintjs/core";
 import { CellWrapper } from "components/designSystems/appsmith/TableStyledWrappers";
+import styled from "styled-components";
+
+const TooltipContentWrapper = styled.div<{ width: number }>`
+  word-break: break-all;
+  max-width: ${(props) => props.width}px;
+`;
 
 const AutoToolTipComponent = (props: {
   isHidden?: boolean;
   children: React.ReactNode;
   title: string;
+  tableWidth?: number;
 }) => {
   const ref = createRef<HTMLDivElement>();
   const [useToolTip, updateToolTip] = useState(false);
@@ -23,7 +30,11 @@ const AutoToolTipComponent = (props: {
         <Tooltip
           autoFocus={false}
           hoverOpenDelay={1000}
-          content={props.title}
+          content={
+            <TooltipContentWrapper width={(props.tableWidth || 300) - 32}>
+              {props.title}
+            </TooltipContentWrapper>
+          }
           position="top"
         >
           {props.children}
diff --git a/app/client/src/components/designSystems/appsmith/TableUtilities.tsx b/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
index b51f2f9d30..9ebef3206d 100644
--- a/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
@@ -463,6 +463,7 @@ export const renderCell = (
   value: any,
   columnType: string,
   isHidden: boolean,
+  tableWidth: number,
 ) => {
   if (!value) {
     return <CellWrapper isHidden={isHidden}></CellWrapper>;
@@ -519,7 +520,11 @@ export const renderCell = (
       }
     default:
       return (
-        <AutoToolTipComponent title={value.toString()} isHidden={isHidden}>
+        <AutoToolTipComponent
+          title={value.toString()}
+          isHidden={isHidden}
+          tableWidth={tableWidth}
+        >
           {value.toString()}
         </AutoToolTipComponent>
       );
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index c7369b76d3..a5ae197285 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -135,6 +135,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
     } = this.props;
     if (tableData.length) {
       const columnKeys: string[] = getAllTableColumnKeys(tableData);
+      const { componentWidth } = this.getComponentDimensions();
       const sortedColumn = this.props.sortedColumn;
       for (let index = 0; index < columnKeys.length; index++) {
         const i = columnKeys[index];
@@ -170,7 +171,12 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
             inputFormat: columnType.inputFormat,
           },
           Cell: (props: any) => {
-            return renderCell(props.cell.value, columnType.type, isHidden);
+            return renderCell(
+              props.cell.value,
+              columnType.type,
+              isHidden,
+              componentWidth,
+            );
           },
         };
         if (isHidden) {

From 63e286a469859054431e420b2905eeecdeca33cb Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 22 Jan 2021 15:42:34 +0530
Subject: [PATCH 09/47] Show row cursor as pointer when `onRowSelected`
 property is set in table widget (#2604)

---
 .../designSystems/appsmith/ReactTableComponent.tsx         | 2 ++
 app/client/src/components/designSystems/appsmith/Table.tsx | 2 ++
 .../designSystems/appsmith/TableStyledWrappers.tsx         | 2 ++
 app/client/src/widgets/TableWidget.tsx                     | 7 +++++++
 4 files changed, 13 insertions(+)

diff --git a/app/client/src/components/designSystems/appsmith/ReactTableComponent.tsx b/app/client/src/components/designSystems/appsmith/ReactTableComponent.tsx
index 9de8406e6d..4fbe08c827 100644
--- a/app/client/src/components/designSystems/appsmith/ReactTableComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/ReactTableComponent.tsx
@@ -64,6 +64,7 @@ interface ReactTableComponentProps {
   multiRowSelection?: boolean;
   hiddenColumns?: string[];
   columnNameMap?: { [key: string]: string };
+  triggerRowSelection: boolean;
   columnTypeMap?: {
     [key: string]: {
       type: string;
@@ -319,6 +320,7 @@ const ReactTableComponent = (props: ReactTableComponentProps) => {
       pageNo={props.pageNo - 1}
       updatePageNo={props.updatePageNo}
       columnActions={props.columnActions}
+      triggerRowSelection={props.triggerRowSelection}
       nextPageClick={() => {
         props.nextPageClick();
       }}
diff --git a/app/client/src/components/designSystems/appsmith/Table.tsx b/app/client/src/components/designSystems/appsmith/Table.tsx
index 46a7bd65cf..6553457b68 100644
--- a/app/client/src/components/designSystems/appsmith/Table.tsx
+++ b/app/client/src/components/designSystems/appsmith/Table.tsx
@@ -53,6 +53,7 @@ interface TableProps {
   selectedRowIndices: number[];
   disableDrag: () => void;
   enableDrag: () => void;
+  triggerRowSelection: boolean;
   searchTableData: (searchKey: any) => void;
   filters?: ReactTableFilter[];
   applyFilter: (filters: ReactTableFilter[]) => void;
@@ -120,6 +121,7 @@ export const Table = (props: TableProps) => {
       height={props.height}
       tableSizes={tableSizes}
       id={`table${props.widgetId}`}
+      triggerRowSelection={props.triggerRowSelection}
       backgroundColor={Colors.ATHENS_GRAY_DARKER}
     >
       <TableHeader
diff --git a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
index 3287362734..d065499168 100644
--- a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
@@ -8,6 +8,7 @@ export const TableWrapper = styled.div<{
   height: number;
   tableSizes: TableSizes;
   backgroundColor?: Color;
+  triggerRowSelection: boolean;
 }>`
   width: 100%;
   height: 100%;
@@ -41,6 +42,7 @@ export const TableWrapper = styled.div<{
     }
     .tr {
       overflow: hidden;
+      cursor: ${(props) => props.triggerRowSelection && "pointer"};
       background: ${Colors.WHITE};
       &.selected-row {
         background: ${Colors.POLAR};
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index a5ae197285..89c5740ab0 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -124,6 +124,12 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
     };
   }
 
+  static getDerivedPropertiesMap() {
+    return {
+      triggerRowSelection: "{{!!this.onRowSelected}}",
+    };
+  }
+
   getTableColumns = (tableData: Array<Record<string, unknown>>) => {
     let columns: ReactTableColumnProps[] = [];
     const hiddenColumns: ReactTableColumnProps[] = [];
@@ -569,6 +575,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
           columnNameMap={this.props.columnNameMap}
           columnTypeMap={this.props.columnTypeMap}
           columnOrder={this.props.columnOrder}
+          triggerRowSelection={this.props.triggerRowSelection}
           pageSize={Math.max(1, pageSize)}
           onCommandClick={this.onCommandClick}
           selectedRowIndex={

From e8a01c456d97da8955946c6f520d7a9a479c6386 Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <rishabh.robben@gmail.com>
Date: Sat, 23 Jan 2021 13:46:50 +0530
Subject: [PATCH 10/47] product updates modal test (#2677)

---
 .../ProductUpdates/ProductUpdates_spec.js     | 29 +++++++++++++++++++
 app/client/src/index.tsx                      |  5 ++++
 .../ProductUpdatesModal/UpdatesButton.tsx     |  2 +-
 .../ProductUpdatesModal/index.tsx             |  5 +++-
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 app/client/cypress/integration/Smoke_TestSuite/ProductUpdates/ProductUpdates_spec.js

diff --git a/app/client/cypress/integration/Smoke_TestSuite/ProductUpdates/ProductUpdates_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ProductUpdates/ProductUpdates_spec.js
new file mode 100644
index 0000000000..1bab141c98
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/ProductUpdates/ProductUpdates_spec.js
@@ -0,0 +1,29 @@
+const commonlocators = require("../../../locators/commonlocators.json");
+
+describe("Check for product updates button and modal", function() {
+  it("Check if we should show the product updates button and it opens the updates modal", function() {
+    cy.get(commonlocators.homeIcon).click({ force: true });
+    cy.wait(2000);
+
+    cy.window()
+      .its("store")
+      .invoke("getState")
+      .then((state) => {
+        const { releaseItems, newReleasesCount } = state.ui.releases;
+        if (Array.isArray(releaseItems) && releaseItems.length > 0) {
+          cy.get("[data-cy=t--product-updates-btn]")
+            .contains(newReleasesCount)
+            .click({ force: true });
+          cy.wait(500); // modal transition
+          cy.get(".bp3-dialog-container").contains("Product Updates");
+          cy.get("[data-cy=t--product-updates-close-btn]").click({
+            force: true,
+          });
+          cy.wait(500); // modal transition
+          cy.get(".bp3-dialog-container").should("not.exist");
+        } else {
+          cy.get("[data-cy=t--product-updates-btn]").should("not.exist");
+        }
+      });
+  });
+});
diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx
index ecc061b4db..e07448d600 100755
--- a/app/client/src/index.tsx
+++ b/app/client/src/index.tsx
@@ -79,3 +79,8 @@ const ThemedAppWithProps = connect(
 )(ThemedApp);
 
 ReactDOM.render(<App />, document.getElementById("root"));
+
+// expose store when run in Cypress
+if ((window as any).Cypress) {
+  (window as any).store = store;
+}
diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx
index 18abe0acf4..a278d8d80e 100644
--- a/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx
+++ b/app/client/src/pages/Applications/ProductUpdatesModal/UpdatesButton.tsx
@@ -56,7 +56,7 @@ const UpdatesIcon = withTheme(({ theme }) => (
 ));
 
 const UpdatesButton = ({ newReleasesCount }: { newReleasesCount: string }) => (
-  <StyledUpdatesButton>
+  <StyledUpdatesButton data-cy="t--product-updates-btn">
     <div style={{ display: "flex" }}>
       <UpdatesIcon />
       <UpdatesButtonTextContainer>What&apos;s New?</UpdatesButtonTextContainer>
diff --git a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
index d2bee94701..d90cf060a1 100644
--- a/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
+++ b/app/client/src/pages/Applications/ProductUpdatesModal/index.tsx
@@ -74,7 +74,10 @@ const Header = withTheme(
           >
             View on Github
           </ViewInGithubLink>
-          <CloseIconContainer onClick={onClose}>
+          <CloseIconContainer
+            onClick={onClose}
+            data-cy="t--product-updates-close-btn"
+          >
             <CloseIcon
               height={20}
               width={20}

From 536a222e1c8700760272045d66a7ab8a28596b1e Mon Sep 17 00:00:00 2001
From: NandanAnantharamu <67676905+NandanAnantharamu@users.noreply.github.com>
Date: Mon, 25 Jan 2021 10:39:16 +0530
Subject: [PATCH 11/47] Uncommented few tests (#2695)

* Uncommented few tests

* updated dsl

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
---
 .../cypress/fixtures/MultipleWidgetDsl.json   | 167 ++++++++----------
 app/client/cypress/fixtures/testdata.json     |   2 +-
 .../Binding/Widget_loading_spec.js            | 154 ++++++++--------
 .../Widgets_Default_data_validation_spec.js   |  13 +-
 4 files changed, 158 insertions(+), 178 deletions(-)

diff --git a/app/client/cypress/fixtures/MultipleWidgetDsl.json b/app/client/cypress/fixtures/MultipleWidgetDsl.json
index 9d99175211..255248bdc5 100644
--- a/app/client/cypress/fixtures/MultipleWidgetDsl.json
+++ b/app/client/cypress/fixtures/MultipleWidgetDsl.json
@@ -1,94 +1,77 @@
 {
-    "dsl": {
-        "widgetName": "MainContainer",
-        "backgroundColor": "none",
-        "rightColumn": 1224,
-        "snapColumns": 16,
-        "detachFromLayout": true,
-        "widgetId": "0",
-        "topRow": 0,
-        "bottomRow": 1280,
-        "containerStyle": "none",
-        "snapRows": 33,
-        "parentRowSpace": 1,
-        "type": "CANVAS_WIDGET",
-        "canExtend": true,
-        "dynamicBindingPathList": [],
-        "version": 6,
-        "minHeight": 1292,
-        "parentColumnSpace": 1,
+  "dsl": {
+    "widgetName": "MainContainer",
+    "backgroundColor": "none",
+    "rightColumn": 1224,
+    "snapColumns": 16,
+    "detachFromLayout": true,
+    "widgetId": "0",
+    "topRow": 0,
+    "bottomRow": 1280,
+    "containerStyle": "none",
+    "snapRows": 33,
+    "parentRowSpace": 1,
+    "type": "CANVAS_WIDGET",
+    "canExtend": true,
+    "version": 8,
+    "minHeight": 1292,
+    "parentColumnSpace": 1,
+    "dynamicBindingPathList": [],
+    "leftColumn": 0,
+    "children": [
+      {
+        "isVisible": true,
+        "inputType": "TEXT",
+        "label": "",
+        "widgetName": "Input1",
+        "type": "INPUT_WIDGET",
+        "isLoading": false,
+        "parentColumnSpace": 74,
+        "parentRowSpace": 40,
+        "leftColumn": 6,
+        "rightColumn": 11,
+        "topRow": 13,
+        "bottomRow": 14,
+        "parentId": "0",
+        "widgetId": "1bek8n8byg"
+      },
+      {
+        "isVisible": true,
+        "label": "",
+        "selectionType": "SINGLE_SELECT",
+        "options": "",
+        "widgetName": "Dropdown1",
+        "defaultOptionValue": "VEG",
+        "type": "DROP_DOWN_WIDGET",
+        "isLoading": false,
+        "parentColumnSpace": 74,
+        "parentRowSpace": 40,
         "leftColumn": 0,
-        "children": [
-            {
-                "isVisible": true,
-                "inputType": "TEXT",
-                "label": "",
-                "widgetName": "Input1",
-                "type": "INPUT_WIDGET",
-                "isLoading": false,
-                "parentColumnSpace": 74,
-                "parentRowSpace": 40,
-                "leftColumn": 4,
-                "rightColumn": 9,
-                "topRow": 0,
-                "bottomRow": 1,
-                "parentId": "0",
-                "widgetId": "orkla1pg88"
-            },
-            {
-                "isVisible": true,
-                "label": "",
-                "selectionType": "SINGLE_SELECT",
-                "options": "[\n  {\n    \"label\": \"Vegetarian\",\n    \"value\": \"VEG\"\n  },\n  {\n    \"label\": \"Non-Vegetarian\",\n    \"value\": \"NON_VEG\"\n  },\n  {\n    \"label\": \"Vegan\",\n    \"value\": \"VEGAN\"\n  }\n]",
-                "widgetName": "Dropdown1",
-                "defaultOptionValue": "VEG",
-                "type": "DROP_DOWN_WIDGET",
-                "isLoading": false,
-                "parentColumnSpace": 74,
-                "parentRowSpace": 40,
-                "leftColumn": 4,
-                "rightColumn": 9,
-                "topRow": 2,
-                "bottomRow": 3,
-                "parentId": "0",
-                "widgetId": "9iofg44qjm",
-                "dynamicBindingPathList": []
-            },
-            {
-                "isVisible": true,
-                "defaultText": "This is the initial <b>content</b> of the editor",
-                "isDisabled": false,
-                "widgetName": "RichTextEditor1",
-                "isDefaultClickDisabled": true,
-                "type": "RICH_TEXT_EDITOR_WIDGET",
-                "isLoading": false,
-                "parentColumnSpace": 74,
-                "parentRowSpace": 40,
-                "leftColumn": 2,
-                "rightColumn": 10,
-                "topRow": 4,
-                "bottomRow": 9,
-                "parentId": "0",
-                "widgetId": "p4uowm5ds3"
-            },
-            {
-                "isVisible": true,
-                "label": "Data",
-                "widgetName": "Table1",
-                "searchKey": "",
-                "tableData": "[\n  {\n    \"id\": 2381224,\n    \"email\": \"michael.lawson@reqres.in\",\n    \"userName\": \"Michael Lawson\",\n    \"productName\": \"Chicken Sandwich\",\n    \"orderAmount\": 4.99\n  },\n  {\n    \"id\": 2736212,\n    \"email\": \"lindsay.ferguson@reqres.in\",\n    \"userName\": \"Lindsay Ferguson\",\n    \"productName\": \"Tuna Salad\",\n    \"orderAmount\": 9.99\n  },\n  {\n    \"id\": 6788734,\n    \"email\": \"tobias.funke@reqres.in\",\n    \"userName\": \"Tobias Funke\",\n    \"productName\": \"Beef steak\",\n    \"orderAmount\": 19.99\n  }\n]",
-                "type": "TABLE_WIDGET",
-                "isLoading": false,
-                "parentColumnSpace": 74,
-                "parentRowSpace": 40,
-                "leftColumn": 3,
-                "rightColumn": 11,
-                "topRow": 12,
-                "bottomRow": 19,
-                "parentId": "0",
-                "widgetId": "iu9vqkj1rd",
-                "dynamicBindingPathList": []
-            }
-        ]
-    }
-}
+        "rightColumn": 5,
+        "topRow": 15,
+        "bottomRow": 16,
+        "parentId": "0",
+        "widgetId": "zd6jycngj7",
+        "dynamicBindingPathList": []
+      },
+      {
+        "isVisible": true,
+        "label": "Data",
+        "widgetName": "Table1",
+        "searchKey": "",
+        "tableData": "[\n  {\n    \"id\": 2381224,\n    \"email\": \"michael.lawson@reqres.in\",\n    \"userName\": \"Michael Lawson\",\n    \"productName\": \"Chicken Sandwich\",\n    \"orderAmount\": 4.99\n  },\n  {\n    \"id\": 2736212,\n    \"email\": \"lindsay.ferguson@reqres.in\",\n    \"userName\": \"Lindsay Ferguson\",\n    \"productName\": \"Tuna Salad\",\n    \"orderAmount\": 9.99\n  },\n  {\n    \"id\": 6788734,\n    \"email\": \"tobias.funke@reqres.in\",\n    \"userName\": \"Tobias Funke\",\n    \"productName\": \"Beef steak\",\n    \"orderAmount\": 19.99\n  }\n]",
+        "type": "TABLE_WIDGET",
+        "isLoading": false,
+        "parentColumnSpace": 74,
+        "parentRowSpace": 40,
+        "leftColumn": 4,
+        "rightColumn": 12,
+        "topRow": 19,
+        "bottomRow": 26,
+        "parentId": "0",
+        "widgetId": "ei38nqop3s",
+        "dynamicBindingPathList": []
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/client/cypress/fixtures/testdata.json b/app/client/cypress/fixtures/testdata.json
index 6bc87d181f..2e2e64cf10 100644
--- a/app/client/cypress/fixtures/testdata.json
+++ b/app/client/cypress/fixtures/testdata.json
@@ -51,7 +51,7 @@
       "value": "VEG"
     },
     {
-      "label": "{{Table1.tableData[1].email}}",
+      "label": "{{Table1.tableData[2].email}}",
       "value": "NONVEG"
     }
   ],
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Binding/Widget_loading_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Binding/Widget_loading_spec.js
index 1647244a8a..6e36956f58 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/Widget_loading_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/Widget_loading_spec.js
@@ -1,88 +1,88 @@
-// const commonlocators = require("../../../locators/commonlocators.json");
-// const formWidgetsPage = require("../../../locators/FormWidgets.json");
-// const dsl = require("../../../fixtures/rundsl.json");
-// const pages = require("../../../locators/Pages.json");
-// const widgetsPage = require("../../../locators/Widgets.json");
-// const publish = require("../../../locators/publishWidgetspage.json");
-// const queryLocators = require("../../../locators/QueryEditor.json");
-// const datasource = require("../../../locators/DatasourcesEditor.json");
-// const apiwidget = require("../../../locators/apiWidgetslocator.json");
-// const testdata = require("../../../fixtures/testdata.json");
+const commonlocators = require("../../../locators/commonlocators.json");
+const formWidgetsPage = require("../../../locators/FormWidgets.json");
+const dsl = require("../../../fixtures/rundsl.json");
+const pages = require("../../../locators/Pages.json");
+const widgetsPage = require("../../../locators/Widgets.json");
+const publish = require("../../../locators/publishWidgetspage.json");
+const queryLocators = require("../../../locators/QueryEditor.json");
+const datasource = require("../../../locators/DatasourcesEditor.json");
+const apiwidget = require("../../../locators/apiWidgetslocator.json");
+const testdata = require("../../../fixtures/testdata.json");
 
-// const pageid = "MyPage";
-// let updatedName;
-// let datasourceName;
+const pageid = "MyPage";
+let updatedName;
+let datasourceName;
 
-// describe("Binding the multiple widgets and validating default data", function() {
-//   before(() => {
-//     cy.addDsl(dsl);
-//   });
-//   it("Create a postgres datasource", function() {
-//     cy.NavigateToDatasourceEditor();
-//     cy.get(datasource.PostgreSQL).click();
+describe("Binding the multiple widgets and validating default data", function() {
+  before(() => {
+    cy.addDsl(dsl);
+  });
+  it("Create a postgres datasource", function() {
+    cy.NavigateToDatasourceEditor();
+    cy.get(datasource.PostgreSQL).click();
 
-//     cy.getPluginFormsAndCreateDatasource();
+    cy.getPluginFormsAndCreateDatasource();
 
-//     cy.fillPostgresDatasourceForm();
+    cy.fillPostgresDatasourceForm();
 
-//     cy.testSaveDatasource();
+    cy.testSaveDatasource();
 
-//     cy.get("@createDatasource").then(httpResponse => {
-//       datasourceName = httpResponse.response.body.data.name;
-//     });
-//   });
-//   it("Create and runs query", () => {
-//     cy.NavigateToQueryEditor();
-//     cy.contains(".t--datasource-name", datasourceName)
-//       .find(queryLocators.createQuery)
-//       .click();
+    cy.get("@createDatasource").then((httpResponse) => {
+      datasourceName = httpResponse.response.body.data.name;
+    });
+  });
+  it("Create and runs query", () => {
+    cy.NavigateToQueryEditor();
+    cy.contains(".t--datasource-name", datasourceName)
+      .find(queryLocators.createQuery)
+      .click();
 
-//     cy.get(queryLocators.templateMenu).click();
-//     cy.get(".CodeMirror textarea")
-//       .first()
-//       .focus()
-//       .type("select * from users limit 10");
+    cy.get(queryLocators.templateMenu).click();
+    cy.get(".CodeMirror textarea")
+      .first()
+      .focus()
+      .type("select * from users limit 10");
 
-//     cy.EvaluateCurrentValue("select * from users limit 10");
-//     cy.runQuery();
-//   });
+    cy.EvaluateCurrentValue("select * from users limit 10");
+    cy.runQuery();
+  });
 
-//   it("Button widget test with on action query run", function() {
-//     cy.SearchEntityandOpen("Button1");
-//     cy.executeDbQuery("Query1");
-//     cy.get(commonlocators.editPropCrossButton).click();
-//     cy.wait("@updateLayout").should(
-//       "have.nested.property",
-//       "response.body.responseMeta.status",
-//       200,
-//     );
-//   });
+  it("Button widget test with on action query run", function() {
+    cy.SearchEntityandOpen("Button1");
+    cy.executeDbQuery("Query1");
+    cy.get(commonlocators.editPropCrossButton).click();
+    cy.wait("@updateLayout").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
+  });
 
-//   it("Input widget test with default value update with query data", function() {
-//     cy.SearchEntityandOpen("Input1");
-//     cy.get(widgetsPage.defaultInput).type(testdata.defaultInputQuery);
-//     cy.get(commonlocators.editPropCrossButton).click();
-//     cy.wait("@updateLayout").should(
-//       "have.nested.property",
-//       "response.body.responseMeta.status",
-//       200,
-//     );
-//   });
+  it("Input widget test with default value update with query data", function() {
+    cy.SearchEntityandOpen("Input1");
+    cy.get(widgetsPage.defaultInput).type(testdata.defaultInputQuery);
+    cy.get(commonlocators.editPropCrossButton).click();
+    cy.wait("@updateLayout").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
+  });
 
-//   it("Publish App and validate loading functionalty", function() {
-//     cy.PublishtheApp();
-//     cy.wait(2000);
-//     cy.get(widgetsPage.widgetBtn)
-//       .first()
-//       .click({ force: true });
-//     cy.wait("@postExecute").should(
-//       "have.nested.property",
-//       "response.body.responseMeta.status",
-//       200,
-//     );
-//     cy.get(publish.inputWidget + " " + "input")
-//       .first()
-//       .invoke("attr", "value")
-//       .should("contain", "7");
-//   });
-// });
+  it("Publish App and validate loading functionalty", function() {
+    cy.PublishtheApp();
+    cy.wait(2000);
+    cy.get(widgetsPage.widgetBtn)
+      .first()
+      .click({ force: true });
+    cy.wait("@postExecute").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      200,
+    );
+    cy.get(publish.inputWidget + " " + "input")
+      .first()
+      .invoke("attr", "value")
+      .should("contain", "7");
+  });
+});
diff --git a/app/client/cypress/integration/Smoke_TestSuite/Binding/Widgets_Default_data_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Binding/Widgets_Default_data_validation_spec.js
index 37ddc1732b..d98eafe74f 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/Widgets_Default_data_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/Widgets_Default_data_validation_spec.js
@@ -22,8 +22,7 @@ describe("Binding the multiple widgets and validating default data", function()
     );
   });
 
-  /*
-  To be enabled once the single select multi select issues are resolved
+  //To be enabled once the single select multi select issues are resolved
   it("Dropdown widget test with default value from table widget", function() {
     cy.openPropertyPane("dropdownwidget");
     cy.testJsontext("options", JSON.stringify(testdata.deafultDropDownWidget));
@@ -34,11 +33,10 @@ describe("Binding the multiple widgets and validating default data", function()
       200,
     );
   });
-*/
 
   it("validation of default data displayed in all widgets based on row selected", function() {
     cy.isSelectRow(1);
-    cy.readTabledataPublish("1", "0").then(tabData => {
+    cy.readTabledataPublish("1", "0").then((tabData) => {
       const tabValue = tabData;
       expect(tabValue).to.be.equal("2736212");
       cy.log("the value is" + tabValue);
@@ -48,18 +46,17 @@ describe("Binding the multiple widgets and validating default data", function()
         .invoke("attr", "value")
         .should("contain", tabValue);
     });
-    /*
-    cy.readTabledataPublish("1", "1").then(tabData => {
+
+    cy.readTabledataPublish("1", "1").then((tabData) => {
       const tabValue = tabData;
       expect(tabValue).to.be.equal("lindsay.ferguson@reqres.in");
       cy.log("the value is" + tabValue);
       cy.get(widgetsPage.defaultSingleSelectValue)
         .invoke("text")
-        .then(text => {
+        .then((text) => {
           const someText = text;
           expect(someText).to.equal(tabValue);
         });
     });
-    */
   });
 });

From 4f1fd680527d8edd01edaccefc1abff6d9a74a95 Mon Sep 17 00:00:00 2001
From: Pawan Kumar <pawan.stardust@gmail.com>
Date: Mon, 25 Jan 2021 11:01:44 +0530
Subject: [PATCH 12/47] add check if widget is available in data tree (#2681)

Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
---
 app/client/src/sagas/WidgetOperationSagas.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index 043ec44edb..b76dd04774 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -803,6 +803,10 @@ function* resetEvaluatedWidgetMetaProperties(widgetIds: string[]) {
   for (const index in widgetIds) {
     const widgetId = widgetIds[index];
     const widget = _.find(evaluatedDataTree, { widgetId }) as DataTreeWidget;
+
+    // the widget was not found in the data tree, so don't do anything
+    if (!widget) continue;
+
     const widgetToUpdate = { ...widget };
     const metaPropsMap = WidgetFactory.getWidgetMetaPropertiesMap(widget.type);
     const defaultPropertiesMap = WidgetFactory.getWidgetDefaultPropertiesMap(

From 3be4828d63767f344045b98afacbf2203584b5b5 Mon Sep 17 00:00:00 2001
From: devrk96 <rohit.kumawat@primathon.in>
Date: Mon, 25 Jan 2021 12:51:54 +0530
Subject: [PATCH 13/47] Fix: App name UI in edit and deploy mode (#2216)

---
 .../src/components/ads/EditableText.tsx       | 12 +++++-----
 .../components/ads/EditableTextWrapper.tsx    | 22 ++++++++++---------
 .../AppViewer/viewer/AppViewerHeader.tsx      | 22 +++++++++----------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/app/client/src/components/ads/EditableText.tsx b/app/client/src/components/ads/EditableText.tsx
index 6afa528566..6346f67c16 100644
--- a/app/client/src/components/ads/EditableText.tsx
+++ b/app/client/src/components/ads/EditableText.tsx
@@ -269,13 +269,15 @@ export const EditableText = (props: EditableTextProps) => {
           onCancel={onConfirm}
         />
 
-        <IconWrapper className="icon-wrapper">
-          {savingState === SavingState.STARTED ? (
+        {savingState === SavingState.STARTED ? (
+          <IconWrapper className="icon-wrapper">
             <Spinner size={IconSize.XL} />
-          ) : value ? (
+          </IconWrapper>
+        ) : value && !props.hideEditIcon ? (
+          <IconWrapper className="icon-wrapper">
             <Icon name={iconName} size={IconSize.XL} />
-          ) : null}
-        </IconWrapper>
+          </IconWrapper>
+        ) : null}
       </TextContainer>
       {isEditing && !!isInvalid ? (
         <Text className="error-message" type={TextType.P2}>
diff --git a/app/client/src/components/ads/EditableTextWrapper.tsx b/app/client/src/components/ads/EditableTextWrapper.tsx
index 41d9a93931..7c8fa701b0 100644
--- a/app/client/src/components/ads/EditableTextWrapper.tsx
+++ b/app/client/src/components/ads/EditableTextWrapper.tsx
@@ -15,13 +15,14 @@ const Container = styled.div<{
   savingState: SavingState;
   isInvalid: boolean;
 }>`
+  position: relative;
   .editable-text-container {
     justify-content: center;
   }
 
   &&& .${Classes.EDITABLE_TEXT}, .icon-wrapper {
-    padding: 5px 10px;
-    height: 25px;
+    padding: 5px 0px;
+    height: 31px;
     background-color: ${(props) =>
       (props.isInvalid && props.isEditing) ||
       props.savingState === SavingState.ERROR
@@ -29,15 +30,14 @@ const Container = styled.div<{
         : "transparent"};
   }
 
-  &&&& .${Classes.EDITABLE_TEXT} {
+  &&&& .${Classes.EDITABLE_TEXT}:hover {
     ${(props) =>
       !props.isEditing
         ? `
-      padding-left: 0px;
-      padding-right: 0px;
       border-bottom-style: solid; 
       border-bottom-width: 1px;
       width: fit-content;
+      max-width: 194px;
     `
         : null}
   }
@@ -47,6 +47,8 @@ const Container = styled.div<{
       !props.isEditing
         ? `
         min-width: 0px !important;
+        height: auto !important;
+        line-height: ${props.theme.typography.h4.lineHeight}px !important;
     `
         : null}
   }
@@ -57,15 +59,15 @@ const Container = styled.div<{
     font-size: ${(props) => props.theme.typography.h4.fontSize}px;
     line-height: ${(props) => props.theme.typography.h4.lineHeight}px;
     letter-spacing: ${(props) => props.theme.typography.h4.letterSpacing}px;
-    font-weight: ${(props) => props.theme.typography.h4.fontWeight}px;
-  }
-
-  .error-message {
-    margin-top: 2px;
+    font-weight: ${(props) => props.theme.typography.h4.fontWeight};
+    padding-right: 0px;
   }
 
   .icon-wrapper {
     padding-bottom: 0px;
+    position: absolute;
+    right: 0;
+    top: 0;
   }
 `;
 
diff --git a/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx b/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx
index f55cca55ba..35daeb5ecf 100644
--- a/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx
+++ b/app/client/src/pages/AppViewer/viewer/AppViewerHeader.tsx
@@ -33,6 +33,8 @@ import { getCurrentUser } from "selectors/usersSelectors";
 import { ANONYMOUS_USERNAME, User } from "constants/userConstants";
 import { isEllipsisActive } from "utils/helpers";
 import TooltipComponent from "components/ads/Tooltip";
+import Text, { TextType } from "components/ads/Text";
+import { Classes } from "components/ads/common";
 
 const HeaderWrapper = styled(StyledHeader)<{ hasPages: boolean }>`
   background: ${Colors.BALTIC_SEA};
@@ -40,6 +42,13 @@ const HeaderWrapper = styled(StyledHeader)<{ hasPages: boolean }>`
   color: white;
   flex-direction: column;
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.05);
+  .${Classes.TEXT} {
+    max-width: 194px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: #d4d4d4;
+  }
 `;
 
 const HeaderRow = styled.div<{ justify: string }>`
@@ -82,13 +91,6 @@ const ShareButton = styled(Button)`
   color: white !important;
 `;
 
-const StyledApplicationName = styled.span`
-  font-size: 15px;
-  font-weight: 500;
-  font-size: 18px;
-  line-height: 14px;
-`;
-
 const PageTab = styled(NavLink)`
   display: flex;
   height: 30px;
@@ -236,11 +238,9 @@ export const AppViewerHeader = (props: AppViewerHeaderProps) => {
             <AppsmithLogoImg src={AppsmithLogo} alt="Appsmith logo" />
           </Link>
         </HeaderSection>
-        <HeaderSection justify={"center"}>
+        <HeaderSection justify={"center"} className="current-app-name">
           {currentApplicationDetails && (
-            <StyledApplicationName>
-              {currentApplicationDetails.name}
-            </StyledApplicationName>
+            <Text type={TextType.H4}>{currentApplicationDetails.name}</Text>
           )}
         </HeaderSection>
         <HeaderSection justify={"flex-end"}>

From 1c6252b71932788dfb6ae66f91e78786be9f6949 Mon Sep 17 00:00:00 2001
From: Tim Dillon <tim@itsdits.com>
Date: Mon, 25 Jan 2021 16:55:10 +0900
Subject: [PATCH 14/47] Add Linux Mint support to install.sh (#2694)

---
 deploy/install.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/deploy/install.sh b/deploy/install.sh
index 3544dd081e..734e15d75a 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -138,6 +138,11 @@ check_os() {
             os="debian"
             package_manager="apt-get"
             ;;
+        Linux\ Mint*)
+            desired_os=1
+            os="linux mint"
+            package_manager="apt-get"
+            ;;
         Red\ Hat*)
             desired_os=1
             os="red hat"
@@ -426,7 +431,7 @@ curl -s --location --request POST 'https://hook.integromat.com/dkwb6i52am93pi30o
 
 if [[ $desired_os -eq 0 ]];then
     echo ""
-    echo "This script is currently meant to install Appsmith on Mac OS X, Ubuntu, SLES or openSUSE machines."
+    echo "This script is currently meant to install Appsmith on Mac OS X, Ubuntu, Debian, Linux Mint, Red Hat, CentOS, SLES or openSUSE machines."
     echo_contact_support " if you wish to extend this support."
     curl -s --location --request POST 'https://hook.integromat.com/dkwb6i52am93pi30ojeboktvj32iw0fa' \
     --header 'Content-Type: text/plain' \

From 5dc01c677d222608534f5ce02908ab5267a4e27a Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Mon, 25 Jan 2021 14:27:26 +0530
Subject: [PATCH 15/47] Batching widget property updates (#2685)

- Changed the updateWidgetProperty redux action to use an object of updates instead of single update
- Added the new batchUpdateWidgetProperty action
> This action will calculate dynamicPath changes for all the updates and update them together
- Added the new deleteWidgetProperty action
>This action will delete a property and any dynamicPaths/child dynamicPaths that exist
---
 app/client/src/actions/controlActions.tsx     |  48 ++-
 app/client/src/actions/pageActions.tsx        |   4 +-
 .../src/constants/ReduxActionConstants.tsx    |   4 +-
 .../entityReducers/canvasWidgetsReducer.tsx   |  13 +-
 .../src/reducers/uiReducers/editorReducer.tsx |   2 +-
 app/client/src/sagas/OnboardingSagas.ts       |  28 +-
 app/client/src/sagas/PageSagas.tsx            |   8 +-
 app/client/src/sagas/WidgetOperationSagas.tsx | 364 +++++++++++++-----
 app/client/src/utils/DynamicBindingUtils.ts   |   9 +
 .../src/utils/DynamicBindingsUtil.test.ts     |  22 +-
 app/client/src/workers/evaluation.worker.ts   |   2 +-
 .../src/workers/evaluationUtils.test.ts       |  17 -
 app/client/src/workers/evaluationUtils.ts     |  10 -
 13 files changed, 357 insertions(+), 174 deletions(-)
 delete mode 100644 app/client/src/workers/evaluationUtils.test.ts

diff --git a/app/client/src/actions/controlActions.tsx b/app/client/src/actions/controlActions.tsx
index c6be484c6d..010610bfb1 100644
--- a/app/client/src/actions/controlActions.tsx
+++ b/app/client/src/actions/controlActions.tsx
@@ -4,7 +4,7 @@ import { BatchAction, batchAction } from "actions/batchActions";
 
 export const updateWidgetPropertyRequest = (
   widgetId: string,
-  propertyName: string,
+  propertyPath: string,
   propertyValue: any,
   renderMode: RenderMode,
 ): ReduxAction<UpdateWidgetPropertyRequestPayload> => {
@@ -12,7 +12,7 @@ export const updateWidgetPropertyRequest = (
     type: ReduxActionTypes.UPDATE_WIDGET_PROPERTY_REQUEST,
     payload: {
       widgetId,
-      propertyName,
+      propertyPath,
       propertyValue,
       renderMode,
     },
@@ -21,29 +21,49 @@ export const updateWidgetPropertyRequest = (
 
 export const updateWidgetProperty = (
   widgetId: string,
-  propertyName: string,
-  propertyValue: any,
+  updates: Record<string, unknown>,
 ): BatchAction<UpdateWidgetPropertyPayload> => {
   return batchAction({
     type: ReduxActionTypes.UPDATE_WIDGET_PROPERTY,
     payload: {
       widgetId,
-      propertyName,
-      propertyValue,
+      updates,
     },
   });
 };
 
+export const batchUpdateWidgetProperty = (
+  widgetId: string,
+  updates: Record<string, unknown>,
+): ReduxAction<UpdateWidgetPropertyPayload> => ({
+  type: ReduxActionTypes.BATCH_UPDATE_WIDGET_PROPERTY,
+  payload: {
+    widgetId,
+    updates,
+  },
+});
+
+export const deleteWidgetProperty = (
+  widgetId: string,
+  propertyPath: string,
+): ReduxAction<DeleteWidgetPropertyPayload> => ({
+  type: ReduxActionTypes.DELETE_WIDGET_PROPERTY,
+  payload: {
+    widgetId,
+    propertyPath,
+  },
+});
+
 export const setWidgetDynamicProperty = (
   widgetId: string,
-  propertyName: string,
+  propertyPath: string,
   isDynamic: boolean,
 ): ReduxAction<SetWidgetDynamicPropertyPayload> => {
   return {
     type: ReduxActionTypes.SET_WIDGET_DYNAMIC_PROPERTY,
     payload: {
       widgetId,
-      propertyName,
+      propertyPath,
       isDynamic,
     },
   };
@@ -51,19 +71,23 @@ export const setWidgetDynamicProperty = (
 
 export interface UpdateWidgetPropertyRequestPayload {
   widgetId: string;
-  propertyName: string;
+  propertyPath: string;
   propertyValue: any;
   renderMode: RenderMode;
 }
 
 export interface UpdateWidgetPropertyPayload {
   widgetId: string;
-  propertyName: string;
-  propertyValue: any;
+  updates: Record<string, unknown>;
 }
 
 export interface SetWidgetDynamicPropertyPayload {
   widgetId: string;
-  propertyName: string;
+  propertyPath: string;
   isDynamic: boolean;
 }
+
+export interface DeleteWidgetPropertyPayload {
+  widgetId: string;
+  propertyPath: string;
+}
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index b18509dde1..28d128e9f0 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -77,11 +77,11 @@ export const updateCurrentPage = (id: string) => ({
   payload: { id },
 });
 
-export const updateCanvas = (
+export const initCanvasLayout = (
   payload: UpdateCanvasPayload,
 ): ReduxAction<UpdateCanvasPayload> => {
   return {
-    type: ReduxActionTypes.UPDATE_CANVAS,
+    type: ReduxActionTypes.INIT_CANVAS_LAYOUT,
     payload,
   };
 };
diff --git a/app/client/src/constants/ReduxActionConstants.tsx b/app/client/src/constants/ReduxActionConstants.tsx
index 6106ea2652..c7d41a158c 100644
--- a/app/client/src/constants/ReduxActionConstants.tsx
+++ b/app/client/src/constants/ReduxActionConstants.tsx
@@ -11,7 +11,7 @@ export const ReduxActionTypes: { [key: string]: string } = {
   FLUSH_AND_REDIRECT: "FLUSH_AND_REDIRECT",
   SAFE_CRASH_APPSMITH: "SAFE_CRASH_APPSMITH",
   SAFE_CRASH_APPSMITH_REQUEST: "SAFE_CRASH_APPSMITH_REQUEST",
-  UPDATE_CANVAS: "UPDATE_CANVAS",
+  INIT_CANVAS_LAYOUT: "INIT_CANVAS_LAYOUT",
   FETCH_CANVAS: "FETCH_CANVAS",
   CLEAR_CANVAS: "CLEAR_CANVAS",
   FETCH_PAGE_INIT: "FETCH_PAGE_INIT",
@@ -55,6 +55,8 @@ export const ReduxActionTypes: { [key: string]: string } = {
   UPDATE_WIDGET_PROPERTY_REQUEST: "UPDATE_WIDGET_PROPERTY_REQUEST",
   UPDATE_WIDGET_PROPERTY: "UPDATE_WIDGET_PROPERTY",
   UPDATE_WIDGET_DYNAMIC_PROPERTY: "UPDATE_WIDGET_DYNAMIC_PROPERTY",
+  BATCH_UPDATE_WIDGET_PROPERTY: "BATCH_UPDATE_WIDGET_PROPERTY",
+  DELETE_WIDGET_PROPERTY: "DELETE_WIDGET_PROPERTY",
   FETCH_PROPERTY_PANE_CONFIGS_INIT: "FETCH_PROPERTY_PANE_CONFIGS_INIT",
   FETCH_PROPERTY_PANE_CONFIGS_SUCCESS: "FETCH_PROPERTY_PANE_CONFIGS_SUCCESS",
   FETCH_CONFIGS_INIT: "FETCH_CONFIGS_INIT",
diff --git a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx
index fa01e3eb7f..ed42e46d6d 100644
--- a/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx
+++ b/app/client/src/reducers/entityReducers/canvasWidgetsReducer.tsx
@@ -6,6 +6,7 @@ import {
 } from "constants/ReduxActionConstants";
 import { WidgetProps } from "widgets/BaseWidget";
 import { UpdateWidgetPropertyPayload } from "actions/controlActions";
+import _ from "lodash";
 
 const initialState: CanvasWidgetsReduxState = {};
 
@@ -14,8 +15,7 @@ export type FlattenedWidgetProps = WidgetProps & {
 };
 
 const canvasWidgetsReducer = createImmerReducer(initialState, {
-  // TODO Rename to INIT_LAYOUT
-  [ReduxActionTypes.UPDATE_CANVAS]: (
+  [ReduxActionTypes.INIT_CANVAS_LAYOUT]: (
     state: CanvasWidgetsReduxState,
     action: ReduxAction<UpdateCanvasPayload>,
   ) => {
@@ -31,8 +31,13 @@ const canvasWidgetsReducer = createImmerReducer(initialState, {
     state: CanvasWidgetsReduxState,
     action: ReduxAction<UpdateWidgetPropertyPayload>,
   ) => {
-    state[action.payload.widgetId][action.payload.propertyName] =
-      action.payload.propertyValue;
+    // We loop over all updates
+    Object.entries(action.payload.updates).forEach(
+      ([propertyPath, propertyValue]) => {
+        // since property paths could be nested, we use lodash set method
+        _.set(state[action.payload.widgetId], propertyPath, propertyValue);
+      },
+    );
   },
 });
 
diff --git a/app/client/src/reducers/uiReducers/editorReducer.tsx b/app/client/src/reducers/uiReducers/editorReducer.tsx
index 0c5550b771..f5ade60ca1 100644
--- a/app/client/src/reducers/uiReducers/editorReducer.tsx
+++ b/app/client/src/reducers/uiReducers/editorReducer.tsx
@@ -93,7 +93,7 @@ const editorReducer = createReducer(initialState, {
     state.loadingStates.savingError = true;
     return { ...state };
   },
-  [ReduxActionTypes.UPDATE_CANVAS]: (
+  [ReduxActionTypes.INIT_CANVAS_LAYOUT]: (
     state: EditorReduxState,
     action: ReduxAction<UpdateCanvasPayload>,
   ) => {
diff --git a/app/client/src/sagas/OnboardingSagas.ts b/app/client/src/sagas/OnboardingSagas.ts
index b65aa962bb..015497b38f 100644
--- a/app/client/src/sagas/OnboardingSagas.ts
+++ b/app/client/src/sagas/OnboardingSagas.ts
@@ -43,6 +43,7 @@ import {
 } from "constants/OnboardingConstants";
 import AnalyticsUtil from "../utils/AnalyticsUtil";
 import { get } from "lodash";
+import { updateWidgetProperty } from "../actions/controlActions";
 
 export const getCurrentStep = (state: AppState) =>
   state.ui.onBoarding.currentStep;
@@ -85,14 +86,9 @@ function* listenForWidgetAdditions() {
       canvasWidgets[selectedWidget.widgetId]
     ) {
       if (selectedWidget.tableData === initialTableData) {
-        yield put({
-          type: "UPDATE_WIDGET_PROPERTY",
-          payload: {
-            widgetId: selectedWidget.widgetId,
-            propertyName: "tableData",
-            propertyValue: [],
-          },
-        });
+        yield put(
+          updateWidgetProperty(selectedWidget.widgetId, { tableData: [] }),
+        );
       }
 
       AnalyticsUtil.logEvent("ONBOARDING_ADD_WIDGET");
@@ -107,11 +103,11 @@ function* listenForWidgetAdditions() {
   }
 }
 
-function* listenForSuccessfullBinding() {
+function* listenForSuccessfulBinding() {
   while (true) {
     yield take();
 
-    let bindSuccessfull = true;
+    let bindSuccessful = true;
     const selectedWidget = yield select(getSelectedWidget);
     if (selectedWidget && selectedWidget.type === "TABLE_WIDGET") {
       const dataTree = yield select(getDataTree);
@@ -124,19 +120,19 @@ function* listenForSuccessfullBinding() {
         const hasBinding =
           dynamicBindingPathList && !!dynamicBindingPathList.length;
 
-        bindSuccessfull =
-          bindSuccessfull && hasBinding && tableHasData && tableHasData.length;
+        bindSuccessful =
+          bindSuccessful && hasBinding && tableHasData && tableHasData.length;
 
         if (widgetProperties.invalidProps) {
-          bindSuccessfull =
-            bindSuccessfull &&
+          bindSuccessful =
+            bindSuccessful &&
             !(
               "tableData" in widgetProperties.invalidProps &&
               widgetProperties.invalidProps.tableData
             );
         }
 
-        if (bindSuccessfull) {
+        if (bindSuccessful) {
           yield put(showTooltip(OnboardingStep.NONE));
           AnalyticsUtil.logEvent("ONBOARDING_SUCCESSFUL_BINDING");
           yield put(setCurrentStep(OnboardingStep.SUCCESSFUL_BINDING));
@@ -320,7 +316,7 @@ export default function* onboardingSagas() {
     takeEvery(ReduxActionTypes.LISTEN_FOR_ADD_WIDGET, listenForWidgetAdditions),
     takeEvery(
       ReduxActionTypes.LISTEN_FOR_TABLE_WIDGET_BINDING,
-      listenForSuccessfullBinding,
+      listenForSuccessfulBinding,
     ),
     takeEvery(ReduxActionTypes.SET_CURRENT_STEP, setupOnboardingStep),
     takeEvery(ReduxActionTypes.LISTEN_FOR_DEPLOY, listenForDeploySaga),
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index cf0a194798..36a2c4a686 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -16,7 +16,7 @@ import {
   fetchPublishedPageSuccess,
   savePageSuccess,
   setUrlData,
-  updateCanvas,
+  initCanvasLayout,
   updateCurrentPage,
   updateWidgetNameSuccess,
 } from "actions/pageActions";
@@ -179,7 +179,7 @@ export function* fetchPageSaga(
       // Get Canvas payload
       const canvasWidgetsPayload = getCanvasWidgetsPayload(fetchPageResponse);
       // Update the canvas
-      yield put(updateCanvas(canvasWidgetsPayload));
+      yield put(initCanvasLayout(canvasWidgetsPayload));
       // set current page
       yield put(updateCurrentPage(id));
       // dispatch fetch page success
@@ -242,7 +242,7 @@ export function* fetchPublishedPageSaga(
       // Get Canvas payload
       const canvasWidgetsPayload = getCanvasWidgetsPayload(response);
       // Update the canvas
-      yield put(updateCanvas(canvasWidgetsPayload));
+      yield put(initCanvasLayout(canvasWidgetsPayload));
       // set current page
       yield put(updateCurrentPage(pageId));
       // dispatch fetch page success
@@ -613,7 +613,7 @@ export function* updateCanvasWithDSL(
     pageActions: data.layoutOnLoadActions,
     widgets: normalizedWidgets.entities.canvasWidgets,
   };
-  yield put(updateCanvas(canvasWidgetsPayload));
+  yield put(initCanvasLayout(canvasWidgetsPayload));
   yield put(fetchActionsForPage(pageId));
 }
 
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index b76dd04774..0499d608fd 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -1,42 +1,44 @@
 import {
-  ReduxActionTypes,
-  ReduxActionErrorTypes,
   ReduxAction,
+  ReduxActionErrorTypes,
+  ReduxActionTypes,
 } from "constants/ReduxActionConstants";
 import {
-  WidgetAddChild,
-  WidgetResize,
-  WidgetMove,
-  WidgetDelete,
   updateAndSaveLayout,
+  WidgetAddChild,
   WidgetAddChildren,
+  WidgetDelete,
+  WidgetMove,
+  WidgetResize,
 } from "actions/pageActions";
 import {
-  FlattenedWidgetProps,
   CanvasWidgetsReduxState,
+  FlattenedWidgetProps,
 } from "reducers/entityReducers/canvasWidgetsReducer";
 import {
-  getWidgets,
-  getWidget,
   getSelectedWidget,
+  getWidget,
   getWidgetMetaProps,
+  getWidgets,
 } from "./selectors";
 import {
   generateWidgetProps,
   updateWidgetPosition,
 } from "utils/WidgetPropsUtils";
 import {
+  all,
   call,
   put,
   select,
   takeEvery,
   takeLatest,
-  all,
 } from "redux-saga/effects";
 import { convertToString, getNextEntityName } from "utils/AppsmithUtils";
 import {
+  DeleteWidgetPropertyPayload,
   SetWidgetDynamicPropertyPayload,
   updateWidgetProperty,
+  UpdateWidgetPropertyPayload,
   UpdateWidgetPropertyRequestPayload,
 } from "actions/controlActions";
 import {
@@ -44,12 +46,13 @@ import {
   getEntityDynamicBindingPathList,
   getWidgetDynamicPropertyPathList,
   getWidgetDynamicTriggerPathList,
+  isChildPropertyPath,
   isDynamicValue,
   isPathADynamicBinding,
   isPathADynamicTrigger,
 } from "utils/DynamicBindingUtils";
 import { WidgetProps } from "widgets/BaseWidget";
-import _ from "lodash";
+import _, { cloneDeep } from "lodash";
 import WidgetFactory from "utils/WidgetFactory";
 import {
   buildWidgetBlueprint,
@@ -58,24 +61,23 @@ import {
 import { resetWidgetMetaProperty } from "actions/metaActions";
 import {
   GridDefaults,
-  WidgetTypes,
   MAIN_CONTAINER_WIDGET_ID,
-  WIDGET_DELETE_UNDO_TIMEOUT,
   RenderModes,
+  WIDGET_DELETE_UNDO_TIMEOUT,
   WidgetType,
+  WidgetTypes,
 } from "constants/WidgetConstants";
 import WidgetConfigResponse from "mockResponses/WidgetConfigResponse";
 import {
+  flushDeletedWidgets,
+  getCopiedWidgets,
+  getDeletedWidgets,
   saveCopiedWidgets,
   saveDeletedWidgets,
-  flushDeletedWidgets,
-  getDeletedWidgets,
-  getCopiedWidgets,
 } from "utils/storage";
 import { generateReactKey } from "utils/generators";
 import { flashElementById } from "utils/helpers";
 import AnalyticsUtil from "utils/AnalyticsUtil";
-import { cloneDeep } from "lodash";
 import log from "loglevel";
 import { navigateToCanvas } from "pages/Editor/Explorer/Widgets/WidgetEntity";
 import {
@@ -86,8 +88,8 @@ import { forceOpenPropertyPane } from "actions/widgetActions";
 import { getDataTree } from "selectors/dataTreeSelectors";
 import { DataTreeWidget } from "entities/DataTree/dataTreeFactory";
 import {
-  validateProperty,
   clearEvalPropertyCacheOfWidget,
+  validateProperty,
 } from "./EvaluationsSaga";
 import { WidgetBlueprint } from "reducers/entityReducers/widgetConfigReducer";
 import { Toaster } from "components/ads/Toast";
@@ -221,7 +223,7 @@ function* generateChildWidgets(
   // Add the parentId prop to this widget
   widget.parentId = parent.widgetId;
   // Remove the blueprint from the widget (if any)
-  // as blueprints are not useful beyont this point.
+  // as blueprints are not useful beyond this point.
   delete widget.blueprint;
   return { widgetId: widget.widgetId, widgets };
 }
@@ -466,7 +468,7 @@ export function* undoDeleteSaga(action: ReduxAction<{ widgetId: string }>) {
     (widget) => widget.widgetId === action.payload.widgetId,
   );
 
-  // If the deleted widget is infact available.
+  // If the deleted widget is in fact available.
   if (deletedWidget) {
     // Log an undo event
     AnalyticsUtil.logEvent("WIDGET_DELETE_UNDO", {
@@ -522,7 +524,7 @@ export function* undoDeleteSaga(action: ReduxAction<{ widgetId: string }>) {
         }
         let newChildren = [widget.widgetId];
         if (widgets[widget.parentId].children) {
-          // Concatenate the list of paren't children with the current widgetId
+          // Concatenate the list of parents children with the current widgetId
           newChildren = newChildren.concat(widgets[widget.parentId].children);
         }
         widgets = {
@@ -636,79 +638,86 @@ export function* resizeSaga(resizeAction: ReduxAction<WidgetResize>) {
   }
 }
 
-function* updateDynamicTriggers(
+enum DynamicPathUpdateEffectEnum {
+  ADD = "ADD",
+  REMOVE = "REMOVE",
+  NOOP = "NOOP",
+}
+
+type DynamicPathUpdate = {
+  propertyPath: string;
+  effect: DynamicPathUpdateEffectEnum;
+};
+
+function getDynamicTriggerPathListUpdate(
   widget: WidgetProps,
   propertyPath: string,
   propertyValue: string,
-) {
-  // TODO WIDGETFACTORY
-  const triggerProperties = WidgetFactory.getWidgetTriggerPropertiesMap(
-    widget.type,
-  );
-  if (propertyPath in triggerProperties) {
-    let dynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
-      widget,
-    );
-    if (propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
-      dynamicTriggerPathList.push({
-        key: propertyPath,
-      });
-    }
-    if (!propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
-      dynamicTriggerPathList = _.reject(dynamicTriggerPathList, {
-        key: propertyValue,
-      });
-    }
-    yield put(
-      updateWidgetProperty(
-        widget.widgetId,
-        "dynamicTriggerPathList",
-        dynamicTriggerPathList,
-      ),
-    );
-    return true;
+): DynamicPathUpdate {
+  if (propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
+    return {
+      propertyPath,
+      effect: DynamicPathUpdateEffectEnum.ADD,
+    };
+  } else if (!propertyValue && !isPathADynamicTrigger(widget, propertyPath)) {
+    return {
+      propertyPath,
+      effect: DynamicPathUpdateEffectEnum.REMOVE,
+    };
   }
-  return false;
+  return {
+    propertyPath,
+    effect: DynamicPathUpdateEffectEnum.NOOP,
+  };
 }
 
-function* updateDynamicBindings(
+function getDynamicBindingPathListUpdate(
   widget: WidgetProps,
-  propertyName: string,
+  propertyPath: string,
   propertyValue: any,
-) {
+): DynamicPathUpdate {
   let stringProp = propertyValue;
   if (_.isObject(propertyValue)) {
     // Stringify this because composite controls may have bindings in the sub controls
     stringProp = JSON.stringify(propertyValue);
   }
   const isDynamic = isDynamicValue(stringProp);
-  let dynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
-    widget,
-  );
-  if (!isDynamic && isPathADynamicBinding(widget, propertyName)) {
-    dynamicBindingPathList = _.reject(dynamicBindingPathList, {
-      key: propertyName,
-    });
+  if (!isDynamic && isPathADynamicBinding(widget, propertyPath)) {
+    return {
+      propertyPath,
+      effect: DynamicPathUpdateEffectEnum.REMOVE,
+    };
+  } else if (isDynamic && !isPathADynamicBinding(widget, propertyPath)) {
+    return {
+      propertyPath,
+      effect: DynamicPathUpdateEffectEnum.ADD,
+    };
   }
-  if (isDynamic && !isPathADynamicBinding(widget, propertyName)) {
-    dynamicBindingPathList.push({
-      key: propertyName,
+  return {
+    propertyPath,
+    effect: DynamicPathUpdateEffectEnum.NOOP,
+  };
+}
+
+function applyDynamicPathUpdates(
+  currentList: DynamicPath[],
+  update: DynamicPathUpdate,
+): DynamicPath[] {
+  if (update.effect === DynamicPathUpdateEffectEnum.ADD) {
+    currentList.push({
+      key: update.propertyPath,
     });
+  } else if (update.effect === DynamicPathUpdateEffectEnum.REMOVE) {
+    _.reject(currentList, { key: update.propertyPath });
   }
-  yield put(
-    updateWidgetProperty(
-      widget.widgetId,
-      "dynamicBindingPathList",
-      dynamicBindingPathList,
-    ),
-  );
+  return currentList;
 }
 
 function* updateWidgetPropertySaga(
   updateAction: ReduxAction<UpdateWidgetPropertyRequestPayload>,
 ) {
   const {
-    payload: { propertyValue, propertyName, widgetId },
+    payload: { propertyValue, propertyPath, widgetId },
   } = updateAction;
   if (!widgetId) {
     // Handling the case where sometimes widget id is not passed through here
@@ -717,55 +726,190 @@ function* updateWidgetPropertySaga(
   const stateWidget: WidgetProps = yield select(getWidget, widgetId);
   const widget = { ...stateWidget };
 
-  const dynamicTriggersUpdated = yield updateDynamicTriggers(
-    widget,
-    propertyName,
-    propertyValue,
+  // Holder object to collect all updates
+  const updates: Record<string, unknown> = {
+    [propertyPath]: propertyValue,
+  };
+
+  // Check if the path is a of a dynamic trigger property
+  const triggerProperties = WidgetFactory.getWidgetTriggerPropertiesMap(
+    widget.type,
   );
-  if (!dynamicTriggersUpdated) {
-    yield updateDynamicBindings(widget, propertyName, propertyValue);
+  const isTriggerProperty = propertyPath in triggerProperties;
+  // If it is a trigger property, it will go in a different list than the general
+  // dynamicBindingPathList.
+  if (isTriggerProperty) {
+    const currentDynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
+      widget,
+    );
+    const effect = getDynamicTriggerPathListUpdate(
+      widget,
+      propertyPath,
+      propertyValue,
+    );
+    updates.dynamicTriggerPathList = applyDynamicPathUpdates(
+      currentDynamicTriggerPathList,
+      effect,
+    );
+  } else {
+    const currentDynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
+      widget,
+    );
+    const effect = getDynamicBindingPathListUpdate(
+      widget,
+      propertyPath,
+      propertyValue,
+    );
+    updates.dynamicBindingPathList = applyDynamicPathUpdates(
+      currentDynamicBindingPathList,
+      effect,
+    );
   }
 
-  yield put(updateWidgetProperty(widgetId, propertyName, propertyValue));
+  // Send the updates
+  yield put(updateWidgetProperty(widgetId, updates));
+
   const stateWidgets = yield select(getWidgets);
   const widgets = { ...stateWidgets, [widgetId]: widget };
+
+  // Save the layout
   yield put(updateAndSaveLayout(widgets));
 }
 
 function* setWidgetDynamicPropertySaga(
   action: ReduxAction<SetWidgetDynamicPropertyPayload>,
 ) {
-  const { isDynamic, propertyName, widgetId } = action.payload;
+  const { isDynamic, propertyPath, widgetId } = action.payload;
   const widget: WidgetProps = yield select(getWidget, widgetId);
-  // const tree = yield select(evaluateDataTree);
-  const propertyValue = _.get(widget, propertyName);
+  const propertyValue = _.get(widget, propertyPath);
   let dynamicPropertyPathList = getWidgetDynamicPropertyPathList(widget);
+  const propertyUpdates: Record<string, unknown> = {};
   if (isDynamic) {
     dynamicPropertyPathList.push({
-      key: propertyName,
+      key: propertyPath,
     });
-    const value = convertToString(propertyValue);
-    yield put(updateWidgetProperty(widgetId, propertyName, value));
+    propertyUpdates[propertyPath] = convertToString(propertyValue);
   } else {
     dynamicPropertyPathList = _.reject(dynamicPropertyPathList, {
-      key: propertyName,
+      key: propertyPath,
     });
     const { parsed } = yield call(
       validateProperty,
       widget.type,
-      propertyName,
+      propertyPath,
       propertyValue,
       widget,
     );
-    yield put(updateWidgetProperty(widgetId, propertyName, parsed));
+    propertyUpdates[propertyPath] = parsed;
   }
-  yield put(
-    updateWidgetProperty(
-      widgetId,
-      "dynamicPropertyPathList",
-      dynamicPropertyPathList,
-    ),
+  propertyUpdates.dynamicPropertyPathList = dynamicPropertyPathList;
+
+  yield put(updateWidgetProperty(widgetId, propertyUpdates));
+
+  const stateWidgets = yield select(getWidgets);
+  const widgets = { ...stateWidgets, [widgetId]: widget };
+
+  // Save the layout
+  yield put(updateAndSaveLayout(widgets));
+}
+
+function* batchUpdateWidgetPropertySaga(
+  action: ReduxAction<UpdateWidgetPropertyPayload>,
+) {
+  const { updates, widgetId } = action.payload;
+  if (!widgetId) {
+    // Handling the case where sometimes widget id is not passed through here
+    return;
+  }
+  const widget: WidgetProps = yield select(getWidget, widgetId);
+  const triggerProperties = WidgetFactory.getWidgetTriggerPropertiesMap(
+    widget.type,
   );
+  const propertyUpdates: Record<string, unknown> = {};
+  const currentDynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
+    widget,
+  );
+  const currentDynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
+    widget,
+  );
+  const dynamicTriggerPathListUpdates: DynamicPathUpdate[] = [];
+  const dynamicBindingPathListUpdates: DynamicPathUpdate[] = [];
+  Object.entries(updates).forEach(([propertyPath, propertyValue]) => {
+    // Set the actual property update
+    propertyUpdates[propertyPath] = propertyValue;
+
+    // Check if the path is a of a dynamic trigger property
+    const isTriggerProperty = propertyPath in triggerProperties;
+    // If it is a trigger property, it will go in a different list than the general
+    // dynamicBindingPathList.
+    if (isTriggerProperty && _.isString(propertyValue)) {
+      dynamicTriggerPathListUpdates.push(
+        getDynamicTriggerPathListUpdate(widget, propertyPath, propertyValue),
+      );
+    } else {
+      dynamicBindingPathListUpdates.push(
+        getDynamicBindingPathListUpdate(widget, propertyPath, propertyValue),
+      );
+    }
+  });
+
+  propertyUpdates.dynamicTriggerPathList = dynamicTriggerPathListUpdates.reduce(
+    applyDynamicPathUpdates,
+    currentDynamicTriggerPathList,
+  );
+  propertyUpdates.dynamicBindingPathList = dynamicBindingPathListUpdates.reduce(
+    applyDynamicPathUpdates,
+    currentDynamicBindingPathList,
+  );
+
+  // Send the updates
+  yield put(updateWidgetProperty(widgetId, updates));
+
+  const stateWidgets = yield select(getWidgets);
+  const widgets = { ...stateWidgets, [widgetId]: widget };
+
+  // Save the layout
+  yield put(updateAndSaveLayout(widgets));
+}
+
+function* deleteWidgetPropertySaga(
+  action: ReduxAction<DeleteWidgetPropertyPayload>,
+) {
+  const { widgetId, propertyPath } = action.payload;
+  if (!widgetId) {
+    // Handling the case where sometimes widget id is not passed through here
+    return;
+  }
+  const stateWidget: WidgetProps = yield select(getWidget, widgetId);
+  const dynamicTriggerPathList: DynamicPath[] = getWidgetDynamicTriggerPathList(
+    stateWidget,
+  );
+  const dynamicBindingPathList: DynamicPath[] = getEntityDynamicBindingPathList(
+    stateWidget,
+  );
+
+  dynamicTriggerPathList.filter((dynamicPath) => {
+    return !isChildPropertyPath(propertyPath, dynamicPath.key);
+  });
+
+  dynamicBindingPathList.forEach((dynamicPath) => {
+    return !isChildPropertyPath(propertyPath, dynamicPath.key);
+  });
+
+  yield put(
+    updateWidgetProperty(widgetId, {
+      dynamicTriggerPathList,
+      dynamicBindingPathList,
+    }),
+  );
+
+  const stateWidgets = yield select(getWidgets);
+  const widget = { ...stateWidget };
+  _.unset(widget, propertyPath);
+  const widgets = { ...stateWidgets, [widgetId]: widget };
+
+  // Save the layout
+  yield put(updateAndSaveLayout(widgets));
 }
 
 function* getWidgetChildren(widgetId: string): any {
@@ -774,11 +918,13 @@ function* getWidgetChildren(widgetId: string): any {
   const { children } = widget;
   if (children && children.length) {
     for (const childIndex in children) {
-      const child = children[childIndex];
-      childrenIds.push(child);
-      const grandChildren = yield call(getWidgetChildren, child);
-      if (grandChildren.length) {
-        childrenIds.push(...grandChildren);
+      if (children.hasOwnProperty(childIndex)) {
+        const child = children[childIndex];
+        childrenIds.push(child);
+        const grandChildren = yield call(getWidgetChildren, child);
+        if (grandChildren.length) {
+          childrenIds.push(...grandChildren);
+        }
       }
     }
   }
@@ -847,7 +993,9 @@ function* updateCanvasSize(
     // TODO(abhinav): This considers that the topRow will always be zero
     // Check this out when non canvas widgets are updating snapRows
     // erstwhile: Math.round((rows * props.snapRowSpace) / props.parentRowSpace),
-    yield put(updateWidgetProperty(canvasWidgetId, "bottomRow", newBottomRow));
+    yield put(
+      updateWidgetProperty(canvasWidgetId, { bottomRow: newBottomRow }),
+    );
   }
 }
 
@@ -856,11 +1004,9 @@ function* createWidgetCopy() {
   if (!selectedWidget) return;
   const widgets = yield select(getWidgets);
   const widgetsToStore = getAllWidgetsInTree(selectedWidget.widgetId, widgets);
-  const saveResult = yield saveCopiedWidgets(
+  return yield saveCopiedWidgets(
     JSON.stringify({ widgetId: selectedWidget.widgetId, list: widgetsToStore }),
   );
-
-  return saveResult;
 }
 
 function* copyWidgetSaga(action: ReduxAction<{ isShortcut: boolean }>) {
@@ -1236,7 +1382,7 @@ function* addTableWidgetFromQuerySaga(action: ReduxAction<string>) {
 // The following is computed to be used in the entity explorer
 // Every time a widget is selected, we need to expand widget entities
 // in the entity explorer so that the selected widget is visible
-function* selectedWidgetAncestorySaga(
+function* selectedWidgetAncestrySaga(
   action: ReduxAction<{ widgetId: string }>,
 ) {
   try {
@@ -1263,7 +1409,7 @@ function* selectedWidgetAncestorySaga(
       payload: widgetIdsExpandList,
     });
   } catch (error) {
-    log.debug("Could not compute selected widget's ancestory", error);
+    log.debug("Could not compute selected widget's ancestry", error);
   }
 }
 
@@ -1289,12 +1435,20 @@ export default function* widgetOperationSagas() {
       ReduxActionTypes.RESET_CHILDREN_WIDGET_META,
       resetChildrenMetaSaga,
     ),
+    takeEvery(
+      ReduxActionTypes.BATCH_UPDATE_WIDGET_PROPERTY,
+      batchUpdateWidgetPropertySaga,
+    ),
+    takeEvery(
+      ReduxActionTypes.DELETE_WIDGET_PROPERTY,
+      deleteWidgetPropertySaga,
+    ),
     takeLatest(ReduxActionTypes.UPDATE_CANVAS_SIZE, updateCanvasSize),
     takeLatest(ReduxActionTypes.COPY_SELECTED_WIDGET_INIT, copyWidgetSaga),
     takeEvery(ReduxActionTypes.PASTE_COPIED_WIDGET_INIT, pasteWidgetSaga),
     takeEvery(ReduxActionTypes.UNDO_DELETE_WIDGET, undoDeleteSaga),
     takeEvery(ReduxActionTypes.CUT_SELECTED_WIDGET, cutWidgetSaga),
     takeEvery(ReduxActionTypes.WIDGET_ADD_CHILDREN, addChildrenSaga),
-    takeLatest(ReduxActionTypes.SELECT_WIDGET, selectedWidgetAncestorySaga),
+    takeLatest(ReduxActionTypes.SELECT_WIDGET, selectedWidgetAncestrySaga),
   ]);
 }
diff --git a/app/client/src/utils/DynamicBindingUtils.ts b/app/client/src/utils/DynamicBindingUtils.ts
index a7e87c2096..705fbbb9a7 100644
--- a/app/client/src/utils/DynamicBindingUtils.ts
+++ b/app/client/src/utils/DynamicBindingUtils.ts
@@ -249,3 +249,12 @@ export const unsafeFunctionForEval = [
   "setInterval",
   "Promise",
 ];
+export const isChildPropertyPath = (
+  parentPropertyPath: string,
+  childPropertyPath: string,
+): boolean => {
+  const regexTest = new RegExp(
+    `^${parentPropertyPath.replace(".", "\\.")}(\\.\\S+)?$`,
+  );
+  return regexTest.test(childPropertyPath);
+};
diff --git a/app/client/src/utils/DynamicBindingsUtil.test.ts b/app/client/src/utils/DynamicBindingsUtil.test.ts
index ef0bea5619..b319780940 100644
--- a/app/client/src/utils/DynamicBindingsUtil.test.ts
+++ b/app/client/src/utils/DynamicBindingsUtil.test.ts
@@ -1,4 +1,7 @@
-import { getDynamicStringSegments } from "./DynamicBindingUtils";
+import {
+  getDynamicStringSegments,
+  isChildPropertyPath,
+} from "./DynamicBindingUtils";
 
 describe.each([
   ["{{A}}", ["{{A}}"]],
@@ -30,3 +33,20 @@ describe.each([
     );
   });
 });
+
+describe("isChildPropertyPath function", () => {
+  it("works", () => {
+    const cases: Array<[string, string, boolean]> = [
+      ["Table1.selectedRow", "Table1.selectedRow", true],
+      ["Table1.selectedRow", "Table1.selectedRows", false],
+      ["Table1.selectedRow", "Table1.selectedRow.email", true],
+      ["Table1.selectedRow", "1Table1.selectedRow", false],
+      ["Table1.selectedRow", "Table11selectedRow", false],
+      ["Table1.selectedRow", "Table1.selectedRow", true],
+    ];
+    cases.forEach((testCase) => {
+      const result = isChildPropertyPath(testCase[0], testCase[1]);
+      expect(result).toBe(testCase[2]);
+    });
+  });
+});
diff --git a/app/client/src/workers/evaluation.worker.ts b/app/client/src/workers/evaluation.worker.ts
index 78c036fe17..902e88a07d 100644
--- a/app/client/src/workers/evaluation.worker.ts
+++ b/app/client/src/workers/evaluation.worker.ts
@@ -15,6 +15,7 @@ import {
   extraLibraries,
   getDynamicBindings,
   getEntityDynamicBindingPathList,
+  isChildPropertyPath,
   isPathADynamicBinding,
   isPathADynamicTrigger,
   unsafeFunctionForEval,
@@ -33,7 +34,6 @@ import {
   CrashingError,
   DataTreeDiffEvent,
   getValidatedTree,
-  isChildPropertyPath,
   makeParentsDependOnChildren,
   removeFunctions,
   removeFunctionsFromDataTree,
diff --git a/app/client/src/workers/evaluationUtils.test.ts b/app/client/src/workers/evaluationUtils.test.ts
deleted file mode 100644
index 0419fb5ada..0000000000
--- a/app/client/src/workers/evaluationUtils.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { isChildPropertyPath } from "./evaluationUtils";
-
-describe("isChildPropertyPath function", () => {
-  it("works", () => {
-    const cases: Array<[string, string, boolean]> = [
-      ["Table1.selectedRow", "Table1.selectedRows", false],
-      ["Table1.selectedRow", "Table1.selectedRow.email", true],
-      ["Table1.selectedRow", "1Table1.selectedRow", false],
-      ["Table1.selectedRow", "Table11selectedRow", false],
-      ["Table1.selectedRow", "Table1.selectedRow", true],
-    ];
-    cases.forEach((testCase) => {
-      const result = isChildPropertyPath(testCase[0], testCase[1]);
-      expect(result).toBe(testCase[2]);
-    });
-  });
-});
diff --git a/app/client/src/workers/evaluationUtils.ts b/app/client/src/workers/evaluationUtils.ts
index 3a94668c83..2801f3000f 100644
--- a/app/client/src/workers/evaluationUtils.ts
+++ b/app/client/src/workers/evaluationUtils.ts
@@ -297,13 +297,3 @@ export function getValidatedTree(
     return { ...tree, [entityKey]: parsedEntity };
   }, tree);
 }
-
-export const isChildPropertyPath = (
-  parentPropertyPath: string,
-  childPropertyPath: string,
-): boolean => {
-  const regexTest = new RegExp(
-    `^${parentPropertyPath.replace(".", "\\.")}(\\.\\S+)?$`,
-  );
-  return regexTest.test(childPropertyPath);
-};

From 3f2e60dc0dec28f3f4894b0691a97751c92e42bf Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Mon, 25 Jan 2021 16:49:31 +0530
Subject: [PATCH 16/47] Sanitise any other possible place which could send
 functions (#2704)

---
 app/client/src/workers/evaluation.worker.ts | 17 ++++++++++-------
 app/client/src/workers/evaluationUtils.ts   |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/client/src/workers/evaluation.worker.ts b/app/client/src/workers/evaluation.worker.ts
index 902e88a07d..f813409d02 100644
--- a/app/client/src/workers/evaluation.worker.ts
+++ b/app/client/src/workers/evaluation.worker.ts
@@ -148,9 +148,10 @@ ctx.addEventListener(
           true,
           callbackData,
         );
+        const cleanTriggers = removeFunctions(triggers);
         const errors = dataTreeEvaluator.errors;
         dataTreeEvaluator.clearErrors();
-        return { triggers, errors };
+        return { triggers: cleanTriggers, errors };
       }
       case EVAL_WORKER_ACTIONS.CLEAR_CACHE: {
         dataTreeEvaluator = undefined;
@@ -180,12 +181,14 @@ ctx.addEventListener(
           value,
           props,
         } = requestData;
-        return validateWidgetProperty(
-          widgetTypeConfigMap,
-          widgetType,
-          property,
-          value,
-          props,
+        return removeFunctions(
+          validateWidgetProperty(
+            widgetTypeConfigMap,
+            widgetType,
+            property,
+            value,
+            props,
+          ),
         );
       }
       default: {
diff --git a/app/client/src/workers/evaluationUtils.ts b/app/client/src/workers/evaluationUtils.ts
index 2801f3000f..6f05837929 100644
--- a/app/client/src/workers/evaluationUtils.ts
+++ b/app/client/src/workers/evaluationUtils.ts
@@ -169,7 +169,7 @@ export function isAction(entity: DataTreeEntity): boolean {
 export const removeFunctions = (value: any) => {
   if (_.isFunction(value)) {
     return "Function call";
-  } else if (_.isObject(value) && _.some(value, _.isFunction)) {
+  } else if (_.isObject(value)) {
     return JSON.parse(JSON.stringify(value));
   } else {
     return value;

From 3776e82fb85f513a908cbe456d819d655b9ddfc2 Mon Sep 17 00:00:00 2001
From: Trisha Anand <trisha@appsmith.com>
Date: Mon, 25 Jan 2021 16:54:45 +0530
Subject: [PATCH 17/47] Scheduling of parallel tasks implementation for on-page
 load actions (#2667)

* Proof of concept code which calculates the on load page actions.

* Refactored the field names introduced in Layout. Added a new field to keep a track of direct action names used in dynamic bindings in the DSL.

* Untested compute on on page load actions completed.

* Working page load actions computation.
TODO : Update the tests for correctness.

* Added fix for BFS starting from root nodes instead of arbitrary nodes.
Fixed a test case to assert for correct page load actions.

* Fixed the bug where the ids of the actions were not getting set in the layout. Also asserting the same in the test case for catching the future breaks.

* Minor refactor of function name to clear its purpose without reading the code.

* Incorporated review comments.

* Added conditional checks for unpublished action deleted and circular dependency of actions depending on each other.
---
 app/server/appsmith-server/pom.xml            |   2 +-
 .../server/domains/ActionDependencyEdge.java  |  13 +
 .../com/appsmith/server/domains/Layout.java   |   9 +
 .../server/helpers/MustacheHelper.java        |  28 ++
 .../server/services/LayoutActionService.java  |  10 +-
 .../services/LayoutActionServiceImpl.java     | 270 +++++----------
 .../server/services/NewActionService.java     |   4 +-
 .../server/services/NewActionServiceImpl.java |  27 +-
 .../server/solutions/PageLoadActionsUtil.java | 309 ++++++++++++++++++
 .../services/LayoutActionServiceTest.java     |  12 +-
 .../server/services/LayoutServiceTest.java    |  25 +-
 11 files changed, 511 insertions(+), 198 deletions(-)
 create mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionDependencyEdge.java
 create mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PageLoadActionsUtil.java

diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index be3c723a2a..6b8d17dbb3 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -203,7 +203,7 @@
         <dependency>
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
-            <version>1.3.0</version>
+            <version>1.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionDependencyEdge.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionDependencyEdge.java
new file mode 100644
index 0000000000..6689529c92
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ActionDependencyEdge.java
@@ -0,0 +1,13 @@
+package com.appsmith.server.domains;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class ActionDependencyEdge {
+    String source;
+    String target;
+}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java
index a81878e4c8..c4f79f2056 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Layout.java
@@ -44,6 +44,15 @@ public class Layout extends BaseDomain {
     @JsonIgnore
     Set<String> widgetNames;
 
+    @JsonIgnore
+    Set<String> allOnPageLoadActionNames;
+
+    @JsonIgnore
+    Set<ActionDependencyEdge> allOnPageLoadActionEdges;
+
+    @JsonIgnore
+    Set<String> actionsUsedInDynamicBindings;
+
     /**
      * If view mode, the dsl returned should be the publishedDSL, else if the edit mode is on (view mode = false)
      * the dsl returned should be JSONObject dsl
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java
index 78b6ddebd3..349ff4e16c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java
@@ -15,12 +15,23 @@ import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static com.appsmith.server.helpers.BeanCopyUtils.isDomainModel;
 
 @Slf4j
 public class MustacheHelper {
 
+    /*
+     * This pattern finds all the String which have been extracted from the mustache dynamic bindings.
+     * e.g. for the given JS function using action with name "fetchUsers"
+     * {{JSON.stringify(fetchUsers)}}
+     * This pattern should return ["JSON.stringify", "fetchUsers"]
+     */
+    private final static Pattern pattern = Pattern.compile("[a-zA-Z_][a-zA-Z0-9._]*");
+
+
     /**
      * Tokenize a Mustache template string into a list of plain text and Mustache interpolations.
      *
@@ -288,4 +299,21 @@ public class MustacheHelper {
         return StringEscapeUtils.unescapeHtml4(rendered.toString());
     }
 
+    public static void extractWordsAndAddToSet(Set<String> bindingNames, String mustacheKey) {
+        String key = mustacheKey.trim();
+
+        // Extract all the words in the dynamic bindings
+        Matcher matcher = pattern.matcher(key);
+
+        while (matcher.find()) {
+            String word = matcher.group();
+
+            String[] subStrings = word.split(Pattern.quote("."));
+            if (subStrings.length > 0) {
+                // We are only interested in the top level. e.g. if its Input1.text, we want just Input1
+                bindingNames.add(subStrings[0]);
+            }
+        }
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java
index 0d0b388088..3929aadeba 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionService.java
@@ -7,15 +7,15 @@ import com.appsmith.server.dtos.RefactorNameDTO;
 import reactor.core.publisher.Mono;
 
 public interface LayoutActionService {
-    public Mono<Layout> updateLayout(String pageId, String layoutId, Layout layout);
+    Mono<Layout> updateLayout(String pageId, String layoutId, Layout layout);
 
-    public Mono<ActionDTO> moveAction(ActionMoveDTO actionMoveDTO);
+    Mono<ActionDTO> moveAction(ActionMoveDTO actionMoveDTO);
 
-    public Mono<Layout> refactorWidgetName(RefactorNameDTO refactorNameDTO);
+    Mono<Layout> refactorWidgetName(RefactorNameDTO refactorNameDTO);
 
-    public Mono<Layout> refactorActionName(RefactorNameDTO refactorNameDTO);
+    Mono<Layout> refactorActionName(RefactorNameDTO refactorNameDTO);
 
-    public Mono<ActionDTO> updateAction(String id, ActionDTO action);
+    Mono<ActionDTO> updateAction(String id, ActionDTO action);
 
     Mono<ActionDTO> setExecuteOnLoad(String id, Boolean isExecuteOnLoad);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
index 819e7c0722..604a91f7bd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
@@ -2,6 +2,7 @@ package com.appsmith.server.services;
 
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.server.constants.FieldName;
+import com.appsmith.server.domains.ActionDependencyEdge;
 import com.appsmith.server.domains.Layout;
 import com.appsmith.server.dtos.ActionDTO;
 import com.appsmith.server.dtos.ActionMoveDTO;
@@ -11,6 +12,7 @@ import com.appsmith.server.dtos.RefactorNameDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.MustacheHelper;
+import com.appsmith.server.solutions.PageLoadActionsUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -22,7 +24,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import reactor.core.Exceptions;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -35,10 +36,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static com.appsmith.server.acl.AclPermission.MANAGE_ACTIONS;
 import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
+import static com.appsmith.server.helpers.MustacheHelper.extractWordsAndAddToSet;
 import static java.util.stream.Collectors.toSet;
 
 @Service
@@ -49,13 +50,7 @@ public class LayoutActionServiceImpl implements LayoutActionService {
     private final AnalyticsService analyticsService;
     private final NewPageService newPageService;
     private final NewActionService newActionService;
-    /*
-     * This pattern finds all the String which have been extracted from the mustache dynamic bindings.
-     * e.g. for the given JS function using action with name "fetchUsers"
-     * {{JSON.stringify(fetchUsers)}}
-     * This pattern should return ["JSON.stringify", "fetchUsers"]
-     */
-    private final Pattern pattern = Pattern.compile("[a-zA-Z_][a-zA-Z0-9._]*");
+    private final PageLoadActionsUtil pageLoadActionsUtil;
 
     /*
      * To replace fetchUsers in `{{JSON.stringify(fetchUsers)}}` with getUsers, the following regex is required :
@@ -68,182 +63,12 @@ public class LayoutActionServiceImpl implements LayoutActionService {
     public LayoutActionServiceImpl(ObjectMapper objectMapper,
                                    AnalyticsService analyticsService,
                                    NewPageService newPageService,
-                                   NewActionService newActionService) {
+                                   NewActionService newActionService, PageLoadActionsUtil pageLoadActionsUtil) {
         this.objectMapper = objectMapper;
         this.analyticsService = analyticsService;
         this.newPageService = newPageService;
         this.newActionService = newActionService;
-    }
-
-    @Override
-    public Mono<Layout> updateLayout(String pageId, String layoutId, Layout layout) {
-        JSONObject dsl = layout.getDsl();
-        if (dsl == null) {
-            // There is no DSL here. No need to process anything. Return as is.
-            return Mono.just(layout);
-        }
-
-        return Mono.fromSupplier(() -> {
-                    Set<String> widgetNames = new HashSet<>();
-                    Set<String> dynamicBindings = new HashSet<>();
-                    try {
-                        extractAllWidgetNamesAndDynamicBindingsFromDSL(dsl, widgetNames, dynamicBindings);
-                    } catch (Throwable t) {
-                        throw Exceptions.propagate(t);
-                    }
-                    layout.setWidgetNames(widgetNames);
-
-                    // dynamicBindingNames is a set of all words extracted from mustaches which would also contain the names
-                    // of the actions being used to read data from into the widget fields
-                    Set<String> dynamicBindingNames = new HashSet<>();
-                    if (!CollectionUtils.isEmpty(dynamicBindings)) {
-                        for (String mustacheKey : dynamicBindings) {
-                            // Extract all the words in the dynamic bindings
-                            extractWordsAndAddToSet(dynamicBindingNames, mustacheKey);
-                        }
-                    }
-                    return dynamicBindingNames;
-                })
-                .flatMap(dynamicBindingNames -> {
-                    // Update these actions to be executed on load, unless the user has touched the executeOnLoad setting for this
-                    Mono<List<HashSet<DslActionDTO>>> onLoadActionsMono = findAndUpdateOnLoadActionsInPage(dynamicBindingNames, pageId);
-                    return onLoadActionsMono;
-                })
-                .zipWith(
-                        // Update the list of actions to be executed on load in the layout as well
-                        newPageService.findByIdAndLayoutsId(pageId, layoutId, MANAGE_PAGES, false)
-                                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND,
-                                        FieldName.PAGE_ID + " or " + FieldName.LAYOUT_ID, pageId + ", " + layoutId))))
-                .map(tuple -> {
-                    PageDTO page = tuple.getT2();
-                    List<HashSet<DslActionDTO>> onLoadActions = tuple.getT1();
-                    List<Layout> layoutList = page.getLayouts();
-                    //Because the findByIdAndLayoutsId call returned non-empty result, we are guaranteed to find the layoutId here.
-                    for (Layout storedLayout : layoutList) {
-                        if (storedLayout.getId().equals(layoutId)) {
-                            //Update
-                            layout.setLayoutOnLoadActions(onLoadActions);
-                            BeanUtils.copyProperties(layout, storedLayout);
-                            storedLayout.setId(layoutId);
-
-                            break;
-                        }
-                    }
-                    page.setLayouts(layoutList);
-                    return page;
-                })
-                .flatMap(newPageService::saveUnpublishedPage)
-                .flatMap(page -> {
-                    List<Layout> layoutList = page.getLayouts();
-                    for (Layout storedLayout : layoutList) {
-                        if (storedLayout.getId().equals(layoutId)) {
-                            return Mono.just(storedLayout);
-                        }
-                    }
-                    return Mono.empty();
-                });
-    }
-
-    public Mono<List<HashSet<DslActionDTO>>> findAndUpdateOnLoadActionsInPage(Set<String> dynamicBindingNames, String pageId) {
-        Mono<List<HashSet<DslActionDTO>>> referencedActions = findAndUpdateOnLoadActionsInPage(new ArrayList<>(), dynamicBindingNames, pageId);
-        return referencedActions
-                // Currently, we do not pick action dependencies for actions that users have set to run
-                // on page load but haven't used on their application page.
-                // If such actions exist, they will inevitably fail because these actions are executed before any other
-                .zipWith(newActionService.findUnpublishedOnLoadActionsInPage(pageId)
-                        .flatMap(newAction -> {
-                            ActionDTO action = newAction.getUnpublishedAction();
-                            DslActionDTO actionDTO = new DslActionDTO();
-                            actionDTO.setId(newAction.getId());
-                            actionDTO.setPluginType(newAction.getPluginType());
-                            actionDTO.setJsonPathKeys(action.getJsonPathKeys());
-                            actionDTO.setName(action.getName());
-                            if (action.getActionConfiguration() != null) {
-                                actionDTO.setTimeoutInMillisecond(action.getActionConfiguration().getTimeoutInMillisecond());
-                            }
-                            return Mono.just(actionDTO);
-                        })
-                        .collect(Collectors.toCollection(HashSet::new)))
-                .map(tuple -> {
-                    List<HashSet<DslActionDTO>> actionList = tuple.getT1();
-                    if (!tuple.getT2().isEmpty()) {
-                        actionList.add(0, tuple.getT2());
-                    }
-                    return actionList;
-                });
-    }
-
-    private Mono<List<HashSet<DslActionDTO>>> findAndUpdateOnLoadActionsInPage(List<HashSet<DslActionDTO>> onLoadActions,
-                                                                               Set<String> dynamicBindingNames,
-                                                                               String pageId) {
-        if (dynamicBindingNames == null || dynamicBindingNames.isEmpty()) {
-            return Mono.just(onLoadActions);
-        }
-        Set<String> bindingNames = new HashSet<>();
-        // First fetch all the actions in the page whose name matches the words found in all the dynamic bindings
-        return newActionService.findUnpublishedActionsInPageByNames(dynamicBindingNames, pageId)
-                .flatMap(newAction -> {
-                    ActionDTO action = newAction.getUnpublishedAction();
-                    if (!CollectionUtils.isEmpty(action.getJsonPathKeys())) {
-                        for (String mustacheKey : action.getJsonPathKeys()) {
-                            extractWordsAndAddToSet(bindingNames, mustacheKey);
-                        }
-                        // If the action refers to itself in the json path keys, remove the same to circumvent
-                        // supposed circular dependency. This is possible in case of pagination with response url
-                        // where the action refers to its own data to find the next and previous URLs.
-                        bindingNames.remove(action.getName());
-                    }
-                    DslActionDTO actionDTO = new DslActionDTO();
-                    actionDTO.setId(newAction.getId());
-                    actionDTO.setPluginType(newAction.getPluginType());
-                    actionDTO.setJsonPathKeys(action.getJsonPathKeys());
-                    actionDTO.setName(action.getName());
-                    if (action.getActionConfiguration() != null) {
-                        actionDTO.setTimeoutInMillisecond(action.getActionConfiguration().getTimeoutInMillisecond());
-                    }
-
-                    // If the executeOnLoad field isn't true and the user hasn't explicitly set it so, set it to true at this point
-                    // This ensures that when the user opens the action settings, the user would know that this action
-                    // executes on page load
-                    if (!Boolean.TRUE.equals(action.getUserSetOnLoad()) && !Boolean.TRUE.equals(action.getExecuteOnLoad())) {
-                        action.setExecuteOnLoad(true);
-
-                        return newActionService.updateUnpublishedAction(newAction.getId(), action)
-                                .thenReturn(actionDTO);
-                    }
-                    // For all others, only pick ones where the execution on load was already set by the user
-                    if (Boolean.TRUE.equals(action.getExecuteOnLoad())) {
-                        return Mono.just(actionDTO);
-                    } else {
-                        return Mono.empty();
-                    }
-                })
-                .collect(toSet())
-                .flatMap(actions -> {
-                    HashSet<DslActionDTO> onLoadSet = new HashSet<>(actions);
-                    // If the resultant set of actions is empty, don't add it to the array list.
-                    if (!onLoadSet.isEmpty()) {
-                        onLoadActions.add(0, onLoadSet);
-                    }
-                    return findAndUpdateOnLoadActionsInPage(onLoadActions, bindingNames, pageId);
-                });
-    }
-
-    private void extractWordsAndAddToSet(Set<String> bindingNames, String mustacheKey) {
-        String key = mustacheKey.trim();
-
-        // Extract all the words in the dynamic bindings
-        Matcher matcher = pattern.matcher(key);
-
-        while (matcher.find()) {
-            String word = matcher.group();
-
-            String[] subStrings = word.split(Pattern.quote("."));
-            if (subStrings.length > 0) {
-                // We are only interested in the top level. e.g. if its Input1.text, we want just Input1
-                bindingNames.add(subStrings[0]);
-            }
-        }
+        this.pageLoadActionsUtil = pageLoadActionsUtil;
     }
 
     @Override
@@ -639,4 +464,87 @@ public class LayoutActionServiceImpl implements LayoutActionService {
                 .collectList()
                 .then(Mono.just(pageId));
     }
+
+    @Override
+    public Mono<Layout> updateLayout(String pageId, String layoutId, Layout layout) {
+        JSONObject dsl = layout.getDsl();
+        if (dsl == null) {
+            // There is no DSL here. No need to process anything. Return as is.
+            return Mono.just(layout);
+        }
+
+        Set<String> widgetNames = new HashSet<>();
+        Set<String> jsSnippetsInDynamicBindings = new HashSet<>();
+        try {
+            extractAllWidgetNamesAndDynamicBindingsFromDSL(dsl, widgetNames, jsSnippetsInDynamicBindings);
+        } catch (Throwable t) {
+            return Mono.error(new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, t.getMessage()));
+        }
+        layout.setWidgetNames(widgetNames);
+
+        // dynamicBindingNames is a set of all words extracted from js snippets which could also contain the names
+        // of the actions 
+        Set<String> dynamicBindingNames = new HashSet<>();
+        if (!CollectionUtils.isEmpty(jsSnippetsInDynamicBindings)) {
+            for (String mustacheKey : jsSnippetsInDynamicBindings) {
+                // Extract all the words in the dynamic bindings
+                extractWordsAndAddToSet(dynamicBindingNames, mustacheKey);
+            }
+        }
+
+        Set<String> actionNames = new HashSet<>();
+        Set<ActionDependencyEdge> edges = new HashSet<>();
+        Set<String> actionsUsedInDSL = new HashSet<>();
+        List<ActionDTO> flatmapPageLoadActions = new ArrayList<>();
+
+        Mono<List<HashSet<DslActionDTO>>> allOnLoadActionsMono = pageLoadActionsUtil
+                .findAllOnLoadActions(dynamicBindingNames, actionNames, pageId, edges, actionsUsedInDSL, flatmapPageLoadActions)
+                .cache();
+
+        // Update these actions to be executed on load, unless the user has touched the executeOnLoad setting for this
+        Mono<Boolean> actionsUpdatedMono = allOnLoadActionsMono
+                .then(newActionService.setOnLoad(flatmapPageLoadActions));
+
+        // First update the actions and set execute on load to true
+        return actionsUpdatedMono
+                .then(allOnLoadActionsMono)
+                .zipWith(newPageService.findByIdAndLayoutsId(pageId, layoutId, MANAGE_PAGES, false)
+                        .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND,
+                                FieldName.PAGE_ID + " or " + FieldName.LAYOUT_ID, pageId + ", " + layoutId))))
+                // Now update the page layout with the page load actions and the graph.
+                .flatMap(tuple -> {
+                    List<HashSet<DslActionDTO>> onLoadActions = tuple.getT1();
+                    PageDTO page = tuple.getT2();
+
+                    List<Layout> layoutList = page.getLayouts();
+                    //Because the findByIdAndLayoutsId call returned non-empty result, we are guaranteed to find the layoutId here.
+                    for (Layout storedLayout : layoutList) {
+                        if (storedLayout.getId().equals(layoutId)) {
+                            // Now that all the on load actions have been computed, set the vertices, edges, actions in DSL
+                            // in the layout for re-use to avoid computing DAG unnecessarily.
+                            layout.setLayoutOnLoadActions(onLoadActions);
+                            layout.setAllOnPageLoadActionNames(actionNames);
+                            layout.setAllOnPageLoadActionEdges(edges);
+                            layout.setActionsUsedInDynamicBindings(actionsUsedInDSL);
+
+                            BeanUtils.copyProperties(layout, storedLayout);
+                            storedLayout.setId(layoutId);
+
+                            break;
+                        }
+                    }
+                    page.setLayouts(layoutList);
+                    return newPageService.saveUnpublishedPage(page);
+                })
+                .flatMap(page -> {
+                    List<Layout> layoutList = page.getLayouts();
+                    for (Layout storedLayout : layoutList) {
+                        if (storedLayout.getId().equals(layoutId)) {
+                            return Mono.just(storedLayout);
+                        }
+                    }
+                    return Mono.empty();
+                });
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java
index 70175c4587..64a6204d1d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionService.java
@@ -31,7 +31,7 @@ public interface NewActionService extends CrudService<NewAction, String> {
 
     Mono<ActionDTO> findByUnpublishedNameAndPageId(String name, String pageId, AclPermission permission);
 
-    Flux<NewAction> findUnpublishedOnLoadActionsInPage(String pageId);
+    Flux<NewAction> findUnpublishedOnLoadActionsExplicitSetByUserInPage(String pageId);
 
     Flux<NewAction> findUnpublishedActionsInPageByNames(Set<String> names, String pageId);
 
@@ -56,4 +56,6 @@ public interface NewActionService extends CrudService<NewAction, String> {
     Flux<NewAction> saveAll(List<NewAction> actions);
 
     Flux<NewAction> findByPageId(String pageId);
+
+    Mono<Boolean> setOnLoad(List<ActionDTO> actions);
 }
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 e8af9f603e..27d541f198 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
@@ -67,6 +67,7 @@ import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
 import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
 import static com.appsmith.server.acl.AclPermission.READ_PAGES;
 import static com.appsmith.server.helpers.BeanCopyUtils.copyNewFieldValuesIntoOldObject;
+import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 
 @Service
@@ -472,7 +473,7 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                     // Now check for erroneous situations which would deter the execution of the action :
 
                     // Error out with in case of an invalid action
-                    if (Boolean.FALSE.equals(action.getIsValid())) {
+                    if (FALSE.equals(action.getIsValid())) {
                         return Mono.error(new AppsmithException(
                                 AppsmithError.INVALID_ACTION,
                                 action.getName(),
@@ -716,7 +717,7 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
     }
 
     @Override
-    public Flux<NewAction> findUnpublishedOnLoadActionsInPage(String pageId) {
+    public Flux<NewAction> findUnpublishedOnLoadActionsExplicitSetByUserInPage(String pageId) {
         return repository
                 .findUnpublishedActionsByPageIdAndExecuteOnLoadSetByUserTrue(pageId, MANAGE_ACTIONS);
     }
@@ -868,6 +869,28 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
         return repository.findByPageId(pageId);
     }
 
+    @Override
+    public Mono<Boolean> setOnLoad(List<ActionDTO> actions) {
+        if (actions == null) {
+            return Mono.just(FALSE);
+        }
+
+        List<ActionDTO> toUpdateActions = new ArrayList<>();
+
+        for (ActionDTO action : actions) {
+            // If a user has ever set execute on load, this field can not be changed automatically. It has to be
+            // explicitly changed by the user again. Add the action to update only if this condition is false.
+            if (FALSE.equals(action.getUserSetOnLoad())) {
+                action.setExecuteOnLoad(TRUE);
+                toUpdateActions.add(action);
+            }
+        }
+
+        return Flux.fromIterable(toUpdateActions)
+                .flatMap(actionDTO -> updateUnpublishedAction(actionDTO.getId(), actionDTO))
+                .then(Mono.just(TRUE));
+    }
+
     @Override
     public Mono<NewAction> delete(String id) {
         Mono<NewAction> actionMono = repository.findById(id)
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PageLoadActionsUtil.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PageLoadActionsUtil.java
new file mode 100644
index 0000000000..433e97dfed
--- /dev/null
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/PageLoadActionsUtil.java
@@ -0,0 +1,309 @@
+package com.appsmith.server.solutions;
+
+import com.appsmith.server.domains.ActionDependencyEdge;
+import com.appsmith.server.dtos.ActionDTO;
+import com.appsmith.server.dtos.DslActionDTO;
+import com.appsmith.server.services.NewActionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jgrapht.graph.DefaultEdge;
+import org.jgrapht.graph.DirectedAcyclicGraph;
+import org.jgrapht.traverse.BreadthFirstIterator;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import reactor.core.publisher.Mono;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static com.appsmith.server.helpers.MustacheHelper.extractWordsAndAddToSet;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class PageLoadActionsUtil {
+
+    private final NewActionService newActionService;
+
+    /**
+     * This function takes all the words used in the DSL dynamic bindings and computes the sequenced on page load actions.
+     *
+     * !!!WARNING!!! : This function edits the parameters actionNames, edges, actionsUsedInDSL and flatPageLoadActions
+     * and the same are used by the caller function for further processing.
+     *
+     * @param bindings : words used in the DSL dynamic bindings
+     * @param actionNames : Set where this function adds all the on page load action names
+     * @param pageId : Argument used for fetching actions in this page
+     * @param edges : Set where this function adds all the relationships (dependencies) between actions
+     * @param actionsUsedInDSL : Set where this function adds all the actions directly used in the DSL
+     * @param flatPageLoadActions : A flat list of on page load actions (Not in the sequence in which these actions
+     *                            would be called on page load)
+     * @return : Returns page load actions which is a list of sets of actions. Inside a set, all actions can be
+     * parallely executed. But one set of actions MUST finish execution before the next set of actions can be executed
+     * in the list.
+     */
+    public Mono<List<HashSet<DslActionDTO>>> findAllOnLoadActions(Set<String> bindings,
+                                                                  Set<String> actionNames,
+                                                                  String pageId,
+                                                                  Set<ActionDependencyEdge> edges,
+                                                                  Set<String> actionsUsedInDSL,
+                                                                  List<ActionDTO> flatPageLoadActions) {
+        Set<String> dynamicBindingNames = new HashSet<>();
+
+        return newActionService.findUnpublishedActionsInPageByNames(bindings, pageId)
+                .flatMap(newAction -> newActionService.generateActionByViewMode(newAction, false))
+                // First find all the actions directly used in the DSL and get the graph started
+                .flatMap(unpublishedAction -> {
+
+                    // If the user has explicity set an action to not run on page load, this action should be ignored
+                    if (Boolean.TRUE.equals(unpublishedAction.getUserSetOnLoad()) && !Boolean.TRUE.equals(unpublishedAction.getExecuteOnLoad())) {
+                        return Mono.empty();
+                    }
+
+                    String name = unpublishedAction.getName();
+                    actionsUsedInDSL.add(name);
+                    extractAndSetActionNameAndBindingsForGraph(actionNames, edges, dynamicBindingNames, unpublishedAction);
+                    return Mono.just(unpublishedAction);
+                })
+                .collectMap(
+                        action -> {
+                            return action.getName();
+                        },
+                        action -> {
+                            return action;
+                        }
+                )
+                // Now add to the map, vertices, and edges the explicitly set user on load actions
+                .flatMap(onLoadActionsMap -> findExplicitUserSetOnLoadActionsAndTheirDependents(pageId, actionNames, edges, dynamicBindingNames, onLoadActionsMap))
+                // Now recursively walk the bindings to find other actions and their bindings till all the actions are identified and added
+                // to the graph which would be on load actions.
+                .flatMap(onLoadActionsMap -> recursivelyFindActionsAndTheirDependents(dynamicBindingNames, pageId, actionNames, edges, onLoadActionsMap))
+                // Now that we have a global set of on load actions, create a DAG and find an offline schedule order in which the on load
+                // actions should be triggered keeping in mind their dependencies on each other.
+                .map(updatedMap -> {
+                    DirectedAcyclicGraph<String, DefaultEdge> directedAcyclicGraph = constructDAG(actionNames, edges);
+                    List<HashSet<String>> onPageLoadActionsSchedulingOrder = computeOnPageLoadActionsSchedulingOrder(directedAcyclicGraph);
+
+                    List<HashSet<DslActionDTO>> onPageLoadActions = new ArrayList<>();
+
+                    for (int i = 0; i < onPageLoadActionsSchedulingOrder.size(); i++) {
+                        HashSet<DslActionDTO> actionsInLevel = new HashSet<>();
+
+                        HashSet<String> names = onPageLoadActionsSchedulingOrder.get(i);
+                        for (String name : names) {
+                            actionsInLevel.add(getDslAction(name, updatedMap));
+                        }
+
+                        onPageLoadActions.add(actionsInLevel);
+                    }
+
+                    // Also collect all the actions in the map in a flat list and update the list
+                    flatPageLoadActions.addAll(updatedMap.values());
+
+                    // Return the sequenced page load actions
+                    return onPageLoadActions;
+
+                });
+    }
+
+        private Mono<Map<String, ActionDTO>> findExplicitUserSetOnLoadActionsAndTheirDependents(String pageId,
+                                                                                            Set<String> actionNames,
+                                                                                            Set<ActionDependencyEdge> edges,
+                                                                                            Set<String> dynamicBindingNames,
+                                                                                            Map<String, ActionDTO> onLoadActionsInMap) {
+
+        //First fetch all the actions which have been tagged as on load by the user explicitly.
+        return newActionService.findUnpublishedOnLoadActionsExplicitSetByUserInPage(pageId)
+                .flatMap(newAction -> newActionService.generateActionByViewMode(newAction, false))
+                // Add the vertices and edges to the graph
+                .map(actionDTO -> {
+                    extractAndSetActionNameAndBindingsForGraph(actionNames, edges, dynamicBindingNames, actionDTO);
+                    return actionDTO;
+                })
+                .collectMap(
+                        action -> {
+                            return action.getName();
+                        },
+                        action -> {
+                            return action;
+                        }
+                )
+                .map(newActionsMap -> {
+                    onLoadActionsInMap.putAll(newActionsMap);
+                    return onLoadActionsInMap;
+                });
+    }
+
+    /**
+     * This function gets a list of binding names that come from other actions. It looks for actions in the page with
+     * the same names as words in the binding names set. If yes, it creates a new set of dynamicBindingNames, adds these newly
+     * found actions' bindings in the set, adds the new actions and their bindings to actionNames and edges and
+     * recursively calls itself with the new set of dynamicBindingNames.
+     * This ensures that the DAG that we create is complete and contains all possible actions and their dependencies
+     * @param dynamicBindingNames
+     * @param pageId
+     * @param actionNames
+     * @param edges
+     * @param onLoadActionsInMap
+     * @return
+     */
+    private Mono<Map<String, ActionDTO>> recursivelyFindActionsAndTheirDependents(Set<String> dynamicBindingNames,
+                                                                                  String pageId,
+                                                                                  Set<String> actionNames,
+                                                                                  Set<ActionDependencyEdge> edges,
+                                                                                  Map<String, ActionDTO> onLoadActionsInMap) {
+        if (dynamicBindingNames == null || dynamicBindingNames.isEmpty()) {
+            return Mono.just(onLoadActionsInMap);
+        }
+        Set<String> bindingNames = new HashSet<>();
+        // First fetch all the actions in the page whose name matches the words found in all the dynamic bindings
+        Mono<Map<String, ActionDTO>> updatedActionsMapMono = newActionService.findUnpublishedActionsInPageByNames(dynamicBindingNames, pageId)
+                .flatMap(newAction -> newActionService.generateActionByViewMode(newAction, false))
+                .flatMap(action -> {
+
+                    // If the user has explicity set an action to not run on page load, this action should be ignored
+                    if (Boolean.TRUE.equals(action.getUserSetOnLoad()) && !Boolean.TRUE.equals(action.getExecuteOnLoad())) {
+                        return Mono.empty();
+                    }
+
+                    extractAndSetActionNameAndBindingsForGraph(actionNames, edges, bindingNames, action);
+                    return Mono.just(action);
+                })
+                .collectMap(
+                        action -> {
+                            return action.getName();
+                        },
+                        action -> {
+                            return action;
+                        }
+                )
+                .map(newActionsMap -> {
+                    onLoadActionsInMap.putAll(newActionsMap);
+                    return onLoadActionsInMap;
+                });
+
+        return updatedActionsMapMono
+                .then(Mono.just(bindingNames))
+                .flatMap(bindings -> {
+                    // Now that the next set of bindings have been found, find recursively all actions by these names
+                    // and their bindings
+                    return recursivelyFindActionsAndTheirDependents(bindings, pageId, actionNames, edges, onLoadActionsInMap);
+                });
+    }
+
+    private DslActionDTO getDslAction(String name, Map<String, ActionDTO> onLoadActionsMap) {
+        ActionDTO actionDTO = onLoadActionsMap.get(name);
+        DslActionDTO dslActionDTO = new DslActionDTO();
+        dslActionDTO.setId(actionDTO.getId());
+        dslActionDTO.setPluginType(actionDTO.getPluginType());
+        dslActionDTO.setJsonPathKeys(actionDTO.getJsonPathKeys());
+        dslActionDTO.setName(actionDTO.getName());
+        if (actionDTO.getActionConfiguration() != null) {
+            dslActionDTO.setTimeoutInMillisecond(actionDTO.getActionConfiguration().getTimeoutInMillisecond());
+        }
+        return dslActionDTO;
+    }
+
+    private void extractAndSetActionNameAndBindingsForGraph(Set<String> actionNames,
+                                                            Set<ActionDependencyEdge> edges,
+                                                            Set<String> dynamicBindings,
+                                                            ActionDTO action) {
+
+        // Check if the action has been deleted in unpublished state. If yes, ignore it.
+        if (action.getDeletedAt() != null) {
+            return;
+        }
+
+        String name = action.getName();
+
+        // Check if the action has already been found (and exists in the global action names set of actionNames
+        // If yes, then we might have circular dependency scenario. Don't add the actions' bindings in the edges
+        if (actionNames.contains(name)) {
+            return;
+        }
+
+        actionNames.add(name);
+
+        Set<String> dynamicBindingNamesInAction = new HashSet<>();
+        Set<String> jsonPathKeys = action.getJsonPathKeys();
+        if (!CollectionUtils.isEmpty(jsonPathKeys)) {
+            for (String mustacheKey : jsonPathKeys) {
+                extractWordsAndAddToSet(dynamicBindingNamesInAction, mustacheKey);
+            }
+
+            // If the action refers to itself in the json path keys, remove the same to circumvent
+            // supposed circular dependency. This is possible in case of pagination with response url
+            // where the action refers to its own data to find the next and previous URLs.
+            dynamicBindingNamesInAction.remove(action.getName());
+
+            // The relationship is represented as follows :
+            // If A depends on B aka B exists in the dynamic bindings of A,
+            // the corresponding edge would be B->A since B updates A and hence,
+            // B should be executed before A.
+            for (String source : dynamicBindingNamesInAction) {
+                ActionDependencyEdge edge = new ActionDependencyEdge();
+                edge.setSource(source);
+                edge.setTarget(name);
+                edges.add(edge);
+            }
+
+            // Update the global actions' dynamic bindings
+            dynamicBindings.addAll(dynamicBindingNamesInAction);
+
+        }
+    }
+
+    private DirectedAcyclicGraph<String, DefaultEdge> constructDAG(Set<String> actionNames, Set<ActionDependencyEdge> edges) {
+        DirectedAcyclicGraph<String, DefaultEdge> actionSchedulingGraph =
+                new DirectedAcyclicGraph<>(DefaultEdge.class);
+
+        for (String name : actionNames) {
+            actionSchedulingGraph.addVertex(name);
+        }
+
+        for (ActionDependencyEdge edge : edges) {
+            // If the source of the edge is an action, only then add an edge
+            // At this point we are guaranteed to find the action in the set because we have recursively found all
+            // possible actions that should be on load
+            if (actionNames.contains(edge.getSource())) {
+                try {
+                    actionSchedulingGraph.addEdge(edge.getSource(), edge.getTarget());
+                } catch (IllegalArgumentException e) {
+                    log.debug("Ignoring the edge ({},{}) because {}", edge.getSource(), edge.getTarget(), e.getMessage());
+                }
+            }
+        }
+
+        return actionSchedulingGraph;
+    }
+
+    private List<HashSet<String>> computeOnPageLoadActionsSchedulingOrder(DirectedAcyclicGraph<String, DefaultEdge> dag) {
+        List<HashSet<String>> onPageLoadActions = new ArrayList<>();
+
+        // Find all root nodes to start the BFS traversal from
+        List<String> rootNodes = dag.vertexSet().stream()
+                .filter(key -> dag.incomingEdgesOf(key).size() == 0)
+                .collect(Collectors.toList());
+
+        BreadthFirstIterator<String, DefaultEdge> bfsIterator = new BreadthFirstIterator<>(dag, rootNodes);
+
+        // Implementation of offline scheduler by using level by level traversal. Level i+1 actions would be dependent
+        // on Level i actions. All actions in a level can run independently and hence would get added to the same set.
+        while (bfsIterator.hasNext()) {
+            String vertex = bfsIterator.next();
+            int level = bfsIterator.getDepth(vertex);
+            if (onPageLoadActions.size() <= level) {
+                onPageLoadActions.add(new HashSet<>());
+            }
+
+            onPageLoadActions.get(level).add(vertex);
+        }
+
+        return onPageLoadActions;
+    }
+
+}
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
index 4e3611e755..a77188aa3e 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutActionServiceTest.java
@@ -37,7 +37,9 @@ import reactor.test.StepVerifier;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
 import static com.appsmith.server.acl.AclPermission.READ_PAGES;
@@ -179,10 +181,10 @@ public class LayoutActionServiceTest {
                 .create(resultMono)
                 .assertNext(page -> {
                     assertThat(page.getLayouts()).hasSize(1);
-                    assertThat(page.getLayouts().get(0).getLayoutOnLoadActions()).hasSize(2);
-                    assertThat(page.getLayouts().get(0).getLayoutOnLoadActions().get(0)).hasSize(1);
-                    assertThat(page.getLayouts().get(0).getLayoutOnLoadActions().get(0).stream().anyMatch(x -> x.getName().equalsIgnoreCase("query2"))).isTrue();
-                    assertThat(page.getLayouts().get(0).getLayoutOnLoadActions().get(1).stream().anyMatch(x -> x.getName().equalsIgnoreCase("query1"))).isTrue();
+                    assertThat(page.getLayouts().get(0).getLayoutOnLoadActions()).hasSize(1);
+                    Set<DslActionDTO> dslActionDTOS = page.getLayouts().get(0).getLayoutOnLoadActions().get(0);
+                    assertThat(dslActionDTOS).hasSize(2);
+                    assertThat(dslActionDTOS.stream().map(dto -> dto.getName()).collect(Collectors.toSet())).containsAll(Set.of("query1", "query2"));
                 })
                 .verifyComplete();
     }
@@ -240,6 +242,6 @@ public class LayoutActionServiceTest {
                     assertThat(postNameChangeLayout.getDsl()).isEqualTo(dsl);
                 })
                 .verifyComplete();
-
     }
+
 }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
index 3027da9c9a..60acf7a58d 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
@@ -37,6 +37,7 @@ import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -254,6 +255,14 @@ public class LayoutServiceTest {
                 .verifyComplete();
     }
 
+    /**
+     * This test adds some actions in the page and attaches a few of those in the dynamic bindings in the widgets
+     * in the layout. An action attached in the widget also has two dependencies on other actions. One of those
+     * has been explicitly marked to NOT run on page load. This test asserts the following :
+     * 1. All the actions which must be executed on page load have been recognized correctly
+     * 2. The sequence of the action execution takes into account the action dependencies
+     * 3. An action which has been marked to not execute on page load does not get added to the on page load order
+     */
     @Test
     @WithUserDetails(value = "api_user")
     public void getActionsExecuteOnLoad() {
@@ -408,11 +417,21 @@ public class LayoutServiceTest {
                     assertThat(layout.getId()).isNotNull();
                     assertThat(layout.getDsl().get("key")).isEqualTo("value-updated");
                     assertThat(layout.getLayoutOnLoadActions()).hasSize(2);
+                    assertThat(layout.getLayoutOnLoadActions().get(0)).hasSize(5);
                     assertThat(layout.getLayoutOnLoadActions().get(0).stream().map(DslActionDTO::getName).collect(Collectors.toSet()))
-                            .hasSameElementsAs(Set.of("aPostTertiaryAction"));
-                    assertThat(layout.getLayoutOnLoadActions().get(1)).hasSize(5);
+                            .hasSameElementsAs(Set.of("aPostTertiaryAction", "aGetAction", "aDBAction", "aTableAction", "anotherDBAction"));
+                    assertThat(layout.getLayoutOnLoadActions().get(1)).hasSize(1);
                     assertThat(layout.getLayoutOnLoadActions().get(1).stream().map(DslActionDTO::getName).collect(Collectors.toSet()))
-                            .hasSameElementsAs(Set.of("aGetAction", "aPostActionWithAutoExec", "aDBAction", "anotherDBAction", "aTableAction"));
+                            .hasSameElementsAs(Set.of("aPostActionWithAutoExec"));
+                    Set<DslActionDTO> flatOnLoadActions = new HashSet<>();
+                    for (Set<DslActionDTO> actions : layout.getLayoutOnLoadActions()) {
+                        flatOnLoadActions.addAll(actions);
+                    }
+                    for (DslActionDTO action : flatOnLoadActions) {
+                        assertThat(action.getId()).isNotBlank();
+                        assertThat(action.getName()).isNotBlank();
+                        assertThat(action.getTimeoutInMillisecond()).isNotZero();
+                    }
                 })
                 .verifyComplete();
     }

From 9e0f36a6f28e2a6d4282ad67d317aeb3c985d062 Mon Sep 17 00:00:00 2001
From: Trisha Anand <trisha@appsmith.com>
Date: Mon, 25 Jan 2021 18:50:32 +0530
Subject: [PATCH 18/47] Improve Server thrown Error Messages' language (#2705)

* Improve Error Messages

* Added naming convention expansion for action name in the error

* Fixed failing test case assertion.

* Minor formatting.
---
 .../pluginExceptions/AppsmithPluginError.java |   6 +-
 .../configurations/ClientUserRepository.java  |   2 +-
 .../appsmith/server/constants/FieldName.java  |   1 +
 .../server/exceptions/AppsmithError.java      |  36 +-
 .../exceptions/GlobalExceptionHandler.java    |   2 +-
 .../server/services/ActionService.java        |  37 -
 .../server/services/ActionServiceImpl.java    | 721 ------------------
 .../services/ApplicationPageServiceImpl.java  |  20 +-
 .../services/ApplicationServiceImpl.java      |   4 +-
 .../services/LayoutActionServiceImpl.java     |   4 +-
 .../server/services/NewActionServiceImpl.java |   7 +-
 .../server/services/NewPageServiceImpl.java   |   2 +-
 .../services/OrganizationServiceImpl.java     |   2 +-
 .../appsmith/server/services/PageService.java |  33 -
 .../server/services/PageServiceImpl.java      | 208 -----
 .../services/UserOrganizationServiceImpl.java |  12 +-
 .../server/services/UserServiceImpl.java      |  22 +-
 .../solutions/ExamplesOrganizationCloner.java |   2 +-
 .../services/ApplicationServiceTest.java      |   2 +-
 .../server/services/LayoutServiceTest.java    |   3 -
 20 files changed, 65 insertions(+), 1061 deletions(-)
 delete mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionService.java
 delete mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
 delete mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageService.java
 delete mode 100644 app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java

diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java
index 49d0f0fc3a..b3a7b2b360 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions/AppsmithPluginError.java
@@ -7,9 +7,9 @@ import java.text.MessageFormat;
 @Getter
 public enum AppsmithPluginError {
 
-    PLUGIN_ERROR(500, 5000, "PluginExecution failed with error {0}"),
-    PLUGIN_STRUCTURE_ERROR(500, 5001, "Plugin failed to get structure with error {0}"),
-    PLUGIN_TIMEOUT_ERROR(504, 5002, "Plugin execution for query \"{0}\" timed out in {1}ms. Please increase timeout duration in your action settings or check your backend action endpoint."),
+    PLUGIN_ERROR(500, 5000, "{0}"),
+    PLUGIN_STRUCTURE_ERROR(500, 5001, "Failed to get database structure with error {0}"),
+    PLUGIN_TIMEOUT_ERROR(504, 5002, "{0} timed out in {1} milliseconds. Please increase timeout. This can be found in Settings tab of {0}."),
     ;
 
     private final Integer httpErrorCode;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
index 0a4fd930b6..83b1281655 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java
@@ -84,7 +84,7 @@ public class ClientUserRepository implements ServerOAuth2AuthorizedClientReposit
                 DefaultOidcUser userPrincipal = (DefaultOidcUser) principal.getPrincipal();
                 domain = (String) userPrincipal.getAttributes().getOrDefault("hd", "");
                 if (!commonConfig.getAllowedDomains().contains(domain)) {
-                    return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_DOMAIN));
+                    return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_DOMAIN, domain));
                 }
             }
         }
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 a95abf7555..b383f38c42 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
@@ -59,4 +59,5 @@ public class FieldName {
     public static String ASSET = "asset";
     public static String APPLICATION = "application";
     public static String PUBLISHED_APPLICATION = "deployed application";
+    public static final String TOKEN = "token";
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
index c573a72f4b..05dc0648a6 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
@@ -23,33 +23,31 @@ public enum AppsmithError {
     USER_DOESNT_BELONG_TO_ORGANIZATION(400, 4010, "User {0} does not belong to an organization with id {1}",
             AppsmithErrorAction.LOG_EXTERNALLY),
     NO_CONFIGURATION_FOUND_IN_DATASOURCE(400, 4011, "No datasource configuration found. Please configure it and try again.", AppsmithErrorAction.DEFAULT),
-    INVALID_ACTION(400, 4012, "Action {0} with id {1} is invalid: {2}", AppsmithErrorAction.DEFAULT),
-    INVALID_DATASOURCE(400, 4013, "Datasource is invalid. Please edit to make it valid. Details: {0}", AppsmithErrorAction.DEFAULT),
-    INVALID_ACTION_NAME(400, 4014, "Action name is invalid. Please input syntactically correct name", AppsmithErrorAction.DEFAULT),
-    INVALID_DATASOURCE_CONFIGURATION(400, 4015, "Datasource configuration is invalid", AppsmithErrorAction.DEFAULT),
-    NO_CONFIGURATION_FOUND_IN_ACTION(400, 4016, "No action configuration found. Please configure it and try again.", AppsmithErrorAction.DEFAULT),
+    INVALID_ACTION(400, 4012, "{0} is not correctly configured. Please fix the following and then re-run: \n{1}", AppsmithErrorAction.DEFAULT),
+    INVALID_DATASOURCE(400, 4013, "{0} is not correctly configured. Please fix the following and then re-run: \n{1}", AppsmithErrorAction.DEFAULT),
+    INVALID_ACTION_NAME(400, 4014, "Appsmith expects the action naming to follow variable naming conventions. "
+            + "It must be a single word contain any alphabets, numbers, or \"_\".  Hyphen (\"-\") symbol is not allowed. "
+            + "Please change the name.", AppsmithErrorAction.DEFAULT),
+    NO_CONFIGURATION_FOUND_IN_ACTION(400, 4016, "No configurations found in this action", AppsmithErrorAction.DEFAULT),
     NAME_CLASH_NOT_ALLOWED_IN_REFACTOR(400, 4017, "The new name {1} already exists in the current page. Choose another name.", AppsmithErrorAction.DEFAULT),
-    PAGE_DOESNT_BELONG_TO_APPLICATION(400, 4018, "Page {0} does not belong to the application {1}",
+    PAGE_DOESNT_BELONG_TO_APPLICATION(400, 4018, "Unexpected state. Page {0} does not seem belong to the application {1}. Please reach out to Appsmith customer support to resolve this.",
             AppsmithErrorAction.LOG_EXTERNALLY),
-    NO_DSL_FOUND_IN_PAGE(400, 4020, "The page {0} doesn't have a DSL. This is an unexpected state", AppsmithErrorAction.DEFAULT),
-    INVALID_DYNAMIC_BINDING_REFERENCE(400, 4022, "The dynamically bounded key {0} you are referring to was not found.", AppsmithErrorAction.LOG_EXTERNALLY),
-    USER_ALREADY_EXISTS_IN_ORGANIZATION(400, 4021, "The user {0} has already been added to the organization with role {1}", AppsmithErrorAction.DEFAULT),
-    UNAUTHORIZED_DOMAIN(401, 4019, "Invalid email domain provided. Please sign in with a valid work email ID", AppsmithErrorAction.DEFAULT),
-    USER_NOT_SIGNED_IN(401, 4020, "User is not logged in. Please sign in with the registered email ID or sign up",
+    INVALID_DYNAMIC_BINDING_REFERENCE(400, 4022, "Unexpected state. The dynamically bounded key {0} referred was not found. Please reach out to Appsmith customer support to resolve this.", AppsmithErrorAction.LOG_EXTERNALLY),
+    USER_ALREADY_EXISTS_IN_ORGANIZATION(400, 4021, "The user {0} has already been added to the organization with role {1}. To change the role, please navigate to `Manage Users` page.", AppsmithErrorAction.DEFAULT),
+    UNAUTHORIZED_DOMAIN(401, 4019, "Invalid email domain {0} used for sign in/sign up. Please contact the administrator to configure this domain if this is unexpected.", AppsmithErrorAction.DEFAULT),
+    USER_NOT_SIGNED_IN(401, 4020, "You are not logged in. Please sign in with the registered email ID or sign up",
             AppsmithErrorAction.DEFAULT),
-    INVALID_PASSWORD_RESET(400, 4020, "Unable to reset the password. Please initiate a request via 'forgot password' " +
+    INVALID_PASSWORD_RESET(400, 4020, "Cannot find an outstanding reset password request for this email. Please initiate a request via 'forgot password' " +
             "button to reset your password", AppsmithErrorAction.DEFAULT),
-    LOGIN_INTERNAL_ERROR(401, 4021, "Internal error while trying to login", AppsmithErrorAction.LOG_EXTERNALLY),
     JSON_PROCESSING_ERROR(400, 4022, "Json processing error with error {0}", AppsmithErrorAction.LOG_EXTERNALLY),
     INVALID_CREDENTIALS(200, 4023, "Invalid credentials provided. Did you input the credentials correctly?", AppsmithErrorAction.DEFAULT),
-    DUPLICATE_KEY(409, 4024, "Duplicate key error", AppsmithErrorAction.DEFAULT),
-    USER_ALREADY_EXISTS_SIGNUP(409, 4025, "There is already an account registered with this email {0}. Please sign in.", AppsmithErrorAction.DEFAULT),
     UNAUTHORIZED_ACCESS(403, 4025, "Unauthorized access", AppsmithErrorAction.DEFAULT),
-    ACTION_IS_NOT_AUTHORIZED(403, 4026, "Sorry. You do not have permissions to perform this action", AppsmithErrorAction.DEFAULT),
-    INVALID_DATASOURCE_NAME(400, 4026, "Invalid datasource name. Check again.", AppsmithErrorAction.DEFAULT),
-    NO_RESOURCE_FOUND(404, 4027, "Unable to find {0} with id {1}", AppsmithErrorAction.DEFAULT),
+    DUPLICATE_KEY(409, 4024, "Unexpected state : Duplicate key error. Please reach out to Appsmith customer support to report this", AppsmithErrorAction.DEFAULT),
+    USER_ALREADY_EXISTS_SIGNUP(409, 4025, "There is already an account registered with this email {0}. Please sign in instead.", AppsmithErrorAction.DEFAULT),
+    ACTION_IS_NOT_AUTHORIZED(403, 4026, "Uh oh! You do not have permissions to do : {0}", AppsmithErrorAction.DEFAULT),
+    NO_RESOURCE_FOUND(404, 4027, "Unable to find {0} {1}", AppsmithErrorAction.DEFAULT),
     USER_NOT_FOUND(404, 4027, "Unable to find user with email {0}", AppsmithErrorAction.DEFAULT),
-    ACL_NO_RESOURCE_FOUND(404, 4028, "Unable to find {0} with id {1}. Either the asset doesn't exist or you don't have required permissions", AppsmithErrorAction.DEFAULT),
+    ACL_NO_RESOURCE_FOUND(404, 4028, "Unable to find {0} {1}. Either the asset doesn't exist or you don't have required permissions", AppsmithErrorAction.DEFAULT),
     GENERIC_BAD_REQUEST(400, 4028, "Bad Request: {0}", AppsmithErrorAction.DEFAULT),
     VALIDATION_FAILURE(400, 4028, "Validation Failure(s): {0}", AppsmithErrorAction.DEFAULT),
     INVALID_CURL_COMMAND(400, 4029, "Invalid cURL command, couldn't import.", AppsmithErrorAction.DEFAULT),
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
index e2a7ddc1ec..8a42268f13 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
@@ -135,7 +135,7 @@ public class GlobalExceptionHandler {
         exchange.getResponse().setStatusCode(HttpStatus.resolve(appsmithError.getHttpErrorCode()));
         doLog(e);
         return Mono.just(new ResponseDTO<>(appsmithError.getHttpErrorCode(), new ErrorDTO(appsmithError.getAppErrorCode(),
-                e.getLocalizedMessage())));
+                e.getMessage())));
     }
 
     @ExceptionHandler
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionService.java
deleted file mode 100644
index 885849633d..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.external.models.ActionExecutionResult;
-import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.domains.Action;
-import com.appsmith.server.dtos.ActionViewDTO;
-import com.appsmith.server.dtos.ExecuteActionDTO;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Map;
-import java.util.Set;
-
-public interface ActionService extends CrudService<Action, String> {
-
-    Mono<ActionExecutionResult> executeAction(ExecuteActionDTO executeActionDTO);
-
-    Mono<Action> save(Action action);
-
-    Mono<Action> findByNameAndPageId(String name, String pageId, AclPermission permission);
-
-    Flux<Action> findOnLoadActionsInPage(Set<String> names, String pageId);
-
-    Mono<Action> validateAndSaveActionToRepository(Action action);
-
-    Action extractAndSetJsonPathKeys(Action action);
-
-    <T> T variableSubstitution(T configuration, Map<String, String> replaceParamsMap);
-
-    Mono<Action> findById(String id);
-
-    Flux<Action> findByPageId(String pageId, AclPermission permission);
-
-    Flux<ActionViewDTO> getActionsForViewMode(String applicationId);
-
-    Mono<Action> findById(String id, AclPermission aclPermission);
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
deleted file mode 100644
index 17d3478f54..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
+++ /dev/null
@@ -1,721 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.external.models.ActionConfiguration;
-import com.appsmith.external.models.ActionExecutionResult;
-import com.appsmith.external.models.DatasourceConfiguration;
-import com.appsmith.external.models.PaginationField;
-import com.appsmith.external.models.PaginationType;
-import com.appsmith.external.models.Param;
-import com.appsmith.external.models.Policy;
-import com.appsmith.external.models.Property;
-import com.appsmith.external.models.Provider;
-import com.appsmith.external.pluginExceptions.AppsmithPluginError;
-import com.appsmith.external.pluginExceptions.AppsmithPluginException;
-import com.appsmith.external.pluginExceptions.StaleConnectionException;
-import com.appsmith.external.plugins.PluginExecutor;
-import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.acl.PolicyGenerator;
-import com.appsmith.server.constants.FieldName;
-import com.appsmith.server.domains.Action;
-import com.appsmith.server.domains.ActionProvider;
-import com.appsmith.server.domains.Datasource;
-import com.appsmith.server.domains.NewPage;
-import com.appsmith.server.domains.Page;
-import com.appsmith.server.domains.Plugin;
-import com.appsmith.server.domains.PluginType;
-import com.appsmith.server.domains.User;
-import com.appsmith.server.dtos.ActionViewDTO;
-import com.appsmith.server.dtos.ExecuteActionDTO;
-import com.appsmith.server.exceptions.AppsmithError;
-import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.helpers.MustacheHelper;
-import com.appsmith.server.helpers.PluginExecutorHelper;
-import com.appsmith.server.repositories.ActionRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Scheduler;
-
-import javax.lang.model.SourceVersion;
-import javax.validation.Validator;
-import javax.validation.constraints.NotNull;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.appsmith.server.acl.AclPermission.EXECUTE_ACTIONS;
-import static com.appsmith.server.acl.AclPermission.EXECUTE_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
-import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
-import static com.appsmith.server.acl.AclPermission.READ_PAGES;
-
-@Slf4j
-@Service
-public class ActionServiceImpl extends BaseService<ActionRepository, Action, String> implements ActionService {
-
-    private final ActionRepository repository;
-    private final DatasourceService datasourceService;
-    private final PluginService pluginService;
-    private final DatasourceContextService datasourceContextService;
-    private final PluginExecutorHelper pluginExecutorHelper;
-    private final SessionUserService sessionUserService;
-    private final MarketplaceService marketplaceService;
-    private final PolicyGenerator policyGenerator;
-    private final NewPageService newPageService;
-
-    @Autowired
-    public ActionServiceImpl(Scheduler scheduler,
-                             Validator validator,
-                             MongoConverter mongoConverter,
-                             ReactiveMongoTemplate reactiveMongoTemplate,
-                             ActionRepository repository,
-                             DatasourceService datasourceService,
-                             PluginService pluginService,
-                             AnalyticsService analyticsService,
-                             DatasourceContextService datasourceContextService,
-                             PluginExecutorHelper pluginExecutorHelper,
-                             SessionUserService sessionUserService,
-                             MarketplaceService marketplaceService,
-                             PolicyGenerator policyGenerator,
-                             NewPageService newPageService) {
-        super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
-        this.repository = repository;
-        this.datasourceService = datasourceService;
-        this.pluginService = pluginService;
-        this.datasourceContextService = datasourceContextService;
-        this.pluginExecutorHelper = pluginExecutorHelper;
-        this.sessionUserService = sessionUserService;
-        this.marketplaceService = marketplaceService;
-        this.policyGenerator = policyGenerator;
-        this.newPageService = newPageService;
-    }
-
-    private Boolean validateActionName(String name) {
-        boolean isValidName = SourceVersion.isName(name);
-        String pattern = "^((?=[A-Za-z0-9_])(?![\\\\-]).)*$";
-        boolean doesPatternMatch = name.matches(pattern);
-        return (isValidName && doesPatternMatch);
-    }
-
-    @Override
-    public Mono<Action> create(@NotNull Action action) {
-        if (action.getId() != null) {
-            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "id"));
-        }
-
-        if (action.getPageId() == null || action.getPageId().isBlank()) {
-            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
-        }
-
-        Mono<User> userMono = sessionUserService
-                .getCurrentUser()
-                .cache();
-
-        return newPageService
-                .findById(action.getPageId(), READ_PAGES)
-                .switchIfEmpty(Mono.error(
-                        new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "page", action.getPageId())))
-                .zipWith(userMono)
-                .flatMap(tuple -> {
-                    NewPage page = tuple.getT1();
-                    User user = tuple.getT2();
-
-                    // Inherit the action policies from the page.
-                    generateAndSetActionPolicies(page, action);
-
-                    // If the datasource is embedded, check for organizationId and set it in action
-                    if (action.getDatasource() != null &&
-                            action.getDatasource().getId() == null) {
-                        Datasource datasource = action.getDatasource();
-                        if (datasource.getOrganizationId() == null) {
-                            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ORGANIZATION_ID));
-                        }
-                        action.setOrganizationId(datasource.getOrganizationId());
-                    }
-
-                    return Mono.just(action);
-                })
-                .flatMap(this::validateAndSaveActionToRepository);
-    }
-
-    @Override
-    public Mono<Action> validateAndSaveActionToRepository(Action action) {
-        //Default the validity to true and invalids to be an empty set.
-        Set<String> invalids = new HashSet<>();
-        action.setIsValid(true);
-
-        if (action.getName() == null || action.getName().trim().isEmpty()) {
-            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.NAME));
-        }
-
-        if (action.getPageId() == null || action.getPageId().isBlank()) {
-            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.PAGE_ID));
-        }
-
-        if (!validateActionName(action.getName())) {
-            action.setIsValid(false);
-            invalids.add(AppsmithError.INVALID_ACTION_NAME.getMessage());
-        }
-
-        if (action.getActionConfiguration() == null) {
-            action.setIsValid(false);
-            invalids.add(AppsmithError.NO_CONFIGURATION_FOUND_IN_ACTION.getMessage());
-        }
-
-        if (action.getDatasource() == null || action.getDatasource().getIsAutoGenerated()) {
-            if (action.getPluginType() != PluginType.JS) {
-                // This action isn't of type JS functions which requires that the pluginType be set by the client. Hence,
-                // datasource is very much required for such an action.
-                action.setIsValid(false);
-                invalids.add(AppsmithError.DATASOURCE_NOT_GIVEN.getMessage());
-            }
-            action.setInvalids(invalids);
-            return super.create(action);
-        }
-
-        Mono<Datasource> datasourceMono;
-        if (action.getDatasource().getId() == null) {
-            datasourceMono = Mono.just(action.getDatasource())
-                    .flatMap(datasourceService::validateDatasource);
-        } else {
-            //Data source already exists. Find the same.
-            datasourceMono = datasourceService.findById(action.getDatasource().getId(), MANAGE_DATASOURCES)
-                    .switchIfEmpty(Mono.defer(() -> {
-                        action.setIsValid(false);
-                        invalids.add(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.DATASOURCE, action.getDatasource().getId()));
-                        return Mono.just(action.getDatasource());
-                    }))
-                    .map(datasource -> {
-                        // datasource is found. Update the action.
-                        action.setOrganizationId(datasource.getOrganizationId());
-                        return datasource;
-                    });
-        }
-
-        Mono<Plugin> pluginMono = datasourceMono.flatMap(datasource -> {
-            if (datasource.getPluginId() == null) {
-                return Mono.error(new AppsmithException(AppsmithError.PLUGIN_ID_NOT_GIVEN));
-            }
-            return pluginService.findById(datasource.getPluginId())
-                    .switchIfEmpty(Mono.defer(() -> {
-                        action.setIsValid(false);
-                        invalids.add(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.PLUGIN, datasource.getPluginId()));
-                        return Mono.just(new Plugin());
-                    }));
-        });
-
-        return pluginMono
-                .zipWith(datasourceMono)
-                //Set plugin in the action before saving.
-                .map(tuple -> {
-                    Plugin plugin = tuple.getT1();
-                    Datasource datasource = tuple.getT2();
-                    action.setDatasource(datasource);
-                    action.setInvalids(invalids);
-                    action.setPluginType(plugin.getType());
-                    return action;
-                }).map(act -> extractAndSetJsonPathKeys(act))
-                .flatMap(super::create)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.REPOSITORY_SAVE_FAILED)))
-                .flatMap(this::setTransientFieldsInAction);
-    }
-
-    /**
-     * This function extracts all the mustache template keys (as per the regex) and returns them to the calling fxn
-     * This set of keys is stored separately in the field `jsonPathKeys` in the action object. The client
-     * uses the set `jsonPathKeys` to simplify it's value substitution.
-     *
-     * @param action
-     * @return
-     */
-    private Set<String> extractKeysFromAction(Action action) {
-        if (action.getActionConfiguration() == null) {
-            return new HashSet<>();
-        }
-
-        return MustacheHelper.extractMustacheKeysFromFields(action.getActionConfiguration());
-    }
-
-    /**
-     * This function extracts the mustache keys and sets them in the field jsonPathKeys in the action object
-     *
-     * @param action
-     * @return
-     */
-    public Action extractAndSetJsonPathKeys(Action action) {
-        Set<String> actionKeys = extractKeysFromAction(action);
-        Set<String> datasourceKeys = datasourceService.extractKeysFromDatasource(action.getDatasource());
-        Set<String> keys = new HashSet<String>() {{
-            addAll(actionKeys);
-            addAll(datasourceKeys);
-        }};
-        action.setJsonPathKeys(keys);
-        return action;
-    }
-
-    @Override
-    public Mono<ActionExecutionResult> executeAction(ExecuteActionDTO executeActionDTO) {
-        Action actionFromDto = executeActionDTO.getAction();
-
-        // 1. Validate input parameters which are required for mustache replacements
-        List<Param> params = executeActionDTO.getParams();
-        if (!CollectionUtils.isEmpty(params)) {
-            for (Param param : params) {
-                // In case the parameter values turn out to be null, set it to empty string instead to allow the
-                // the execution to go through no matter what.
-                if (!StringUtils.isEmpty(param.getKey()) && param.getValue() == null) {
-                    param.setValue("");
-                }
-            }
-        }
-
-        // 2. Fetch the query from the DB/from dto to get the type
-        Mono<Action> actionMono;
-        if (actionFromDto.getId() != null) {
-            actionMono = repository.findById(actionFromDto.getId(), EXECUTE_ACTIONS)
-                    .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "action", actionFromDto.getId())))
-                    .flatMap(action -> {
-                        // This is separately done instead of fetching from the repository using id and isValid. This is
-                        // because we want to error out with two different statuses -> Wrong action id OR Invalid action
-                        if (Boolean.FALSE.equals(action.getIsValid())) {
-                            return Mono.error(new AppsmithException(
-                                    AppsmithError.INVALID_ACTION,
-                                    action.getName(),
-                                    action.getId(),
-                                    ArrayUtils.toString(action.getInvalids().toArray())
-                            ));
-                        }
-                        return Mono.just(action);
-                    })
-                    .cache();
-        } else {
-            actionMono = Mono.just(actionFromDto).cache();
-        }
-
-        // 3. Instantiate the implementation class based on the query type
-
-        Mono<Datasource> datasourceMono = actionMono
-                .flatMap(action -> {
-                    if (action.getPluginType() == PluginType.JS) {
-                        return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION));
-                    }
-                    if (action.getDatasource() != null && action.getDatasource().getId() != null) {
-                        return datasourceService.findById(action.getDatasource().getId(), EXECUTE_DATASOURCES)
-                                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.DATASOURCE)));
-                    }
-                    //The data source in the action has not been persisted.
-                    if (action.getDatasource() != null) {
-                        return Mono.just(action.getDatasource());
-                    } else {
-                        return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "Valid action"));
-                    }
-                })
-                .cache();
-
-        Mono<Plugin> pluginMono = datasourceMono
-                .flatMap(datasource -> {
-                    // For embedded datasources/dry runs, validate the datasource for each execution
-                    if (datasource.getId() == null) {
-                        return datasourceService.validateDatasource(datasource);
-                    }
-
-                    return Mono.just(datasource);
-                })
-                .flatMap(datasource -> {
-                    Set<String> invalids = datasource.getInvalids();
-                    if (!CollectionUtils.isEmpty(invalids)) {
-                        log.error("Unable to execute actionId: {} because it's datasource is not valid. Cause: {}",
-                                actionFromDto.getId(), ArrayUtils.toString(invalids));
-                        return Mono.error(new AppsmithException(AppsmithError.INVALID_DATASOURCE, ArrayUtils.toString(invalids)));
-                    }
-                    return pluginService.findById(datasource.getPluginId());
-                })
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "plugin")));
-
-        Mono<PluginExecutor> pluginExecutorMono = pluginExecutorHelper.getPluginExecutor(pluginMono);
-
-        // 4. Execute the query
-        Mono<ActionExecutionResult> actionExecutionResultMono = Mono
-                .zip(
-                        actionMono,
-                        datasourceMono,
-                        pluginExecutorMono
-                )
-                .flatMap(tuple -> {
-                    final Action action = tuple.getT1();
-                    final Datasource datasource = tuple.getT2();
-                    final PluginExecutor pluginExecutor = tuple.getT3();
-
-                    DatasourceConfiguration datasourceConfigurationTemp;
-                    ActionConfiguration actionConfigurationTemp;
-                    //Do variable substitution before invoking the plugin
-                    //Do this only if params have been provided in the execute command
-                    if (executeActionDTO.getParams() != null && !executeActionDTO.getParams().isEmpty()) {
-                        Map<String, String> replaceParamsMap = executeActionDTO
-                                .getParams()
-                                .stream()
-                                .collect(Collectors.toMap(
-                                        // Trimming here for good measure. If the keys have space on either side,
-                                        // Mustache won't be able to find the key.
-                                        // We also add a backslash before every double-quote or backslash character
-                                        // because we apply the template replacing in a JSON-stringified version of
-                                        // these properties, where these two characters are escaped.
-                                        p -> p.getKey().trim(), // .replaceAll("[\"\n\\\\]", "\\\\$0"),
-                                        Param::getValue,
-                                        // In case of a conflict, we pick the older value
-                                        (oldValue, newValue) -> oldValue)
-                                );
-
-                        datasourceConfigurationTemp = variableSubstitution(datasource.getDatasourceConfiguration(), replaceParamsMap);
-                        actionConfigurationTemp = variableSubstitution(action.getActionConfiguration(), replaceParamsMap);
-                    } else {
-                        datasourceConfigurationTemp = datasource.getDatasourceConfiguration();
-                        actionConfigurationTemp = action.getActionConfiguration();
-                    }
-
-                    DatasourceConfiguration datasourceConfiguration;
-                    ActionConfiguration actionConfiguration;
-
-                    // If the action is paginated, update the configurations to update the correct URL.
-                    if (action.getActionConfiguration() != null &&
-                            action.getActionConfiguration().getPaginationType() != null &&
-                            PaginationType.URL.equals(action.getActionConfiguration().getPaginationType()) &&
-                            executeActionDTO.getPaginationField() != null) {
-                        datasourceConfiguration = updateDatasourceConfigurationForPagination(actionConfigurationTemp, datasourceConfigurationTemp, executeActionDTO.getPaginationField());
-                        actionConfiguration = updateActionConfigurationForPagination(actionConfigurationTemp, executeActionDTO.getPaginationField());
-                    } else {
-                        datasourceConfiguration = datasourceConfigurationTemp;
-                        actionConfiguration = actionConfigurationTemp;
-                    }
-
-                    // Filter out any empty headers
-                    if (actionConfiguration.getHeaders() != null && !actionConfiguration.getHeaders().isEmpty()) {
-                        List<Property> headerList = actionConfiguration.getHeaders().stream()
-                                .filter(header -> !StringUtils.isEmpty(header.getKey()))
-                                .collect(Collectors.toList());
-                        actionConfiguration.setHeaders(headerList);
-                    }
-
-                    Integer timeoutDuration = actionConfiguration.getTimeoutInMillisecond();
-
-                    log.debug("Execute Action called in Page {}, for action id : {}  action name : {}, {}, {}",
-                            action.getPageId(), action.getId(), action.getName(), datasourceConfiguration,
-                            actionConfiguration);
-
-                    Mono<ActionExecutionResult> executionMono = Mono.just(datasource)
-                            .flatMap(datasourceContextService::getDatasourceContext)
-                            // Now that we have the context (connection details), execute the action.
-                            .flatMap(
-                                    resourceContext -> pluginExecutor.execute(
-                                            resourceContext.getConnection(),
-                                            datasourceConfiguration,
-                                            actionConfiguration
-                                    )
-                            );
-
-                    return executionMono
-                            .onErrorResume(StaleConnectionException.class, error -> {
-                                log.info("Looks like the connection is stale. Retrying with a fresh context.");
-                                return datasourceContextService
-                                        .deleteDatasourceContext(datasource.getId())
-                                        .then(executionMono);
-                            })
-                            .timeout(Duration.ofMillis(timeoutDuration))
-                            .onErrorMap(
-                                    StaleConnectionException.class,
-                                    error -> new AppsmithPluginException(
-                                            AppsmithPluginError.PLUGIN_ERROR,
-                                            "Secondary stale connection error."
-                                    )
-                            )
-                            .onErrorResume(e -> {
-                                log.debug("In the action execution error mode.", e);
-                                ActionExecutionResult result = new ActionExecutionResult();
-                                result.setBody(e.getMessage());
-                                result.setIsExecutionSuccess(false);
-                                // Set the status code for Appsmith plugin errors
-                                if (e instanceof AppsmithPluginException) {
-                                    result.setStatusCode(((AppsmithPluginException) e).getAppErrorCode().toString());
-                                } else {
-                                    result.setStatusCode(AppsmithPluginError.PLUGIN_ERROR.getAppErrorCode().toString());
-                                }
-                                return Mono.just(result);
-                            });
-                });
-
-        // Populate the actionExecution result by setting the cached response and saving it to the DB
-        return actionExecutionResultMono
-                .flatMap(result -> {
-                    Mono<ActionExecutionResult> resultMono = Mono.just(result);
-                    if (actionFromDto.getId() == null) {
-                        // This is a dry-run. We shouldn't query the db because it'll throw NPE on null IDs
-                        return resultMono;
-                    }
-
-                    Mono<Action> actionFromDbMono = repository.findById(actionFromDto.getId())
-                            //If the action is found in the db (i.e. it is not a dry run, save the cached response
-                            .flatMap(action -> {
-                                // If the plugin execution result is successful, then cache response body in
-                                // the action and save it.
-                                if (Boolean.TRUE.equals(result.getIsExecutionSuccess())) {
-                                    // Save the result only if body exists in the body. e.g. Even though 204
-                                    // is an execution success, there would be no body expected.
-                                    if (result.getBody() != null) {
-                                        action.setCacheResponse(result.getBody().toString());
-                                        return repository.save(action);
-                                    }
-                                    // No result body exists. Return the action as is.
-                                    return Mono.just(action);
-                                }
-                                log.debug("Action execution resulted in failure beyond the proxy with the result of {}", result);
-                                return Mono.just(action);
-                            });
-
-                    return actionFromDbMono.then(resultMono);
-                })
-                .onErrorResume(AppsmithException.class, error -> {
-                    ActionExecutionResult result = new ActionExecutionResult();
-                    result.setIsExecutionSuccess(false);
-                    result.setStatusCode(error.getAppErrorCode().toString());
-                    result.setBody(error.getMessage());
-                    return Mono.just(result);
-                });
-    }
-
-    @Override
-    public Mono<Action> save(Action action) {
-        return repository.save(action);
-    }
-
-    @Override
-    public Mono<Action> findByNameAndPageId(String name, String pageId, AclPermission permission) {
-        return repository.findByNameAndPageId(name, pageId, permission);
-    }
-
-    /**
-     * Given a list of names of actions and pageId, find all the actions matching this criteria of name, pageId, http
-     * method 'GET' (for API actions only) or have isExecuteOnLoad be true.
-     *
-     * @param names Set of Action names. The returned list of actions will be a subset of the actioned named in this set.
-     * @param pageId Id of the Page within which to look for Actions.
-     * @return A Flux of Actions that are identified to be executed on page-load.
-     */
-    public Flux<Action> findOnLoadActionsInPage(Set<String> names, String pageId) {
-        final Flux<Action> getApiActions = repository
-                .findDistinctActionsByNameInAndPageIdAndActionConfiguration_HttpMethodAndUserSetOnLoad(names, pageId, "GET", false);
-
-        final Flux<Action> explicitOnLoadActions = repository
-                .findDistinctActionsByNameInAndPageIdAndExecuteOnLoadTrue(names, pageId);
-
-        return getApiActions.concatWith(explicitOnLoadActions);
-    }
-
-    /**
-     * This function replaces the variables in the Object with the actual params
-     */
-    @Override
-    public <T> T variableSubstitution(T configuration, Map<String, String> replaceParamsMap) {
-        return MustacheHelper.renderFieldValues(configuration, replaceParamsMap);
-    }
-
-    @Override
-    public Mono<Action> findById(String id) {
-        return repository.findById(id);
-    }
-
-    @Override
-    public Flux<Action> findByPageId(String pageId, AclPermission permission) {
-        return repository.findByPageId(pageId, permission);
-    }
-
-    @Override
-    public Flux<ActionViewDTO> getActionsForViewMode(String applicationId) {
-        Sort sort = Sort.by(FieldName.NAME);
-        if (applicationId == null || applicationId.isEmpty()) {
-            return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID));
-        }
-
-        // fetch the published pages by application
-        return newPageService
-                .findApplicationPagesByApplicationIdAndViewMode(applicationId, true)
-                .switchIfEmpty(Mono.error(new AppsmithException(
-                        AppsmithError.NO_RESOURCE_FOUND, "pages for application", applicationId))
-                )
-                .map(applicationPagesDTO -> applicationPagesDTO.getPages())
-                .flatMapMany(Flux::fromIterable)
-                .map(pageNameIdDTO -> pageNameIdDTO.getId())
-                .collectList()
-                // Since this is to fetch actions just for execution, instead of reading actions with READ_ACTIONS permission
-                // read actions with EXECUTE_ACTIONS permission only
-                .flatMapMany(pages -> repository.findAllActionsByNameAndPageIds(null, pages, EXECUTE_ACTIONS, sort))
-                .map(action -> {
-                    ActionViewDTO actionViewDTO = new ActionViewDTO();
-                    actionViewDTO.setId(action.getId());
-                    actionViewDTO.setName(action.getName());
-                    actionViewDTO.setPageId(action.getPageId());
-                    actionViewDTO.setConfirmBeforeExecute(action.getConfirmBeforeExecute());
-                    if (action.getJsonPathKeys() != null && !action.getJsonPathKeys().isEmpty()) {
-                        Set<String> jsonPathKeys;
-                        jsonPathKeys = new HashSet<>();
-                        jsonPathKeys.addAll(action.getJsonPathKeys());
-                        actionViewDTO.setJsonPathKeys(jsonPathKeys);
-                    }
-                    if (action.getActionConfiguration() != null) {
-                        actionViewDTO.setTimeoutInMillisecond(action.getActionConfiguration().getTimeoutInMillisecond());
-                    }
-                    return actionViewDTO;
-                });
-    }
-
-    @Override
-    public Mono<Action> findById(String id, AclPermission aclPermission) {
-        return repository.findById(id, aclPermission);
-    }
-
-    @Override
-    public Mono<Action> delete(String id) {
-        Mono<Action> actionMono = repository.findById(id)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.ACTION, id)));
-        return actionMono
-                .flatMap(toDelete -> repository.delete(toDelete).thenReturn(toDelete))
-                .flatMap(analyticsService::sendDeleteEvent);
-    }
-
-    @Override
-    public Flux<Action> get(MultiValueMap<String, String> params) {
-        String name = null;
-        List<String> pageIds = new ArrayList<>();
-        Sort sort = Sort.by(FieldName.NAME);
-
-        if (params.getFirst(FieldName.NAME) != null) {
-            name = params.getFirst(FieldName.NAME);
-        }
-
-        if (params.getFirst(FieldName.PAGE_ID) != null) {
-            pageIds.add(params.getFirst(FieldName.PAGE_ID));
-        }
-
-        if (params.getFirst(FieldName.APPLICATION_ID) != null) {
-            String finalName = name;
-            // Fetch unpublished pages because GET actions is only called during edit mode. For view mode, different
-            // function call is made which takes care of returning only the essential fields of an action
-            return newPageService
-                    .findApplicationPagesByApplicationIdAndViewMode(params.getFirst(FieldName.APPLICATION_ID), false)
-                    .switchIfEmpty(Mono.error(new AppsmithException(
-                            AppsmithError.NO_RESOURCE_FOUND, "pages for application", params.getFirst(FieldName.APPLICATION_ID)))
-                    )
-                    .map(applicationPagesDTO -> applicationPagesDTO.getPages())
-                    .flatMapMany(Flux::fromIterable)
-                    .map(pageNameIdDTO -> pageNameIdDTO.getId())
-                    .collectList()
-                    .flatMapMany(pages -> {
-                        pageIds.addAll(pages);
-                        return repository.findAllActionsByNameAndPageIds(finalName, pageIds, READ_ACTIONS, sort);
-                    })
-                    .flatMap(this::setTransientFieldsInAction);
-        }
-        return repository.findAllActionsByNameAndPageIds(name, pageIds, READ_ACTIONS, sort)
-                .flatMap(this::setTransientFieldsInAction);
-    }
-
-    private ActionConfiguration updateActionConfigurationForPagination(ActionConfiguration actionConfiguration,
-                                                                       PaginationField paginationField) {
-        if (PaginationField.NEXT.equals(paginationField) || PaginationField.PREV.equals(paginationField)) {
-            actionConfiguration.setPath("");
-            actionConfiguration.setQueryParameters(null);
-        }
-        return actionConfiguration;
-    }
-
-    private DatasourceConfiguration updateDatasourceConfigurationForPagination(ActionConfiguration actionConfiguration,
-                                                                               DatasourceConfiguration datasourceConfiguration,
-                                                                               PaginationField paginationField) {
-        if (PaginationField.NEXT.equals(paginationField)) {
-            try {
-                datasourceConfiguration.setUrl(URLDecoder.decode(actionConfiguration.getNext(), "UTF-8"));
-            } catch (UnsupportedEncodingException e) {
-                e.printStackTrace();
-            }
-        } else if (PaginationField.PREV.equals(paginationField)) {
-            datasourceConfiguration.setUrl(actionConfiguration.getPrev());
-        }
-        return datasourceConfiguration;
-    }
-
-    private Mono<Action> setTransientFieldsInAction(Action action) {
-
-        // Set the plugin id in the action object fetching it from the datasource.
-
-        Mono<Action> pluginIdUpdateMono = null;
-        Datasource datasource = action.getDatasource();
-        if (datasource != null) {
-            if (datasource.getId() != null) {
-                // its a global datasource. Get the datasource from the collection
-                pluginIdUpdateMono = datasourceService
-                        .findById(datasource.getId())
-                        .map(datasource1 -> {
-                            action.setPluginId(datasource1.getPluginId());
-                            return action;
-                        });
-            } else {
-                // Its a nested datasource. Pick up the pluginId from here
-                pluginIdUpdateMono = Mono.just(action)
-                        .map(action1 -> {
-                            action1.setPluginId(datasource.getPluginId());
-                            return action1;
-                        });
-            }
-        }
-
-        // In case of an action which was imported from a 3P API, fill in the extra information of the provider required by the front end UI.
-        Mono<Action> providerUpdateMono = null;
-        if ((action.getTemplateId() != null) && (action.getProviderId() != null)) {
-
-            providerUpdateMono = marketplaceService
-                    .getProviderById(action.getProviderId())
-                    .switchIfEmpty(Mono.just(new Provider()))
-                    .map(provider -> {
-                        ActionProvider actionProvider = new ActionProvider();
-                        actionProvider.setName(provider.getName());
-                        actionProvider.setCredentialSteps(provider.getCredentialSteps());
-                        actionProvider.setDescription(provider.getDescription());
-                        actionProvider.setImageUrl(provider.getImageUrl());
-                        actionProvider.setUrl(provider.getUrl());
-
-                        action.setProvider(actionProvider);
-                        return action;
-                    });
-        } else {
-            providerUpdateMono = Mono.just(action);
-        }
-
-        return Mono.zip(pluginIdUpdateMono, providerUpdateMono)
-                .map(tuple -> {
-                    Action pluginIdUpdatedAction = tuple.getT1();
-                    Action providerUpdatedAction = tuple.getT2();
-
-                    providerUpdatedAction.setPluginId(pluginIdUpdatedAction.getPluginId());
-                    return providerUpdatedAction;
-                });
-    }
-
-    private void generateAndSetActionPolicies(NewPage page, Action action) {
-        Set<Policy> documentPolicies = policyGenerator.getAllChildPolicies(page.getPolicies(), Page.class, Action.class);
-        action.setPolicies(documentPolicies);
-    }
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
index a1f02c79ca..6a3dca428e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationPageServiceImpl.java
@@ -97,7 +97,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
         }
 
         Mono<Application> applicationMono = applicationService.findById(page.getApplicationId(), AclPermission.MANAGE_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, page.getApplicationId())))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, page.getApplicationId())))
                 .cache();
 
         Mono<PageDTO> pageMono = applicationMono
@@ -158,9 +158,9 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
 
         return applicationService
                 .findByName(applicationName, appPermission)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + "by application name", applicationName)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + " by application name", applicationName)))
                 .flatMap(application -> newPageService.findByNameAndApplicationIdAndViewMode(pageName, application.getId(), pagePermission, viewMode))
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + "by page name", pageName)));
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + " by page name", pageName)));
     }
 
     @Override
@@ -182,7 +182,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
                     return Mono.error(new AppsmithException(AppsmithError.PAGE_DOESNT_BELONG_TO_APPLICATION, page.getName(), applicationId));
                 })
                 .then(applicationService.findById(applicationId, MANAGE_APPLICATIONS))
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, applicationId)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)))
                 .flatMap(application ->
                         applicationRepository
                                 .setDefaultPage(applicationId, pageId)
@@ -291,7 +291,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
         log.debug("Archiving application with id: {}", id);
 
         Mono<Application> applicationMono = applicationService.findById(id, MANAGE_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application", id)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, id)))
                 .flatMap(application -> {
                     log.debug("Archiving pages for applicationId: {}", id);
                     return newPageService.archivePagesByApplicationId(id, MANAGE_PAGES)
@@ -307,7 +307,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
     public Mono<PageDTO> clonePage(String pageId) {
 
         return newPageService.findById(pageId, MANAGE_PAGES)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED, "Clone Page")))
                 .flatMap(page -> clonePageGivenApplicationId(pageId, page.getApplicationId(), " Copy"));
     }
 
@@ -413,7 +413,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
     public Mono<Application> cloneApplication(String applicationId) {
 
         Mono<Application> applicationMono = applicationService.findById(applicationId, MANAGE_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED, "Clone Application")))
                 .cache();
 
         // Find the name for the cloned application which wouldn't lead to duplicate key exception
@@ -496,7 +496,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
     public Mono<PageDTO> deleteUnpublishedPage(String id) {
 
         return newPageService.findById(id, AclPermission.MANAGE_PAGES)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE_ID, id)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, id)))
                 .flatMap(page -> {
                     log.debug("Going to archive pageId: {} for applicationId: {}", page.getId(), page.getApplicationId());
                     Mono<Application> applicationMono = applicationService.getById(page.getApplicationId())
@@ -549,7 +549,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
     @Override
     public Mono<Boolean> publish(String applicationId) {
         Mono<Application> applicationMono = applicationService.findById(applicationId, MANAGE_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "application", applicationId)));
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, applicationId)));
 
         Flux<NewPage> publishApplicationAndPages = applicationMono
                 //Return all the pages in the Application
@@ -600,7 +600,7 @@ public class ApplicationPageServiceImpl implements ApplicationPageService {
                 //In each page, copy each layout's dsl to publishedDsl field
                 .flatMap(applicationPage -> newPageService
                         .findById(applicationPage.getId(), MANAGE_PAGES)
-                        .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "page", applicationPage.getId())))
+                        .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, applicationPage.getId())))
                         .map(page -> {
                             page.setPublishedPage(page.getUnpublishedPage());
                             return page;
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
index bd3117b0c3..7607d78eb0 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java
@@ -70,7 +70,7 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
 
         return repository.findById(id, READ_APPLICATIONS)
                 .flatMap(this::setTransientFields)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "resource", id)));
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.APPLICATION, id)));
     }
 
     @Override
@@ -141,7 +141,7 @@ public class ApplicationServiceImpl extends BaseService<ApplicationRepository, A
     public Mono<Application> changeViewAccess(String id, ApplicationAccessDTO applicationAccessDTO) {
         return repository
                 .findById(id, MAKE_PUBLIC_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION_ID, id)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.APPLICATION, id)))
                 .flatMap(application -> {
 
                     if (application.getIsPublic().equals(applicationAccessDTO.getPublicAccess())) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
index 604a91f7bd..e0430617ff 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
@@ -374,8 +374,8 @@ public class LayoutActionServiceImpl implements LayoutActionService {
                             if (layout.getWidgetNames() != null && layout.getWidgetNames().size() > 0) {
                                 return Mono.just(layout.getWidgetNames());
                             }
-                            // In case of no widget names (which implies that there is no DSL), return an error.
-                            return Mono.error(new AppsmithException(AppsmithError.NO_DSL_FOUND_IN_PAGE, pageId));
+                            // In case of no widget names (which implies that there is no DSL), return an empty set.
+                            return Mono.just(new HashSet<>());
                         }
                     }
                     return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.LAYOUT_ID, layoutId));
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 27d541f198..9913d561eb 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
@@ -185,7 +185,7 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
         return newPageService
                 .findById(action.getPageId(), READ_PAGES)
                 .switchIfEmpty(Mono.error(
-                        new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "page", action.getPageId())))
+                        new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE, action.getPageId())))
                 .flatMap(page -> {
 
                     // Inherit the action policies from the page.
@@ -477,7 +477,6 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                         return Mono.error(new AppsmithException(
                                 AppsmithError.INVALID_ACTION,
                                 action.getName(),
-                                actionId,
                                 ArrayUtils.toString(action.getInvalids().toArray())
                         ));
                     }
@@ -521,7 +520,9 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                     if (!CollectionUtils.isEmpty(invalids)) {
                         log.error("Unable to execute actionId: {} because it's datasource is not valid. Cause: {}",
                                 actionId, ArrayUtils.toString(invalids));
-                        return Mono.error(new AppsmithException(AppsmithError.INVALID_DATASOURCE, ArrayUtils.toString(invalids)));
+                        return Mono.error(new AppsmithException(AppsmithError.INVALID_DATASOURCE,
+                                datasource.getName(),
+                                ArrayUtils.toString(invalids)));
                     }
                     return pluginService.findById(datasource.getPluginId());
                 })
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
index dba3bffffd..3af9e1e324 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewPageServiceImpl.java
@@ -162,7 +162,7 @@ public class NewPageServiceImpl extends BaseService<NewPageRepository, NewPage,
                 .flatMap(application -> {
                     if (Boolean.TRUE.equals(view)) {
                         if (application.getPublishedPages() == null || application.getPublishedPages().isEmpty()) {
-                            // We are trying to fetch published pages but they doesnt exist because the application
+                            // We are trying to fetch published pages but they don't exist because the application
                             // hasn't been published yet
                             return Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND,
                                     FieldName.PUBLISHED_APPLICATION, application.getId()));
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
index 18dffa970a..8e067ad47d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
@@ -140,7 +140,7 @@ public class OrganizationServiceImpl extends BaseService<OrganizationRepository,
                 .anyMatch(policy -> policy.getPermission().equals(USER_MANAGE_ORGANIZATIONS.getValue()));
 
         if (!isManageOrgPolicyPresent) {
-            return Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_ACCESS));
+            return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED, "Create organization"));
         }
 
         if (organization.getEmail() == null) {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageService.java
deleted file mode 100644
index 5074860b05..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.domains.Layout;
-import com.appsmith.server.domains.Page;
-import com.appsmith.server.dtos.ApplicationPagesDTO;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public interface PageService extends CrudService<Page, String> {
-
-    Mono<Page> findById(String pageId, AclPermission aclPermission);
-
-    Flux<Page> findByApplicationId(String applicationId, AclPermission permission);
-
-    Mono<Page> save(Page page);
-
-    Mono<Page> createDefault(Page object);
-
-    Mono<Page> findByIdAndLayoutsId(String pageId, String layoutId, AclPermission aclPermission);
-
-    Mono<Page> findByName(String name, AclPermission permission);
-
-    Mono<Void> deleteAll();
-
-    Mono<ApplicationPagesDTO> findNamesByApplicationId(String applicationId);
-
-    Layout createDefaultLayout();
-
-    Mono<ApplicationPagesDTO> findNamesByApplicationName(String applicationName);
-
-    Mono<Page> findByNameAndApplicationId(String name, String applicationId, AclPermission permission);
-}
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
deleted file mode 100644
index 5553a38099..0000000000
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PageServiceImpl.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.appsmith.server.services;
-
-import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.constants.FieldName;
-import com.appsmith.server.domains.Action;
-import com.appsmith.server.domains.Application;
-import com.appsmith.server.domains.ApplicationPage;
-import com.appsmith.server.domains.Layout;
-import com.appsmith.server.domains.Page;
-import com.appsmith.server.dtos.ApplicationPagesDTO;
-import com.appsmith.server.dtos.PageNameIdDTO;
-import com.appsmith.server.exceptions.AppsmithError;
-import com.appsmith.server.exceptions.AppsmithException;
-import com.appsmith.server.repositories.ActionRepository;
-import com.appsmith.server.repositories.PageRepository;
-import lombok.extern.slf4j.Slf4j;
-import net.minidev.json.JSONObject;
-import net.minidev.json.parser.JSONParser;
-import net.minidev.json.parser.ParseException;
-import org.bson.types.ObjectId;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Scheduler;
-
-import javax.validation.Validator;
-import java.util.List;
-import java.util.Set;
-
-@Service
-@Slf4j
-public class PageServiceImpl extends BaseService<PageRepository, Page, String> implements PageService {
-
-    private final ApplicationService applicationService;
-    private final ActionRepository actionRepository;
-
-    @Autowired
-    public PageServiceImpl(Scheduler scheduler,
-                           Validator validator,
-                           MongoConverter mongoConverter,
-                           ReactiveMongoTemplate reactiveMongoTemplate,
-                           PageRepository repository,
-                           ApplicationService applicationService,
-                           AnalyticsService analyticsService,
-                           ActionRepository actionRepository) {
-        super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
-        this.applicationService = applicationService;
-        this.actionRepository = actionRepository;
-    }
-
-    @Override
-    public Mono<Page> findById(String pageId, AclPermission aclPermission) {
-        return repository.findById(pageId, aclPermission);
-    }
-
-    @Override
-    public Flux<Page> findByApplicationId(String applicationId, AclPermission permission) {
-        return repository.findByApplicationId(applicationId, permission);
-    }
-
-    @Override
-    public Mono<Page> save(Page page) {
-        return repository.save(page);
-    }
-
-    @Override
-    public Mono<Page> create(Page object) {
-        throw new UnsupportedOperationException("Please use `ApplicationPageService.createPage` to create a page.");
-    }
-
-    @Override
-    public Mono<Page> createDefault(Page object) {
-        return super.create(object);
-    }
-
-    @Override
-    public Mono<Page> findByIdAndLayoutsId(String pageId, String layoutId, AclPermission aclPermission) {
-        return repository.findByIdAndLayoutsId(pageId, layoutId, aclPermission);
-    }
-
-    @Override
-    public Mono<Page> findByName(String name, AclPermission permission) {
-        return repository.findByName(name, permission);
-    }
-
-    @Override
-    public Layout createDefaultLayout() {
-        Layout layout = new Layout();
-        String id = new ObjectId().toString();
-        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);
-        }
-        return layout;
-    }
-
-    @Override
-    public Mono<Void> deleteAll() {
-        return repository.deleteAll();
-    }
-
-    /**
-     * This function archives the page and all the actions associated with that page.
-     *
-     * @param id The pageId which needs to be archived.
-     * @return
-     */
-    @Override
-    public Mono<Page> delete(String id) {
-        Mono<Page> pageMono = repository.findById(id, AclPermission.MANAGE_PAGES)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PAGE_ID, id)))
-                .flatMap(page -> {
-                    log.debug("Going to archive pageId: {} for applicationId: {}", page.getId(), page.getApplicationId());
-                    Mono<Application> applicationMono = applicationService.getById(page.getApplicationId())
-                            .flatMap(application -> {
-                                application.getPages().removeIf(p -> p.getId().equals(page.getId()));
-                                return applicationService.save(application);
-                            });
-                    Mono<Page> archivedPageMono = repository.archive(page);
-                    Mono<List<Action>> archivedActionsMono = actionRepository.findByPageId(page.getId(), AclPermission.MANAGE_ACTIONS)
-                            .flatMap(action -> {
-                                log.debug("Going to archive actionId: {} for applicationId: {}", action.getId(), id);
-                                return actionRepository.archive(action);
-                            }).collectList();
-                    return Mono.zip(archivedPageMono, archivedActionsMono, applicationMono)
-                            .map(tuple -> {
-                                Page page1 = tuple.getT1();
-                                List<Action> actions = tuple.getT2();
-                                Application application = tuple.getT3();
-                                log.debug("Archived pageId: {} and {} actions for applicationId: {}", page1.getId(), actions.size(), application.getId());
-                                return page1;
-                            });
-                });
-
-        return pageMono
-                .flatMap(analyticsService::sendDeleteEvent);
-    }
-
-    @Override
-    public Mono<ApplicationPagesDTO> findNamesByApplicationId(String applicationId) {
-        Mono<Application> applicationMono = applicationService.findById(applicationId, AclPermission.READ_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + "by application id", applicationId)))
-                .cache();
-
-        Mono<List<PageNameIdDTO>> pagesListMono = applicationMono
-                .flatMapMany(this::findNamesByApplication)
-                .collectList();
-
-        return Mono.zip(applicationMono, pagesListMono)
-                .map(tuple -> {
-                    Application application = tuple.getT1();
-                    List<PageNameIdDTO> nameIdDTOList = tuple.getT2();
-                    ApplicationPagesDTO applicationPagesDTO = new ApplicationPagesDTO();
-                    applicationPagesDTO.setOrganizationId(application.getOrganizationId());
-                    applicationPagesDTO.setPages(nameIdDTOList);
-                    return applicationPagesDTO;
-                });
-    }
-
-    @Override
-    public Mono<ApplicationPagesDTO> findNamesByApplicationName(String applicationName) {
-        Mono<Application> applicationMono = applicationService.findByName(applicationName, AclPermission.READ_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.NAME, applicationName)))
-                .cache();
-
-        Mono<List<PageNameIdDTO>> pagesListMono = applicationMono
-                .flatMapMany(this::findNamesByApplication)
-                .collectList();
-
-        return Mono.zip(applicationMono, pagesListMono)
-                .map(tuple -> {
-                    Application application = tuple.getT1();
-                    List<PageNameIdDTO> nameIdDTOList = tuple.getT2();
-                    ApplicationPagesDTO applicationPagesDTO = new ApplicationPagesDTO();
-                    applicationPagesDTO.setOrganizationId(application.getOrganizationId());
-                    applicationPagesDTO.setPages(nameIdDTOList);
-                    return applicationPagesDTO;
-                });
-    }
-
-    private Flux<PageNameIdDTO> findNamesByApplication(Application application) {
-        List<ApplicationPage> pages = application.getPages();
-        return findByApplicationId(application.getId(), AclPermission.READ_PAGES)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACL_NO_RESOURCE_FOUND, FieldName.PAGE + "by application name", application.getName())))
-                .map(page -> {
-                    PageNameIdDTO pageNameIdDTO = new PageNameIdDTO();
-                    pageNameIdDTO.setId(page.getId());
-                    pageNameIdDTO.setName(page.getName());
-                    for (ApplicationPage applicationPage : pages) {
-                        if (applicationPage.getId().equals(page.getId())) {
-                            pageNameIdDTO.setIsDefault(applicationPage.getIsDefault());
-                        }
-                    }
-                    return pageNameIdDTO;
-                });
-    }
-
-    @Override
-    public Mono<Page> findByNameAndApplicationId(String name, String applicationId, AclPermission permission) {
-        return repository.findByNameAndApplicationId(name, applicationId, permission);
-    }
-}
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java
index 7c0f70b31c..af52fa4a0d 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java
@@ -86,7 +86,7 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
         exampleOrg.setPolicies(null);
 
         return organizationRepository.findOne(Example.of(exampleOrg))
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "organization", orgId)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.ORGANIZATION, orgId)))
                 .zipWith(currentUserMono)
                 .map(tuple -> {
                     Organization organization = tuple.getT1();
@@ -204,7 +204,7 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
     public Mono<Organization> removeUserRoleFromOrganizationGivenUserObject(Organization organization, User user) {
         List<UserRole> userRoles = organization.getUserRoles();
         if (userRoles == null) {
-            return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER));
+            return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER + " in organization", organization.getName()));
         }
 
         AppsmithRole role = null;
@@ -219,7 +219,7 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
 
         // The user was not found in the organization.
         if (role == null) {
-            return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER));
+            return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER + " in organization", organization.getName()));
         }
 
         // Generate all the policies for Organization, Application, Page and Actions
@@ -259,7 +259,8 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
 
         Mono<Organization> organizationMono = organizationRepository
                 .findById(orgId, MANAGE_ORGANIZATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED)));
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED,
+                        "Change role of a member")));
         Mono<User> userMono = userRepository.findByEmail(userRole.getUsername());
         Mono<User> currentUserMono = sessionUserService.getCurrentUser();
 
@@ -316,7 +317,8 @@ public class UserOrganizationServiceImpl implements UserOrganizationService {
                         }
                     }
                     // The user was not found in the organization. Return an error
-                    return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, user.getId()));
+                    return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, user.getUsername()
+                            + " in the organization " + organization.getName()));
                 });
     }
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
index dd1158a081..cdbcc5d294 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java
@@ -190,7 +190,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
 
         // Check if the user exists in our DB. If not, we will not send a password reset link to the user
         Mono<User> userMono = repository.findByEmail(email)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.USER_NOT_FOUND, email)));
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, email)));
 
         // Generate the password reset link for the user
         Mono<PasswordResetToken> passwordResetTokenMono = passwordResetTokenRepository.findByEmail(email)
@@ -247,7 +247,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
 
         return passwordResetTokenRepository
                 .findByEmail(email)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "email", email)))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.EMAIL, email)))
                 .flatMap(obj -> {
                     boolean matches = this.passwordEncoder.matches(token, obj.getTokenHash());
                     if (!matches) {
@@ -256,7 +256,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
 
                     return repository
                             .findByEmail(email)
-                            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "user", email)))
+                            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, email)))
                             .map(user -> {
                                 user.setPasswordResetInitiated(true);
                                 return user;
@@ -280,7 +280,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
 
         return repository
                 .findByEmail(user.getEmail())
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "user", user.getEmail())))
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, user.getEmail())))
                 .flatMap(userFromDb -> {
                     if (!userFromDb.getPasswordResetInitiated()) {
                         return Mono.error(new AppsmithException(AppsmithError.INVALID_PASSWORD_RESET));
@@ -296,7 +296,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
 
                     return passwordResetTokenRepository
                             .findByEmail(user.getEmail())
-                            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "token", token)))
+                            .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.TOKEN, token)))
                             .flatMap(passwordResetTokenRepository::delete)
                             .then(repository.save(userFromDb))
                             .thenReturn(true);
@@ -326,7 +326,8 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
         // permission on this app
         Mono<Application> applicationMono = applicationRepository
                 .findById(applicationId, MANAGE_APPLICATIONS)
-                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.UNAUTHORIZED_ACCESS)));
+                .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED,
+                        "Invite users to this application")));
 
         // Check if the new user is already a part of the appsmith ecosystem. If yes, then simply
         // add the user with the required permissions to the application
@@ -680,13 +681,15 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
 
         // The current organization has no members. Clearly the current user is also not present
         if (userRoles == null || userRoles.isEmpty()) {
-            return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED));
+            return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED,
+                    "Invite a user for the role " + invitedRoleName));
         }
 
         Optional<UserRole> optionalUserRole = userRoles.stream().filter(role -> role.getUsername().equals(username)).findFirst();
         // If the current user is not present in the organization, the user would also not be permitted to invite
         if (!optionalUserRole.isPresent()) {
-            return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED));
+            return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED,
+                    "Invite a user for the role " + invitedRoleName));
         }
 
         UserRole currentUserRole = optionalUserRole.get();
@@ -700,7 +703,8 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
         // If the role for which users are being invited is not in the list of permissible roles that the
         // current user can invite for, throw an error
         if (!appsmithRoles.contains(invitedRole)) {
-            return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED));
+            return Mono.error(new AppsmithException(AppsmithError.ACTION_IS_NOT_AUTHORIZED,
+                    "Invite a user for the role " + invitedRoleName));
         }
 
         return Mono.just(Boolean.TRUE);
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java
index 0a11341449..54d27290d9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ExamplesOrganizationCloner.java
@@ -342,7 +342,7 @@ public class ExamplesOrganizationCloner {
                 .flatMap(datasource -> {
                     final String templateDatasourceId = datasource.getId();
                     if (templateDatasourceId == null) {
-                        return Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND));
+                        return Mono.error(new AppsmithException(AppsmithError.INTERNAL_SERVER_ERROR));
                     }
                     makePristine(datasource);
                     datasource.setOrganizationId(toOrganizationId);
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
index efa15d649b..9e86146dd2 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java
@@ -195,7 +195,7 @@ public class ApplicationServiceTest {
         Mono<Application> applicationMono = applicationService.getById("random-id");
         StepVerifier.create(applicationMono)
                 .expectErrorMatches(throwable -> throwable instanceof AppsmithException &&
-                        throwable.getMessage().equals(AppsmithError.NO_RESOURCE_FOUND.getMessage("resource", "random-id")))
+                        throwable.getMessage().equals(AppsmithError.NO_RESOURCE_FOUND.getMessage(FieldName.APPLICATION, "random-id")))
                 .verify();
     }
 
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
index 60acf7a58d..acd8802383 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java
@@ -53,9 +53,6 @@ public class LayoutServiceTest {
     @Autowired
     LayoutService layoutService;
 
-    @Autowired
-    PageService pageService;
-
     @Autowired
     LayoutActionService layoutActionService;
 

From 40e42b296dcc106955b41a1709262e0dc106f52d Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Tue, 26 Jan 2021 08:42:52 +0530
Subject: [PATCH 19/47] Fix for timeout being sent in a different location
 (#2708)

---
 app/client/src/api/ActionAPI.tsx        |  4 ++--
 app/client/src/entities/Action/index.ts |  9 +++++++++
 app/client/src/sagas/ActionSagas.ts     | 14 +++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/client/src/api/ActionAPI.tsx b/app/client/src/api/ActionAPI.tsx
index bc7a280b87..6f56308aca 100644
--- a/app/client/src/api/ActionAPI.tsx
+++ b/app/client/src/api/ActionAPI.tsx
@@ -5,7 +5,7 @@ import {
   DEFAULT_EXECUTE_ACTION_TIMEOUT_MS,
 } from "constants/ApiConstants";
 import axios, { AxiosPromise, CancelTokenSource } from "axios";
-import { Action } from "entities/Action";
+import { Action, ActionViewMode } from "entities/Action";
 
 export interface CreateActionRequest<T> extends APIRequest {
   datasourceId: string;
@@ -127,7 +127,7 @@ class ActionAPI extends API {
 
   static fetchActionsForViewMode(
     applicationId: string,
-  ): AxiosPromise<GenericApiResponse<Action[]>> {
+  ): AxiosPromise<GenericApiResponse<ActionViewMode[]>> {
     return API.get(`${ActionAPI.url}/view`, { applicationId });
   }
 
diff --git a/app/client/src/entities/Action/index.ts b/app/client/src/entities/Action/index.ts
index 636dff8006..42499edabf 100644
--- a/app/client/src/entities/Action/index.ts
+++ b/app/client/src/entities/Action/index.ts
@@ -108,4 +108,13 @@ export interface QueryAction extends BaseAction {
   datasource: StoredDatasource;
 }
 
+export type ActionViewMode = {
+  id: string;
+  name: string;
+  pageId: string;
+  jsonPathKeys: string[];
+  confirmBeforeExecute?: boolean;
+  timeoutInMillisecond?: number;
+};
+
 export type Action = ApiAction | QueryAction;
diff --git a/app/client/src/sagas/ActionSagas.ts b/app/client/src/sagas/ActionSagas.ts
index c1a3b5e18d..5bc35771f8 100644
--- a/app/client/src/sagas/ActionSagas.ts
+++ b/app/client/src/sagas/ActionSagas.ts
@@ -44,7 +44,7 @@ import {
 } from "selectors/editorSelectors";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { QUERY_CONSTANT } from "constants/QueryEditorConstants";
-import { Action } from "entities/Action";
+import { Action, ActionViewMode } from "entities/Action";
 import { ActionData } from "reducers/entityReducers/actionsReducer";
 import {
   getAction,
@@ -145,14 +145,22 @@ export function* fetchActionsForViewModeSaga(
     { mode: "VIEWER", appId: applicationId },
   );
   try {
-    const response: GenericApiResponse<Action[]> = yield ActionAPI.fetchActionsForViewMode(
+    const response: GenericApiResponse<ActionViewMode[]> = yield ActionAPI.fetchActionsForViewMode(
       applicationId,
     );
+    const correctFormatResponse = response.data.map((action) => {
+      return {
+        ...action,
+        actionConfiguration: {
+          timeoutInMillisecond: action.timeoutInMillisecond,
+        },
+      };
+    });
     const isValidResponse = yield validateResponse(response);
     if (isValidResponse) {
       yield put({
         type: ReduxActionTypes.FETCH_ACTIONS_VIEW_MODE_SUCCESS,
-        payload: response.data,
+        payload: correctFormatResponse,
       });
       PerformanceTracker.stopAsyncTracking(
         PerformanceTransactionName.FETCH_ACTIONS_API,

From 777c4bc891c14539049923ca2215b6354f2eb845 Mon Sep 17 00:00:00 2001
From: Meng Ye <4025839+jk2K@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:02:04 +0800
Subject: [PATCH 20/47] Improve doc for setting up IntelliJ IDEA (#2710)

---
 contributions/ServerSetup.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contributions/ServerSetup.md b/contributions/ServerSetup.md
index 3ce552609d..ca9b4111e1 100644
--- a/contributions/ServerSetup.md
+++ b/contributions/ServerSetup.md
@@ -93,6 +93,12 @@ When using this command, the value of `APPSMITH_REDIS_URI` should be set to `red
 
 To run the project from within the IDE, you will need to make use of the run configuration that is part of the repository. The run configuration uses the [EnvFile](https://plugins.jetbrains.com/plugin/7861-envfile) plugin to include environment variables in the path. Any and all tests can be run within the IDE by cloning this run configuration.
 
+Please note when setting **Working directory** option. If the path is not correct, plugins will fail to load and cannot fetch data from mongo, redis
+
+example:
+
+![381611580157_ pic_hd](https://user-images.githubusercontent.com/4025839/105710505-2ead5300-5f52-11eb-9549-531e459e86ea.jpg)
+
 ## Need Assistance
 - If you are unable to resolve any issue while doing the setup, please initiate a Github discussion or send an email to support@appsmith.com. We'll be happy to help you.
 - In case you notice any discrepancy, please raise an issue on Github and/or send an email to support@appsmith.com.

From 6515b5c91cbdd56c6be17b920fafbbda801d6a34 Mon Sep 17 00:00:00 2001
From: Nidhi <nidhi.nair93@gmail.com>
Date: Tue, 26 Jan 2021 17:16:31 +0530
Subject: [PATCH 21/47] Fixed null endpoint issue for MySQL plugin (#2719)

---
 .../java/com/external/plugins/MySqlPlugin.java  |  4 +++-
 .../com/external/plugins/MySqlPluginTest.java   | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
index f6d7b7b59e..a79f41571e 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java
@@ -313,7 +313,9 @@ public class MySqlPlugin extends BasePlugin {
                 invalids.add("Missing endpoint and url");
             } else if (!CollectionUtils.isEmpty(datasourceConfiguration.getEndpoints())) {
                 for (final Endpoint endpoint : datasourceConfiguration.getEndpoints()) {
-                    if (endpoint.getHost().contains("/") || endpoint.getHost().contains(":")) {
+                    if (endpoint.getHost() == null || endpoint.getHost().isBlank()) {
+                        invalids.add("Host value cannot be empty");
+                    } else if (endpoint.getHost().contains("/") || endpoint.getHost().contains(":")) {
                         invalids.add("Host value cannot contain `/` or `:` characters. Found `" + endpoint.getHost() + "`.");
                     }
                 }
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
index a5f12cb1da..aedbac198c 100644
--- a/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
+++ b/app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java
@@ -29,6 +29,7 @@ import reactor.test.StepVerifier;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Set;
+
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -257,6 +258,18 @@ public class MySqlPluginTest {
         assertTrue(output.contains("Missing endpoint and url"));
     }
 
+    @Test
+    public void testValidateDatasource_NullHost() {
+        dsConfig.setEndpoints(List.of(new Endpoint()));
+        Set<String> output = pluginExecutor.validateDatasource(dsConfig);
+        assertEquals(output.size(), 1);
+        assertTrue(output.contains("Host value cannot be empty"));
+        Endpoint endpoint = new Endpoint();
+        endpoint.setHost(address);
+        endpoint.setPort(port.longValue());
+        dsConfig.setEndpoints(List.of(endpoint));
+    }
+
     @Test
     public void testValidateDatasourceInvalidEndpoint() {
         String hostname = "r2dbc:mysql://localhost";
@@ -344,8 +357,8 @@ public class MySqlPluginTest {
      * 1. Add a test to check that mysql driver can interpret and read all the regular data types used in mysql.
      * 2. List of the data types is taken is from https://dev.mysql.com/doc/refman/8.0/en/data-types.html
      * 3. Data types tested here are: INTEGER, SMALLINT, TINYINT, MEDIUMINT, BIGINT, DECIMAL, FLOAT, DOUBLE, BIT,
-     *    DATE, DATETIME, TIMESTAMP, TIME, YEAR, CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, BLOB, MEDIUMBLOB, LONGBLOB,
-     *    TINYTEXT, TEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET, JSON, GEOMETRY, POINT    
+     * DATE, DATETIME, TIMESTAMP, TIME, YEAR, CHAR, VARCHAR, BINARY, VARBINARY, TINYBLOB, BLOB, MEDIUMBLOB, LONGBLOB,
+     * TINYTEXT, TEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET, JSON, GEOMETRY, POINT
      */
     @Test
     public void testExecuteDataTypesExtensive() {

From 42efb20d14d2d17a884c17e1dff8c62b8e8284d2 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Tue, 26 Jan 2021 18:44:01 +0530
Subject: [PATCH 22/47] Remove unused cert fields for Mongo and Postgres
 plugins (#2723)

---
 .../mongoPlugin/src/main/resources/form.json  | 35 ------------------
 .../src/main/resources/form.json              | 37 -------------------
 2 files changed, 72 deletions(-)

diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
index a6f4eb44eb..f2b6162dd4 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/resources/form.json
@@ -111,41 +111,6 @@
           ]
         }
       ]
-    },
-    {
-      "sectionName": "SSL (optional)",
-      "children": [
-        {
-          "label": "Authentication Mechanism",
-          "configProperty": "datasourceConfiguration.connection.ssl.authType",
-          "controlType": "DROP_DOWN",
-          "initialValue": "NO_SSL",
-          "options": [
-            {
-              "label": "No SSL",
-              "value": "NO_SSL"
-            },
-            {
-              "label": "CA Certificate",
-              "value": "CA_CERTIFICATE"
-            },
-            {
-              "label": "Self Signed Certificate",
-              "value": "SELF_SIGNED_CERTIFICATE"
-            }
-          ]
-        },
-        {
-          "label": "CA Certificate",
-          "configProperty": "datasourceConfiguration.connection.ssl.caCertificate",
-          "controlType": "FILE_PICKER"
-        },
-        {
-          "label": "PEM Certificate",
-          "configProperty": "datasourceConfiguration.connection.ssl.pemCertificate",
-          "controlType": "FILE_PICKER"
-        }
-      ]
     }
   ]
 }
diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
index eb58eb62e8..3793b58cd7 100644
--- a/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
+++ b/app/server/appsmith-plugins/postgresPlugin/src/main/resources/form.json
@@ -111,43 +111,6 @@
               "value": "VERIFY_FULL"
             }
           ]
-        },
-        {
-          "sectionName": null,
-          "children": [
-            {
-              "label": "Key File",
-              "configProperty": "datasourceConfiguration.connection.ssl.keyFile",
-              "controlType": "FILE_PICKER"
-            },
-            {
-              "label": "Certificate",
-              "configProperty": "datasourceConfiguration.connection.ssl.certificateFile",
-              "controlType": "FILE_PICKER"
-            }
-          ]
-        },
-        {
-          "sectionName": null,
-          "children": [
-            {
-              "label": "CA Certificate",
-              "configProperty": "datasourceConfiguration.connection.ssl.caCertificateFile",
-              "controlType": "FILE_PICKER"
-            },
-            {
-              "label": "PEM Certificate",
-              "configProperty": "datasourceConfiguration.connection.ssl.pemCertificate.file",
-              "controlType": "FILE_PICKER"
-            },
-            {
-              "label": "PEM Passphrase",
-              "configProperty": "datasourceConfiguration.connection.ssl.pemCertificate.password",
-              "dataType": "PASSWORD",
-              "controlType": "INPUT_TEXT",
-              "placeholderText": "PEM Passphrase"
-            }
-          ]
         }
       ]
     }

From 9490ba4ecab2c53e13c043927eb1f1ebde00782d Mon Sep 17 00:00:00 2001
From: Piyush Mishra <piyush@codeitout.com>
Date: Wed, 27 Jan 2021 00:04:19 +0530
Subject: [PATCH 23/47] Remove SSL related clicks from
 `fillMongoDatasourceForm` cypress command (#2726)

---
 app/client/cypress/fixtures/datasources.json       | 1 -
 app/client/cypress/locators/DatasourcesEditor.json | 2 --
 app/client/cypress/support/commands.js             | 7 -------
 3 files changed, 10 deletions(-)

diff --git a/app/client/cypress/fixtures/datasources.json b/app/client/cypress/fixtures/datasources.json
index c9bb0e0069..d53c2abdb9 100644
--- a/app/client/cypress/fixtures/datasources.json
+++ b/app/client/cypress/fixtures/datasources.json
@@ -5,7 +5,6 @@
     "mongo-username": "cypress-test",
     "mongo-password": "RaopEmky505xYV4p",
     "mongo-authenticationAuthtype": "SCRAM-SHA-1",
-    "mongo-sslAuthtype": "No SSL",
     "postgres-host": "postgres-test-db.cz8diybf9wdj.ap-south-1.rds.amazonaws.com",
     "postgres-port": 5432,
     "postgres-databaseName": "fakeapi",
diff --git a/app/client/cypress/locators/DatasourcesEditor.json b/app/client/cypress/locators/DatasourcesEditor.json
index 441a498e0e..12a49f29b5 100644
--- a/app/client/cypress/locators/DatasourcesEditor.json
+++ b/app/client/cypress/locators/DatasourcesEditor.json
@@ -6,13 +6,11 @@
   "username": "input[name='datasourceConfiguration.authentication.username']",
   "password": "input[name='datasourceConfiguration.authentication.password']",
   "authenticationAuthtype": "[data-cy=datasourceConfiguration\\.authentication\\.authType]",
-  "sslAuthtype": "[data-cy=datasourceConfiguration\\.connection\\.ssl\\.authType]",
   "url": "input[name='datasourceConfiguration.url']",
   "MongoDB": ".t--plugin-name:contains('MongoDB')",
   "RESTAPI": ".t--plugin-name:contains('REST API')",
   "PostgreSQL": ".t--plugin-name:contains('PostgreSQL')",
   "sectionAuthentication": "[data-cy=section-Authentication]",
-  "sectionSSL": "[data-cy=section-SSL\\ \\(optional\\)]",
   "PostgresEntity": ".t--entity-name:contains(PostgreSQL)",
   "createQuerty": ".t--create-query",
   "editDatasource": ".t--edit-datasource",
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 3b2f4845dd..481fe934e9 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1424,17 +1424,10 @@ Cypress.Commands.add("fillMongoDatasourceForm", () => {
   cy.get(datasourceEditor["password"]).type(
     datasourceFormData["mongo-password"],
   );
-
-  cy.get(datasourceEditor.sectionSSL).click();
   cy.get(datasourceEditor["authenticationAuthtype"]).click();
   cy.contains(datasourceFormData["mongo-authenticationAuthtype"]).click({
     force: true,
   });
-
-  cy.get(datasourceEditor["sslAuthtype"]).click();
-  cy.contains(datasourceFormData["mongo-sslAuthtype"]).click({
-    force: true,
-  });
 });
 
 Cypress.Commands.add("fillPostgresDatasourceForm", () => {

From c9b3059498e8cc9b0d9d10c65ffe3b42d961402e Mon Sep 17 00:00:00 2001
From: Tim Dillon <tim@itsdits.com>
Date: Wed, 27 Jan 2021 03:54:50 +0900
Subject: [PATCH 24/47] Disable sort by Delete column in Members page (#2722)

---
 app/client/src/pages/organization/Members.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/client/src/pages/organization/Members.tsx b/app/client/src/pages/organization/Members.tsx
index abdc1c20ed..80303eec0f 100644
--- a/app/client/src/pages/organization/Members.tsx
+++ b/app/client/src/pages/organization/Members.tsx
@@ -128,6 +128,7 @@ export default function MemberSettings(props: PageProps) {
     {
       Header: "Delete",
       accessor: "delete",
+      disableSortBy: true,
       Cell: function DeleteCell(cellProps: any) {
         if (
           cellProps.cell.row.values.username ===

From e34a98833cc8592d2d2f27248113c954dfdbc9df Mon Sep 17 00:00:00 2001
From: Vicky Bansal <67091118+vicky-primathon@users.noreply.github.com>
Date: Wed, 27 Jan 2021 11:10:53 +0530
Subject: [PATCH 25/47] Trigger `onPageSizeChange` action when table page size
 changes (#2737)

---
 app/client/src/constants/ActionConstants.tsx  |  1 +
 .../PropertyPaneConfigResponse.tsx            |  8 ++
 app/client/src/widgets/TableWidget.tsx        | 77 +++++++++++++------
 3 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/app/client/src/constants/ActionConstants.tsx b/app/client/src/constants/ActionConstants.tsx
index 56d053506b..01dc05da7a 100644
--- a/app/client/src/constants/ActionConstants.tsx
+++ b/app/client/src/constants/ActionConstants.tsx
@@ -18,6 +18,7 @@ export enum EventType {
   ON_PAGE_LOAD = "ON_PAGE_LOAD",
   ON_PREV_PAGE = "ON_PREV_PAGE",
   ON_NEXT_PAGE = "ON_NEXT_PAGE",
+  ON_PAGE_SIZE_CHANGE = "ON_PAGE_SIZE_CHANGE",
   ON_ERROR = "ON_ERROR",
   ON_SUCCESS = "ON_SUCCESS",
   ON_ROW_SELECTED = "ON_ROW_SELECTED",
diff --git a/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx b/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx
index 8dddbb02ed..6409a8ab98 100644
--- a/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx
+++ b/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx
@@ -281,6 +281,14 @@ const PropertyPaneConfigResponse: PropertyPaneConfigsResponse["data"] = {
           },
           {
             id: "7.2.4",
+            helpText: "Triggers an action when a table page size is changed",
+            propertyName: "onPageSizeChange",
+            label: "onPageSizeChange",
+            controlType: "ACTION_SELECTOR",
+            isJSConvertible: true,
+          },
+          {
+            id: "7.2.5",
             propertyName: "onSearchTextChanged",
             label: "onSearchTextChanged",
             controlType: "ACTION_SELECTOR",
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index 89c5740ab0..026ed95bf5 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -90,13 +90,13 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       searchText: VALIDATION_TYPES.TEXT,
       defaultSearchText: VALIDATION_TYPES.TEXT,
       defaultSelectedRow: VALIDATION_TYPES.DEFAULT_SELECTED_ROW,
+      pageSize: VALIDATION_TYPES.NUMBER,
     };
   }
 
   static getMetaPropertiesMap(): Record<string, any> {
     return {
       pageNo: 1,
-      pageSize: undefined,
       selectedRowIndex: undefined,
       selectedRowIndices: undefined,
       searchText: undefined,
@@ -120,12 +120,50 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       onRowSelected: true,
       onPageChange: true,
       onSearchTextChanged: true,
+      onPageSizeChange: true,
       columnActions: true,
     };
   }
 
   static getDerivedPropertiesMap() {
     return {
+      pageSize: `{{function() {
+          const TABLE_SIZES = {
+           ${CompactModeTypes.DEFAULT}: {
+            COLUMN_HEADER_HEIGHT: 38,
+            TABLE_HEADER_HEIGHT: 42,
+            ROW_HEIGHT: 40,
+            ROW_FONT_SIZE: 14,
+           },
+           ${CompactModeTypes.SHORT}: {
+            COLUMN_HEADER_HEIGHT: 38,
+            TABLE_HEADER_HEIGHT: 42,
+            ROW_HEIGHT: 20,
+            ROW_FONT_SIZE: 12,
+           },
+           ${CompactModeTypes.TALL}: {
+            COLUMN_HEADER_HEIGHT: 38,
+            TABLE_HEADER_HEIGHT: 42,
+            ROW_HEIGHT: 60,
+            ROW_FONT_SIZE: 18,
+           },
+          };
+          const compactMode = this.compactMode || "${CompactModeTypes.DEFAULT}";
+          const componentHeight = (this.bottomRow - this.topRow) * this.parentRowSpace;
+          const tableSizes = TABLE_SIZES[compactMode];
+          let pageSize= Math.floor((componentHeight - tableSizes.TABLE_HEADER_HEIGHT - tableSizes.COLUMN_HEADER_HEIGHT) / tableSizes.ROW_HEIGHT);
+          if (
+            componentHeight -
+              (tableSizes.TABLE_HEADER_HEIGHT +
+                tableSizes.COLUMN_HEADER_HEIGHT +
+                tableSizes.ROW_HEIGHT * pageSize) >
+            0
+          ) {
+            pageSize += 1;
+          }
+          return pageSize;
+        }()
+      }}`,
       triggerRowSelection: "{{!!this.onRowSelected}}",
     };
   }
@@ -505,6 +543,14 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
         );
       }
     }
+    if (this.props.pageSize !== prevProps.pageSize) {
+      super.executeAction({
+        dynamicString: this.props.onPageSizeChange,
+        event: {
+          type: EventType.ON_PAGE_SIZE_CHANGE,
+        },
+      });
+    }
   }
 
   getSelectedRowIndexes = (selectedRowIndices: string) => {
@@ -514,7 +560,12 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
   };
 
   getPageView() {
-    const { tableData, hiddenColumns, filteredTableData } = this.props;
+    const {
+      tableData,
+      hiddenColumns,
+      filteredTableData,
+      pageSize,
+    } = this.props;
     const computedSelectedRowIndices = Array.isArray(
       this.props.selectedRowIndices,
     )
@@ -536,28 +587,6 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       this.props.updateWidgetMetaProperty("pageNo", pageNo);
     }
     const { componentWidth, componentHeight } = this.getComponentDimensions();
-    const tableSizes =
-      TABLE_SIZES[this.props.compactMode || CompactModeTypes.DEFAULT];
-    let pageSize = Math.floor(
-      (componentHeight -
-        tableSizes.TABLE_HEADER_HEIGHT -
-        tableSizes.COLUMN_HEADER_HEIGHT) /
-        tableSizes.ROW_HEIGHT,
-    );
-
-    if (
-      componentHeight -
-        (tableSizes.TABLE_HEADER_HEIGHT +
-          tableSizes.COLUMN_HEADER_HEIGHT +
-          tableSizes.ROW_HEIGHT * pageSize) >
-      0
-    )
-      pageSize += 1;
-
-    if (pageSize !== this.props.pageSize) {
-      this.props.updateWidgetMetaProperty("pageSize", pageSize);
-    }
-
     return (
       <Suspense fallback={<Skeleton />}>
         <ReactTableComponent

From aea3b3d4db786265cf936c65be91df1a92e50bfe Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <rishabh.robben@gmail.com>
Date: Wed, 27 Jan 2021 11:42:32 +0530
Subject: [PATCH 26/47] Revamping UI on the Login/Signup page (#2696)

---
 .../src/assets/images/Github_inverted.png     | Bin 0 -> 335 bytes
 app/client/src/components/ads/Button.tsx      |   1 +
 app/client/src/components/ads/TextInput.tsx   |  10 ++
 .../components/ads/formFields/FieldError.tsx  |  34 ++++
 .../components/ads/formFields/FormGroup.tsx   |  22 +++
 .../components/ads/formFields/FormMessage.tsx |  85 +++++++++
 .../components/ads/formFields/TextField.tsx   |  45 +++++
 app/client/src/constants/DefaultTheme.tsx     |  67 +++++--
 app/client/src/constants/SocialLogin.tsx      |   3 +-
 app/client/src/constants/messages.ts          |  18 +-
 app/client/src/pages/UserAuth/FooterLinks.tsx |  39 ++++
 .../src/pages/UserAuth/ForgotPassword.tsx     | 122 +++++++------
 app/client/src/pages/UserAuth/Login.tsx       | 154 ++++++++--------
 .../src/pages/UserAuth/ResetPassword.tsx      | 102 ++++++-----
 app/client/src/pages/UserAuth/SignUp.tsx      | 169 ++++++++----------
 .../src/pages/UserAuth/StyledComponents.tsx   | 106 +++++++----
 .../src/pages/UserAuth/ThirdPartyAuth.tsx     |  63 +++----
 app/client/src/pages/UserAuth/index.tsx       |  61 +++----
 app/client/src/selectors/themeSelectors.tsx   |  27 +++
 19 files changed, 711 insertions(+), 417 deletions(-)
 create mode 100644 app/client/src/assets/images/Github_inverted.png
 create mode 100644 app/client/src/components/ads/formFields/FieldError.tsx
 create mode 100644 app/client/src/components/ads/formFields/FormGroup.tsx
 create mode 100644 app/client/src/components/ads/formFields/FormMessage.tsx
 create mode 100644 app/client/src/components/ads/formFields/TextField.tsx
 create mode 100644 app/client/src/pages/UserAuth/FooterLinks.tsx

diff --git a/app/client/src/assets/images/Github_inverted.png b/app/client/src/assets/images/Github_inverted.png
new file mode 100644
index 0000000000000000000000000000000000000000..2acb24bb5426ba1e02f341158f09433c1fe7dff6
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngd!3HEhbh*6;Qk(@Ik;M!Q+`=Ht$S`Y;1W=H%
zILO_JVcj{Imp~3nx}&cn1H;CC?mvmFK>ia?7srqa#;HMXd7BIbY&rg?w)7ofyT)6>
z>~?@NfyGS0uR+>?sSpTnEZE0={YlP-7v6HV>-Mg{E~IJkyl4X(dqJ6Y#al=3`weHA
zYIa#z>1`1Gq3t$bp*eBGw@J^L{1Q~PoB8z;w4dulG>5N?TD2y<%VEoh6P~vUjPmyh
zui*~WtZ98?J4q!{qi^>nU$6g;<z){Zc-Hk*=U&#DcD(y}Msu}Ebl`{R??3t0lp9G2
z_Q!`TZ|V`cntUNrnsZZ<xMOH+;kUb~e;QB898e42!+I#=L++e{x?8hWPZ67az`o1O
b?f3l;jA5J7n9uG8`j^4e)z4*}Q$iB}*g}5?

literal 0
HcmV?d00001

diff --git a/app/client/src/components/ads/Button.tsx b/app/client/src/components/ads/Button.tsx
index c71f261a27..c49e083978 100644
--- a/app/client/src/components/ads/Button.tsx
+++ b/app/client/src/components/ads/Button.tsx
@@ -58,6 +58,7 @@ type ButtonProps = CommonComponentProps & {
   fill?: boolean;
   href?: string;
   tag?: "a" | "button";
+  type?: "submit" | "reset" | "button";
 };
 
 const stateStyles = (
diff --git a/app/client/src/components/ads/TextInput.tsx b/app/client/src/components/ads/TextInput.tsx
index 251f029cf6..466c928e36 100644
--- a/app/client/src/components/ads/TextInput.tsx
+++ b/app/client/src/components/ads/TextInput.tsx
@@ -91,6 +91,14 @@ const StyledInput = styled.input<
   background-color: ${(props) => props.inputStyle.bgColor};
   color: ${(props) => props.inputStyle.color};
 
+  &:-internal-autofill-selected,
+  &:-webkit-autofill,
+  &:-webkit-autofill:hover,
+  &:-webkit-autofill:focus {
+    -webkit-box-shadow: 0 0 0 30px ${(props) => props.inputStyle.bgColor} inset !important;
+    -webkit-text-fill-color: ${(props) => props.inputStyle.color} !important;
+  }
+
   &::placeholder {
     color: ${(props) => props.theme.colors.textInput.placeholder};
   }
@@ -199,3 +207,5 @@ const TextInput = forwardRef(
 TextInput.displayName = "TextInput";
 
 export default TextInput;
+
+export type InputType = "text" | "password" | "number" | "email" | "tel";
diff --git a/app/client/src/components/ads/formFields/FieldError.tsx b/app/client/src/components/ads/formFields/FieldError.tsx
new file mode 100644
index 0000000000..a5459d0a67
--- /dev/null
+++ b/app/client/src/components/ads/formFields/FieldError.tsx
@@ -0,0 +1,34 @@
+import React from "react";
+import styled from "styled-components";
+import { IntentColors } from "constants/DefaultTheme";
+// Note: This component is only for the input fields which donot have the
+// popover error tooltip. This is also only for Appsmith components
+// Not to be used in widgets / canvas
+
+const StyledError = styled.span<{ show: boolean }>`
+  text-align: left;
+  color: ${IntentColors.danger};
+  font-size: ${(props) => props.theme.fontSizes[3]}px;
+  opacity: ${(props) => (props.show ? 1 : 0)};
+  display: block;
+  position: relative;
+  margin-top: ${(props) => props.theme.spaces[1]}px;
+`;
+
+type FormFieldErrorProps = {
+  error?: string;
+  className?: string;
+};
+
+export const FormFieldError = (props: FormFieldErrorProps) => {
+  return (
+    <StyledError
+      className={props.className ? props.className : undefined}
+      show={!!props.error}
+    >
+      {props.error || "&nbsp;"}
+    </StyledError>
+  );
+};
+
+export default FormFieldError;
diff --git a/app/client/src/components/ads/formFields/FormGroup.tsx b/app/client/src/components/ads/formFields/FormGroup.tsx
new file mode 100644
index 0000000000..f27dca7791
--- /dev/null
+++ b/app/client/src/components/ads/formFields/FormGroup.tsx
@@ -0,0 +1,22 @@
+import styled from "styled-components";
+import { FormGroup, Classes } from "@blueprintjs/core";
+import { getTypographyByKey } from "constants/DefaultTheme";
+type FormGroupProps = {
+  fill?: boolean;
+};
+const StyledFormGroup = styled(FormGroup)<FormGroupProps>`
+  & {
+    width: ${(props) => (props.fill ? "100%" : "auto")};
+    &.${Classes.FORM_GROUP} {
+      margin: 0 0 ${(props) => props.theme.spaces[5]}px;
+    }
+    &.${Classes.FORM_GROUP} .${Classes.FORM_HELPER_TEXT} {
+      font-size: ${(props) => props.theme.fontSizes[3]}px;
+    }
+    &.${Classes.FORM_GROUP} .${Classes.LABEL} {
+      ${(props) => getTypographyByKey(props, "h5")}
+      color: ${(props) => props.theme.colors.textInput.normal.text};
+    }
+  }
+`;
+export default StyledFormGroup;
diff --git a/app/client/src/components/ads/formFields/FormMessage.tsx b/app/client/src/components/ads/formFields/FormMessage.tsx
new file mode 100644
index 0000000000..3dd062d8ab
--- /dev/null
+++ b/app/client/src/components/ads/formFields/FormMessage.tsx
@@ -0,0 +1,85 @@
+import React from "react";
+import styled from "styled-components";
+import { Intent } from "constants/DefaultTheme";
+import { getTypographyByKey } from "constants/DefaultTheme";
+import { Link } from "react-router-dom";
+
+export type MessageAction = {
+  url?: string;
+  onClick?: () => void;
+  text: string;
+  intent: Intent;
+};
+
+const StyledMessage = styled.div<{ intent: Intent }>`
+  & {
+    ${(props) => getTypographyByKey(props, "p1")}
+    width: 100%;
+    padding: ${(props) => props.theme.spaces[4]}px;
+    color: ${(props) => props.theme.colors.formMessage.text[props.intent]};
+    background-color: ${(props) =>
+      props.theme.colors.formMessage.background[props.intent]};
+  }
+`;
+
+export const ActionsContainer = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`;
+
+const StyledAction = styled.div<{ intent: Intent }>`
+  margin-top: ${(props) => props.theme.spaces[5]}px;
+  ${(props) => getTypographyByKey(props, "h5")}
+  font-weight: 600;
+  & a {
+    text-decoration: none;
+    color: ${(props) => props.theme.colors.formMessage.text[props.intent]};
+  }
+`;
+
+export const ActionButton = (props: MessageAction) => {
+  if (props.url) {
+    const isExternal = props.url.indexOf("//") !== -1;
+    return (
+      <StyledAction intent={props.intent}>
+        {isExternal ? (
+          <a href={props.url} target="_blank" rel="noreferrer">
+            {props.text}
+          </a>
+        ) : (
+          <Link to={props.url}>{props.text}</Link>
+        )}
+      </StyledAction>
+    );
+  } else if (props.onClick) {
+    return (
+      <StyledAction onClick={props.onClick} intent={props.intent}>
+        {props.text}
+      </StyledAction>
+    );
+  }
+  return null;
+};
+
+export type FormMessageProps = {
+  intent: Intent;
+  message: string;
+  actions?: MessageAction[];
+};
+
+export const FormMessage = (props: FormMessageProps) => {
+  const actions =
+    props.actions &&
+    props.actions.map((action) => (
+      <ActionButton key={action.text} {...action} intent={props.intent} />
+    ));
+  return (
+    <StyledMessage intent={props.intent} className="form-message-container">
+      {props.message}
+      {actions && <ActionsContainer>{actions}</ActionsContainer>}
+    </StyledMessage>
+  );
+};
+
+export default FormMessage;
diff --git a/app/client/src/components/ads/formFields/TextField.tsx b/app/client/src/components/ads/formFields/TextField.tsx
new file mode 100644
index 0000000000..cef1273bca
--- /dev/null
+++ b/app/client/src/components/ads/formFields/TextField.tsx
@@ -0,0 +1,45 @@
+import React from "react";
+import {
+  Field,
+  WrappedFieldMetaProps,
+  WrappedFieldInputProps,
+} from "redux-form";
+import InputComponent, { InputType } from "../TextInput";
+import { Intent } from "constants/DefaultTheme";
+import FormFieldError from "./FieldError";
+
+const renderComponent = (
+  componentProps: FormTextFieldProps & {
+    meta: Partial<WrappedFieldMetaProps>;
+    input: Partial<WrappedFieldInputProps>;
+  },
+) => {
+  const showError = componentProps.meta.touched && !componentProps.meta.active;
+
+  return (
+    <React.Fragment>
+      <InputComponent {...componentProps} {...componentProps.input} fill />
+      <FormFieldError error={showError && componentProps.meta.error} />
+    </React.Fragment>
+  );
+};
+
+type FormTextFieldProps = {
+  name: string;
+  placeholder: string;
+  type?: InputType;
+  label?: string;
+  intent?: Intent;
+  disabled?: boolean;
+  autoFocus?: boolean;
+};
+
+const FormTextField = (props: FormTextFieldProps) => {
+  return (
+    <React.Fragment>
+      <Field component={renderComponent} {...props} asyncControl />
+    </React.Fragment>
+  );
+};
+
+export default FormTextField;
diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index 58b7d11314..b4ccba00d9 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -60,6 +60,13 @@ export const scrollbarDark = css`
   }
 `;
 
+export const getTypographyByKey = (props: Record<string, any>, key: string) => `
+  font-weight: ${props.theme.typography[key].fontWeight};
+  font-size: ${props.theme.typography[key].fontSize}px;
+  line-height: ${props.theme.typography[key].lineHeight}px;
+  letter-spacing: ${props.theme.typography[key].letterSpacing}px;
+`;
+
 export const BlueprintControlTransform = css`
   && {
     .${Classes.CONTROL} {
@@ -312,11 +319,8 @@ export type Theme = {
   };
   authCard: {
     width: number;
-    borderRadius: number;
-    background: Color;
-    padding: number;
     dividerSpacing: number;
-    shadow: string;
+    formMessageWidth: number;
   };
   shadows: string[];
   widgets: {
@@ -735,6 +739,34 @@ type ColorType = {
     bg: ShadeColor;
   };
   floatingBtn: any;
+  auth: any;
+  formMessage: Record<string, Record<Intent, string>>;
+};
+
+const auth: any = {
+  background: darkShades[1],
+  cardBackground: lightShades[10],
+  btnPrimary: "#F86A2B",
+  inputBackground: darkShades[1],
+  headingText: "#FFF",
+  link: "#457AE6",
+  text: darkShades[7],
+  placeholder: darkShades[5],
+  socialBtnText: darkShades[8],
+  socialBtnBorder: darkShades[8],
+};
+
+const formMessage = {
+  background: {
+    danger: "rgba(226,44,44,0.08)",
+    success: "#172320",
+    warning: "rgba(224, 179, 14, 0.08)",
+  },
+  text: {
+    danger: "#E22C2C",
+    success: "#03B365",
+    warning: "#E0B30E",
+  },
 };
 
 export const dark: ColorType = {
@@ -862,9 +894,9 @@ export const dark: ColorType = {
       border: darkShades[2],
     },
     normal: {
-      bg: lightShades[10],
-      text: darkShades[9],
+      bg: darkShades[0],
       border: darkShades[0],
+      text: darkShades[7],
     },
     placeholder: darkShades[5],
     readOnly: {
@@ -1019,6 +1051,8 @@ export const dark: ColorType = {
     backgroundColor: darkShades[3],
     iconColor: darkShades[6],
   },
+  auth,
+  formMessage,
 };
 
 export const light: ColorType = {
@@ -1303,6 +1337,8 @@ export const light: ColorType = {
     backgroundColor: lightShades[3],
     iconColor: lightShades[7],
   },
+  auth,
+  formMessage,
 };
 
 export const theme: Theme = {
@@ -1395,6 +1431,18 @@ export const theme: Theme = {
       letterSpacing: -0.24,
       fontWeight: "normal",
     },
+    authCardHeader: {
+      fontStyle: "normal",
+      fontWeight: 600,
+      fontSize: 24,
+      lineHeight: 20,
+    },
+    authCardSubheader: {
+      fontStyle: "normal",
+      fontWeight: "normal",
+      fontSize: 14,
+      lineHeight: 20,
+    },
   },
   iconSizes: {
     XXS: 8,
@@ -1545,12 +1593,9 @@ export const theme: Theme = {
     },
   },
   authCard: {
-    width: 612,
-    borderRadius: 16,
-    background: Colors.WHITE,
-    padding: 40,
+    width: 400,
     dividerSpacing: 32,
-    shadow: "0px 4px 8px rgba(9, 30, 66, 0.25)",
+    formMessageWidth: 352,
   },
   shadows: [
     /* 0. tab */
diff --git a/app/client/src/constants/SocialLogin.tsx b/app/client/src/constants/SocialLogin.tsx
index e82a600f3e..eaaa37f3be 100644
--- a/app/client/src/constants/SocialLogin.tsx
+++ b/app/client/src/constants/SocialLogin.tsx
@@ -1,5 +1,6 @@
 import { GoogleOAuthURL, GithubOAuthURL } from "constants/ApiConstants";
-import GithubLogo from "assets/images/Github.png";
+
+import GithubLogo from "assets/images/Github_inverted.png";
 import GoogleLogo from "assets/images/Google.png";
 export type SocialLoginButtonProps = {
   url: string;
diff --git a/app/client/src/constants/messages.ts b/app/client/src/constants/messages.ts
index f5695775a5..2fbd8d7f82 100644
--- a/app/client/src/constants/messages.ts
+++ b/app/client/src/constants/messages.ts
@@ -18,10 +18,10 @@ export const ENTER_VIDEO_URL = "Please provide a valid url";
 export const FORM_VALIDATION_EMPTY_PASSWORD = "Please enter the password";
 export const FORM_VALIDATION_PASSWORD_RULE =
   "Please provide a password with a minimum of 6 characters";
-export const FORM_VALIDATION_INVALID_PASSWORD = "Please enter a valid password";
+export const FORM_VALIDATION_INVALID_PASSWORD = FORM_VALIDATION_PASSWORD_RULE;
 
 export const LOGIN_PAGE_SUBTITLE = "Use your organization email";
-export const LOGIN_PAGE_TITLE = "Login";
+export const LOGIN_PAGE_TITLE = "Sign In to your account";
 export const LOGIN_PAGE_EMAIL_INPUT_LABEL = "Email";
 export const LOGIN_PAGE_PASSWORD_INPUT_LABEL = "Password";
 export const LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER = "Email";
@@ -29,12 +29,13 @@ export const LOGIN_PAGE_PASSWORD_INPUT_PLACEHOLDER = "Password";
 export const LOGIN_PAGE_INVALID_CREDS_ERROR =
   "It looks like you may have entered incorrect/invalid credentials. Please try again or reset password using the button below.";
 export const LOGIN_PAGE_INVALID_CREDS_FORGOT_PASSWORD_LINK = "Reset Password";
+export const NEW_TO_APPSMITH = "New to Appsmith?";
 
-export const LOGIN_PAGE_LOGIN_BUTTON_TEXT = "Login";
+export const LOGIN_PAGE_LOGIN_BUTTON_TEXT = "sign in";
 export const LOGIN_PAGE_FORGOT_PASSWORD_TEXT = "Forgot Password";
 export const LOGIN_PAGE_REMEMBER_ME_LABEL = "Remember";
-export const LOGIN_PAGE_SIGN_UP_LINK_TEXT = "New to Appsmith? Sign up";
-export const SIGNUP_PAGE_TITLE = "Sign Up";
+export const LOGIN_PAGE_SIGN_UP_LINK_TEXT = "Sign up";
+export const SIGNUP_PAGE_TITLE = "Create your free account";
 export const SIGNUP_PAGE_SUBTITLE = "Use your organization email";
 export const SIGNUP_PAGE_EMAIL_INPUT_LABEL = "Email";
 export const SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER = " Email";
@@ -42,16 +43,17 @@ export const SIGNUP_PAGE_NAME_INPUT_PLACEHOLDER = "Name";
 export const SIGNUP_PAGE_NAME_INPUT_LABEL = "Name";
 export const SIGNUP_PAGE_PASSWORD_INPUT_LABEL = "Password";
 export const SIGNUP_PAGE_PASSWORD_INPUT_PLACEHOLDER = "Password";
-export const SIGNUP_PAGE_LOGIN_LINK_TEXT = "Have an account? Login";
+export const SIGNUP_PAGE_LOGIN_LINK_TEXT = "Sign In";
 export const SIGNUP_PAGE_NAME_INPUT_SUBTEXT = "How should we call you?";
 export const SIGNUP_PAGE_SUBMIT_BUTTON_TEXT = "Sign Up";
+export const ALREADY_HAVE_AN_ACCOUNT = "Already have an account?";
 
 export const SIGNUP_PAGE_SUCCESS = "Awesome! You have successfully registered.";
 export const SIGNUP_PAGE_SUCCESS_LOGIN_BUTTON_TEXT = "Login";
 
 export const RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL = "New Password";
 export const RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER = "New Password";
-export const RESET_PASSWORD_LOGIN_LINK_TEXT = "Changed your mind? Login";
+export const RESET_PASSWORD_LOGIN_LINK_TEXT = "Back to Sign In";
 export const RESET_PASSWORD_PAGE_TITLE = "Reset Password";
 export const RESET_PASSWORD_SUBMIT_BUTTON_TEXT = "Reset";
 export const RESET_PASSWORD_PAGE_SUBTITLE =
@@ -129,7 +131,7 @@ export const DELETING_APPLICATION = "Deleting application...";
 export const DUPLICATING_APPLICATION = "Duplicating application...";
 
 export const CURL_IMPORT_SUCCESS = "Curl Import Successfull";
-export const FORGOT_PASSWORD_PAGE_LOGIN_LINK = "Back to Login";
+export const FORGOT_PASSWORD_PAGE_LOGIN_LINK = "Back to Sign In";
 export const ADD_API_TO_PAGE_SUCCESS_MESSAGE = "Api added to page.";
 export const INPUT_WIDGET_DEFAULT_VALIDATION_ERROR = "Invalid input";
 
diff --git a/app/client/src/pages/UserAuth/FooterLinks.tsx b/app/client/src/pages/UserAuth/FooterLinks.tsx
new file mode 100644
index 0000000000..7cf506fb68
--- /dev/null
+++ b/app/client/src/pages/UserAuth/FooterLinks.tsx
@@ -0,0 +1,39 @@
+import React from "react";
+import styled from "styled-components";
+
+const FooterLink = styled.a`
+  cursor: pointer;
+  text-decoration: none;
+  :hover {
+    text-decoration: underline;
+    color: ${(props) => props.theme.colors.text.normal};
+  }
+  font-weight: ${(props) => props.theme.typography.releaseList.fontWeight};
+  font-size: ${(props) => props.theme.typography.releaseList.fontSize}px;
+  line-height: ${(props) => props.theme.typography.releaseList.lineHeight}px;
+  letter-spacing: ${(props) =>
+    props.theme.typography.releaseList.letterSpacing}px;
+  color: ${(props) => props.theme.colors.text.normal};
+`;
+
+const FooterLinksContainer = styled.div`
+  padding: ${(props) => props.theme.spaces[9]}px;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  width: 100%;
+  max-width: ${(props) => props.theme.authCard.width}px;
+`;
+
+const FooterLinks = () => (
+  <FooterLinksContainer>
+    <FooterLink target="_blank" href="/privacy-policy.html">
+      Privacy Policy
+    </FooterLink>
+    <FooterLink target="_blank" href="/terms-and-conditions.html">
+      Terms and conditions
+    </FooterLink>
+  </FooterLinksContainer>
+);
+
+export default FooterLinks;
diff --git a/app/client/src/pages/UserAuth/ForgotPassword.tsx b/app/client/src/pages/UserAuth/ForgotPassword.tsx
index e090f5e603..daa119e10f 100644
--- a/app/client/src/pages/UserAuth/ForgotPassword.tsx
+++ b/app/client/src/pages/UserAuth/ForgotPassword.tsx
@@ -4,17 +4,17 @@ import { withRouter, RouteComponentProps } from "react-router-dom";
 import { reduxForm, InjectedFormProps, formValueSelector } from "redux-form";
 import StyledForm from "components/editorComponents/Form";
 import {
-  AuthCardContainer,
   AuthCardHeader,
-  AuthCardBody,
   FormActions,
   AuthCardNavLink,
+  FormMessagesContainer,
 } from "./StyledComponents";
+import { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
 import {
   FORGOT_PASSWORD_PAGE_EMAIL_INPUT_LABEL,
   FORGOT_PASSWORD_PAGE_EMAIL_INPUT_PLACEHOLDER,
   FORGOT_PASSWORD_PAGE_SUBMIT_BUTTON_TEXT,
-  FORGOT_PASSWORD_PAGE_SUBTITLE,
   FORGOT_PASSWORD_PAGE_TITLE,
   FORM_VALIDATION_EMPTY_EMAIL,
   FORM_VALIDATION_INVALID_EMAIL,
@@ -22,11 +22,12 @@ import {
   FORGOT_PASSWORD_PAGE_LOGIN_LINK,
 } from "constants/messages";
 import { AUTH_LOGIN_URL } from "constants/routes";
-import FormMessage from "components/editorComponents/form/FormMessage";
+import FormMessage from "components/ads/formFields/FormMessage";
 import { FORGOT_PASSWORD_FORM_NAME } from "constants/forms";
-import FormGroup from "components/editorComponents/form/FormGroup";
-import Button from "components/editorComponents/Button";
-import FormTextField from "components/editorComponents/form/FormTextField";
+import FormGroup from "components/ads/formFields/FormGroup";
+import Button, { Size } from "components/ads/Button";
+import FormTextField from "components/ads/formFields/TextField";
+import { Icon } from "@blueprintjs/core";
 import { isEmail, isEmptyString } from "utils/formhelpers";
 import {
   ForgotPasswordFormValues,
@@ -52,46 +53,56 @@ type ForgotPasswordProps = InjectedFormProps<
 > &
   RouteComponentProps<{ email: string }> & { emailValue: string };
 
-export const ForgotPassword = (props: ForgotPasswordProps) => {
-  const {
-    error,
-    handleSubmit,
-    submitting,
-    submitFailed,
-    submitSucceeded,
-  } = props;
+export const ForgotPassword = withTheme(
+  (props: ForgotPasswordProps & { theme: Theme }) => {
+    const {
+      error,
+      handleSubmit,
+      submitting,
+      submitFailed,
+      submitSucceeded,
+    } = props;
 
-  return (
-    <AuthCardContainer>
-      {submitSucceeded && (
-        <FormMessage
-          intent="primary"
-          message={`${FORGOT_PASSWORD_SUCCESS_TEXT} ${props.emailValue}`}
-        />
-      )}
-      {!mailEnabled && (
-        <FormMessage
-          intent="warning"
-          message={
-            "You haven’t setup any email service yet. Please configure your email service to receive a reset link"
-          }
-          actions={[
-            {
-              url: "https://docs.appsmith.com/third-party-services/email",
-              text: "Configure Email service",
-              intent: "primary",
-            },
-          ]}
-        />
-      )}
-      {submitFailed && error && (
-        <FormMessage intent="warning" message={error} />
-      )}
-      <AuthCardHeader>
-        <h1>{FORGOT_PASSWORD_PAGE_TITLE}</h1>
-        <h5>{FORGOT_PASSWORD_PAGE_SUBTITLE}</h5>
-      </AuthCardHeader>
-      <AuthCardBody>
+    return (
+      <>
+        <AuthCardHeader>
+          <h1>{FORGOT_PASSWORD_PAGE_TITLE}</h1>
+        </AuthCardHeader>
+        <div style={{ display: "flex", justifyContent: "center" }}>
+          <AuthCardNavLink to={AUTH_LOGIN_URL}>
+            <Icon
+              icon="arrow-left"
+              style={{ marginRight: props.theme.spaces[3] }}
+            />
+            {FORGOT_PASSWORD_PAGE_LOGIN_LINK}
+          </AuthCardNavLink>
+        </div>
+        <FormMessagesContainer>
+          {submitSucceeded && (
+            <FormMessage
+              intent="success"
+              message={`${FORGOT_PASSWORD_SUCCESS_TEXT} ${props.emailValue}`}
+            />
+          )}
+          {!mailEnabled && (
+            <FormMessage
+              intent="warning"
+              message={
+                "You haven’t setup any email service yet. Please configure your email service to receive a reset link"
+              }
+              actions={[
+                {
+                  url: "https://docs.appsmith.com/third-party-services/email",
+                  text: "Configure Email service",
+                  intent: "primary",
+                },
+              ]}
+            />
+          )}
+          {submitFailed && error && (
+            <FormMessage intent="warning" message={error} />
+          )}
+        </FormMessagesContainer>
         <StyledForm onSubmit={handleSubmit(forgotPasswordSubmitHandler)}>
           <FormGroup
             intent={error ? "danger" : "none"}
@@ -105,23 +116,20 @@ export const ForgotPassword = (props: ForgotPasswordProps) => {
           </FormGroup>
           <FormActions>
             <Button
+              tag="button"
               type="submit"
               text={FORGOT_PASSWORD_PAGE_SUBMIT_BUTTON_TEXT}
-              intent="primary"
-              filled
-              size="large"
+              fill
+              size={Size.large}
               disabled={!isEmail(props.emailValue)}
-              loading={submitting}
+              isLoading={submitting}
             />
           </FormActions>
         </StyledForm>
-      </AuthCardBody>
-      <AuthCardNavLink to={AUTH_LOGIN_URL}>
-        {FORGOT_PASSWORD_PAGE_LOGIN_LINK}
-      </AuthCardNavLink>
-    </AuthCardContainer>
-  );
-};
+      </>
+    );
+  },
+);
 
 const selector = formValueSelector(FORGOT_PASSWORD_FORM_NAME);
 
diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx
index 8850421fce..b357127400 100644
--- a/app/client/src/pages/UserAuth/Login.tsx
+++ b/app/client/src/pages/UserAuth/Login.tsx
@@ -9,7 +9,6 @@ import {
 } from "constants/forms";
 import { FORGOT_PASSWORD_URL, SIGN_UP_URL } from "constants/routes";
 import {
-  LOGIN_PAGE_SUBTITLE,
   LOGIN_PAGE_TITLE,
   LOGIN_PAGE_EMAIL_INPUT_LABEL,
   LOGIN_PAGE_PASSWORD_INPUT_LABEL,
@@ -24,29 +23,28 @@ import {
   LOGIN_PAGE_SIGN_UP_LINK_TEXT,
   LOGIN_PAGE_INVALID_CREDS_ERROR,
   LOGIN_PAGE_INVALID_CREDS_FORGOT_PASSWORD_LINK,
-  FORM_VALIDATION_PASSWORD_RULE,
+  NEW_TO_APPSMITH,
 } from "constants/messages";
-import Divider from "components/editorComponents/Divider";
-import FormMessage from "components/editorComponents/form/FormMessage";
-import FormGroup from "components/editorComponents/form/FormGroup";
-import FormTextField from "components/editorComponents/form/FormTextField";
-import Button from "components/editorComponents/Button";
+import FormMessage from "components/ads/formFields/FormMessage";
+import FormGroup from "components/ads/formFields/FormGroup";
+import FormTextField from "components/ads/formFields/TextField";
+import Button, { Size } from "components/ads/Button";
 import ThirdPartyAuth, { SocialLoginTypes } from "./ThirdPartyAuth";
 import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers";
 import { LoginFormValues } from "./helpers";
+import { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
 
 import {
-  AuthCardContainer,
   SpacedSubmitForm,
   FormActions,
   AuthCardHeader,
-  AuthCardFooter,
   AuthCardNavLink,
-  AuthCardBody,
+  SignUpLinkSection,
+  ForgotPasswordLink,
 } from "./StyledComponents";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { getAppsmithConfigs } from "configs";
-import { TncPPLinks } from "./SignUp";
 import { LOGIN_SUBMIT_PATH } from "constants/ApiConstants";
 import PerformanceTracker, {
   PerformanceTransactionName,
@@ -74,11 +72,13 @@ const validate = (values: LoginFormValues) => {
 type LoginFormProps = { emailValue: string } & InjectedFormProps<
   LoginFormValues,
   { emailValue: string }
->;
+> & {
+    theme: Theme;
+  };
 
 const SocialLoginList: string[] = [];
-if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
 if (enableGoogleOAuth) SocialLoginList.push(SocialLoginTypes.GOOGLE);
+if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
 
 export const Login = (props: LoginFormProps) => {
   const { error, valid } = props;
@@ -103,7 +103,19 @@ export const Login = (props: LoginFormProps) => {
   }
 
   return (
-    <AuthCardContainer>
+    <>
+      <AuthCardHeader>
+        <h1>{LOGIN_PAGE_TITLE}</h1>
+      </AuthCardHeader>
+      <SignUpLinkSection>
+        {NEW_TO_APPSMITH}
+        <AuthCardNavLink
+          to={signupURL}
+          style={{ marginLeft: props.theme.spaces[3] }}
+        >
+          {LOGIN_PAGE_SIGN_UP_LINK_TEXT}
+        </AuthCardNavLink>
+      </SignUpLinkSection>
       {showError && (
         <FormMessage
           intent="warning"
@@ -117,68 +129,56 @@ export const Login = (props: LoginFormProps) => {
           ]}
         />
       )}
-      <AuthCardHeader>
-        <h1>{LOGIN_PAGE_TITLE}</h1>
-        <h5>{LOGIN_PAGE_SUBTITLE}</h5>
-      </AuthCardHeader>
-      <AuthCardBody>
-        <SpacedSubmitForm method="POST" action={loginURL}>
-          <FormGroup
-            intent={error ? "danger" : "none"}
-            label={LOGIN_PAGE_EMAIL_INPUT_LABEL}
-          >
-            <FormTextField
-              name={LOGIN_FORM_EMAIL_FIELD_NAME}
-              type="email"
-              placeholder={LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER}
-              autoFocus
-            />
-          </FormGroup>
-          <FormGroup
-            intent={error ? "danger" : "none"}
-            label={LOGIN_PAGE_PASSWORD_INPUT_LABEL}
-            helperText={FORM_VALIDATION_PASSWORD_RULE}
-          >
-            <FormTextField
-              type="password"
-              name={LOGIN_FORM_PASSWORD_FIELD_NAME}
-              placeholder={LOGIN_PAGE_PASSWORD_INPUT_PLACEHOLDER}
-            />
-          </FormGroup>
-          <Link to={forgotPasswordURL}>{LOGIN_PAGE_FORGOT_PASSWORD_TEXT}</Link>
-          <FormActions>
-            <Button
-              type="submit"
-              disabled={!valid}
-              text={LOGIN_PAGE_LOGIN_BUTTON_TEXT}
-              intent="primary"
-              filled
-              size="large"
-              onClick={() => {
-                PerformanceTracker.startTracking(
-                  PerformanceTransactionName.LOGIN_CLICK,
-                );
-                AnalyticsUtil.logEvent("LOGIN_CLICK", {
-                  loginMethod: "EMAIL",
-                });
-              }}
-            />
-          </FormActions>
-        </SpacedSubmitForm>
-        {SocialLoginList.length > 0 && (
-          <>
-            <Divider />
-            <ThirdPartyAuth type={"SIGNIN"} logins={SocialLoginList} />
-          </>
-        )}
-      </AuthCardBody>
-      <AuthCardNavLink to={signupURL}>
-        {LOGIN_PAGE_SIGN_UP_LINK_TEXT}
-      </AuthCardNavLink>
-      <AuthCardFooter>
-        <TncPPLinks />
-      </AuthCardFooter>
-    </AuthCardContainer>
+      {SocialLoginList.length > 0 && (
+        <ThirdPartyAuth type={"SIGNIN"} logins={SocialLoginList} />
+      )}
+      <SpacedSubmitForm method="POST" action={loginURL}>
+        <FormGroup
+          intent={error ? "danger" : "none"}
+          label={LOGIN_PAGE_EMAIL_INPUT_LABEL}
+        >
+          <FormTextField
+            name={LOGIN_FORM_EMAIL_FIELD_NAME}
+            type="email"
+            placeholder={LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER}
+            autoFocus
+          />
+        </FormGroup>
+        <FormGroup
+          intent={error ? "danger" : "none"}
+          label={LOGIN_PAGE_PASSWORD_INPUT_LABEL}
+          // helperText={FORM_VALIDATION_PASSWORD_RULE}
+        >
+          <FormTextField
+            type="password"
+            name={LOGIN_FORM_PASSWORD_FIELD_NAME}
+            placeholder={LOGIN_PAGE_PASSWORD_INPUT_PLACEHOLDER}
+          />
+        </FormGroup>
+
+        <FormActions>
+          <Button
+            tag="button"
+            type="submit"
+            disabled={!valid}
+            text={LOGIN_PAGE_LOGIN_BUTTON_TEXT}
+            fill
+            size={Size.large}
+            onClick={() => {
+              PerformanceTracker.startTracking(
+                PerformanceTransactionName.LOGIN_CLICK,
+              );
+              AnalyticsUtil.logEvent("LOGIN_CLICK", {
+                loginMethod: "EMAIL",
+              });
+            }}
+          />
+        </FormActions>
+      </SpacedSubmitForm>
+      <ForgotPasswordLink>
+        <Link to={forgotPasswordURL}>{LOGIN_PAGE_FORGOT_PASSWORD_TEXT}</Link>
+      </ForgotPasswordLink>
+    </>
   );
 };
 
@@ -190,5 +190,5 @@ export default connect((state) => ({
     validate,
     touchOnBlur: true,
     form: LOGIN_FORM_NAME,
-  })(Login),
+  })(withTheme(Login)),
 );
diff --git a/app/client/src/pages/UserAuth/ResetPassword.tsx b/app/client/src/pages/UserAuth/ResetPassword.tsx
index 9051027b3c..02e7e1a12c 100644
--- a/app/client/src/pages/UserAuth/ResetPassword.tsx
+++ b/app/client/src/pages/UserAuth/ResetPassword.tsx
@@ -7,33 +7,32 @@ import { RESET_PASSWORD_FORM_NAME } from "constants/forms";
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
 import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors";
 import { Icon } from "@blueprintjs/core";
-import FormTextField from "components/editorComponents/form/fields/TextField";
+import FormGroup from "components/ads/formFields/FormGroup";
+import FormTextField from "components/ads/formFields/TextField";
 import FormMessage, {
-  FormMessageProps,
   MessageAction,
-} from "components/editorComponents/form/FormMessage";
+  FormMessageProps,
+} from "components/ads/formFields/FormMessage";
 import Spinner from "components/editorComponents/Spinner";
-import Button from "components/editorComponents/Button";
-import FormGroup from "components/editorComponents/form/FormGroup";
+import Button, { Size } from "components/ads/Button";
+
 import StyledForm from "components/editorComponents/Form";
 import { isEmptyString, isStrongPassword } from "utils/formhelpers";
 import { ResetPasswordFormValues, resetPasswordSubmitHandler } from "./helpers";
 import {
   AuthCardHeader,
-  AuthCardFooter,
-  AuthCardContainer,
-  AuthCardBody,
   AuthCardNavLink,
   FormActions,
 } from "./StyledComponents";
 import { AUTH_LOGIN_URL, FORGOT_PASSWORD_URL } from "constants/routes";
+import { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
 
 import {
   RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL,
   RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER,
   RESET_PASSWORD_LOGIN_LINK_TEXT,
   RESET_PASSWORD_SUBMIT_BUTTON_TEXT,
-  RESET_PASSWORD_PAGE_SUBTITLE,
   RESET_PASSWORD_PAGE_TITLE,
   FORM_VALIDATION_INVALID_PASSWORD,
   FORM_VALIDATION_EMPTY_PASSWORD,
@@ -43,7 +42,6 @@ import {
   RESET_PASSWORD_RESET_SUCCESS,
   RESET_PASSWORD_RESET_SUCCESS_LOGIN_LINK,
 } from "constants/messages";
-import { TncPPLinks } from "./SignUp";
 
 const validate = (values: ResetPasswordFormValues) => {
   const errors: ResetPasswordFormValues = {};
@@ -66,6 +64,7 @@ type ResetPasswordProps = InjectedFormProps<
   verifyToken: (token: string, email: string) => void;
   isTokenValid: boolean;
   validatingToken: boolean;
+  theme: Theme;
 } & RouteComponentProps<{ email: string; token: string }>;
 
 export const ResetPassword = (props: ResetPasswordProps) => {
@@ -154,50 +153,49 @@ export const ResetPassword = (props: ResetPasswordProps) => {
     return <Spinner />;
   }
   return (
-    <AuthCardContainer>
+    <>
+      <AuthCardHeader>
+        <h1>{RESET_PASSWORD_PAGE_TITLE}</h1>
+      </AuthCardHeader>
+      <div style={{ display: "flex", justifyContent: "center" }}>
+        <AuthCardNavLink to={AUTH_LOGIN_URL}>
+          <Icon
+            icon="arrow-left"
+            style={{ marginRight: props.theme.spaces[3] }}
+          />
+          {RESET_PASSWORD_LOGIN_LINK_TEXT}
+        </AuthCardNavLink>
+      </div>
       {(showSuccessMessage || showFailureMessage) && (
         <FormMessage {...messageTagProps} />
       )}
-      <AuthCardHeader>
-        <h1>{RESET_PASSWORD_PAGE_TITLE}</h1>
-        <h5>{RESET_PASSWORD_PAGE_SUBTITLE}</h5>
-      </AuthCardHeader>
-      <AuthCardBody>
-        <StyledForm onSubmit={handleSubmit(resetPasswordSubmitHandler)}>
-          <FormGroup
-            intent={error ? "danger" : "none"}
-            label={RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL}
-          >
-            <FormTextField
-              name="password"
-              type="password"
-              placeholder={RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER}
-              disabled={submitSucceeded}
-            />
-          </FormGroup>
-          <Field type="hidden" name="email" component="input" />
-          <Field type="hidden" name="token" component="input" />
-          <FormActions>
-            <Button
-              filled
-              size="large"
-              type="submit"
-              text={RESET_PASSWORD_SUBMIT_BUTTON_TEXT}
-              intent="primary"
-              disabled={pristine || submitSucceeded}
-              loading={submitting}
-            />
-          </FormActions>
-        </StyledForm>
-      </AuthCardBody>
-      <AuthCardNavLink to={AUTH_LOGIN_URL}>
-        {RESET_PASSWORD_LOGIN_LINK_TEXT}
-        <Icon icon="arrow-right" intent="primary" />
-      </AuthCardNavLink>
-      <AuthCardFooter>
-        <TncPPLinks></TncPPLinks>
-      </AuthCardFooter>
-    </AuthCardContainer>
+      <StyledForm onSubmit={handleSubmit(resetPasswordSubmitHandler)}>
+        <FormGroup
+          intent={error ? "danger" : "none"}
+          label={RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL}
+        >
+          <FormTextField
+            name="password"
+            type="password"
+            placeholder={RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER}
+            disabled={submitSucceeded}
+          />
+        </FormGroup>
+        <Field type="hidden" name="email" component="input" />
+        <Field type="hidden" name="token" component="input" />
+        <FormActions>
+          <Button
+            tag="button"
+            fill
+            size={Size.large}
+            type="submit"
+            text={RESET_PASSWORD_SUBMIT_BUTTON_TEXT}
+            disabled={pristine || submitSucceeded}
+            isLoading={submitting}
+          />
+        </FormActions>
+      </StyledForm>
+    </>
   );
 };
 
@@ -232,5 +230,5 @@ export default connect(
     validate,
     form: RESET_PASSWORD_FORM_NAME,
     touchOnBlur: true,
-  })(withRouter(ResetPassword)),
+  })(withRouter(withTheme(ResetPassword))),
 );
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index 364fd9a986..3665d88f19 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -2,25 +2,16 @@ import React from "react";
 import { reduxForm, InjectedFormProps } from "redux-form";
 import { AUTH_LOGIN_URL } from "constants/routes";
 import { SIGNUP_FORM_NAME } from "constants/forms";
-import {
-  Link,
-  RouteComponentProps,
-  useLocation,
-  withRouter,
-} from "react-router-dom";
-import Divider from "components/editorComponents/Divider";
+import { RouteComponentProps, useLocation, withRouter } from "react-router-dom";
 import {
   AuthCardHeader,
-  AuthCardBody,
-  AuthCardFooter,
   AuthCardNavLink,
   SpacedSubmitForm,
   FormActions,
-  AuthCardContainer,
+  SignUpLinkSection,
 } from "./StyledComponents";
 import {
   SIGNUP_PAGE_TITLE,
-  SIGNUP_PAGE_SUBTITLE,
   SIGNUP_PAGE_EMAIL_INPUT_LABEL,
   SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER,
   SIGNUP_PAGE_PASSWORD_INPUT_LABEL,
@@ -31,15 +22,13 @@ import {
   FORM_VALIDATION_INVALID_EMAIL,
   FORM_VALIDATION_INVALID_PASSWORD,
   SIGNUP_PAGE_SUBMIT_BUTTON_TEXT,
-  PRIVACY_POLICY_LINK,
-  TERMS_AND_CONDITIONS_LINK,
-  FORM_VALIDATION_PASSWORD_RULE,
+  ALREADY_HAVE_AN_ACCOUNT,
 } from "constants/messages";
-import FormMessage from "components/editorComponents/form/FormMessage";
-import FormGroup from "components/editorComponents/form/FormGroup";
-import FormTextField from "components/editorComponents/form/FormTextField";
+import FormMessage from "components/ads/formFields/FormMessage";
+import FormGroup from "components/ads/formFields/FormGroup";
+import FormTextField from "components/ads/formFields/TextField";
 import ThirdPartyAuth, { SocialLoginTypes } from "./ThirdPartyAuth";
-import Button from "components/editorComponents/Button";
+import Button, { Size } from "components/ads/Button";
 
 import { isEmail, isStrongPassword, isEmptyString } from "utils/formhelpers";
 
@@ -54,28 +43,13 @@ import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
 import { setOnboardingState } from "utils/storage";
-const {
-  enableGithubOAuth,
-  enableGoogleOAuth,
-  enableTNCPP,
-} = getAppsmithConfigs();
+const { enableGithubOAuth, enableGoogleOAuth } = getAppsmithConfigs();
 const SocialLoginList: string[] = [];
 if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
 if (enableGoogleOAuth) SocialLoginList.push(SocialLoginTypes.GOOGLE);
 
-export const TncPPLinks = () => {
-  if (!enableTNCPP) return null;
-  return (
-    <>
-      <Link target="_blank" to="/privacy-policy.html">
-        {PRIVACY_POLICY_LINK}
-      </Link>
-      <Link target="_blank" to="/terms-and-conditions.html">
-        {TERMS_AND_CONDITIONS_LINK}
-      </Link>
-    </>
-  );
-};
+import { withTheme } from "styled-components";
+import { Theme } from "constants/DefaultTheme";
 
 const validate = (values: SignupFormValues) => {
   const errors: SignupFormValues = {};
@@ -93,7 +67,7 @@ const validate = (values: SignupFormValues) => {
 };
 
 type SignUpFormProps = InjectedFormProps<SignupFormValues> &
-  RouteComponentProps<{ email: string }>;
+  RouteComponentProps<{ email: string }> & { theme: Theme };
 
 export const SignUp = (props: SignUpFormProps) => {
   const { error, submitting, pristine, valid } = props;
@@ -115,71 +89,68 @@ export const SignUp = (props: SignUpFormProps) => {
   }
 
   return (
-    <AuthCardContainer>
+    <>
       {showError && <FormMessage intent="danger" message={errorMessage} />}
       <AuthCardHeader>
         <h1>{SIGNUP_PAGE_TITLE}</h1>
-        <h5>{SIGNUP_PAGE_SUBTITLE}</h5>
       </AuthCardHeader>
-      <AuthCardBody>
-        <SpacedSubmitForm method="POST" action={signupURL}>
-          <FormGroup
-            intent={error ? "danger" : "none"}
-            label={SIGNUP_PAGE_EMAIL_INPUT_LABEL}
-          >
-            <FormTextField
-              name="email"
-              type="email"
-              placeholder={SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER}
-              autoFocus
-            />
-          </FormGroup>
-          <FormGroup
-            intent={error ? "danger" : "none"}
-            label={SIGNUP_PAGE_PASSWORD_INPUT_LABEL}
-            helperText={FORM_VALIDATION_PASSWORD_RULE}
-          >
-            <FormTextField
-              type="password"
-              name="password"
-              placeholder={SIGNUP_PAGE_PASSWORD_INPUT_PLACEHOLDER}
-            />
-          </FormGroup>
-          <FormActions>
-            <Button
-              type="submit"
-              disabled={pristine || !valid}
-              loading={submitting}
-              text={SIGNUP_PAGE_SUBMIT_BUTTON_TEXT}
-              intent="primary"
-              filled
-              size="large"
-              onClick={() => {
-                AnalyticsUtil.logEvent("SIGNUP_CLICK", {
-                  signupMethod: "EMAIL",
-                });
-                PerformanceTracker.startTracking(
-                  PerformanceTransactionName.SIGN_UP,
-                );
-                setOnboardingState(true);
-              }}
-            />
-          </FormActions>
-        </SpacedSubmitForm>
-        {SocialLoginList.length > 0 && (
-          <>
-            <Divider />
-            <ThirdPartyAuth type={"SIGNUP"} logins={SocialLoginList} />
-          </>
-        )}
-      </AuthCardBody>
-      <AuthCardFooter>
-        <TncPPLinks />
-      </AuthCardFooter>
-      <AuthCardNavLink to={AUTH_LOGIN_URL}>
-        {SIGNUP_PAGE_LOGIN_LINK_TEXT}
-      </AuthCardNavLink>
-    </AuthCardContainer>
+      <SignUpLinkSection>
+        {ALREADY_HAVE_AN_ACCOUNT}
+        <AuthCardNavLink
+          to={AUTH_LOGIN_URL}
+          style={{ marginLeft: props.theme.spaces[3] }}
+        >
+          {SIGNUP_PAGE_LOGIN_LINK_TEXT}
+        </AuthCardNavLink>
+      </SignUpLinkSection>
+      {SocialLoginList.length > 0 && (
+        <ThirdPartyAuth type={"SIGNUP"} logins={SocialLoginList} />
+      )}
+      <SpacedSubmitForm method="POST" action={signupURL}>
+        <FormGroup
+          intent={error ? "danger" : "none"}
+          label={SIGNUP_PAGE_EMAIL_INPUT_LABEL}
+        >
+          <FormTextField
+            name="email"
+            type="email"
+            placeholder={SIGNUP_PAGE_EMAIL_INPUT_PLACEHOLDER}
+            autoFocus
+          />
+        </FormGroup>
+        <FormGroup
+          intent={error ? "danger" : "none"}
+          label={SIGNUP_PAGE_PASSWORD_INPUT_LABEL}
+          // helperText={FORM_VALIDATION_PASSWORD_RULE}
+        >
+          <FormTextField
+            type="password"
+            name="password"
+            placeholder={SIGNUP_PAGE_PASSWORD_INPUT_PLACEHOLDER}
+          />
+        </FormGroup>
+        <FormActions>
+          <Button
+            tag="button"
+            type="submit"
+            disabled={pristine || !valid}
+            isLoading={submitting}
+            text={SIGNUP_PAGE_SUBMIT_BUTTON_TEXT}
+            fill
+            size={Size.large}
+            onClick={() => {
+              AnalyticsUtil.logEvent("SIGNUP_CLICK", {
+                signupMethod: "EMAIL",
+              });
+              PerformanceTracker.startTracking(
+                PerformanceTransactionName.SIGN_UP,
+              );
+              setOnboardingState(true);
+            }}
+          />
+        </FormActions>
+      </SpacedSubmitForm>
+    </>
   );
 };
 
@@ -195,5 +166,5 @@ export default connect((state: AppState, props: SignUpFormProps) => {
     validate,
     form: SIGNUP_FORM_NAME,
     touchOnBlur: true,
-  })(withRouter(SignUp)),
+  })(withRouter(withTheme(SignUp))),
 );
diff --git a/app/client/src/pages/UserAuth/StyledComponents.tsx b/app/client/src/pages/UserAuth/StyledComponents.tsx
index 84fee636fb..f55e09aa80 100644
--- a/app/client/src/pages/UserAuth/StyledComponents.tsx
+++ b/app/client/src/pages/UserAuth/StyledComponents.tsx
@@ -1,38 +1,64 @@
-import styled, { css } from "styled-components";
+import styled from "styled-components";
 import { Link } from "react-router-dom";
 import Form from "components/editorComponents/Form";
 import { Card } from "@blueprintjs/core";
+import { getTypographyByKey } from "constants/DefaultTheme";
 
 export const AuthContainer = styled.section`
   position: absolute;
   width: 100%;
-  height: 100vh;
-  will-change: transform, opacity;
+  height: ${(props) => `calc(100vh - ${props.theme.headerHeight})`};
+  background-color: ${(props) => props.theme.colors.auth.background};
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  overflow: auto;
+`;
+
+export const AuthCardContainer = styled.div`
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+  justify-content: center;
+  padding: ${(props) => props.theme.authCard.padding}px 0;
 `;
 
 export const AuthCard = styled(Card)`
-  && {
-    width: ${(props) => props.theme.authCard.width}px;
-    background: ${(props) => props.theme.authCard.background};
-    border-radius: ${(props) => props.theme.authCard.borderRadius}px;
-    padding: ${(props) => props.theme.authCard.padding}px;
-    box-shadow: ${(props) => props.theme.authCard.shadow};
-    border: none;
-    & h1,
-    h5 {
-      padding: 0;
-      margin: 0;
-      font-weight: ${(props) => props.theme.fontWeights[1]};
-    }
+  display: flex;
+  flex-direction: column;
+  background-color: ${(props) => props.theme.colors.auth.cardBackground};
+  padding: ${(props) => props.theme.spaces[15]}px 64px;
+  width: ${(props) => props.theme.authCard.width}px;
+  border: none;
+  h1 {
+    text-align: center;
+    padding: 0;
+    margin: 0;
+    ${(props) => getTypographyByKey(props, "authCardHeader")}
+    color: ${(props) => props.theme.colors.auth.headingText};
+  }
+  & .form-message-container {
+    width: ${(props) => props.theme.authCard.formMessageWidth}px;
+    align-self: center;
+    text-align: center;
+  }
+  .form-message-container ~ .form-message-container {
+    margin-top: ${(props) => props.theme.spaces[4]}px;
+  }
+  & > div {
+    margin-bottom: ${(props) => props.theme.spaces[14]}px;
+  }
+  & > div:last-child,
+  & > div:empty {
+    margin-bottom: 0;
   }
 `;
 
-export const AuthCardContainer = styled.div``;
-
 export const AuthCardHeader = styled.header`
   & {
     h1 {
       font-size: ${(props) => props.theme.fontSizes[6]}px;
+      white-space: nowrap;
     }
     h5 {
       font-size: ${(props) => props.theme.fontSizes[4]}px;
@@ -41,15 +67,7 @@ export const AuthCardHeader = styled.header`
   }
 `;
 
-export const AuthCardNavLink = styled(Link)`
-  text-align: center;
-  margin: 0 auto;
-  display: block;
-  margin-top: ${(props) => props.theme.spaces[12]}px;
-  & span {
-    margin-left: ${(props) => props.theme.spaces[4]}px;
-  }
-`;
+export const AuthCardNavLink = styled(Link)``;
 
 export const AuthCardFooter = styled.footer`
   display: flex;
@@ -60,26 +78,15 @@ export const AuthCardFooter = styled.footer`
 `;
 
 export const AuthCardBody = styled.div`
-  display: flex;
-  justify-content: flex-start;
-  align-items: stretch;
   & a {
     margin-top: ${(props) => props.theme.spaces[8]}px;
     font-size: ${(props) => props.theme.fontSizes[2]}px;
   }
 `;
 
-const formSpacing = css`
-  flex-grow: 1;
-  margin-right: ${(props) => props.theme.authCard.dividerSpacing}px;
-`;
-
-export const SpacedForm = styled(Form)`
-  ${formSpacing}
-`;
+export const SpacedForm = styled(Form)``;
 
 export const SpacedSubmitForm = styled.form`
-  ${formSpacing}
   & a {
     font-size: ${(props) => props.theme.fontSizes[3]}px;
   }
@@ -100,3 +107,24 @@ export const FormActions = styled.div`
     margin-right: ${(props) => props.theme.spaces[11]}px;
   }
 `;
+
+export const SignUpLinkSection = styled.div`
+  ${(props) => getTypographyByKey(props, "authCardSubheader")}
+  color: ${(props) => props.theme.colors.auth.text};
+  text-align: center;
+`;
+
+export const ForgotPasswordLink = styled.div`
+  ${(props) => getTypographyByKey(props, "authCardSubheader")}
+  color: ${(props) => props.theme.colors.auth.text};
+  text-align: center;
+  margin-top: ${(props) => props.theme.spaces[11]}px;
+  & a {
+    color: ${(props) => props.theme.colors.auth.text};
+  }
+`;
+
+export const FormMessagesContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
diff --git a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
index 30cbfb01db..cfb346dee9 100644
--- a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
+++ b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
@@ -4,7 +4,7 @@ import {
   getSocialLoginButtonProps,
   SocialLoginType,
 } from "constants/SocialLogin";
-import { IntentColors, getBorderCSSShorthand } from "constants/DefaultTheme";
+import { getTypographyByKey } from "constants/DefaultTheme";
 import AnalyticsUtil, { EventName } from "utils/AnalyticsUtil";
 import { useLocation } from "react-router-dom";
 import PerformanceTracker, {
@@ -15,52 +15,41 @@ import { setOnboardingState } from "utils/storage";
 const ThirdPartyAuthWrapper = styled.div`
   display: flex;
   flex-direction: column;
-  justify-content: flex-start;
-  align-items: flex-end;
-  margin-left: ${(props) => props.theme.authCard.dividerSpacing}px;
 `;
 
 //TODO(abhinav): Port this to use themes.
 const StyledSocialLoginButton = styled.a`
-  width: 200px;
   display: flex;
   align-items: center;
-  border: ${(props) => getBorderCSSShorthand(props.theme.borders[2])};
-  padding: 8px;
-  color: ${(props) => props.theme.colors.textDefault};
-  border-radius: ${(props) => props.theme.radii[1]}px;
-  position: relative;
-  height: 42px;
+  justify-content: center;
+  border: solid 1px ${(props) => props.theme.colors.auth.socialBtnBorder};
+  padding: ${(props) => props.theme.spaces[2]}px;
+
+  &:first-child {
+    margin-bottom: ${(props) => props.theme.spaces[4]}px;
+  }
+
+  &:only-child {
+    margin-bottom: 0;
+  }
 
   &:hover {
     text-decoration: none;
-    background: ${IntentColors.success};
-    color: ${(props) => props.theme.colors.textOnDarkBG};
   }
-  & > div {
-    width: 36px;
-    height: 36px;
-    padding: ${(props) => props.theme.radii[1]}px;
-    position: absolute;
-    left: 2px;
-    top: 2px;
-    background: white;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    & img {
-      width: 80%;
-      height: 80%;
-    }
-  }
-  & p {
-    display: block;
-    margin: 0 0 0 36px;
-    font-size: ${(props) => props.theme.fontSizes[3]}px;
-    font-weight: ${(props) => props.theme.fontWeights[3]};
+
+  & .login-method {
+    ${(props) => getTypographyByKey(props, "btnLarge")}
+    color: ${(props) => props.theme.colors.auth.socialBtnText};
+    text-transform: uppercase;
   }
 `;
 
+const ButtonLogo = styled.img`
+  margin: ${(props) => props.theme.spaces[2]}px;
+  width: 14px;
+  height: 14px;
+`;
+
 export const SocialLoginTypes: Record<string, string> = {
   GOOGLE: "google",
   GITHUB: "github",
@@ -102,10 +91,8 @@ const SocialLoginButton = (props: {
         });
       }}
     >
-      <div>
-        <img alt={` ${props.name} login`} src={props.logo} />
-      </div>
-      <p>{`Sign in with ${props.name}`}</p>
+      <ButtonLogo alt={` ${props.name} login`} src={props.logo} />
+      <div className="login-method">{`continue with ${props.name}`}</div>
     </StyledSocialLoginButton>
   );
 };
diff --git a/app/client/src/pages/UserAuth/index.tsx b/app/client/src/pages/UserAuth/index.tsx
index a2ea945f90..2a9aa79df2 100644
--- a/app/client/src/pages/UserAuth/index.tsx
+++ b/app/client/src/pages/UserAuth/index.tsx
@@ -1,52 +1,43 @@
 import React from "react";
 import { Switch, useRouteMatch, useLocation, Route } from "react-router-dom";
 import Login from "./Login";
-import Centered from "components/designSystems/appsmith/CenteredWrapper";
-import { animated, useTransition } from "react-spring";
-import { AuthContainer, AuthCard } from "./StyledComponents";
+import { AuthContainer, AuthCard, AuthCardContainer } from "./StyledComponents";
 import SignUp from "./SignUp";
 import ForgotPassword from "./ForgotPassword";
 import ResetPassword from "./ResetPassword";
 import PageNotFound from "pages/common/PageNotFound";
+import FooterLinks from "./FooterLinks";
 import * as Sentry from "@sentry/react";
 const SentryRoute = Sentry.withSentryRouting(Route);
 
-const AnimatedAuthCard = animated(AuthContainer);
 export const UserAuth = () => {
   const { path } = useRouteMatch();
   const location = useLocation();
-  const transitions = useTransition(location, (location) => location.pathname, {
-    from: { opacity: 0, transform: "translate3d(50%,0,0)" },
-    enter: { opacity: 1, transform: "translate3d(0%,0,0)" },
-    leave: { opacity: 0, transform: "translate3d(-50%,0,0)" },
-    reset: true,
-  });
-  const renderTransitions = transitions.map(
-    ({ item: location, props, key }) => (
-      <AnimatedAuthCard key={key} style={props}>
-        <Centered>
-          <AuthCard>
-            <Switch location={location}>
-              <SentryRoute exact path={`${path}/login`} component={Login} />
-              <SentryRoute exact path={`${path}/signup`} component={SignUp} />
-              <SentryRoute
-                exact
-                path={`${path}/resetPassword`}
-                component={ResetPassword}
-              />
-              <SentryRoute
-                exact
-                path={`${path}/forgotPassword`}
-                component={ForgotPassword}
-              />
-              <SentryRoute component={PageNotFound} />
-            </Switch>
-          </AuthCard>
-        </Centered>
-      </AnimatedAuthCard>
-    ),
+
+  return (
+    <AuthContainer>
+      <AuthCardContainer>
+        <AuthCard>
+          <Switch location={location}>
+            <SentryRoute exact path={`${path}/login`} component={Login} />
+            <SentryRoute exact path={`${path}/signup`} component={SignUp} />
+            <SentryRoute
+              exact
+              path={`${path}/resetPassword`}
+              component={ResetPassword}
+            />
+            <SentryRoute
+              exact
+              path={`${path}/forgotPassword`}
+              component={ForgotPassword}
+            />
+            <SentryRoute component={PageNotFound} />
+          </Switch>
+        </AuthCard>
+      </AuthCardContainer>
+      <FooterLinks />
+    </AuthContainer>
   );
-  return <React.Fragment>{renderTransitions}</React.Fragment>;
 };
 
 export default UserAuth;
diff --git a/app/client/src/selectors/themeSelectors.tsx b/app/client/src/selectors/themeSelectors.tsx
index f42a41cdcc..6f7c8b7596 100644
--- a/app/client/src/selectors/themeSelectors.tsx
+++ b/app/client/src/selectors/themeSelectors.tsx
@@ -1,6 +1,33 @@
 import { AppState } from "reducers";
+import {
+  AUTH_LOGIN_URL,
+  SIGN_UP_URL,
+  RESET_PASSWORD_URL,
+  FORGOT_PASSWORD_URL,
+} from "constants/routes";
+import { theme, dark } from "constants/DefaultTheme";
+
+const enforceDarkThemeRoutes = [
+  AUTH_LOGIN_URL,
+  SIGN_UP_URL,
+  RESET_PASSWORD_URL,
+  FORGOT_PASSWORD_URL,
+];
+const getShouldEnforceDarkTheme = () => {
+  const currentPath = window.location.pathname;
+  return enforceDarkThemeRoutes.some(
+    (path: string) => currentPath.indexOf(path) !== -1,
+  );
+};
 
 export const getThemeDetails = (state: AppState) => {
+  if (getShouldEnforceDarkTheme()) {
+    return {
+      mode: state.ui.theme.mode,
+      theme: { ...theme, colors: { ...theme.colors, ...dark } },
+    };
+  }
+
   return {
     theme: state.ui.theme.theme,
     mode: state.ui.theme.mode,

From 43322413c6ab858d872ecfca1e4bd0d13d786c13 Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Wed, 27 Jan 2021 11:58:23 +0530
Subject: [PATCH 27/47] Support for navigateTo function to open in new window
 (#2706)

* Support target for navigate function

* Add docs and action creator field
---
 .../actioncreator/ActionCreator.tsx           | 33 ++++++++++++
 app/client/src/constants/routes.ts            |  4 +-
 app/client/src/sagas/ActionExecutionSagas.ts  | 52 +++++++++++++------
 .../utils/autocomplete/EntityDefinitions.ts   |  2 +-
 app/client/src/workers/evaluation.worker.ts   |  3 +-
 5 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/app/client/src/components/editorComponents/actioncreator/ActionCreator.tsx b/app/client/src/components/editorComponents/actioncreator/ActionCreator.tsx
index 56b78c2195..65205a569e 100644
--- a/app/client/src/components/editorComponents/actioncreator/ActionCreator.tsx
+++ b/app/client/src/components/editorComponents/actioncreator/ActionCreator.tsx
@@ -25,6 +25,7 @@ import {
   createNewApiAction,
   createNewQueryAction,
 } from "actions/apiPaneActions";
+import { NavigationTargetType } from "../../../sagas/ActionExecutionSagas";
 
 /* eslint-disable @typescript-eslint/ban-types */
 /* TODO: Function and object types need to be updated to enable the lint rule */
@@ -47,6 +48,19 @@ const FILE_TYPE_OPTIONS = [
   { label: "SVG", value: "'image/svg+xml'", id: "image/svg+xml" },
 ];
 
+const NAVIGATION_TARGET_FIELD_OPTIONS = [
+  {
+    label: "Same window",
+    value: `'${NavigationTargetType.SAME_WINDOW}'`,
+    id: NavigationTargetType.SAME_WINDOW,
+  },
+  {
+    label: "New window",
+    value: `'${NavigationTargetType.NEW_WINDOW}'`,
+    id: NavigationTargetType.NEW_WINDOW,
+  },
+];
+
 const FUNC_ARGS_REGEX = /((["][^"]*["])|([\[].*[\]])|([\{].*[\}])|(['][^']*['])|([\(].*[\)[=][>][{].*[}])|([^'",][^,"+]*[^'",]*))*/gi;
 const ACTION_TRIGGER_REGEX = /^{{([\s\S]*?)\(([\s\S]*?)\)}}$/g;
 //Old Regex:: /\(\) => ([\s\S]*?)(\([\s\S]*?\))/g;
@@ -316,6 +330,7 @@ const FieldType = {
   DOWNLOAD_FILE_NAME_FIELD: "DOWNLOAD_FILE_NAME_FIELD",
   DOWNLOAD_FILE_TYPE_FIELD: "DOWNLOAD_FILE_TYPE_FIELD",
   COPY_TEXT_FIELD: "COPY_TEXT_FIELD",
+  NAVIGATION_TARGET_FIELD: "NAVIGATION_TARGET_FIELD",
 };
 type FieldType = typeof FieldType[keyof typeof FieldType];
 
@@ -406,6 +421,15 @@ const fieldConfigs: FieldConfigs = {
     },
     view: ViewTypes.TEXT_VIEW,
   },
+  [FieldType.NAVIGATION_TARGET_FIELD]: {
+    getter: (value: any) => {
+      return enumTypeGetter(value, 2, NavigationTargetType.SAME_WINDOW);
+    },
+    setter: (option: any, currentValue: string) => {
+      return enumTypeSetter(option.value, currentValue, 2);
+    },
+    view: ViewTypes.SELECTOR_VIEW,
+  },
   [FieldType.ALERT_TEXT_FIELD]: {
     getter: (value: string) => {
       return textGetter(value, 0);
@@ -628,6 +652,9 @@ function getFieldFromValue(
     fields.push({
       field: FieldType.QUERY_PARAMS_FIELD,
     });
+    fields.push({
+      field: FieldType.NAVIGATION_TARGET_FIELD,
+    });
   }
 
   if (value.indexOf("showModal") !== -1) {
@@ -718,6 +745,7 @@ function renderField(props: {
     case FieldType.PAGE_SELECTOR_FIELD:
     case FieldType.ALERT_TYPE_SELECTOR_FIELD:
     case FieldType.DOWNLOAD_FILE_TYPE_FIELD:
+    case FieldType.NAVIGATION_TARGET_FIELD:
       let label = "";
       let defaultText = "Select Action";
       let options = props.apiOptionTree;
@@ -776,6 +804,11 @@ function renderField(props: {
         options = FILE_TYPE_OPTIONS;
         defaultText = "Select file type (optional)";
       }
+      if (fieldType === FieldType.NAVIGATION_TARGET_FIELD) {
+        label = "Target";
+        options = NAVIGATION_TARGET_FIELD_OPTIONS;
+        defaultText = "Navigation target";
+      }
       viewElement = (view as (props: SelectorViewProps) => JSX.Element)({
         options: options,
         label: label,
diff --git a/app/client/src/constants/routes.ts b/app/client/src/constants/routes.ts
index af0f81ca0f..c0429d61c7 100644
--- a/app/client/src/constants/routes.ts
+++ b/app/client/src/constants/routes.ts
@@ -127,7 +127,9 @@ export const getApplicationViewerPageURL = (
   return url + queryParams;
 };
 
-function convertToQueryParams(params: Record<string, string> = {}): string {
+export function convertToQueryParams(
+  params: Record<string, string> = {},
+): string {
   const paramKeys = Object.keys(params);
   const queryParams: string[] = [];
   if (paramKeys) {
diff --git a/app/client/src/sagas/ActionExecutionSagas.ts b/app/client/src/sagas/ActionExecutionSagas.ts
index 05c6e0ee78..cc9436c698 100644
--- a/app/client/src/sagas/ActionExecutionSagas.ts
+++ b/app/client/src/sagas/ActionExecutionSagas.ts
@@ -38,6 +38,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 import history from "utils/history";
 import {
   BUILDER_PAGE_URL,
+  convertToQueryParams,
   getApplicationViewerPageURL,
 } from "constants/routes";
 import {
@@ -86,42 +87,61 @@ import {
 } from "./EvaluationsSaga";
 import copy from "copy-to-clipboard";
 
+export enum NavigationTargetType {
+  SAME_WINDOW = "SAME_WINDOW",
+  NEW_WINDOW = "NEW_WINDOW",
+}
+
 function* navigateActionSaga(
-  action: { pageNameOrUrl: string; params: Record<string, string> },
+  action: {
+    pageNameOrUrl: string;
+    params: Record<string, string>;
+    target?: NavigationTargetType;
+  },
   event: ExecuteActionPayloadEvent,
 ) {
   const pageList = yield select(getPageList);
   const applicationId = yield select(getCurrentApplicationId);
+  const {
+    pageNameOrUrl,
+    params,
+    target = NavigationTargetType.SAME_WINDOW,
+  } = action;
   const page = _.find(
     pageList,
-    (page: Page) => page.pageName === action.pageNameOrUrl,
+    (page: Page) => page.pageName === pageNameOrUrl,
   );
   if (page) {
     AnalyticsUtil.logEvent("NAVIGATE", {
-      pageName: action.pageNameOrUrl,
-      pageParams: action.params,
+      pageName: pageNameOrUrl,
+      pageParams: params,
     });
-    // TODO need to make this check via RENDER_MODE;
+    const appMode = yield select(getAppMode);
     const path =
-      history.location.pathname.indexOf("/edit") !== -1
-        ? BUILDER_PAGE_URL(applicationId, page.pageId, action.params)
-        : getApplicationViewerPageURL(
-            applicationId,
-            page.pageId,
-            action.params,
-          );
-    history.push(path);
+      appMode === APP_MODE.EDIT
+        ? BUILDER_PAGE_URL(applicationId, page.pageId, params)
+        : getApplicationViewerPageURL(applicationId, page.pageId, params);
+    if (target === NavigationTargetType.SAME_WINDOW) {
+      history.push(path);
+    } else if (target === NavigationTargetType.NEW_WINDOW) {
+      window.open(path, "_blank");
+    }
     if (event.callback) event.callback({ success: true });
   } else {
     AnalyticsUtil.logEvent("NAVIGATE", {
-      navUrl: action.pageNameOrUrl,
+      navUrl: pageNameOrUrl,
     });
     // Add a default protocol if it doesn't exist.
-    let url = action.pageNameOrUrl;
+    let url = pageNameOrUrl + convertToQueryParams(params);
     if (url.indexOf("://") === -1) {
       url = "https://" + url;
     }
-    window.location.assign(url);
+    if (target === NavigationTargetType.SAME_WINDOW) {
+      window.location.assign(url);
+    } else if (target === NavigationTargetType.NEW_WINDOW) {
+      window.open(url, "_blank");
+    }
+    if (event.callback) event.callback({ success: true });
   }
 }
 
diff --git a/app/client/src/utils/autocomplete/EntityDefinitions.ts b/app/client/src/utils/autocomplete/EntityDefinitions.ts
index a0cecf10e9..01428c5270 100644
--- a/app/client/src/utils/autocomplete/EntityDefinitions.ts
+++ b/app/client/src/utils/autocomplete/EntityDefinitions.ts
@@ -231,7 +231,7 @@ export const GLOBAL_DEFS = {
 export const GLOBAL_FUNCTIONS = {
   navigateTo: {
     "!doc": "Action to navigate the user to another page or url",
-    "!type": "fn(pageNameOrUrl: string, params: {}) -> void",
+    "!type": "fn(pageNameOrUrl: string, params: {}, target?: string) -> void",
   },
   showAlert: {
     "!doc": "Show a temporary notification style message to the user",
diff --git a/app/client/src/workers/evaluation.worker.ts b/app/client/src/workers/evaluation.worker.ts
index f813409d02..43ffa95e42 100644
--- a/app/client/src/workers/evaluation.worker.ts
+++ b/app/client/src/workers/evaluation.worker.ts
@@ -1376,10 +1376,11 @@ const addFunctions = (dataTree: Readonly<DataTree>): DataTree => {
   withFunction.navigateTo = function(
     pageNameOrUrl: string,
     params: Record<string, string>,
+    target?: string,
   ) {
     return {
       type: "NAVIGATE_TO",
-      payload: { pageNameOrUrl, params },
+      payload: { pageNameOrUrl, params, target },
     };
   };
   withFunction.actionPaths.push("navigateTo");

From 5406cbee9e69ce5ef6b18d91293009541a320e4d Mon Sep 17 00:00:00 2001
From: Vicky Bansal <67091118+vicky-primathon@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:25:43 +0530
Subject: [PATCH 28/47] Fix: Update map initial location after creating a new
 marker (#2736)

---
 app/client/src/widgets/MapWidget.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/client/src/widgets/MapWidget.tsx b/app/client/src/widgets/MapWidget.tsx
index ba35a190a5..ddc72df2e0 100644
--- a/app/client/src/widgets/MapWidget.tsx
+++ b/app/client/src/widgets/MapWidget.tsx
@@ -132,6 +132,16 @@ class MapWidget extends BaseWidget<MapWidgetProps, WidgetState> {
     return this.props.center || this.props.mapCenter || DefaultCenter;
   }
 
+  componentDidUpdate(prevProps: MapWidgetProps) {
+    //remove selectedMarker when map initial location is updated
+    if (
+      JSON.stringify(prevProps.center) !== JSON.stringify(this.props.center) &&
+      this.props.selectedMarker
+    ) {
+      this.unselectMarker();
+    }
+  }
+
   getPageView() {
     return (
       <>

From aa71f2ae7b4c9c5cbccea13e0c49533e88e1e9dc Mon Sep 17 00:00:00 2001
From: Vicky Bansal <67091118+vicky-primathon@users.noreply.github.com>
Date: Wed, 27 Jan 2021 12:26:19 +0530
Subject: [PATCH 29/47] Handle invalid entity ids (#2547)

---
 app/client/src/assets/images/invalid-page.png | Bin 0 -> 3273 bytes
 app/client/src/constants/messages.ts          |   3 +
 .../src/pages/Editor/APIEditor/index.tsx      |   4 +
 .../pages/Editor/DataSourceEditor/index.tsx   |   5 +-
 .../src/pages/Editor/EntityNotFoundPane.tsx   |  71 ++++++++++++++++++
 app/client/src/sagas/DatasourcesSagas.ts      |   4 +-
 6 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 app/client/src/assets/images/invalid-page.png
 create mode 100644 app/client/src/pages/Editor/EntityNotFoundPane.tsx

diff --git a/app/client/src/assets/images/invalid-page.png b/app/client/src/assets/images/invalid-page.png
new file mode 100644
index 0000000000000000000000000000000000000000..83e780d2c67de91e93ad4cfdf8a574067491b790
GIT binary patch
literal 3273
zcmV;)3^wzLP)<h;3K|Lk000e1NJLTq003YB003491^@s6FuRk800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH3|>h@K~#7F?Obha
z97h?RnccllpB*PI#fjrMXUBFzfEFV_AQC4{{-DUTDwj49u@fpJgz_O&L0i<MiG)Cu
zMClLsfs%$2egJhLB9S7YD2gcsg_2MO5vvIhMU4{!aYbS~{y3j+nRjpJJUh2{d*{2o
zouz)H(cQi?J2N})yfe?tyt@c3U;*>Rf1c^sH@vg61^E~R`4GCU<KeG$wxo6R3L^Sz
z$j9)d0t`%}gYbh9T0hj=u>q8lx%3zOr~v%8ovY#)>wQe1sOTk(u`fH5-zp6~Tv@D;
zUkk$ZH~Ttv(!YdS0`e35qyT7qLL0hILHJ{0WLQCmFKlbCr<UNWVaPWMFncx$Dri5G
zg+BKLB9T}o9-&380lW`op2;^#@QVVVW0Uv#Iu6j5T>%26VHv9V;%-#)^tZE#0t(u5
zaeF*|@Zdq;C_q8}0KWKSymfI{IZRu25eQ<m;R79?LR#}`G;{53H2eN-5Ql11vZ&|i
zuTCSwDCCD9EWjB1n_}92zW0ae@WT+LmcXDQyyM#TRo#BE0@)Q{aC;b5RDyOeVYFwr
zB@tKx1cq1$@23jz#atk@0@%d6BBUK=GMISz-p^3`mG5OIWP<RzzxTF1PXA)rX{pR}
z08G62MDv|p0fN8Dgp2n4h&FU>PGXShGf87U00ap6^p?&gKU?{wy^}~{NNoXh7*WD1
zevw^6?^l*A%bPyBxi@PCFkkqAmddOEe51F$Po$j%Z=hDdPsl(^&nDUyBZ(Ct<q!lD
z=+UMBZmkcX<BWDf;|JG%-tk^7{s>CGa~`EfN8mE_p&$<3YTNkR!NEZ!BV_Cu2JO7F
ztMdfGdM^l|_cwh1e9;*s={)e?mwU6<4`%gEtv|hff&NV+$spqpM1Xd(#s`SB(+MIi
z4P$hmySrP;xj-rfz|cb*3O5C`?0%0%8`6$;Iss@Y10i_bkDG6IBMB8C(;R>Y1_sEv
zb?Osgg?xtz7e9B>mUcS9prw<eXy(Qh<2p$2`T^4N!{Om!sTKy(Sb&~cG2t3ju`Id@
z(M~7S(4mW`rKi@89!Mk-Qdzwem4V~Lty{M$ly>f9v=bW6iFP^xXlZy;_TUT!6|#HB
z<XiPfqK+p;MPSAItadrhFS^2;`^xJ544_0{Q2;nI=xT@^KoTv^WKaO6!vbEaDZQ3O
zS5JApp9eo7D+KSk{N>gbw4eY3#%?F{{(wTVy+2yP#s`SBv@xK(iX^cD&n*CYe^Y3V
zc8Yubl>)y-0lTHwdRKMJFd?hRBf!K9cqwq@6L5&a<n`Y=S@6E(yKke>pS+MGhxI}o
zH`Is#3y9Fox`}g{{A*Nv<nG<OT_|G(o>5cJdVuM?pezaEekLoHcFvC6whd0;X(@PC
zoLuoQ*e&(cq037XB>ZkCpj_JNgj`yxzj%5}qo=#2UMYZdb#)P*cET843EJrdI5XgB
z=_5;O_j$Qb<b?tZlZRC)PdlSr&vdnLY6UUDmF37ow_1=#Ly;#IaPi4_4(-I|*jx<+
zAAO9crFD(53@!EI{J7c*fJGN+s&k)qIzgnR|D?3k3%ACqE8yAm<v8WOS=w1!fI7Mf
zuz(P!csd_Jr-0qzsw$zH3NTK(me;9oFab0Gze24xcv=cpaHF@a4^_ESR;@4?dPL7=
zw`r#njNy-){G+P!1MsjmU-qa9s-*zZ-`{WXY_1mVbOP_n!aS_amp!VY1lJY7ULAUG
zm({b`i;33`KubjrYr0#yvRb~St{+K4Zvq#SI!({<Y@QEb%VFw|r*h=wC{^^Zj$mBh
z^GbC*tlhQ%3_a<gKzhH7y`P80!<yh7uv=OUD{xZ*ww}$gr(ZxaBFDp;($X_$&M2mr
zwQF!SbJ$}MJ)47%ZbGs`^ss(??Pw2G0CIDM?3MzIq31;N9XMp~VM4EIrxQe48d1m*
z*e!K)h3uLIfa#Xv*(?i04{O*hMJ^s+x}ks!?d<E^SBht|ED$}c>Dpzt>0#{(Tu}h!
z(Q!@D_b>q*1^S`)Geqbxq%B`<{D;Na$D;%mkgixkr4?ZG{)YpqWziL>(q4ZhQL}B1
zt$`~GrKKB?3uguuSHL^lS6g;FEA3)ZE!fdg<idzi$qX^jPFQp?!F)ZNWr4-R+H_?>
z5?cU1);#n$zv!xa#+$wVO2HUDH_yH3QLB>U^enrgX9g8ffVo;EmGo?u1)_)bZ$3J{
zzmg7Jl~Mq{$$2*WiFP_cq@~ot_kLZyQZWzfvNM6+5BohqA1=Cz1+X~g%0f}s9z@__
zT@gl95e2yE*(?ikJggI$GlOzZ&*rTFvta1`E8X;LmIXN;)-mN(=zQgF6P0TL7SCpN
zd8e;wrxRk^=1$HkMN7-Mna~PstW(K3CTMv1yz67XJ~4`BZoQi$hnMo81GtT`Uwk*~
zVLglVzxG^-ee%+!ODSpz^V+kXuX{QMK3uDgA7_GUO}xNLymn=o`ok%do)|MctWT|d
zu$MOeQ8T(^C6qh_u|xL$kBn8-vso6{d01cA);{mu(vlSbhZC<SKD@*W&t_R5dRUk9
zRhE(zz?jcxBC)+*cs9!dI}hvmy0Vmd1JKUamXLOx34kAa!F>2PVqgNUrgt?1d=MmQ
zejqBH*56$E+VzdJlcr0Vkc+ke*8BPIIC$k^0*ycN++*1=N|}iluy|M#gO+Y6_58SK
z1wh7sdaBdnV&au&vn&ujtYf5f59?wTkm>!=wB?05FX^Bxuy|NgE4bO$2K(1VPsqi(
zCc<|db_EIkDih@UcwRLCPc}O`g4E{KMqnRs^#bC@0yRR`ty>m2_VerGMSU#LQ30^u
zF)%QoJm1yu2J`KNu`lGIgB8|-M)@pw)%Xlrb0?bm^I5t|AA`%#L!n@DsD0z_1_uWn
zC*y)c5KO#RuU^ICH=F;T_j~38<IJGP`mw<0(O*^;vs3Cg2f%k6G{t(z{y|!F6^pQS
zPON)4svMxa#c@I|qyQj33hZ_+^#0<I<6*tsdAGEn0)GEg+~Q&)t7o$;01JRuU>RZo
z?C8*yPXPw)Y>leNm_T;VW?2AR6joZ=QSimToCvn!g&X0}fyqB8yPf4i^st8a;!baA
z%=_YB&UwJ0Lx&6n@GsOsrju`-LJKGkaA?H9Jgn(_dJttk9BZMbqE<}L=Jsy{6nq#h
zpi;R1=J5ShiL=8a;zpe~1c7g7tES*RXaSW(-DewXkC?R70)7ZGd^>S!D1Lt$|8g>=
z2PRUf;7nRqQ#w}CdYWYP1y)4pTmdvSO@}taF+k5;gL$#fGtcREE-v#wTOhsPS{;I{
z`Q%>n@=P9l*$iovsaM)8lUU-#^tpAn)`?HY>TP{)>ovhBtx%yt^x2T2BqJ)CrXxz~
zY@)6H3;q9iA8`d?p(Id9kcLPw7>rF%Pe<tgFbx{AaYRy86{S+Cyw|)O0CD_(Aq~r0
z=i|*hv!4}XWfUsQPM!zG$702L(EIg#`4*ACZl-}m$v_}5NeCIAnwomh)YLRFG&D4W
z;5^@a9*Y9n+S;^{k&*Ddd-tH>qbSq(0VGV;nx>(dnHl330RM}CrGa@F%}0001Dg+}
z3;7s|;p!n?=hT<~1=uurR@q!U;>x$=$wQDqTDX{|;ei<@Xh_nKLN*G3@d+9_6ro6`
z(;)~T1N#ymh`Y9Hlq_fu(38oerK|$?+aYhf`M{P&he?i>hx0T_!E2jFg?urUW$Pez
zJ_eA%vqD>$=^?;S0}nriGL1ip@+iQdo+zUL=<z``*Yhp=8FXkubZD{^9twqYYGRm=
zWB=h70RJH!@L}<OF}+=UJ`}2td8yMhP^Qj3t8G54o;J_H^2jNZzfXu`N=TUjl#n!o
z{SbsQjjc2^G{8`#m@=dH$6_%wHa3=1agYOS;*6dt-e+DjGq;$#SWZn%4IUpK*SR>I
z#u4+^t~|t-X;)`Hu0Xwwd{FVo_dLuBpuw3UX7imJ!_5k1Lh70|YoPas%mDL1gata0
zgds3_p8w&-#>NQuYe{DY{#uO726n$q8Y6GMOfj7qm(52=YpENH=bq0}J|_zcb+W_>
z?GrZJ5X=O|EXUnZ#&ojQz(OLCFoK=j{7;1I?0-1a5%0Cji**3LtbFPCwE5zlLV<f#
zmOq3-X>H_0s5`qhHsy+a>mCaVaY|QeTq$+PcU`G`J;nb3L+5EVA59)b00000NkvXX
Hu0mjfMH49O

literal 0
HcmV?d00001

diff --git a/app/client/src/constants/messages.ts b/app/client/src/constants/messages.ts
index 2fbd8d7f82..d8dd5a19d4 100644
--- a/app/client/src/constants/messages.ts
+++ b/app/client/src/constants/messages.ts
@@ -92,6 +92,9 @@ export const WIDGET_TYPE_VALIDATION_ERROR = "Value does not match type";
 export const URL_HTTP_VALIDATION_ERROR = "Please enter a valid URL";
 export const NAVIGATE_TO_VALIDATION_ERROR =
   "Please enter a valid URL or page name";
+export const PAGE_NOT_FOUND_ERROR =
+  "The page you’re looking for either does not exist, or cannot be found";
+export const INVALID_URL_ERROR = "Invalid URL";
 
 export const INVITE_USERS_VALIDATION_EMAIL_LIST =
   "Invalid Email address(es) found";
diff --git a/app/client/src/pages/Editor/APIEditor/index.tsx b/app/client/src/pages/Editor/APIEditor/index.tsx
index 6fe50d8315..77b47bc193 100644
--- a/app/client/src/pages/Editor/APIEditor/index.tsx
+++ b/app/client/src/pages/Editor/APIEditor/index.tsx
@@ -32,6 +32,7 @@ import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
 import * as Sentry from "@sentry/react";
+import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
 import { ApplicationPayload } from "constants/ReduxActionConstants";
 
 const LoadingContainer = styled(CenteredWrapper)`
@@ -144,6 +145,9 @@ class ApiEditor extends React.Component<Props> {
       paginationType,
       isEditorInitialized,
     } = this.props;
+    if (!this.props.pluginId && this.props.match.params.apiId) {
+      return <EntityNotFoundPane />;
+    }
     if (isCreating || !isEditorInitialized) {
       return (
         <LoadingContainer>
diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
index 6f47d53974..89616cf9d0 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx
@@ -21,6 +21,7 @@ import DatasourceHome from "./DatasourceHome";
 import DataSourceEditorForm from "./DBForm";
 import { Datasource } from "entities/Datasource";
 import { RouteComponentProps } from "react-router";
+import EntityNotFoundPane from "pages/Editor/EntityNotFoundPane";
 
 interface ReduxStateProps {
   formData: Datasource;
@@ -88,7 +89,9 @@ class DataSourceEditor extends React.Component<Props> {
       setDatasourceEditorMode,
       pluginType,
     } = this.props;
-
+    if (!pluginId && datasourceId) {
+      return <EntityNotFoundPane />;
+    }
     return (
       <React.Fragment>
         {datasourceId ? (
diff --git a/app/client/src/pages/Editor/EntityNotFoundPane.tsx b/app/client/src/pages/Editor/EntityNotFoundPane.tsx
new file mode 100644
index 0000000000..94703ee6d6
--- /dev/null
+++ b/app/client/src/pages/Editor/EntityNotFoundPane.tsx
@@ -0,0 +1,71 @@
+import React from "react";
+import styled from "styled-components";
+import Button, { Size, Category } from "components/ads/Button";
+import PageUnavailableImage from "assets/images/invalid-page.png";
+import { PAGE_NOT_FOUND_ERROR, INVALID_URL_ERROR } from "constants/messages";
+import { useHistory } from "react-router-dom";
+
+const Wrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  align-items: center;
+  justify-content: flex-start;
+  padding-top: 15%;
+  background: #fcfcfc;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  .page-details {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 450px;
+  }
+  .bold-text {
+    font-weight: ${(props) => props.theme.fontWeights[3]};
+    font-size: 24px;
+    margin-top: 20px;
+  }
+  .page-message {
+    margin-top: 14px;
+    color: #716e6e;
+    font-size: 14px;
+    line-height: 17px;
+    letter-spacing: 0.733333px;
+  }
+  .page-unavailable-img {
+    width: 72px;
+  }
+  .button-position {
+    margin-top: 14px;
+  }
+`;
+
+const EntityNotFoundPane = () => {
+  const history = useHistory();
+  return (
+    <Wrapper>
+      <img
+        src={PageUnavailableImage}
+        alt="Page Unavailable"
+        className="page-unavailable-img"
+      />
+      <div className="page-details">
+        <p className="bold-text">{INVALID_URL_ERROR}</p>
+        <p className="page-message">{PAGE_NOT_FOUND_ERROR}</p>
+        <Button
+          tag="button"
+          text="Go Back"
+          cypressSelector="t--invalid-page-go-back"
+          className="button-position"
+          size={Size.large}
+          category={Category.secondary}
+          onClick={history.goBack}
+        />
+      </div>
+    </Wrapper>
+  );
+};
+
+export default EntityNotFoundPane;
diff --git a/app/client/src/sagas/DatasourcesSagas.ts b/app/client/src/sagas/DatasourcesSagas.ts
index bf087f866d..7de41029cf 100644
--- a/app/client/src/sagas/DatasourcesSagas.ts
+++ b/app/client/src/sagas/DatasourcesSagas.ts
@@ -390,7 +390,9 @@ function* switchDatasourceSaga(action: ReduxAction<{ datasourceId: string }>) {
       (datasource: Datasource) => datasource.id === datasourceId,
     ),
   );
-  yield put(changeDatasource(datasource));
+  if (datasource) {
+    yield put(changeDatasource(datasource));
+  }
 }
 
 function* formValueChangeSaga(

From 6bf2be65c076842ed43354c75073b1bc8270acea Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Wed, 27 Jan 2021 13:44:15 +0530
Subject: [PATCH 30/47] Don't attempt to get structure for invalid datasources
 (#2730)

---
 .../DatasourceStructureSolution.java          | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java
index 58780ba8c5..6622785d15 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/DatasourceStructureSolution.java
@@ -19,6 +19,7 @@ import com.appsmith.server.services.PluginService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
@@ -41,19 +42,25 @@ public class DatasourceStructureSolution {
 
     public Mono<DatasourceStructure> getStructure(String datasourceId, boolean ignoreCache) {
         return datasourceService.getById(datasourceId)
-                .flatMap(datasource -> getStructure(datasource, ignoreCache));
+                .flatMap(datasource -> getStructure(datasource, ignoreCache))
+                .defaultIfEmpty(new DatasourceStructure());
     }
 
-    public Mono<DatasourceStructure> getStructure(Datasource datasource, boolean ignoreCache) {
-        // This mono, when computed, will yield the cached structure if applicable, or resolve to an empty mono.
-        // If the structure is `null` inside the datasource, this will resolve to empty as well.
-        final Mono<DatasourceStructure> cachedStructureMono =
-                ignoreCache ? Mono.empty() : Mono.justOrEmpty(datasource.getStructure());
+    private Mono<DatasourceStructure> getStructure(Datasource datasource, boolean ignoreCache) {
+        if (!CollectionUtils.isEmpty(datasource.getInvalids())) {
+            // Don't attempt to get structure for invalid datasources.
+            return Mono.empty();
+        }
+
+        if (!ignoreCache && datasource.getStructure() != null) {
+            // Return the cached structure if available.
+            return Mono.just(datasource.getStructure());
+        }
 
         decryptEncryptedFieldsInDatasource(datasource);
 
         // This mono, when computed, will load the structure of the datasource by calling the plugin method.
-        final Mono<DatasourceStructure> loadStructureMono = pluginExecutorHelper
+        return pluginExecutorHelper
                 .getPluginExecutor(pluginService.findById(datasource.getPluginId()))
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.PLUGIN, datasource.getPluginId())))
                 .flatMap(pluginExecutor -> datasourceContextService
@@ -79,10 +86,6 @@ public class DatasourceStructureSolution {
                         ? Mono.empty()
                         : datasourceRepository.saveStructure(datasource.getId(), structure).thenReturn(structure)
                 );
-
-        return cachedStructureMono
-                .switchIfEmpty(loadStructureMono)
-                .defaultIfEmpty(new DatasourceStructure());
     }
 
     private Datasource decryptEncryptedFieldsInDatasource(Datasource datasource) {

From 0fa245a9857beb25da43d8dc181b5996d04f849a Mon Sep 17 00:00:00 2001
From: Abhinav Jha <abhinav@appsmith.com>
Date: Wed, 27 Jan 2021 13:51:47 +0530
Subject: [PATCH 31/47] Fix issue where users could undo delete long after the
 timeout has expired (#2741)

---
 app/client/src/components/ads/Toast.tsx       |  3 ++-
 app/client/src/sagas/WidgetOperationSagas.tsx | 26 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/client/src/components/ads/Toast.tsx b/app/client/src/components/ads/Toast.tsx
index bd8f3f9b72..1feec4cde9 100644
--- a/app/client/src/components/ads/Toast.tsx
+++ b/app/client/src/components/ads/Toast.tsx
@@ -168,7 +168,8 @@ export const Toaster = {
       />,
       {
         toastId: toastId,
-        pauseOnHover: true,
+        pauseOnHover: !config.dispatchableAction && !config.hideProgressBar,
+        pauseOnFocusLoss: !config.dispatchableAction && !config.hideProgressBar,
         autoClose: false,
         closeOnClick: false,
         hideProgressBar: config.hideProgressBar,
diff --git a/app/client/src/sagas/WidgetOperationSagas.tsx b/app/client/src/sagas/WidgetOperationSagas.tsx
index 0499d608fd..320ed8072d 100644
--- a/app/client/src/sagas/WidgetOperationSagas.tsx
+++ b/app/client/src/sagas/WidgetOperationSagas.tsx
@@ -463,21 +463,21 @@ export function* undoDeleteSaga(action: ReduxAction<{ widgetId: string }>) {
   const deletedWidgets: FlattenedWidgetProps[] = yield getDeletedWidgets(
     action.payload.widgetId,
   );
-  // Find the parent in the list of deleted widgets
-  const deletedWidget = deletedWidgets.find(
-    (widget) => widget.widgetId === action.payload.widgetId,
-  );
+  if (deletedWidgets && Array.isArray(deletedWidgets)) {
+    // Find the parent in the list of deleted widgets
+    const deletedWidget = deletedWidgets.find(
+      (widget) => widget.widgetId === action.payload.widgetId,
+    );
 
-  // If the deleted widget is in fact available.
-  if (deletedWidget) {
-    // Log an undo event
-    AnalyticsUtil.logEvent("WIDGET_DELETE_UNDO", {
-      widgetName: deletedWidget.widgetName,
-      widgetType: deletedWidget.type,
-    });
-  }
+    // If the deleted widget is in fact available.
+    if (deletedWidget) {
+      // Log an undo event
+      AnalyticsUtil.logEvent("WIDGET_DELETE_UNDO", {
+        widgetName: deletedWidget.widgetName,
+        widgetType: deletedWidget.type,
+      });
+    }
 
-  if (deletedWidgets) {
     // Get the current list of widgets from reducer
     const stateWidgets = yield select(getWidgets);
     let widgets = { ...stateWidgets };

From a6d76d16728f37cd13151307c0de1d50a04459f1 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Wed, 27 Jan 2021 14:35:43 +0530
Subject: [PATCH 32/47] Fix organization slug computation clashes (#2725)

* Fix organization slug computation clashes

* Handle case where number-less slug is available
---
 .../CustomOrganizationRepository.java         |  2 ++
 .../CustomOrganizationRepositoryImpl.java     | 27 +++++++++++++++++++
 .../repositories/OrganizationRepository.java  |  5 +---
 .../services/OrganizationServiceImpl.java     |  4 +--
 .../services/OrganizationServiceTest.java     | 15 ++++-------
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
index 8c04b55885..3d80001be8 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepository.java
@@ -14,4 +14,6 @@ public interface CustomOrganizationRepository extends AppsmithRepository<Organiz
 
     Flux<Organization> findByIdsIn(Set<String> orgIds, AclPermission aclPermission, Sort sort);
 
+    Mono<Long> nextSlugNumber(String slugPrefix);
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
index a295a8b87e..9b45fa8d70 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomOrganizationRepositoryImpl.java
@@ -8,14 +8,17 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
 
 @Component
 @Slf4j
@@ -39,4 +42,28 @@ public class CustomOrganizationRepositoryImpl extends BaseAppsmithRepositoryImpl
 
         return queryAll(List.of(orgIdsCriteria), aclPermission, sort);
     }
+
+    @Override
+    public Mono<Long> nextSlugNumber(String slugPrefix) {
+        final String slugField = fieldName(QOrganization.organization.slug);
+        final Query slugPrefixQuery = query(where(slugField).regex("^" + slugPrefix + "\\d*$"));
+        slugPrefixQuery.fields().include(slugField);
+        return mongoOperations
+                .find(slugPrefixQuery, Organization.class)
+                .map(Organization::getSlug)
+                .collect(Collectors.toSet())
+                .map(slugs -> {
+                    if (slugs.isEmpty() || !slugs.contains(slugPrefix)) {
+                        return 0L;
+                    }
+
+                    long number = 1L;
+                    while (slugs.contains(slugPrefix + number)) {
+                        ++number;
+                    }
+
+                    return number;
+                });
+    }
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
index 8114a37f61..6d2224f775 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/OrganizationRepository.java
@@ -1,7 +1,6 @@
 package com.appsmith.server.repositories;
 
 import com.appsmith.server.domains.Organization;
-import org.springframework.data.mongodb.repository.Query;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Mono;
 
@@ -10,10 +9,8 @@ public interface OrganizationRepository extends BaseRepository<Organization, Str
 
     Mono<Organization> findBySlug(String slug);
 
-    @Query(value = "{slug: {$regex: ?0}}", count = true)
-    Mono<Long> countSlugsByPrefix(String keyword);
-
     Mono<Organization> findByIdAndPluginsPluginId(String organizationId, String pluginId);
 
     Mono<Organization> findByName(String name);
+
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
index 8e067ad47d..b1567ed5ab 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/OrganizationServiceImpl.java
@@ -98,8 +98,8 @@ public class OrganizationServiceImpl extends BaseService<OrganizationRepository,
 
     @Override
     public Mono<String> getNextUniqueSlug(String initialSlug) {
-        return repository.countSlugsByPrefix(initialSlug)
-                .map(max -> initialSlug + (max == 0 ? "" : (max + 1)));
+        return repository.nextSlugNumber(initialSlug)
+                .map(number -> initialSlug + (number == 0 ? "" : number));
     }
 
     /**
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
index ca3efabc57..d153c6368f 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
@@ -234,21 +234,16 @@ public class OrganizationServiceTest {
     @WithUserDetails(value = "api_user")
     public void uniqueSlugs() {
         Organization organization = new Organization();
-        organization.setName("First slug org");
+        organization.setName("Slug org");
         organization.setDomain("example.com");
         organization.setWebsite("https://example.com");
 
-        Mono<String> uniqueSlug = organizationService.getNextUniqueSlug("slug-org")
-                .map(slug -> {
-                    organization.setSlug(slug);
-                    return organization;
-                })
-                .flatMap(organizationService::create)
-                .then(organizationService.getNextUniqueSlug("slug-org"));
+        Mono<String> uniqueSlug = organizationService.create(organization)
+                .flatMap(org -> organizationService.getNextUniqueSlug(org.getSlug()));
 
         StepVerifier.create(uniqueSlug)
                 .assertNext(slug -> {
-                    assertThat(slug).isNotEqualTo("slug-org");
+                    assertThat(slug).isEqualTo("slug-org1");
                 })
                 .verifyComplete();
     }
@@ -272,7 +267,7 @@ public class OrganizationServiceTest {
         StepVerifier.create(Mono.zip(firstOrgCreation, secondOrgCreation))
                 .assertNext(orgsTuple -> {
                     assertThat(orgsTuple.getT1().getSlug()).isEqualTo("really-good-org");
-                    assertThat(orgsTuple.getT2().getSlug()).isEqualTo("really-good-org2");
+                    assertThat(orgsTuple.getT2().getSlug()).isEqualTo("really-good-org1");
                 })
                 .verifyComplete();
     }

From 704b78743533c39ee42ffc5a6a0a66da986364f6 Mon Sep 17 00:00:00 2001
From: NandanAnantharamu <67676905+NandanAnantharamu@users.noreply.github.com>
Date: Wed, 27 Jan 2021 14:37:33 +0530
Subject: [PATCH 33/47] updated action on file selected (#2691)

* updated action on file selected

* updated common method

* Review comments incorporated

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
---
 .../FormWidgets/FilePicker_spec.js            | 29 ++++++++++++-------
 app/client/cypress/support/commands.js        | 13 +++++++++
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FilePicker_spec.js b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FilePicker_spec.js
index 08a8e52607..ddd231e396 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FilePicker_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/FormWidgets/FilePicker_spec.js
@@ -6,30 +6,37 @@ describe("FilePicker Widget Functionality", function() {
   beforeEach(() => {
     cy.addDsl(dsl);
   });
+
+  it("Create API to be used in Filepicker", function() {
+    cy.log("Login Successful");
+    cy.NavigateToAPI_Panel();
+    cy.log("Navigation to API Panel screen successful");
+    cy.CreateAPI("FirstAPI");
+    cy.log("Creation of FirstAPI Action successful");
+    cy.enterDatasourceAndPath(
+      this.data.paginationUrl,
+      this.data.paginationParam,
+    );
+    cy.SaveAndRunAPI();
+  });
+
   it("FilePicker Widget Functionality", function() {
-    cy.openPropertyPane("filepickerwidget");
-
+    cy.SearchEntityandOpen("FilePicker1");
+    cy.wait(1000);
     //Checking the edit props for FilePicker and also the properties of FilePicker widget
-
     cy.testCodeMirror("Upload Files");
-    cy.get(commonlocators.editPropCrossButton).click();
   });
 
   it("It checks the loading state of filepicker on call the action", function() {
-    cy.openPropertyPane("filepickerwidget");
+    cy.SearchEntityandOpen("FilePicker1");
     const fixturePath = "testFile.mov";
-    cy.getAlert(commonlocators.filePickerOnFilesSelected);
+    cy.addAPIFromLightningMenu("FirstAPI");
     cy.get(commonlocators.filePickerButton).click();
     cy.get(commonlocators.filePickerInput)
       .first()
       .attachFile(fixturePath);
     cy.get(commonlocators.filePickerUploadButton).click();
     cy.get(".bp3-spinner").should("have.length", 1);
-    cy.wait("@updateLayout").should(
-      "have.nested.property",
-      "response.body.responseMeta.status",
-      200,
-    );
     cy.wait(500);
     cy.get("button").contains("1 files selected");
   });
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 481fe934e9..12141bbbd6 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1279,6 +1279,19 @@ Cypress.Commands.add("getAlert", (alertcss) => {
     .click({ force: true });
 });
 
+Cypress.Commands.add("addAPIFromLightningMenu", (ApiName) => {
+  cy.get(commonlocators.dropdownSelectButton)
+    .click({ force: true })
+    .get("ul.bp3-menu")
+    .children()
+    .contains("Call An API")
+    .click({ force: true })
+    .get("ul.bp3-menu")
+    .children()
+    .contains(ApiName)
+    .click({ force: true });
+});
+
 Cypress.Commands.add("radioInput", (index, text) => {
   cy.get(widgetsPage.RadioInput)
     .eq(index)

From 63b7eb6e95e9df4fcb95c6136c2e70b8b3963afb Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Wed, 27 Jan 2021 14:55:08 +0530
Subject: [PATCH 34/47] Fix signature in RestAPI plugin throwing timeout error
 (#2745)

* Fix restapi signature throwing timeout error

* Add missing dependencies for restapi
---
 .../appsmith-plugins/restApiPlugin/pom.xml    | 68 +++++++++++--------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/app/server/appsmith-plugins/restApiPlugin/pom.xml b/app/server/appsmith-plugins/restApiPlugin/pom.xml
index b34dbf1947..cd9e8fa6a5 100644
--- a/app/server/appsmith-plugins/restApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/restApiPlugin/pom.xml
@@ -4,13 +4,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-
     <groupId>com.external.plugins</groupId>
     <artifactId>restApiPlugin</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -47,8 +40,14 @@
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webflux</artifactId>
-            <version>5.1.13.RELEASE</version>
+            <artifactId>spring-core</artifactId>
+            <version>5.2.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+            <version>2.2.4.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -59,8 +58,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.10.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.10.2</version>
         </dependency>
 
         <dependency>
@@ -106,6 +111,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>3.13.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -127,31 +133,33 @@
 
     </dependencies>
 
-    <!--
-        This doesn't use the maven-shade-plugin because it inherits from spring-boot-starter-parent
-        for it's dependency on webclient. This is a normal compile.
-    -->
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
                 <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Plugin-Id>${plugin.id}</Plugin-Id>
-                            <Plugin-Class>${plugin.class}</Plugin-Class>
-                            <Plugin-Version>${plugin.version}</Plugin-Version>
-                            <Plugin-Provider>${plugin.provider}</Plugin-Provider>
-                            <Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
-                        </manifestEntries>
-                    </archive>
+                    <minimizeJar>false</minimizeJar>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <manifestEntries>
+                                <Plugin-Id>${plugin.id}</Plugin-Id>
+                                <Plugin-Class>${plugin.class}</Plugin-Class>
+                                <Plugin-Version>${plugin.version}</Plugin-Version>
+                                <Plugin-Provider>${plugin.provider}</Plugin-Provider>
+                            </manifestEntries>
+                        </transformer>
+                    </transformers>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>

From 35e66360e213f4263b11620a4a2d82c686aa7d54 Mon Sep 17 00:00:00 2001
From: Pawan Kumar <pawan.stardust@gmail.com>
Date: Wed, 27 Jan 2021 17:08:21 +0530
Subject: [PATCH 35/47] Fix: Hover highlight in entity explorer should be
 edge-to-edge (#2478)

* fix merge conflicts of sumanthyedoti:fix/entity-items-hover

* remove unused import

Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
---
 .../appsmith/ScrollIndicator.tsx              | 94 +++++++++++++++++++
 .../components/editorComponents/Sidebar.tsx   |  2 +-
 .../pages/Editor/Explorer/Entity/index.tsx    |  3 +-
 .../pages/Editor/Explorer/EntityExplorer.tsx  | 13 ++-
 4 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 app/client/src/components/designSystems/appsmith/ScrollIndicator.tsx

diff --git a/app/client/src/components/designSystems/appsmith/ScrollIndicator.tsx b/app/client/src/components/designSystems/appsmith/ScrollIndicator.tsx
new file mode 100644
index 0000000000..e2fc432579
--- /dev/null
+++ b/app/client/src/components/designSystems/appsmith/ScrollIndicator.tsx
@@ -0,0 +1,94 @@
+import React, { useEffect, useState, useRef } from "react";
+import styled from "styled-components";
+import _ from "lodash";
+import { useSpring, animated, interpolate } from "react-spring";
+
+const ScrollTrack = styled.div<{
+  isVisible: boolean;
+}>`
+  position: absolute;
+  z-index: 100;
+  top: 0;
+  right: 2px;
+  width: 4px;
+  height: 100%;
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  overflow: hidden;
+  opacity: ${(props) => (props.isVisible ? 1 : 0)};
+  transition: opacity 0.15s ease-in;
+`;
+
+const ScrollThumb = styled(animated.div)`
+  width: 4px;
+  background-color: #ebeef0aa;
+  border-radius: 3px;
+  transform: translate3d(0, 0, 0);
+`;
+
+interface Props {
+  containerRef: React.RefObject<HTMLDivElement>;
+}
+const ScrollIndicator = ({ containerRef }: Props) => {
+  const [{ thumbPosition }, setThumbPosition] = useSpring(() => ({
+    thumbPosition: 0,
+    config: {
+      clamp: true,
+      friction: 10,
+      precision: 0.1,
+      tension: 800,
+    },
+  }));
+  const [isScrollVisible, setIsScrollVisible] = useState(false);
+  const thumbRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const handleContainerScroll = (e: any): void => {
+      setIsScrollVisible(true);
+      const thumbHeight =
+        e.target.offsetHeight / (e.target.scrollHeight / e.target.offsetHeight);
+      const thumbPosition = (e.target.scrollTop / e.target.offsetHeight) * 100;
+      /* set scroll thumb height */
+      if (thumbRef.current) {
+        thumbRef.current.style.height = thumbHeight + "px";
+      }
+      setThumbPosition({
+        thumbPosition,
+      });
+    };
+
+    containerRef.current?.addEventListener("scroll", handleContainerScroll);
+
+    return () => {
+      containerRef.current?.removeEventListener(
+        "scroll",
+        handleContainerScroll,
+      );
+    };
+  }, []);
+
+  useEffect(() => {
+    if (isScrollVisible) {
+      hideScrollbar();
+    }
+  }, [isScrollVisible]);
+
+  const hideScrollbar = _.debounce(() => {
+    setIsScrollVisible(false);
+  }, 1500);
+
+  return (
+    <ScrollTrack isVisible={isScrollVisible}>
+      <ScrollThumb
+        ref={thumbRef}
+        style={{
+          transform: interpolate(
+            [thumbPosition],
+            (top: number) => `translate3d(0px, ${top}%, 0)`,
+          ),
+        }}
+      />
+    </ScrollTrack>
+  );
+};
+
+export default ScrollIndicator;
diff --git a/app/client/src/components/editorComponents/Sidebar.tsx b/app/client/src/components/editorComponents/Sidebar.tsx
index a3867af282..8282baf2ff 100644
--- a/app/client/src/components/editorComponents/Sidebar.tsx
+++ b/app/client/src/components/editorComponents/Sidebar.tsx
@@ -10,7 +10,7 @@ import PerformanceTracker, {
 
 const SidebarWrapper = styled.div`
   background-color: ${Colors.MINE_SHAFT};
-  padding: 0px 0 0 6px;
+  padding: 0;
   width: ${(props) => props.theme.sidebarWidth};
   z-index: 3;
 
diff --git a/app/client/src/pages/Editor/Explorer/Entity/index.tsx b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
index b2f18dbba3..5f48fe0640 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/index.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/index.tsx
@@ -37,7 +37,8 @@ export const EntityItem = styled.div<{
 }>`
   position: relative;
   font-size: 12px;
-  padding-left: ${(props) => props.step * props.theme.spaces[2]}px;
+  padding-left: ${(props) =>
+    props.step * props.theme.spaces[2] + props.theme.spaces[2]}px;
   background: ${(props) => (props.active ? Colors.TUNDORA : "none")};
   height: 30px;
   width: 100%;
diff --git a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
index 9fa198df11..fc874ddfbe 100644
--- a/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
+++ b/app/client/src/pages/Editor/Explorer/EntityExplorer.tsx
@@ -9,7 +9,6 @@ import {
 } from "./hooks";
 import Search from "./ExplorerSearch";
 import ExplorerPageGroup from "./Pages/PageGroup";
-import { scrollbarDark } from "constants/DefaultTheme";
 import { NonIdealState, Classes, IPanelProps } from "@blueprintjs/core";
 import WidgetSidebar from "../WidgetSidebar";
 import { BUILDER_PAGE_URL } from "constants/routes";
@@ -22,11 +21,17 @@ import PerformanceTracker, {
 } from "utils/PerformanceTracker";
 import { useSelector } from "react-redux";
 import { getPlugins } from "selectors/entitiesSelector";
+import ScrollIndicator from "components/designSystems/appsmith/ScrollIndicator";
 
 const Wrapper = styled.div`
   height: 100%;
-  overflow-y: scroll;
-  ${scrollbarDark};
+  overflow-y: auto;
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+  &::-webkit-scrollbar {
+    width: 0px;
+    -webkit-appearance: none;
+  }
 `;
 
 const NoResult = styled(NonIdealState)`
@@ -41,6 +46,7 @@ const StyledDivider = styled(Divider)`
 
 const EntityExplorer = (props: IPanelProps) => {
   const { applicationId } = useParams<ExplorerURLParams>();
+
   const searchInputRef: MutableRefObject<HTMLInputElement | null> = useRef(
     null,
   );
@@ -99,6 +105,7 @@ const EntityExplorer = (props: IPanelProps) => {
       )}
       <StyledDivider />
       <JSDependencies />
+      <ScrollIndicator containerRef={explorerRef} />
     </Wrapper>
   );
 };

From 350aea90c4ac6414004977286ebe3a5fa0675dfc Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Wed, 27 Jan 2021 17:24:25 +0530
Subject: [PATCH 36/47] Revert RestAPI plugin signature timeout fix (#2748)

---
 .../appsmith-plugins/restApiPlugin/pom.xml    | 68 ++++++++-----------
 1 file changed, 30 insertions(+), 38 deletions(-)

diff --git a/app/server/appsmith-plugins/restApiPlugin/pom.xml b/app/server/appsmith-plugins/restApiPlugin/pom.xml
index cd9e8fa6a5..b34dbf1947 100644
--- a/app/server/appsmith-plugins/restApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/restApiPlugin/pom.xml
@@ -4,6 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.2.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
     <groupId>com.external.plugins</groupId>
     <artifactId>restApiPlugin</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -40,14 +47,8 @@
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>5.2.3.RELEASE</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>2.2.4.RELEASE</version>
+            <artifactId>spring-webflux</artifactId>
+            <version>5.1.13.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -58,14 +59,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.10.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.10.2</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
 
         <dependency>
@@ -111,7 +106,6 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.13.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -133,33 +127,31 @@
 
     </dependencies>
 
+    <!--
+        This doesn't use the maven-shade-plugin because it inherits from spring-boot-starter-parent
+        for it's dependency on webclient. This is a normal compile.
+    -->
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.2</version>
                 <configuration>
-                    <minimizeJar>false</minimizeJar>
-                    <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <manifestEntries>
-                                <Plugin-Id>${plugin.id}</Plugin-Id>
-                                <Plugin-Class>${plugin.class}</Plugin-Class>
-                                <Plugin-Version>${plugin.version}</Plugin-Version>
-                                <Plugin-Provider>${plugin.provider}</Plugin-Provider>
-                            </manifestEntries>
-                        </transformer>
-                    </transformers>
+                    <archive>
+                        <manifestEntries>
+                            <Plugin-Id>${plugin.id}</Plugin-Id>
+                            <Plugin-Class>${plugin.class}</Plugin-Class>
+                            <Plugin-Version>${plugin.version}</Plugin-Version>
+                            <Plugin-Provider>${plugin.provider}</Plugin-Provider>
+                            <Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
+                        </manifestEntries>
+                    </archive>
                 </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>

From 94885e95fb0fbb0267eab710248f0057aaf21d03 Mon Sep 17 00:00:00 2001
From: abhishek nayak <nayak.abhishek@gmail.com>
Date: Wed, 27 Jan 2021 18:07:13 +0530
Subject: [PATCH 37/47] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 43dc21e16a..74606891bf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Thank you for your interest in Appsmith and taking the time to contribute on this project. 🙌 
 Appsmith is a project by developers for developers and there are a lot of ways you can contribute. 
-Feel free to propose changes to this document in a pull request.
+If you don't know where to start contributing, ask us on our [Discord channel](https://discord.gg/WN8b2W8j). 
 
 ## Code of conduct
 
@@ -10,7 +10,7 @@ Read our [Code of Conduct](CODE_OF_CONDUCT.md) before contributing
 
 ## How can I contribute?
 
-There are many ways in which we/one can to contribute to Appsmith. All contributions are highly appreciated.
+There are many ways in which you can to contribute to Appsmith.
 
 #### 🐛 Report a bug
 Report all issues through GitHub Issues using the [Report a Bug](https://github.com/appsmithorg/appsmith/issues/new?assignees=Nikhil-Nandagopal&labels=Bug%2C+High&template=---bug-report.md&title=%5BBug%5D) template.
@@ -24,4 +24,4 @@ File your feature request through GitHub Issues using the [Feature Request](http
 In the process of shipping features quickly, we often forget to keep our docs up to date. You can help by suggesting improvements to our documentation or dive right in to our [Contribution Guide](contributions/docs/CONTRIBUTING.md)!
 
 #### ⚙️ Close a Bug / Feature issue
-We welcome contributions that help make appsmith bug free & improve the experience of our users. Check out our [Code Contribution Guide](contributions/CodeContributionsGuidelines.md) to begin.
+We welcome contributions that help make appsmith bug free & improve the experience of our users. You can also find issues tagged [Good First Issues](https://github.com/appsmithorg/appsmith/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22+bug). Check out our [Code Contribution Guide](contributions/CodeContributionsGuidelines.md) to begin.

From 8358709f563416c1211c1d06c0a2372ffb280570 Mon Sep 17 00:00:00 2001
From: NandanAnantharamu <67676905+NandanAnantharamu@users.noreply.github.com>
Date: Wed, 27 Jan 2021 18:44:44 +0530
Subject: [PATCH 38/47] Added usecase for orgNaming convention (#2521)

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
---
 .../Orgname_validation_spec.js                | 30 ++++++++++++
 app/client/cypress/locators/HomePage.json     |  4 +-
 .../cypress/manual_TestSuite/Duplicate_App.js | 11 -----
 .../manual_TestSuite/Duplicate_App_Spec.js    | 22 ---------
 .../cypress/manual_TestSuite/Org_Logo_Del.js  | 19 --------
 .../cypress/manual_TestSuite/Org_Logo_Set.js  | 18 -------
 .../manual_TestSuite/Organisation_Name.js     | 11 -----
 .../Organisation_Name_Spec.js                 | 47 -------------------
 .../Reusing_Name_of_Deleted_App.js            | 14 ------
 .../manual_TestSuite/Share_User_Icon.js       | 17 -------
 .../manual_TestSuite/Spl_Chracter_Org_Name.js | 11 -----
 .../Table_Filter_Test_spec.js                 | 15 ------
 12 files changed, 33 insertions(+), 186 deletions(-)
 create mode 100644 app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/Orgname_validation_spec.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Duplicate_App.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Org_Logo_Del.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Org_Logo_Set.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Organisation_Name.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Reusing_Name_of_Deleted_App.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Share_User_Icon.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Spl_Chracter_Org_Name.js
 delete mode 100644 app/client/cypress/manual_TestSuite/Table_Filter_Test_spec.js

diff --git a/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/Orgname_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/Orgname_validation_spec.js
new file mode 100644
index 0000000000..98871c03ad
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/OrganisationTests/Orgname_validation_spec.js
@@ -0,0 +1,30 @@
+/// <reference types="Cypress" />
+
+const homePage = require("../../../locators/HomePage.json");
+
+describe("Org name validation spec", function() {
+  it("create org with leading space validation", function() {
+    cy.NavigateToHome();
+    cy.get(homePage.createOrg)
+      .should("be.visible")
+      .first()
+      .click({ force: true });
+    cy.xpath(homePage.inputOrgName)
+      .should("be.visible")
+      .type(" ");
+    cy.get(homePage.submit).should("be.disabled");
+    cy.xpath(homePage.cancelBtn).click();
+  });
+
+  it("create org with special characters validation", function() {
+    cy.get(homePage.createOrg)
+      .should("be.visible")
+      .first()
+      .click({ force: true });
+    cy.xpath(homePage.inputOrgName)
+      .should("be.visible")
+      .type("Test & Org");
+    cy.get(homePage.submit).should("be.enabled");
+    cy.xpath(homePage.cancelBtn).click();
+  });
+});
diff --git a/app/client/cypress/locators/HomePage.json b/app/client/cypress/locators/HomePage.json
index 6b9366e204..ba279d11fc 100644
--- a/app/client/cypress/locators/HomePage.json
+++ b/app/client/cypress/locators/HomePage.json
@@ -67,5 +67,7 @@
     "uploadLogo": "//div/form/input",
     "removeLogo": ".remove-button a span",
     "generalTab": "//li//span[text()='General']",
-    "membersTab": "//li//span[text()='Members']"
+    "membersTab": "//li//span[text()='Members']",
+    "cancelBtn": "//span[text()='Cancel']",
+    "submit": "button:contains('Submit')"
 }
diff --git a/app/client/cypress/manual_TestSuite/Duplicate_App.js b/app/client/cypress/manual_TestSuite/Duplicate_App.js
deleted file mode 100644
index 8b70a6bbb3..0000000000
--- a/app/client/cypress/manual_TestSuite/Duplicate_App.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function() {
-  it("Duplicating an application", function() {
-    // Navigate to home Page
-    // Click on any application action icon (Three dots)
-    // Click on "Duplicate" option
-    // Ensure the application gets copied
-    // Ensure the name is appended with the word "Copy"
-  });
-});
diff --git a/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js b/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
deleted file mode 100644
index 1b6eb8240a..0000000000
--- a/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function() {
-  it("Duplicating an application", function() {
-    // Navigate to home Page
-    // Click on any application action icon (Three dots)
-    // Click on "Duplicate" option
-    // Ensure the application gets copied
-    // Ensure the name is appended with the word "Copy"
-  });
-  it("Deleting the duplicated Application ", function() {
-    // Navigate to home Page
-    // Click on any application action icon (Three dots)
-    // Click on "Duplicate" option
-    // Ensure the application gets copied
-    // Click on "Appsmith" to navigate to homepage
-    // Click  on action icon
-    // Click on Delete option
-    // Click on "Are You Sure?" option
-    // Ensure  the App gets deleted
-  });
-});
diff --git a/app/client/cypress/manual_TestSuite/Org_Logo_Del.js b/app/client/cypress/manual_TestSuite/Org_Logo_Del.js
deleted file mode 100644
index 9f90bcf735..0000000000
--- a/app/client/cypress/manual_TestSuite/Org_Logo_Del.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-
-describe("Deletion of organisational Logo ", function()  {
-    it(" org logo upload ", function() 
-    {
-     //Click on the dropdown next to organisational Name 
-     // Navigate between tabs 
-     // Naviagte to General Tab
-     // Add an Organisational Logo
-     // Wait until it loads
-     // Switch between Tabs
-     // Click on the remove Icon 
-     //Ensure the organisational Logo is deleted
-    }
-    )
-}
-)
-
diff --git a/app/client/cypress/manual_TestSuite/Org_Logo_Set.js b/app/client/cypress/manual_TestSuite/Org_Logo_Set.js
deleted file mode 100644
index 9ef5c824ef..0000000000
--- a/app/client/cypress/manual_TestSuite/Org_Logo_Set.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-
-describe("insert organisational Logo  ", function()  {
-    it(" org logo upload ", function() 
-    {
-     //Click on the dropdown next to organisational Name 
-     // Navigate between tabs 
-     // Naviagte to General Tab
-     // Add an Organisational Logo
-     //Wait until it loads
-     // Switch between Tabs
-     // Navigate to General Tab and ensure the logo exsits
-     //navigate back to Homepage
-    }
-    )
-}
-)
\ No newline at end of file
diff --git a/app/client/cypress/manual_TestSuite/Organisation_Name.js b/app/client/cypress/manual_TestSuite/Organisation_Name.js
deleted file mode 100644
index 4babed2641..0000000000
--- a/app/client/cypress/manual_TestSuite/Organisation_Name.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-describe("Checking for error message on Organisation Name ", function() {
-  it("Ensure of Inactive Submit button ", function() {
-    // Navigate to home Page
-    // Click on Create Organisation
-    // Type "Space" as first character
-    // Ensure "Submit" button does not get Active
-    // Now click on "X" (Close icon) ensure the pop up closes
-  });
-});
diff --git a/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js b/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
deleted file mode 100644
index 035ad05bc2..0000000000
--- a/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
+++ /dev/null
@@ -1,47 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-describe("Checking for error message on Organisation Name ", function()  {
-    it("Ensure of Inactive Submit button ", function() 
-    {
-        // Navigate to home Page 
-        // Click on Create Organisation 
-        // Type "Space" as first character
-        // Ensure "Submit" button does not get Active
-        // Now click on "X" (Close icon) ensure the pop up closes
-    }
-    )
-    it("Reuse the name of the deleted application name ", function() 
-    {
-        // Navigate to home Page 
-        // Create an Application by name "XYZ"
-        // Add some widgets
-        // Navigate back to the application
-        // Delete the Application
-        // Click on "Create New" option under same organisation  
-        // Enter the name "XYZ"
-        // Ensure the application can be created with the same name 
-    }
-    )
-    it("Adding Special Character ", function() 
-    {
-        // Navigate to home Page 
-        // Click on Create Organisation 
-        // Add special as first character
-        // Ensure "Submit" get Active
-        // Now click outside and ensure the pop up closes
-    }
-    )
-    it("Reuse the name of the deleted application name on the other organisation", function() 
-    {
-        // Navigate to home Page 
-        // Create an Application by name "XYZ"
-        // Add some widgets
-        // Navigate back to the application
-        // Delete the Application
-        // Click on "Create New" option under different organisation  
-        // Enter the name "XYZ"
-        // Ensure the application can be created with the same name 
-    }
-    )
-}
-)
\ No newline at end of file
diff --git a/app/client/cypress/manual_TestSuite/Reusing_Name_of_Deleted_App.js b/app/client/cypress/manual_TestSuite/Reusing_Name_of_Deleted_App.js
deleted file mode 100644
index 879abc8b3b..0000000000
--- a/app/client/cypress/manual_TestSuite/Reusing_Name_of_Deleted_App.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-describe("Reuse the name of the deleted application name inside the same organisation", function() {
-  it("Reuse the name of the deleted application name ", function() {
-    // Navigate to home Page
-    // Create an Application by name "XYZ"
-    // Add some widgets
-    // Navigate back to the application
-    // Delete the Application
-    // Click on "Create New" option under samee organisation
-    // Enter the name "XYZ"
-    // Ensure the application can be created with the same name
-  });
-});
diff --git a/app/client/cypress/manual_TestSuite/Share_User_Icon.js b/app/client/cypress/manual_TestSuite/Share_User_Icon.js
deleted file mode 100644
index dd662a021b..0000000000
--- a/app/client/cypress/manual_TestSuite/Share_User_Icon.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-
-describe("Shared user icon  ", function()  {
-    it(" User Icon is disaplyed to user ", function() 
-    {
-        // Navigate to home Page 
-        //Click on Share Icon 
-        // Click on Field to add an Email Id 
-        // Click on the Roles field 
-        // Add an role from the Dropdown
-        // CLick on Invite
-        //Now observe the icon next to the Share Icon 
-    }
-    )
-}
-)
\ No newline at end of file
diff --git a/app/client/cypress/manual_TestSuite/Spl_Chracter_Org_Name.js b/app/client/cypress/manual_TestSuite/Spl_Chracter_Org_Name.js
deleted file mode 100644
index 39093565c6..0000000000
--- a/app/client/cypress/manual_TestSuite/Spl_Chracter_Org_Name.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const homePage = require("../../../locators/HomePage.json");
-
-describe("Adding Special Character ", function() {
-  it("Adding Special Character ", function() {
-    // Navigate to home Page
-    // Click on Create Organisation
-    // Add special as first character
-    // Ensure "Submit" get Active
-    // Now click outside and ensure the pop up closes
-  });
-});
diff --git a/app/client/cypress/manual_TestSuite/Table_Filter_Test_spec.js b/app/client/cypress/manual_TestSuite/Table_Filter_Test_spec.js
deleted file mode 100644
index 8c4e5447ce..0000000000
--- a/app/client/cypress/manual_TestSuite/Table_Filter_Test_spec.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const dsl = require("../../../fixtures/tableWidgetDsl.json");
-
-
-describe("Test for Table Filter ", function()  {
-    it("Table Filter", function() 
-    {
-        //Add a table
-        // click  on the column action item 
-        // Click on Select a datatype 
-        // Click on Filter option
-        // ensure to add filter 
-    }
-    )
-}
-)
\ No newline at end of file

From b731793a8865b9a8290f38eb55a345d3d9e86984 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Wed, 27 Jan 2021 20:38:46 +0530
Subject: [PATCH 39/47] Fix reference type fields in Firestore throwing 500
 (#2718)

---
 .../com/external/plugins/FirestorePlugin.java | 14 +++++-
 .../external/plugins/FirestorePluginTest.java | 43 ++++++++++++-------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
index 76e0ebe7f5..0d931ff897 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
+++ b/app/server/appsmith-plugins/firestorePlugin/src/main/java/com/external/plugins/FirestorePlugin.java
@@ -359,6 +359,10 @@ public class FirestorePlugin extends BasePlugin {
         }
 
         private Object resultToMap(Object objResult) throws AppsmithPluginException {
+            return resultToMap(objResult, true);
+        }
+
+        private Object resultToMap(Object objResult, boolean isRoot) throws AppsmithPluginException {
             if (objResult instanceof WriteResult) {
                 WriteResult writeResult = (WriteResult) objResult;
                 Map<String, Object> resultMap = new HashMap<>();
@@ -377,7 +381,11 @@ public class FirestorePlugin extends BasePlugin {
                 QuerySnapshot querySnapshot = (QuerySnapshot) objResult;
                 List<Map<String, Object>> documents = new ArrayList<>();
                 for (QueryDocumentSnapshot documentSnapshot : querySnapshot.getDocuments()) {
-                    documents.add(documentSnapshot.getData());
+                    final Map<String, Object> data = documentSnapshot.getData();
+                    for (final Map.Entry<String, Object> entry : data.entrySet()) {
+                        data.put(entry.getKey(), resultToMap(entry.getValue(), false));
+                    }
+                    documents.add(data);
                 }
                 return documents;
 
@@ -388,13 +396,15 @@ public class FirestorePlugin extends BasePlugin {
                 resultMap.put("path", documentReference.getPath());
                 return resultMap;
 
-            } else {
+            } else if (isRoot) {
                 throw new AppsmithPluginException(
                         AppsmithPluginError.PLUGIN_ERROR,
                         "Unable to serialize object of type " + objResult.getClass().getName() + "."
                 );
 
             }
+
+            return objResult;
         }
 
         @Override
diff --git a/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java b/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
index 386d38ae9a..d242e783b0 100644
--- a/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
+++ b/app/server/appsmith-plugins/firestorePlugin/src/test/java/com/external/plugins/FirestorePluginTest.java
@@ -19,6 +19,7 @@ import org.testcontainers.utility.DockerImageName;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -56,7 +57,12 @@ public class FirestorePluginTest {
                 .getService();
 
         firestoreConnection.document("initial/one").set(Map.of("value", 1, "name", "one", "isPlural", false)).get();
-        firestoreConnection.document("initial/two").set(Map.of("value", 2, "name", "two", "isPlural", true)).get();
+        firestoreConnection.document("initial/two").set(Map.of(
+                "value", 2,
+                "name", "two",
+                "isPlural", true,
+                "ref", firestoreConnection.document("initial/one")
+        )).get();
         firestoreConnection.document("changing/to-update").set(Map.of("value", 1)).get();
         firestoreConnection.document("changing/to-delete").set(Map.of("value", 1)).get();
 
@@ -79,19 +85,11 @@ public class FirestorePluginTest {
         StepVerifier.create(resultMono)
                 .assertNext(result -> {
                     assertTrue(result.getIsExecutionSuccess());
-                    assertTrue(((Map<String, Object>) result.getBody()).entrySet().stream().allMatch(entry -> {
-                        Object value = entry.getValue();
-                        switch (entry.getKey()) {
-                            case "name":
-                                return "one".equals(value);
-                            case "isPlural":
-                                return Boolean.FALSE.equals(value);
-                            case "value":
-                                return value.equals(1L);
-                            default:
-                                return false;
-                        }
-                    }));
+                    final Map<String, Object> first = (Map) result.getBody();
+                    assertEquals("one", first.remove("name"));
+                    assertFalse((Boolean) first.remove("isPlural"));
+                    assertEquals(1L, first.remove("value"));
+                    assertEquals(Collections.emptyMap(), first);
                 })
                 .verifyComplete();
     }
@@ -108,7 +106,22 @@ public class FirestorePluginTest {
         StepVerifier.create(resultMono)
                 .assertNext(result -> {
                     assertTrue(result.getIsExecutionSuccess());
-                    assertEquals(2, ((List) result.getBody()).size());
+
+                    List<Map<String, Object>> results = (List) result.getBody();
+                    assertEquals(2, results.size());
+
+                    final Map<String, Object> first = results.get(0);
+                    assertEquals("one", first.remove("name"));
+                    assertFalse((Boolean) first.remove("isPlural"));
+                    assertEquals(1L, first.remove("value"));
+                    assertEquals(Collections.emptyMap(), first);
+
+                    final Map<String, Object> second = results.get(1);
+                    assertEquals("two", second.remove("name"));
+                    assertTrue((Boolean) second.remove("isPlural"));
+                    assertEquals(2L, second.remove("value"));
+                    assertEquals(Map.of("path", "initial/one", "id", "one"), second.remove("ref"));
+                    assertEquals(Collections.emptyMap(), second);
                 })
                 .verifyComplete();
     }

From 19c4559c95cffe2ee37b1581d066b59886c78737 Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <rishabh.robben@gmail.com>
Date: Wed, 27 Jan 2021 23:35:32 +0530
Subject: [PATCH 40/47] fix: datasource bound value preview in the explorer
 showing entire response (#2480)

---
 .../src/pages/Editor/Explorer/Entity/EntityProperties.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
index d6825b0192..ac21089eb0 100644
--- a/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
+++ b/app/client/src/pages/Editor/Explorer/Entity/EntityProperties.tsx
@@ -62,7 +62,7 @@ export const EntityProperties = memo(
                 actionProperty = actionProperty + "()";
               }
               if (actionProperty === "data") {
-                value = entity.data;
+                value = entity.data?.body;
               }
               return {
                 propertyName: actionProperty,

From 4c393f0f1f1ab5327e5f18e22ed22153c3b4bf8d Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <rishabh.robben@gmail.com>
Date: Wed, 27 Jan 2021 23:38:08 +0530
Subject: [PATCH 41/47] fix: action not a plain object for widget entity name
 action creater  (#2638)

---
 app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
index fe50cabc6c..0d1c433557 100644
--- a/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
+++ b/app/client/src/pages/Editor/Explorer/Widgets/WidgetEntity.tsx
@@ -17,7 +17,6 @@ import { useWidgetSelection } from "utils/hooks/dragResizeHooks";
 import { AppState } from "reducers";
 import { getWidgetIcon } from "../ExplorerIcons";
 
-import { noop } from "lodash";
 import WidgetContextMenu from "./WidgetContextMenu";
 import { updateWidgetName } from "actions/propertyPaneActions";
 import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory";
@@ -133,7 +132,7 @@ export const WidgetEntity = memo((props: WidgetEntityProps) => {
       name={props.widgetName}
       entityId={props.widgetId}
       step={props.step}
-      updateEntityName={props.pageId === pageId ? updateWidgetName : noop}
+      updateEntityName={props.pageId === pageId ? updateWidgetName : undefined}
       searchKeyword={props.searchKeyword}
       isDefaultExpanded={
         shouldExpand ||

From 51ccd19081ed8e5e3726bd913845a9c16c6f3b64 Mon Sep 17 00:00:00 2001
From: Dwayne Forde <dwayne.forde@gmail.com>
Date: Thu, 28 Jan 2021 01:38:44 -0500
Subject: [PATCH 42/47] Use IPv4 on WSL machines (#2729)

WSL has issues when handling IPv6 ips. In order to resolve this, on dev machines, we now check if it's a WSL environment. If yes, we default to using IPv4 instead of IPv6.
---
 app/client/start-https.sh              | 16 +++-------
 app/server/scripts/start-dev-server.sh |  5 +++
 app/util/is_wsl.sh                     | 13 ++++++++
 app/util/is_wsl_test.sh                | 44 ++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100755 app/util/is_wsl.sh
 create mode 100755 app/util/is_wsl_test.sh

diff --git a/app/client/start-https.sh b/app/client/start-https.sh
index 626bafb919..f8fa9d0c06 100755
--- a/app/client/start-https.sh
+++ b/app/client/start-https.sh
@@ -63,24 +63,18 @@ client_proxy_pass="${default_client_proxy}"
 network_mode="bridge"
 case "${uname_out}" in
     Linux*)     machine=Linux
-
-        proc_version="$(cat /proc/version)"
-        case "$proc_version" in
-        *icrosoft*)
+	
+        source ../util/is_wsl.sh
+	      if [ $IS_WSL ]; then
             # ignore to continue using host.docker.internal
-        ;;
-        *WSL*)
-            # ignore to continue using host.docker.internal
-        ;;
-        *)
+	      else
             network_mode="host"
             client_proxy_pass=$default_linux_client_proxy
             # if no server was passed
             if [[ -z $1 ]]; then
                 server_proxy_pass=$default_linux_server_proxy
             fi
-            ;;
-        esac
+	      fi
                 echo "
     Starting nginx for Linux...
     "
diff --git a/app/server/scripts/start-dev-server.sh b/app/server/scripts/start-dev-server.sh
index 9e1ec6324c..66a9c753e6 100755
--- a/app/server/scripts/start-dev-server.sh
+++ b/app/server/scripts/start-dev-server.sh
@@ -10,4 +10,9 @@ if [[ -f .env ]]; then
   source .env
 fi
 
+source ../util/is_wsl.sh
+if [ $IS_WSL ]; then
+  _JAVA_OPTIONS="-Djava.net.preferIPv4Stack=true $_JAVA_OPTIONS"
+fi
+
 (cd dist && exec java -jar server-*.jar)
diff --git a/app/util/is_wsl.sh b/app/util/is_wsl.sh
new file mode 100755
index 0000000000..ee100634c0
--- /dev/null
+++ b/app/util/is_wsl.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+IS_WSL=
+
+proc_version="$(cat /proc/version)"
+case "$proc_version" in
+*icrosoft*)
+    IS_WSL=true
+;;
+*WSL*)
+    IS_WSL=true
+;;
+esac
diff --git a/app/util/is_wsl_test.sh b/app/util/is_wsl_test.sh
new file mode 100755
index 0000000000..ba97288f68
--- /dev/null
+++ b/app/util/is_wsl_test.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set -e
+
+DIR="$(cd "$(dirname "$0")" && pwd)"
+
+distro=
+
+cat() {
+  echo $distro
+}
+
+fail() {
+  local reason=$1
+
+  echo "${reason}
+  context: ${distro}"
+
+  exit 1
+}
+
+stub_distro() {
+  local name=$1
+
+  distro=$name
+  source $DIR/is_wsl.sh
+}
+
+stub_distro "Linux Computer 4.19.104-microsoft-standard #1 SMP Wed Feb 19 06:37:35 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux"
+if [ ! $IS_WSL ]; then
+  fail "Failed: Detected lack of WSL where it should have."
+fi
+
+stub_distro "Linux Computer 4.19.104-WSL-standard #1 SMP Wed Feb 19 06:37:35 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux"
+if [ ! $IS_WSL ]; then
+  fail "Failed: Detected lack of WSL where it should have."
+fi
+
+stub_distro "Linux pop-os 5.3.0-22-generic #24+system76~1573659475~19.04~26b2022-Ubuntu SMP Wed Nov 13 20:0 x86_64 x86_64 x86_64 GNU/Linux"
+if [ $IS_WSL ]; then
+  fail "Failed: Detected WSL where it shouldn't have."
+fi
+
+echo "All Tests Pass!"

From c17a2ea536d8315928d075db377ff5be83f9681e Mon Sep 17 00:00:00 2001
From: Nidhi <nidhi.nair93@gmail.com>
Date: Thu, 28 Jan 2021 12:14:34 +0530
Subject: [PATCH 43/47] Modified error displayed to user on generic bad request
 (#2583)

* Modified error displayed to user on generic bad request

* Separate null check for cURL import
---
 .../appsmith/server/constants/FieldName.java   |  1 +
 .../controllers/RestApiImportController.java   |  2 +-
 .../exceptions/GlobalExceptionHandler.java     | 18 +++++++++++++-----
 .../server/services/CurlImporterService.java   |  4 ++++
 4 files changed, 19 insertions(+), 6 deletions(-)

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 b383f38c42..6fec4982c8 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
@@ -6,6 +6,7 @@ public class FieldName {
     public static final String DELETED = "deleted";
     public static final String CREATED_AT = "createdAt";
     public static final String DELETED_AT = "deletedAt";
+    public static final String CURL_CODE = "curlCode";
     public static String ORGANIZATION = "organization";
     public static String ID = "id";
     public static final String NAME = "name";
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java
index 32ec045d0e..d526ce33a2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java
@@ -41,7 +41,7 @@ public class RestApiImportController {
 
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
-    public Mono<ResponseDTO<ActionDTO>> create(@Valid @RequestBody Object input,
+    public Mono<ResponseDTO<ActionDTO>> create(@RequestBody(required = false) Object input,
                                                @RequestParam RestApiImporterType type,
                                                @RequestParam String pageId,
                                                @RequestParam String name,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
index 8a42268f13..6079f1dbb7 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/GlobalExceptionHandler.java
@@ -10,6 +10,7 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.support.WebExchangeBindException;
 import org.springframework.web.server.ServerWebExchange;
@@ -30,7 +31,8 @@ import java.util.Map;
 @Slf4j
 public class GlobalExceptionHandler {
 
-    public GlobalExceptionHandler() {}
+    public GlobalExceptionHandler() {
+    }
 
     private void doLog(Throwable error) {
         log.error("", error);
@@ -52,11 +54,10 @@ public class GlobalExceptionHandler {
         );
 
         if (error instanceof AppsmithException) {
-            if (((AppsmithException)error).getErrorAction() == AppsmithErrorAction.LOG_EXTERNALLY) {
+            if (((AppsmithException) error).getErrorAction() == AppsmithErrorAction.LOG_EXTERNALLY) {
                 Sentry.captureException(error);
             }
-        }
-        else {
+        } else {
             Sentry.captureException(error);
         }
     }
@@ -124,8 +125,15 @@ public class GlobalExceptionHandler {
         AppsmithError appsmithError = AppsmithError.GENERIC_BAD_REQUEST;
         exchange.getResponse().setStatusCode(HttpStatus.resolve(appsmithError.getHttpErrorCode()));
         doLog(e);
+        String errorMessage = e.getReason();
+        if (e.getMethodParameter() != null) {
+            errorMessage = "Malformed parameter '" + e.getMethodParameter().getParameterName()
+                    + "' for " + e.getMethodParameter().getContainingClass().getSimpleName()
+                    + (e.getMethodParameter().getMethod() != null ? "." + e.getMethodParameter().getMethod().getName() : "");
+        }
+
         return Mono.just(new ResponseDTO<>(appsmithError.getHttpErrorCode(), new ErrorDTO(appsmithError.getAppErrorCode(),
-                appsmithError.getMessage(e.getReason()))));
+                appsmithError.getMessage(errorMessage))));
     }
 
     @ExceptionHandler
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
index 8971b7eecb..0c1541a055 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/CurlImporterService.java
@@ -3,6 +3,7 @@ package com.appsmith.server.services;
 import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.models.Property;
+import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Datasource;
 import com.appsmith.server.domains.Plugin;
 import com.appsmith.server.dtos.ActionDTO;
@@ -53,6 +54,9 @@ public class CurlImporterService extends BaseApiImporter {
         ActionDTO action;
 
         try {
+            if (input == null) {
+                throw new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.CURL_CODE);
+            }
             action = curlToAction((String) input, pageId, name);
         } catch (AppsmithException e) {
             return Mono.error(e);

From ca052e7515457b47c2a18bbb88b2c27c5f3e410d Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <rishabh.robben@gmail.com>
Date: Thu, 28 Jan 2021 12:50:09 +0530
Subject: [PATCH 44/47] minor updates for auth pages: polish UI, hide empty
 email error message (#2743)

---
 app/client/src/constants/DefaultTheme.tsx     | 11 +++----
 app/client/src/constants/forms.ts             |  1 +
 app/client/src/pages/UserAuth/Login.tsx       | 12 ++++----
 app/client/src/pages/UserAuth/SignUp.tsx      | 29 ++++++++++++-------
 .../src/pages/UserAuth/StyledComponents.tsx   | 15 ++++++++--
 .../src/pages/UserAuth/ThirdPartyAuth.tsx     |  1 +
 app/client/src/pages/common/LoginHeader.tsx   |  2 +-
 7 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx
index b4ccba00d9..2b346a780d 100644
--- a/app/client/src/constants/DefaultTheme.tsx
+++ b/app/client/src/constants/DefaultTheme.tsx
@@ -749,11 +749,12 @@ const auth: any = {
   btnPrimary: "#F86A2B",
   inputBackground: darkShades[1],
   headingText: "#FFF",
-  link: "#457AE6",
+  link: "#106ba3",
   text: darkShades[7],
   placeholder: darkShades[5],
   socialBtnText: darkShades[8],
   socialBtnBorder: darkShades[8],
+  socialBtnHighlight: darkShades[1],
 };
 
 const formMessage = {
@@ -1434,13 +1435,13 @@ export const theme: Theme = {
     authCardHeader: {
       fontStyle: "normal",
       fontWeight: 600,
-      fontSize: 24,
+      fontSize: 25,
       lineHeight: 20,
     },
     authCardSubheader: {
       fontStyle: "normal",
       fontWeight: "normal",
-      fontSize: 14,
+      fontSize: 15,
       lineHeight: 20,
     },
   },
@@ -1593,9 +1594,9 @@ export const theme: Theme = {
     },
   },
   authCard: {
-    width: 400,
+    width: 440,
     dividerSpacing: 32,
-    formMessageWidth: 352,
+    formMessageWidth: 370,
   },
   shadows: [
     /* 0. tab */
diff --git a/app/client/src/constants/forms.ts b/app/client/src/constants/forms.ts
index 35de679c5d..f172b65000 100644
--- a/app/client/src/constants/forms.ts
+++ b/app/client/src/constants/forms.ts
@@ -7,6 +7,7 @@ export const LOGIN_FORM_EMAIL_FIELD_NAME = "username";
 export const LOGIN_FORM_PASSWORD_FIELD_NAME = "password";
 
 export const SIGNUP_FORM_NAME = "SignupForm";
+export const SIGNUP_FORM_EMAIL_FIELD_NAME = "email";
 export const FORGOT_PASSWORD_FORM_NAME = "ForgotPasswordForm";
 export const RESET_PASSWORD_FORM_NAME = "ResetPasswordForm";
 export const CREATE_PASSWORD_FORM_NAME = "CreatePasswordForm";
diff --git a/app/client/src/pages/UserAuth/Login.tsx b/app/client/src/pages/UserAuth/Login.tsx
index b357127400..e8ce8f4e0b 100644
--- a/app/client/src/pages/UserAuth/Login.tsx
+++ b/app/client/src/pages/UserAuth/Login.tsx
@@ -14,7 +14,6 @@ import {
   LOGIN_PAGE_PASSWORD_INPUT_LABEL,
   LOGIN_PAGE_PASSWORD_INPUT_PLACEHOLDER,
   LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER,
-  FORM_VALIDATION_EMPTY_EMAIL,
   FORM_VALIDATION_EMPTY_PASSWORD,
   FORM_VALIDATION_INVALID_EMAIL,
   FORM_VALIDATION_INVALID_PASSWORD,
@@ -53,16 +52,14 @@ const { enableGithubOAuth, enableGoogleOAuth } = getAppsmithConfigs();
 
 const validate = (values: LoginFormValues) => {
   const errors: LoginFormValues = {};
-  const email = values[LOGIN_FORM_EMAIL_FIELD_NAME];
+  const email = values[LOGIN_FORM_EMAIL_FIELD_NAME] || "";
   const password = values[LOGIN_FORM_PASSWORD_FIELD_NAME];
   if (!password || isEmptyString(password)) {
     errors[LOGIN_FORM_PASSWORD_FIELD_NAME] = FORM_VALIDATION_EMPTY_PASSWORD;
   } else if (!isStrongPassword(password)) {
     errors[LOGIN_FORM_PASSWORD_FIELD_NAME] = FORM_VALIDATION_INVALID_PASSWORD;
   }
-  if (!email || isEmptyString(email)) {
-    errors[LOGIN_FORM_EMAIL_FIELD_NAME] = FORM_VALIDATION_EMPTY_EMAIL;
-  } else if (!isEmail(email)) {
+  if (!isEmptyString(email) && !isEmail(email)) {
     errors[LOGIN_FORM_EMAIL_FIELD_NAME] = FORM_VALIDATION_INVALID_EMAIL;
   }
 
@@ -81,7 +78,8 @@ if (enableGoogleOAuth) SocialLoginList.push(SocialLoginTypes.GOOGLE);
 if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
 
 export const Login = (props: LoginFormProps) => {
-  const { error, valid } = props;
+  const { error, valid, emailValue: email } = props;
+  const isFormValid = valid && email && !isEmptyString(email);
   const location = useLocation();
 
   const queryParams = new URLSearchParams(location.search);
@@ -160,7 +158,7 @@ export const Login = (props: LoginFormProps) => {
           <Button
             tag="button"
             type="submit"
-            disabled={!valid}
+            disabled={!isFormValid}
             text={LOGIN_PAGE_LOGIN_BUTTON_TEXT}
             fill
             size={Size.large}
diff --git a/app/client/src/pages/UserAuth/SignUp.tsx b/app/client/src/pages/UserAuth/SignUp.tsx
index 3665d88f19..11f3dab7b4 100644
--- a/app/client/src/pages/UserAuth/SignUp.tsx
+++ b/app/client/src/pages/UserAuth/SignUp.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { reduxForm, InjectedFormProps } from "redux-form";
+import { reduxForm, InjectedFormProps, formValueSelector } from "redux-form";
 import { AUTH_LOGIN_URL } from "constants/routes";
 import { SIGNUP_FORM_NAME } from "constants/forms";
 import { RouteComponentProps, useLocation, withRouter } from "react-router-dom";
@@ -17,7 +17,6 @@ import {
   SIGNUP_PAGE_PASSWORD_INPUT_LABEL,
   SIGNUP_PAGE_PASSWORD_INPUT_PLACEHOLDER,
   SIGNUP_PAGE_LOGIN_LINK_TEXT,
-  FORM_VALIDATION_EMPTY_EMAIL,
   FORM_VALIDATION_EMPTY_PASSWORD,
   FORM_VALIDATION_INVALID_EMAIL,
   FORM_VALIDATION_INVALID_PASSWORD,
@@ -43,6 +42,9 @@ import PerformanceTracker, {
   PerformanceTransactionName,
 } from "utils/PerformanceTracker";
 import { setOnboardingState } from "utils/storage";
+
+import { SIGNUP_FORM_EMAIL_FIELD_NAME } from "constants/forms";
+
 const { enableGithubOAuth, enableGoogleOAuth } = getAppsmithConfigs();
 const SocialLoginList: string[] = [];
 if (enableGithubOAuth) SocialLoginList.push(SocialLoginTypes.GITHUB);
@@ -58,19 +60,24 @@ const validate = (values: SignupFormValues) => {
   } else if (!isStrongPassword(values.password)) {
     errors.password = FORM_VALIDATION_INVALID_PASSWORD;
   }
-  if (!values.email || isEmptyString(values.email)) {
-    errors.email = FORM_VALIDATION_EMPTY_EMAIL;
-  } else if (!isEmail(values.email)) {
+
+  const email = values.email || "";
+  if (!isEmptyString(email) && !isEmail(email)) {
     errors.email = FORM_VALIDATION_INVALID_EMAIL;
   }
   return errors;
 };
 
-type SignUpFormProps = InjectedFormProps<SignupFormValues> &
-  RouteComponentProps<{ email: string }> & { theme: Theme };
+type SignUpFormProps = InjectedFormProps<
+  SignupFormValues,
+  { emailValue: string }
+> &
+  RouteComponentProps<{ email: string }> & { theme: Theme; emailValue: string };
 
 export const SignUp = (props: SignUpFormProps) => {
-  const { error, submitting, pristine, valid } = props;
+  const { error, submitting, pristine, valid, emailValue: email } = props;
+  const isFormValid = valid && email && !isEmptyString(email);
+
   const location = useLocation();
 
   let showError = false;
@@ -133,7 +140,7 @@ export const SignUp = (props: SignUpFormProps) => {
           <Button
             tag="button"
             type="submit"
-            disabled={pristine || !valid}
+            disabled={pristine || !isFormValid}
             isLoading={submitting}
             text={SIGNUP_PAGE_SUBMIT_BUTTON_TEXT}
             fill
@@ -154,15 +161,17 @@ export const SignUp = (props: SignUpFormProps) => {
   );
 };
 
+const selector = formValueSelector(SIGNUP_FORM_NAME);
 export default connect((state: AppState, props: SignUpFormProps) => {
   const queryParams = new URLSearchParams(props.location.search);
   return {
     initialValues: {
       email: queryParams.get("email"),
     },
+    emailValue: selector(state, SIGNUP_FORM_EMAIL_FIELD_NAME),
   };
 }, null)(
-  reduxForm<SignupFormValues>({
+  reduxForm<SignupFormValues, { emailValue: string }>({
     validate,
     form: SIGNUP_FORM_NAME,
     touchOnBlur: true,
diff --git a/app/client/src/pages/UserAuth/StyledComponents.tsx b/app/client/src/pages/UserAuth/StyledComponents.tsx
index f55e09aa80..a1a0818a96 100644
--- a/app/client/src/pages/UserAuth/StyledComponents.tsx
+++ b/app/client/src/pages/UserAuth/StyledComponents.tsx
@@ -3,6 +3,7 @@ import { Link } from "react-router-dom";
 import Form from "components/editorComponents/Form";
 import { Card } from "@blueprintjs/core";
 import { getTypographyByKey } from "constants/DefaultTheme";
+import { Classes } from "@blueprintjs/core";
 
 export const AuthContainer = styled.section`
   position: absolute;
@@ -13,6 +14,10 @@ export const AuthContainer = styled.section`
   flex-direction: column;
   align-items: center;
   overflow: auto;
+
+  & .${Classes.FORM_GROUP} {
+    margin: 0 0 ${(props) => props.theme.spaces[2]}px;
+  }
 `;
 
 export const AuthCardContainer = styled.div`
@@ -67,7 +72,13 @@ export const AuthCardHeader = styled.header`
   }
 `;
 
-export const AuthCardNavLink = styled(Link)``;
+export const AuthCardNavLink = styled(Link)`
+  border-bottom: 1px solid transparent;
+  &:hover {
+    border-bottom: 1px solid ${(props) => props.theme.colors.auth.link};
+    text-decoration: none;
+  }
+`;
 
 export const AuthCardFooter = styled.footer`
   display: flex;
@@ -102,7 +113,7 @@ export const FormActions = styled.div`
   }
   justify-content: space-between;
   align-items: baseline;
-  margin-top: ${(props) => props.theme.spaces[2]}px;
+  margin-top: ${(props) => props.theme.spaces[5]}px;
   & > label {
     margin-right: ${(props) => props.theme.spaces[11]}px;
   }
diff --git a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
index cfb346dee9..a608d9e778 100644
--- a/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
+++ b/app/client/src/pages/UserAuth/ThirdPartyAuth.tsx
@@ -35,6 +35,7 @@ const StyledSocialLoginButton = styled.a`
 
   &:hover {
     text-decoration: none;
+    background-color: ${(props) => props.theme.colors.auth.socialBtnHighlight};
   }
 
   & .login-method {
diff --git a/app/client/src/pages/common/LoginHeader.tsx b/app/client/src/pages/common/LoginHeader.tsx
index 3e3e38d87a..36ac879ded 100644
--- a/app/client/src/pages/common/LoginHeader.tsx
+++ b/app/client/src/pages/common/LoginHeader.tsx
@@ -14,7 +14,7 @@ const StyledPageHeader = styled(StyledHeader)`
   height: 48px;
   background: ${Colors.BALTIC_SEA};
   display: flex;
-  justify-content: space-between;
+  justify-content: center;
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.05);
   padding: 0px ${(props) => props.theme.spaces[12]};
 `;

From c3740709d054f02161bdb311b6415e8a113af2a6 Mon Sep 17 00:00:00 2001
From: Piyush Mishra <piyush@codeitout.com>
Date: Thu, 28 Jan 2021 14:26:29 +0530
Subject: [PATCH 45/47] Do not show sections that are supposed to be hidden
 (#2746)

---
 .../pages/Editor/DataSourceEditor/DBForm.tsx  | 118 ++++++++++--------
 .../DataSourceEditor/DatasourceSection.tsx    |  19 ++-
 2 files changed, 84 insertions(+), 53 deletions(-)

diff --git a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
index d9e4b783ea..4e4d415cbd 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
@@ -27,6 +27,8 @@ import BackButton from "./BackButton";
 import { PluginType } from "entities/Action";
 import Boxed from "components/editorComponents/Onboarding/Boxed";
 import { OnboardingStep } from "constants/OnboardingConstants";
+import { isHidden } from "components/formControls/utils";
+import log from "loglevel";
 
 const { cloudHosting } = getAppsmithConfigs();
 
@@ -412,6 +414,7 @@ class DatasourceDBEditor extends React.Component<
   };
 
   renderMainSection = (section: any, index: number) => {
+    if (isHidden(this.props.formData, section.hidden)) return null;
     return (
       <Collapsible title={section.sectionName} defaultIsOpen={index === 0}>
         {this.renderEachConfig(section)}
@@ -419,60 +422,73 @@ class DatasourceDBEditor extends React.Component<
     );
   };
 
-  renderEachConfig(section: any) {
-    const keyValueItems: any = [];
-
-    return (
-      <div key={section.id}>
-        <div>
-          {_.map(section.children, (propertyControlOrSection: ControlProps) => {
-            if ("children" in propertyControlOrSection) {
-              return this.renderEachConfig(propertyControlOrSection);
-            } else {
-              try {
-                const {
-                  controlType,
-                  isRequired,
-                  configProperty,
-                } = propertyControlOrSection;
-                const config = { ...propertyControlOrSection };
-                const multipleConfig = keyValueItems;
-
-                this.configDetails[configProperty] = controlType;
-
-                if (isRequired) {
-                  this.requiredFields[
-                    configProperty
-                  ] = propertyControlOrSection;
-                }
-
-                if (
-                  controlType === "KEYVALUE_ARRAY" &&
-                  keyValueItems.length < 2
-                ) {
-                  keyValueItems.push(config);
-
-                  if (keyValueItems.length < 2) return undefined;
-                }
-
-                return (
-                  <div key={configProperty} style={{ marginTop: "16px" }}>
-                    <FormControl
-                      config={config}
-                      formName={DATASOURCE_DB_FORM}
-                      multipleConfig={multipleConfig}
-                    />
-                  </div>
-                );
-              } catch (e) {
-                console.log(e);
-              }
-            }
-          })}
+  renderSingleConfig = (
+    config: ControlProps,
+    multipleConfig?: ControlProps[],
+  ) => {
+    multipleConfig = multipleConfig || [];
+    try {
+      this.setupConfig(config);
+      return (
+        <div key={config.configProperty} style={{ marginTop: "16px" }}>
+          <FormControl
+            config={config}
+            formName={DATASOURCE_DB_FORM}
+            multipleConfig={multipleConfig}
+          />
         </div>
+      );
+    } catch (e) {
+      log.error(e);
+    }
+  };
+
+  setupConfig = (config: ControlProps) => {
+    const { controlType, isRequired, configProperty } = config;
+    this.configDetails[configProperty] = controlType;
+
+    if (isRequired) {
+      this.requiredFields[configProperty] = config;
+    }
+  };
+
+  isKVArray = (children: Array<ControlProps>) => {
+    if (!Array.isArray(children) || children.length < 2) return false;
+    return (
+      children[0].controlType && children[0].controlType === "KEYVALUE_ARRAY"
+    );
+  };
+
+  renderKVArray = (children: Array<ControlProps>) => {
+    try {
+      // setup config for each child
+      children.forEach((c) => this.setupConfig(c));
+      // We pass last child for legacy reasons, to keep the logic here exactly same as before.
+      return this.renderSingleConfig(children[children.length - 1], children);
+    } catch (e) {
+      log.error(e);
+    }
+  };
+
+  renderEachConfig = (section: any) => {
+    return (
+      <div key={section.sectionName}>
+        {_.map(section.children, (propertyControlOrSection: ControlProps) => {
+          // If the section is hidden, skip rendering
+          if (isHidden(this.props.formData, section.hidden)) return null;
+          if ("children" in propertyControlOrSection) {
+            const { children } = propertyControlOrSection;
+            if (this.isKVArray(children)) {
+              return this.renderKVArray(children);
+            }
+            return this.renderEachConfig(propertyControlOrSection);
+          } else {
+            return this.renderSingleConfig(propertyControlOrSection);
+          }
+        })}
       </div>
     );
-  }
+  };
 }
 
 export default reduxForm<Datasource, DatasourceDBEditorProps>({
diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
index e8f7c6db6e..0f3dc8a558 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceSection.tsx
@@ -3,6 +3,8 @@ import React from "react";
 import { map, get } from "lodash";
 import { Colors } from "constants/Colors";
 import styled from "styled-components";
+import { isHidden } from "components/formControls/utils";
+import log from "loglevel";
 
 const Key = styled.div`
   color: ${Colors.DOVE_GRAY};
@@ -14,7 +16,6 @@ const Value = styled.div`
   font-size: 14px;
   font-weight: 500;
   display: inline-block;
-  text-transform: uppercase;
   margin-left: 5px;
 `;
 
@@ -34,6 +35,7 @@ export const renderDatasourceSection = (
   return (
     <React.Fragment key={datasource.id}>
       {map(config.children, (section) => {
+        if (isHidden(datasource, section.hidden)) return null;
         if ("children" in section) {
           return renderDatasourceSection(section, datasource);
         } else {
@@ -85,12 +87,25 @@ export const renderDatasourceSection = (
               );
             }
 
+            if (controlType === "DROP_DOWN") {
+              if (Array.isArray(section.options)) {
+                const option = section.options.find(
+                  (el: any) => el.value === value,
+                );
+                if (option && option.label) {
+                  value = option.label;
+                }
+              }
+            }
+
             return (
               <FieldWrapper key={reactKey}>
                 <Key>{label}: </Key> <Value>{value}</Value>
               </FieldWrapper>
             );
-          } catch (e) {}
+          } catch (e) {
+            log.error(e);
+          }
         }
       })}
     </React.Fragment>

From 4ccdba9e8519afdd19a355c0272f057ba159b99c Mon Sep 17 00:00:00 2001
From: prapullac <71753653+prapullac@users.noreply.github.com>
Date: Thu, 28 Jan 2021 14:42:22 +0530
Subject: [PATCH 46/47] Adding manual test ideas for Home page and Login
 scenarios (#2627)

Co-authored-by: Arpit Mohan <arpit@appsmith.com>
---
 .../manual_TestSuite/Clipboard_Copy_Spec.js   | 51 ++++++++++++
 .../manual_TestSuite/Duplicate_App_Spec.js    | 58 ++++++++++++++
 .../manual_TestSuite/Invite_flow_Spec.js      | 61 +++++++++++++++
 .../cypress/manual_TestSuite/Login_Spec.js    | 34 ++++++++
 .../Organisation_Name_Spec.js                 | 77 +++++++++++++++++++
 5 files changed, 281 insertions(+)
 create mode 100644 app/client/cypress/manual_TestSuite/Clipboard_Copy_Spec.js
 create mode 100644 app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
 create mode 100644 app/client/cypress/manual_TestSuite/Invite_flow_Spec.js
 create mode 100644 app/client/cypress/manual_TestSuite/Login_Spec.js
 create mode 100644 app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js

diff --git a/app/client/cypress/manual_TestSuite/Clipboard_Copy_Spec.js b/app/client/cypress/manual_TestSuite/Clipboard_Copy_Spec.js
new file mode 100644
index 0000000000..b2b30e8444
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Clipboard_Copy_Spec.js
@@ -0,0 +1,51 @@
+const dsl = require("../../../fixtures/tableWidgetDsl.json");
+
+
+describe("Test for Clipboard Copy", function()  {
+    it(" Clipboard copy on selecting a row ", function() 
+    {
+        // Add a table widget
+        // Click on the Property Pane
+        // Naviagte to Action Items 
+        // Click on "onRow Selection" Dropdown
+        // Select "Copy to Clipboard"
+        // Add Text to be copied 
+        // Select a Row from the table 
+        // Add an Input Widget 
+        // Now paste the copied text 
+        // Ensure the text the same as written 
+    }
+    )
+    it(" Clipboard copy by adding an action button", function() 
+    {
+        // Add a table widget
+        // Click on the Property Pane
+        // Naviagte to Action Items 
+        // Click on "Add button"
+        // Click on the dropdown 
+        // Select on Copy to Clipboard 
+        // Add a Text 
+        // Click on the Action Button 
+        // Add Input Widget
+        // Paste the text into the widget 
+        // Ensure the text the same as written 
+    }
+    )
+    it(" Clipboard copy function by converting it to  JS ", function() 
+    {
+        // Add a table widget
+        // Click on the Property Pane
+        // Naviagte to Action Items 
+        // Click on "Add button"
+        // Click on the dropdown 
+        // Click on the Js Option 
+        // Add Copy to Clipboard FUNTION
+        // Add a Text 
+        // Click on the Action Button 
+        // Add Input Widget
+        // Paste the text into the widget 
+        // Ensure the text the same as written 
+    }
+    )
+}
+)
diff --git a/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js b/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
new file mode 100644
index 0000000000..322eff4e4e
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Duplicate_App_Spec.js
@@ -0,0 +1,58 @@
+const homePage = require("../../../locators/HomePage.json");
+
+describe("Duplicate an application must duplicate every API ,Query widget and Datasource", function() {
+  it("Duplicating an application", function() 
+  {
+    // Navigate to home Page
+    // Click on any application action icon (Three dots)
+    // Click on "Duplicate" option
+    // Ensure the application gets copied
+    // Ensure the name is appended with the word "Copy"
+  }
+  )
+  it("Deleting the duplicated Application ", function() 
+  {
+    // Navigate to home Page
+    // Click on any application action icon (Three dots)
+    // Click on "Duplicate" option
+    // Ensure the application gets copied
+    // Click on "Appsmith" to navigate to homepage
+    // Click  on action icon
+    // Click on Delete option
+    // Click on "Are You Sure?" option
+    // Ensure  the App gets deleted
+  }
+  )
+
+  it(" Ensure only the original application is deleted  and copy of it exists", function() 
+  {
+    // Navigate to home Page
+    // Create an Application
+    // Add a name to the application 
+    // Navigate to home page 
+    // Now click on the action (Three Dots)
+    // Select "Duplicate" option 
+    // Ensure App is created with App name prefixed with Copy
+    // Click on Delete option of Original Application
+    // Click on "Are You Sure?" option
+    // Ensure only Original Application is deleted and not the child application 
+  }
+  )
+
+  it(" Ensure only the Duplicate application is deleted  and original Application of it exists", function() 
+  {
+    // Navigate to home Page
+    // Create an Application
+    // Add a name to the application 
+    // Navigate to home page 
+    // Now click on the action (Three Dots)
+    // Select "Duplicate" option 
+    // Ensure App is created with App name prefixed with Copy
+    // Click on Delete option of Duplicate Application
+    // Click on "Are You Sure?" option
+    // Ensure only Duplicate Application is deleted and not the Orginal application 
+  }
+  )
+
+}
+)
diff --git a/app/client/cypress/manual_TestSuite/Invite_flow_Spec.js b/app/client/cypress/manual_TestSuite/Invite_flow_Spec.js
new file mode 100644
index 0000000000..380addd9fe
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Invite_flow_Spec.js
@@ -0,0 +1,61 @@
+const homePage = require("../../../locators/HomePage.json");
+
+
+describe("adding role without Email Id", function()  {
+    it("Empty Email ID Invite flow", function() 
+    {
+     // Navigate to Home Page
+     // Click on "Share" option
+     // Add Role from the dropdown
+     // Ensure the "Invite" option is "Inactive"
+    }
+    )
+    it("Error message must be dispalyed to user on inappropriate Email ID", function() 
+    {
+     // Navigate to Home Page
+     // Click on "Share" option
+     // Add inappropriate Email Id
+     // Select the "Role"
+     // Ensure the "Invite" option is "Inactive" and error message is displayed to user
+    }
+    )
+    it("Clicking on the organisation list the user must be lead to organisation Station ", function() 
+    {
+     // Navigate to Home Page
+     // Navigate to Organisation list
+     // Click on one of the organisation name
+     // Ensure user is directed to the organisation
+    }
+    )
+    it("Admin can only assign another Admin ", function() 
+    {
+        // Navigate to Organisation Setting 
+        // Navigate to Members
+        // Navigate to roles 
+        // Ensure your also an "Admin"
+        // Change the role "Admin" 
+
+    }
+    )
+    it("Ensure the user can not delete or create an application in the organisation", function() 
+    {
+        // Navigate to Home page 
+        // Navigate to Members
+        // Navigate to roles 
+        // Ensure role is "App Viewer"
+        // Ensure user is not able to  delete or add any user for the application 
+
+    }
+    )
+    it("Ensure On invaild Email Id the box must get highlighted", function() 
+    {
+        // Navigate to Home page 
+        // Click on the Share option 
+        // Ensure the pop up opens 
+        // Enter an Invaild Email Id 
+        // and ensure the Email ID box is highlight
+        
+    }
+    )
+}
+)
\ No newline at end of file
diff --git a/app/client/cypress/manual_TestSuite/Login_Spec.js b/app/client/cypress/manual_TestSuite/Login_Spec.js
new file mode 100644
index 0000000000..c85a1355ea
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Login_Spec.js
@@ -0,0 +1,34 @@
+const onboarding = require("../../../locators/Onboarding.json");
+const explorer = require("../../../locators/explorerlocators.json");
+const homePage = require("../../../locators/HomePage.json");
+const loginPage = require("../../../locators/LoginPage.json");
+
+describe("Onboarding flow", function() 
+{
+    it("Onboarding using Google Id ", function() 
+    {
+        // Navigate to Login Page
+        // Click on "Sign In with Google" 
+        // Ensure user is navigated to Google Account 
+        // Do select the Google Id 
+        // Ensure user is navigated into the Appsmith 
+        // Click on the icon on the right with single letter (Profile)
+        // Check the Email Id 
+        // Click on Logout 
+    }
+    )
+
+    it("Onboarding using Github ID ", function() 
+    {
+        // Navigate to Login Page
+        // Click on "Sign In with Github" 
+        // Ensure user is navigated to Github Account 
+        // Do select the Github Id 
+        // Ensure user is navigated into the Appsmith 
+        // Click on the icon on the right with single letter (Profile)
+        // Check the Email Id 
+        // Click on Logout 
+    }
+    )
+}
+)
\ No newline at end of file
diff --git a/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js b/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
new file mode 100644
index 0000000000..9eed15193e
--- /dev/null
+++ b/app/client/cypress/manual_TestSuite/Organisation_Name_Spec.js
@@ -0,0 +1,77 @@
+const homePage = require("../../../locators/HomePage.json");
+
+describe("Checking for error message on Organisation Name ", function()  {
+    it("Ensure of Inactive Submit button ", function() 
+    {
+        // Navigate to home Page 
+        // Click on Create Organisation 
+        // Type "Space" as first character
+        // Ensure "Submit" button does not get Active
+        // Now click on "X" (Close icon) ensure the pop up closes
+    }
+    )
+    it("Reuse the name of the deleted application name ", function() 
+    {
+        // Navigate to home Page 
+        // Create an Application by name "XYZ"
+        // Add some widgets
+        // Navigate back to the application
+        // Delete the Application
+        // Click on "Create New" option under same organisation  
+        // Enter the name "XYZ"
+        // Ensure the application can be created with the same name 
+    }
+    )
+    it("Adding Special Character ", function() 
+    {
+        // Navigate to home Page 
+        // Click on Create Organisation 
+        // Add special as first character
+        // Ensure "Submit" get Active
+        // Now click outside and ensure the pop up closes
+    }
+    )
+    it("Reuse the name of the deleted application name on the other organisation", function() 
+    {
+        // Navigate to home Page 
+        // Create an Application by name "XYZ"
+        // Add some widgets
+        // Navigate back to the application
+        // Delete the Application
+        // Click on "Create New" option under different organisation  
+        // Enter the name "XYZ"
+        // Ensure the application can be created with the same name 
+    }
+    )
+
+    it("User must not be able to add empty organisation name", function() 
+    {
+        // Navigate to home Page 
+        // Click on the "Create Organisation" button 
+        // Ensure "Organisation Name" field is empty
+        // Ensure "Submit" is inactive
+    }
+    )
+
+    it("Cancel creating an Organisation when the Organisation name is empty", function() 
+    {
+        // Navigate to home Page 
+        // Click on the "Create Organisation" button 
+        // Ensure "Organisation Name" field is empty
+        // Click on "Cancel" option 
+        // Observe the organisation is not created 
+    }
+    )
+
+
+    it("Cancel creating an Organisation when the Organisation name is dually filled", function() 
+    {
+        // Navigate to home Page 
+        // Click on the "Create Organisation" button 
+        // Ensure "Organisation Name" field is enterd respectively
+        // Click on "Cancel" option 
+        // Observe the organisation is not created 
+    }
+    )
+}
+)
\ No newline at end of file

From b8bcac85449aa75f8a403c2c03c0ed7027575b72 Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <rishabh.robben@gmail.com>
Date: Thu, 28 Jan 2021 16:45:14 +0530
Subject: [PATCH 47/47] add support for an onSubmit action for the input widget
 (#2749)

---
 ...InputWidgets_NavigateTo_validation_spec.js |  4 ++-
 app/client/cypress/support/commands.js        |  4 ++-
 .../blueprint/InputComponent.tsx              | 25 +++++++++++++++++++
 .../PropertyPaneConfigResponse.tsx            |  9 +++++++
 app/client/src/widgets/InputWidget.tsx        | 21 ++++++++++++++++
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/app/client/cypress/integration/Smoke_TestSuite/Binding/InputWidgets_NavigateTo_validation_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Binding/InputWidgets_NavigateTo_validation_spec.js
index d7d81832b6..cba595adff 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/Binding/InputWidgets_NavigateTo_validation_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/Binding/InputWidgets_NavigateTo_validation_spec.js
@@ -17,7 +17,9 @@ describe("Binding the multiple Widgets and validating NavigateTo Page", function
   it("Input widget test with default value from table widget", function() {
     cy.openPropertyPane("inputwidget");
     cy.get(widgetsPage.defaultInput).type(testdata.defaultInputWidget);
-    cy.get(widgetsPage.actionSelect).click();
+    cy.get(widgetsPage.actionSelect)
+      .first()
+      .click();
     cy.get(commonlocators.chooseAction)
       .children()
       .contains("Navigate To")
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 12141bbbd6..4629a4fe92 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1262,7 +1262,9 @@ Cypress.Commands.add("togglebarDisable", (value) => {
 });
 
 Cypress.Commands.add("getAlert", (alertcss) => {
-  cy.get(commonlocators.dropdownSelectButton).click({ force: true });
+  cy.get(commonlocators.dropdownSelectButton)
+    .first()
+    .click({ force: true });
   cy.get(widgetsPage.menubar)
     .contains("Show Message")
     .click({ force: true })
diff --git a/app/client/src/components/designSystems/blueprint/InputComponent.tsx b/app/client/src/components/designSystems/blueprint/InputComponent.tsx
index 02b923577e..49690b6995 100644
--- a/app/client/src/components/designSystems/blueprint/InputComponent.tsx
+++ b/app/client/src/components/designSystems/blueprint/InputComponent.tsx
@@ -136,6 +136,22 @@ class InputComponent extends React.Component<
         return "text";
     }
   }
+  onKeyDownTextArea = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+    const isEnterKey = e.key === "Enter" || e.keyCode === 13;
+    const { disableNewLineOnPressEnterKey } = this.props;
+    if (isEnterKey && disableNewLineOnPressEnterKey && !e.shiftKey) {
+      e.preventDefault();
+    }
+    if (typeof this.props.onKeyDown === "function") {
+      this.props.onKeyDown(e);
+    }
+  };
+  onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (typeof this.props.onKeyDown === "function") {
+      this.props.onKeyDown(e);
+    }
+  };
+
   private numericInputComponent = () => (
     <NumericInput
       value={this.props.value}
@@ -155,6 +171,7 @@ class InputComponent extends React.Component<
       stepSize={this.props.stepSize}
       onFocus={() => this.setFocusState(true)}
       onBlur={() => this.setFocusState(false)}
+      onKeyDown={this.onKeyDown}
     />
   );
   private textAreaInputComponent = () => (
@@ -169,6 +186,7 @@ class InputComponent extends React.Component<
       growVertically={false}
       onFocus={() => this.setFocusState(true)}
       onBlur={() => this.setFocusState(false)}
+      onKeyDown={this.onKeyDownTextArea}
     />
   );
 
@@ -199,6 +217,7 @@ class InputComponent extends React.Component<
         type={this.getType(this.props.inputType)}
         onFocus={() => this.setFocusState(true)}
         onBlur={() => this.setFocusState(false)}
+        onKeyDown={this.onKeyDown}
       />
     );
   private renderInputComponent = (inputType: InputType, isTextArea: boolean) =>
@@ -267,6 +286,12 @@ export interface InputComponentProps extends ComponentProps {
   isInvalid: boolean;
   showError: boolean;
   onFocusChange: (state: boolean) => void;
+  disableNewLineOnPressEnterKey?: boolean;
+  onKeyDown?: (
+    e:
+      | React.KeyboardEvent<HTMLTextAreaElement>
+      | React.KeyboardEvent<HTMLInputElement>,
+  ) => void;
 }
 
 export default InputComponent;
diff --git a/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx b/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx
index 6409a8ab98..d757a50071 100644
--- a/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx
+++ b/app/client/src/mockResponses/PropertyPaneConfigResponse.tsx
@@ -725,6 +725,15 @@ const PropertyPaneConfigResponse: PropertyPaneConfigsResponse["data"] = {
             controlType: "ACTION_SELECTOR",
             isJSConvertible: true,
           },
+          {
+            id: "5.11.3",
+            helpText:
+              "Triggers an action on submit (when the enter key is pressed)",
+            propertyName: "onSubmit",
+            label: "onSubmit",
+            controlType: "ACTION_SELECTOR",
+            isJSConvertible: true,
+          },
         ],
       },
     ],
diff --git a/app/client/src/widgets/InputWidget.tsx b/app/client/src/widgets/InputWidget.tsx
index f186283381..90427ccd2e 100644
--- a/app/client/src/widgets/InputWidget.tsx
+++ b/app/client/src/widgets/InputWidget.tsx
@@ -44,6 +44,7 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
   static getTriggerPropertyMap(): TriggerPropertiesMap {
     return {
       onTextChanged: true,
+      onSubmit: true,
     };
   }
 
@@ -136,6 +137,22 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
     this.props.updateWidgetMetaProperty("isFocused", focusState);
   };
 
+  handleKeyDown = (
+    e:
+      | React.KeyboardEvent<HTMLTextAreaElement>
+      | React.KeyboardEvent<HTMLInputElement>,
+  ) => {
+    const isEnterKey = e.key === "Enter" || e.keyCode === 13;
+    if (isEnterKey && this.props.onSubmit) {
+      super.executeAction({
+        dynamicString: this.props.onSubmit,
+        event: {
+          type: EventType.ON_SUBMIT,
+        },
+      });
+    }
+  };
+
   getPageView() {
     const value = this.props.text || "";
     const isInvalid =
@@ -149,6 +166,7 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
     if (this.props.maxChars) conditionalProps.maxChars = this.props.maxChars;
     if (this.props.maxNum) conditionalProps.maxNum = this.props.maxNum;
     if (this.props.minNum) conditionalProps.minNum = this.props.minNum;
+
     return (
       <InputComponent
         value={value}
@@ -168,6 +186,8 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
         stepSize={1}
         onFocusChange={this.handleFocusChange}
         showError={!!this.props.isFocused}
+        disableNewLineOnPressEnterKey={!!this.props.onSubmit}
+        onKeyDown={this.handleKeyDown}
         {...conditionalProps}
       />
     );
@@ -215,6 +235,7 @@ export interface InputWidgetProps extends WidgetProps, WithMeta {
   isRequired?: boolean;
   isFocused?: boolean;
   isDirty?: boolean;
+  onSubmit?: string;
 }
 
 export default InputWidget;