From 5658e04a1c63db6f286271252eac5679dc7b44a3 Mon Sep 17 00:00:00 2001
From: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Date: Fri, 21 Aug 2020 20:55:49 +0530
Subject: [PATCH 01/10] Navigate to app via href instead of history push (#396)

---
 app/client/src/pages/Applications/ApplicationCard.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx
index 06b1c0d821..776ab813f3 100644
--- a/app/client/src/pages/Applications/ApplicationCard.tsx
+++ b/app/client/src/pages/Applications/ApplicationCard.tsx
@@ -151,6 +151,7 @@ const Control = styled.div<{ fixed?: boolean }>`
 
   .${Classes.BUTTON_TEXT} {
     font-size: 12px;
+    color: white;
   }
 
   .more {
@@ -269,7 +270,7 @@ export const ApplicationCard = (props: ApplicationCardProps) => {
 
                 {hasEditPermission && (
                   <Button
-                    onClick={() => history.push(editApplicationURL)}
+                    href={editApplicationURL}
                     filled
                     text="EDIT"
                     intent="primary"
@@ -285,8 +286,8 @@ export const ApplicationCard = (props: ApplicationCardProps) => {
                   />
                 )}
                 <Button
-                  onClick={() => history.push(viewApplicationURL)}
                   intent="none"
+                  href={viewApplicationURL}
                   outline
                   fluid
                   text="LAUNCH"

From a2b1d3442f71c8eeea68ca1c77f4303e74e96f8e Mon Sep 17 00:00:00 2001
From: Hetu Nandu <hetunandu@gmail.com>
Date: Fri, 21 Aug 2020 22:13:02 +0530
Subject: [PATCH 02/10] Table widget selected row initial value fix (#401)

* Set initial value as empty object

* log debug
---
 app/client/src/jsExecution/RealmExecutor.ts | 4 +++-
 app/client/src/widgets/TableWidget.tsx      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/client/src/jsExecution/RealmExecutor.ts b/app/client/src/jsExecution/RealmExecutor.ts
index f21f1b4e48..e9b587e3ce 100644
--- a/app/client/src/jsExecution/RealmExecutor.ts
+++ b/app/client/src/jsExecution/RealmExecutor.ts
@@ -4,6 +4,7 @@ import {
   JSExecutorResult,
 } from "./JSExecutionManagerSingleton";
 import JSONFn from "json-fn";
+import log from "loglevel";
 declare let Realm: any;
 
 export default class RealmExecutor implements JSExecutor {
@@ -104,7 +105,8 @@ export default class RealmExecutor implements JSExecutor {
         triggers,
       };
     } catch (e) {
-      // console.error(`Error: "${e.message}" when evaluating {{${sourceText}}}`);
+      log.debug(`Error: "${e.message}" when evaluating {{${sourceText}}}`);
+      log.debug(e);
       return { result: undefined, triggers: [] };
     }
   }
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index 237f77d630..78ccdfc906 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -93,7 +93,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       pageSize: undefined,
       selectedRowIndex: -1,
       searchText: undefined,
-      selectedRow: undefined,
+      selectedRow: {},
       // The following meta property is used for rendering the table.
       filteredTableData: undefined,
     };

From 27b7f6c5e242521d7f7c9da99a8b85f1b1c94d94 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Sat, 22 Aug 2020 07:40:02 +0530
Subject: [PATCH 03/10] Fix test DS fails on datasources with direct mongo
 connection (#400)

---
 .../com/external/plugins/MongoPlugin.java     | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
index 45230d6c5f..0261cb3161 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
@@ -299,14 +299,28 @@ public class MongoPlugin extends BasePlugin {
 
         @Override
         public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
+            final Connection.Type connectionType = datasourceConfiguration.getConnection().getType();
             return datasourceCreate(datasourceConfiguration)
-                    .map(mongoClient -> {
+                    .map(mongoClientObj -> {
+                        final MongoClient mongoClient = (MongoClient) mongoClientObj;
                         ClientSession clientSession = null;
 
                         try {
                             // Not using try-with-resources here since we want to close the *session* before closing the
                             // MongoClient instance.
-                            clientSession = ((MongoClient) mongoClient).startSession();
+                            if (Connection.Type.REPLICA_SET.equals(connectionType)) {
+                                // For REPLICA_SET connections, we check by creating a session, as this is faster.
+                                clientSession = mongoClient.startSession();
+
+                            } else {
+                                // For DIRECT connections, we check by running a DB command, as it's the only reliable
+                                // method of checking if the connection is usable.
+                                mongoClient
+                                        .getDatabase("admin")
+                                        .runCommand(new Document("listDatabases", 1));
+                                return new DatasourceTestResult();
+
+                            }
 
                         } catch (MongoTimeoutException e) {
                             log.warn("Timeout connecting to MongoDB from MongoPlugin.", e);
@@ -319,8 +333,8 @@ public class MongoPlugin extends BasePlugin {
                             if (clientSession != null) {
                                 clientSession.close();
                             }
-                            if (mongoClient instanceof MongoClient) {
-                                ((MongoClient) mongoClient).close();
+                            if (mongoClient != null) {
+                                mongoClient.close();
                             }
 
                         }

From 3deb9ace43069fb40e0a0e37a5aa85675947f94e Mon Sep 17 00:00:00 2001
From: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Date: Sat, 22 Aug 2020 08:40:22 +0530
Subject: [PATCH 04/10] Add clone page option (#365)

Adding the option to clone a page in the overflow menu of the entity explorer
---
 .../Smoke_TestSuite/Pages/Pages_spec.js       | 18 +++++++++
 app/client/cypress/locators/Pages.json        |  1 +
 app/client/cypress/support/commands.js        |  1 +
 app/client/src/actions/pageActions.tsx        | 24 ++++++++++++
 app/client/src/api/PageApi.tsx                |  8 ++++
 .../src/constants/ReduxActionConstants.tsx    | 10 +++++
 .../Editor/Explorer/Pages/PageContextMenu.tsx | 11 ++++++
 .../entityReducers/pageListReducer.tsx        | 12 ++++++
 .../src/reducers/uiReducers/editorReducer.tsx | 18 +++++++++
 .../reducers/uiReducers/explorerReducer.ts    |  4 ++
 app/client/src/sagas/PageSagas.tsx            | 37 +++++++++++++++++++
 11 files changed, 144 insertions(+)
 create mode 100644 app/client/cypress/integration/Smoke_TestSuite/Pages/Pages_spec.js

diff --git a/app/client/cypress/integration/Smoke_TestSuite/Pages/Pages_spec.js b/app/client/cypress/integration/Smoke_TestSuite/Pages/Pages_spec.js
new file mode 100644
index 0000000000..420a709de5
--- /dev/null
+++ b/app/client/cypress/integration/Smoke_TestSuite/Pages/Pages_spec.js
@@ -0,0 +1,18 @@
+const pages = require("../../../locators/Pages.json");
+
+describe("Pages", function() {
+  it("Clone page", function() {
+    cy.xpath(pages.popover)
+      .last()
+      .click({ force: true });
+    cy.get(pages.clonePage).click({ force: true });
+
+    cy.wait("@clonePage").should(
+      "have.nested.property",
+      "response.body.responseMeta.status",
+      201,
+    );
+
+    cy.get(".t--entity-name:contains(Page1 Copy)");
+  });
+});
diff --git a/app/client/cypress/locators/Pages.json b/app/client/cypress/locators/Pages.json
index a718431a0b..8ef9748aa0 100644
--- a/app/client/cypress/locators/Pages.json
+++ b/app/client/cypress/locators/Pages.json
@@ -16,6 +16,7 @@
     "entityExplorer": ".t--nav-link-entity-explorer",
     "popover": "//div[contains(@class,'t--entity page')]//*[local-name()='g' and @id='Icon/Outline/more-vertical']",
     "editName": ".single-select >div:contains('Edit Name')",
+    "clonePage": ".single-select >div:contains('Clone')",
     "deletePage": ".single-select >div:contains('Delete')",
     "entityQuery": ".t--entity-name:contains('Queries')"
   }
\ No newline at end of file
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index 87da3f2c72..9b4a491d2c 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -1478,6 +1478,7 @@ Cypress.Commands.add("startServerAndRoutes", () => {
   );
   cy.route("GET", "/api/v1/users/me").as("getUser");
   cy.route("POST", "/api/v1/pages").as("createPage");
+  cy.route("POST", "/api/v1/pages/clone/*").as("clonePage");
 });
 
 Cypress.Commands.add("alertValidate", text => {
diff --git a/app/client/src/actions/pageActions.tsx b/app/client/src/actions/pageActions.tsx
index 8d0cbc7324..ff0122138e 100644
--- a/app/client/src/actions/pageActions.tsx
+++ b/app/client/src/actions/pageActions.tsx
@@ -105,6 +105,30 @@ export const createPage = (applicationId: string, pageName: string) => {
   };
 };
 
+export const clonePageInit = (pageId: string) => {
+  return {
+    type: ReduxActionTypes.CLONE_PAGE_INIT,
+    payload: {
+      id: pageId,
+    },
+  };
+};
+
+export const clonePageSuccess = (
+  pageId: string,
+  pageName: string,
+  layoutId: string,
+) => {
+  return {
+    type: ReduxActionTypes.CLONE_PAGE_SUCCESS,
+    payload: {
+      pageId,
+      pageName,
+      layoutId,
+    },
+  };
+};
+
 export const updatePage = (id: string, name: string) => {
   return {
     type: ReduxActionTypes.UPDATE_PAGE_INIT,
diff --git a/app/client/src/api/PageApi.tsx b/app/client/src/api/PageApi.tsx
index dfd0d150fc..4344fb22d6 100644
--- a/app/client/src/api/PageApi.tsx
+++ b/app/client/src/api/PageApi.tsx
@@ -78,6 +78,10 @@ export interface DeletePageRequest {
   id: string;
 }
 
+export interface ClonePageRequest {
+  id: string;
+}
+
 export interface UpdateWidgetNameRequest {
   pageId: string;
   layoutId: string;
@@ -150,6 +154,10 @@ class PageApi extends Api {
     return Api.delete(PageApi.url + "/" + request.id);
   }
 
+  static clonePage(request: ClonePageRequest): AxiosPromise<ApiResponse> {
+    return Api.post(PageApi.url + "/clone/" + request.id);
+  }
+
   static updateWidgetName(
     request: UpdateWidgetNameRequest,
   ): AxiosPromise<UpdateWidgetNameResponse> {
diff --git a/app/client/src/constants/ReduxActionConstants.tsx b/app/client/src/constants/ReduxActionConstants.tsx
index 7a50182ef2..51911c992a 100644
--- a/app/client/src/constants/ReduxActionConstants.tsx
+++ b/app/client/src/constants/ReduxActionConstants.tsx
@@ -161,6 +161,8 @@ export const ReduxActionTypes: { [key: string]: string } = {
   DELETE_APPLICATION_SUCCESS: "DELETE_APPLICATION_SUCCESS",
   DELETE_PAGE_INIT: "DELETE_PAGE_INIT",
   DELETE_PAGE_SUCCESS: "DELETE_PAGE_SUCCESS",
+  CLONE_PAGE_INIT: "CLONE_PAGE_INIT",
+  CLONE_PAGE_SUCCESS: "CLONE_PAGE_SUCCESS",
   SET_DEFAULT_APPLICATION_PAGE_INIT: "SET_DEFAULT_APPLICATION_PAGE_INIT",
   SET_DEFAULT_APPLICATION_PAGE_SUCCESS: "SET_DEFAULT_APPLICATION_PAGE_SUCCESS",
   CREATE_ORGANIZATION_INIT: "CREATE_ORGANIZATION_INIT",
@@ -312,6 +314,7 @@ export const ReduxActionErrorTypes: { [key: string]: string } = {
   MOVE_ACTION_ERROR: "MOVE_ACTION_ERROR",
   COPY_ACTION_ERROR: "COPY_ACTION_ERROR",
   DELETE_PAGE_ERROR: "DELETE_PAGE_ERROR",
+  CLONE_PAGE_ERROR: "CLONE_PAGE_ERROR",
   DELETE_APPLICATION_ERROR: "DELETE_APPLICATION_ERROR",
   SET_DEFAULT_APPLICATION_PAGE_ERROR: "SET_DEFAULT_APPLICATION_PAGE_ERROR",
   CREATE_ORGANIZATION_ERROR: "CREATE_ORGANIZATION_ERROR",
@@ -394,6 +397,13 @@ export interface Page {
   latest?: boolean;
 }
 
+export interface ClonePageSuccessPayload {
+  pageName: string;
+  pageId: string;
+  layoutId: string;
+  isDefault: boolean;
+}
+
 export type PageListPayload = Array<Page>;
 
 export type ApplicationPayload = {
diff --git a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
index 5ac771bfab..6deffd7340 100644
--- a/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
+++ b/app/client/src/pages/Editor/Explorer/Pages/PageContextMenu.tsx
@@ -9,6 +9,7 @@ import { ReduxActionTypes } from "constants/ReduxActionConstants";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import { ContextMenuPopoverModifiers } from "../helpers";
 import { initExplorerEntityNameEdit } from "actions/explorerActions";
+import { clonePageInit } from "actions/pageActions";
 
 export const PageContextMenu = (props: {
   pageId: string;
@@ -52,12 +53,22 @@ export const PageContextMenu = (props: {
     [dispatch, props.pageId],
   );
 
+  const clonePage = useCallback(() => dispatch(clonePageInit(props.pageId)), [
+    dispatch,
+    props.pageId,
+  ]);
+
   const optionTree: TreeDropdownOption[] = [
     {
       value: "rename",
       onSelect: editPageName,
       label: "Edit Name",
     },
+    {
+      value: "clone",
+      onSelect: clonePage,
+      label: "Clone",
+    },
   ];
   if (!props.isDefaultPage) {
     optionTree.push({
diff --git a/app/client/src/reducers/entityReducers/pageListReducer.tsx b/app/client/src/reducers/entityReducers/pageListReducer.tsx
index c5b8696160..e7fbb3bd78 100644
--- a/app/client/src/reducers/entityReducers/pageListReducer.tsx
+++ b/app/client/src/reducers/entityReducers/pageListReducer.tsx
@@ -3,6 +3,7 @@ import {
   ReduxAction,
   ReduxActionTypes,
   PageListPayload,
+  ClonePageSuccessPayload,
 } from "constants/ReduxActionConstants";
 
 const initialState: PageListReduxState = {
@@ -51,6 +52,17 @@ const pageListReducer = createReducer(initialState, {
     _state.pages.push({ ...action.payload, latest: true });
     return { ..._state };
   },
+  [ReduxActionTypes.CLONE_PAGE_SUCCESS]: (
+    state: PageListReduxState,
+    action: ReduxAction<ClonePageSuccessPayload>,
+  ): PageListReduxState => {
+    return {
+      ...state,
+      pages: state.pages
+        .map(page => ({ ...page, latest: false }))
+        .concat([{ ...action.payload, latest: true }]),
+    };
+  },
   [ReduxActionTypes.SET_DEFAULT_APPLICATION_PAGE_SUCCESS]: (
     state: PageListReduxState,
     action: ReduxAction<{ pageId: string; applicationId: string }>,
diff --git a/app/client/src/reducers/uiReducers/editorReducer.tsx b/app/client/src/reducers/uiReducers/editorReducer.tsx
index d3b6bb25ca..2276b126f7 100644
--- a/app/client/src/reducers/uiReducers/editorReducer.tsx
+++ b/app/client/src/reducers/uiReducers/editorReducer.tsx
@@ -22,6 +22,8 @@ const initialState: EditorReduxState = {
     isPageSwitching: false,
     creatingPage: false,
     creatingPageError: false,
+    cloningPage: false,
+    cloningPageError: false,
     updatingWidgetName: false,
     updateWidgetNameError: false,
   },
@@ -111,6 +113,20 @@ const editorReducer = createReducer(initialState, {
       currentApplicationId,
     };
   },
+  [ReduxActionTypes.CLONE_PAGE_INIT]: (state: EditorReduxState) => {
+    state.loadingStates.cloningPage = true;
+    state.loadingStates.cloningPageError = false;
+    return { ...state };
+  },
+  [ReduxActionTypes.CLONE_PAGE_ERROR]: (state: EditorReduxState) => {
+    state.loadingStates.cloningPageError = true;
+    state.loadingStates.cloningPage = false;
+    return { ...state };
+  },
+  [ReduxActionTypes.CLONE_PAGE_SUCCESS]: (state: EditorReduxState) => {
+    state.loadingStates.cloningPage = false;
+    return { ...state };
+  },
   [ReduxActionTypes.CREATE_PAGE_INIT]: (state: EditorReduxState) => {
     state.loadingStates.creatingPage = true;
     state.loadingStates.creatingPageError = false;
@@ -162,6 +178,8 @@ export interface EditorReduxState {
     pageSwitchingError: boolean;
     creatingPage: boolean;
     creatingPageError: boolean;
+    cloningPage: boolean;
+    cloningPageError: boolean;
     updatingWidgetName: boolean;
     updateWidgetNameError: boolean;
   };
diff --git a/app/client/src/reducers/uiReducers/explorerReducer.ts b/app/client/src/reducers/uiReducers/explorerReducer.ts
index 4382d76e90..eea97da4fc 100644
--- a/app/client/src/reducers/uiReducers/explorerReducer.ts
+++ b/app/client/src/reducers/uiReducers/explorerReducer.ts
@@ -32,6 +32,10 @@ const explorerReducer = createReducer(initialState, {
   [ReduxActionTypes.FETCH_PAGE_ERROR]: setEntityUpdateError,
   [ReduxActionTypes.FETCH_PAGE_SUCCESS]: setEntityUpdateSuccess,
 
+  [ReduxActionTypes.CLONE_PAGE_INIT]: setUpdatingEntity,
+  [ReduxActionTypes.CLONE_PAGE_ERROR]: setEntityUpdateError,
+  [ReduxActionTypes.CLONE_PAGE_SUCCESS]: setEntityUpdateSuccess,
+
   [ReduxActionTypes.MOVE_ACTION_INIT]: setUpdatingEntity,
   [ReduxActionErrorTypes.MOVE_ACTION_ERROR]: setEntityUpdateError,
   [ReduxActionTypes.MOVE_ACTION_SUCCESS]: setEntityUpdateSuccess,
diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx
index 13a2ef63db..4c19491595 100644
--- a/app/client/src/sagas/PageSagas.tsx
+++ b/app/client/src/sagas/PageSagas.tsx
@@ -10,6 +10,7 @@ import {
 } from "constants/ReduxActionConstants";
 import {
   deletePageSuccess,
+  clonePageSuccess,
   fetchPageSuccess,
   fetchPublishedPageSuccess,
   savePageSuccess,
@@ -31,6 +32,7 @@ import PageApi, {
   UpdatePageRequest,
   UpdateWidgetNameRequest,
   UpdateWidgetNameResponse,
+  ClonePageRequest,
 } from "api/PageApi";
 import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer";
 import {
@@ -382,6 +384,40 @@ export function* deletePageSaga(action: ReduxAction<DeletePageRequest>) {
   }
 }
 
+export function* clonePageSaga(clonePageAction: ReduxAction<ClonePageRequest>) {
+  try {
+    const request: ClonePageRequest = clonePageAction.payload;
+    const response: FetchPageResponse = yield call(PageApi.clonePage, request);
+    const applicationId = yield select(
+      (state: AppState) => state.entities.pageList.applicationId,
+    );
+    const isValidResponse = yield validateResponse(response);
+    if (isValidResponse) {
+      yield put(
+        clonePageSuccess(
+          response.data.id,
+          response.data.name,
+          response.data.layouts[0].id,
+        ),
+      );
+      yield put({
+        type: ReduxActionTypes.FETCH_PAGE_DSL_INIT,
+        payload: {
+          pageId: response.data.id,
+        },
+      });
+      history.push(BUILDER_PAGE_URL(applicationId, response.data.id));
+    }
+  } catch (error) {
+    yield put({
+      type: ReduxActionErrorTypes.CLONE_PAGE_ERROR,
+      payload: {
+        error,
+      },
+    });
+  }
+}
+
 export function* updateWidgetNameSaga(
   action: ReduxAction<{ id: string; newName: string }>,
 ) {
@@ -477,6 +513,7 @@ export default function* pageSagas() {
     ),
     takeLatest(ReduxActionTypes.UPDATE_LAYOUT, saveLayoutSaga),
     takeLeading(ReduxActionTypes.CREATE_PAGE_INIT, createPageSaga),
+    takeLeading(ReduxActionTypes.CLONE_PAGE_INIT, clonePageSaga),
     takeLatest(ReduxActionTypes.FETCH_PAGE_LIST_INIT, fetchPageListSaga),
     takeLatest(ReduxActionTypes.UPDATE_PAGE_INIT, updatePageSaga),
     takeLatest(ReduxActionTypes.DELETE_PAGE_INIT, deletePageSaga),

From bccef563c4362a4b3a8d87527cb05ff645ec912f Mon Sep 17 00:00:00 2001
From: satbir121 <39981226+satbir121@users.noreply.github.com>
Date: Mon, 24 Aug 2020 11:12:19 +0530
Subject: [PATCH 05/10] Alignment of icon button is to right (#372)

---
 app/client/src/widgets/IconWidget.tsx | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/client/src/widgets/IconWidget.tsx b/app/client/src/widgets/IconWidget.tsx
index 6841a6f82e..57ba12a34a 100644
--- a/app/client/src/widgets/IconWidget.tsx
+++ b/app/client/src/widgets/IconWidget.tsx
@@ -2,12 +2,16 @@ import React from "react";
 import BaseWidget, { WidgetProps, WidgetState } from "./BaseWidget";
 import { TriggerPropertiesMap } from "utils/WidgetFactory";
 import { WidgetType, WidgetTypes } from "constants/WidgetConstants";
-
+import styled from "styled-components";
 import IconComponent, {
   IconType,
 } from "components/designSystems/appsmith/IconComponent";
 import { EventType, ExecutionResult } from "constants/ActionConstants";
 
+const IconWrapper = styled.div`
+  display: flex;
+  justify-content: flex-end;
+`;
 class IconWidget extends BaseWidget<IconWidgetProps, WidgetState> {
   static getTriggerPropertyMap(): TriggerPropertiesMap {
     return {
@@ -32,13 +36,15 @@ class IconWidget extends BaseWidget<IconWidgetProps, WidgetState> {
 
   getPageView() {
     return (
-      <IconComponent
-        iconName={this.props.iconName}
-        disabled={this.props.disabled}
-        iconSize={this.props.iconSize}
-        color={this.props.color}
-        onClick={this.onClick}
-      />
+      <IconWrapper>
+        <IconComponent
+          iconName={this.props.iconName}
+          disabled={this.props.disabled}
+          iconSize={this.props.iconSize}
+          color={this.props.color}
+          onClick={this.onClick}
+        />
+      </IconWrapper>
     );
   }
 

From f5f65dd89e31754aac01739cd7873a497d451ea9 Mon Sep 17 00:00:00 2001
From: devrk96 <rohit.kumawat@primathon.in>
Date: Mon, 24 Aug 2020 11:30:22 +0530
Subject: [PATCH 06/10] table dropdown functionalities and UI implemented
 (#407)

---
 .../src/components/ads/TableDropdown.tsx      | 109 ++++++++++++++++++
 .../stories/TableDropdown.stories.tsx         |  37 ++++++
 2 files changed, 146 insertions(+)
 create mode 100644 app/client/src/components/ads/TableDropdown.tsx
 create mode 100644 app/client/src/components/stories/TableDropdown.stories.tsx

diff --git a/app/client/src/components/ads/TableDropdown.tsx b/app/client/src/components/ads/TableDropdown.tsx
new file mode 100644
index 0000000000..ae55039dd9
--- /dev/null
+++ b/app/client/src/components/ads/TableDropdown.tsx
@@ -0,0 +1,109 @@
+import React, { useCallback, useState } from "react";
+import { CommonComponentProps, hexToRgba } from "./common";
+import { ReactComponent as DownArrow } from "../../assets/icons/ads/down_arrow.svg";
+import Text, { TextType } from "./Text";
+import styled from "styled-components";
+
+type DropdownOption = {
+  label: string;
+  value: string;
+};
+
+type DropdownProps = CommonComponentProps & {
+  options: DropdownOption[];
+  onSelect: (selectedValue: string) => void;
+  selectedOption: DropdownOption;
+};
+
+const DropdownWrapper = styled.div`
+  width: 100%;
+  position: relative;
+`;
+
+const SelectedItem = styled.div`
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  user-select: none;
+
+  span {
+    margin-right: ${props => props.theme.spaces[1] + 1}px;
+  }
+`;
+
+const OptionsWrapper = styled.div`
+  position: absolute;
+  margin-top: ${props => props.theme.spaces[8]}px;
+  left: -60px;
+  width: 200px;
+  display: flex;
+  flex-direction: column;
+  background-color: ${props => props.theme.colors.blackShades[3]};
+  box-shadow: ${props => props.theme.spaces[0]}px
+    ${props => props.theme.spaces[5]}px ${props => props.theme.spaces[13] - 2}px
+    ${props => hexToRgba(props.theme.colors.blackShades[0], 0.75)};
+`;
+
+const DropdownOption = styled.div<{
+  selected: DropdownOption;
+  option: DropdownOption;
+}>`
+  display: flex;
+  flex-direction: column;
+  padding: 10px 12px;
+  cursor: pointer;
+  background-color: ${props =>
+    props.option.label === props.selected.label
+      ? props.theme.colors.blackShades[4]
+      : "transparent"};
+
+  span:last-child {
+    margin-top: ${props => props.theme.spaces[1] + 1}px;
+  }
+
+  &:hover {
+    span {
+      color: ${props => props.theme.colors.blackShades[9]};
+    }
+  }
+`;
+
+const TableDropdown = (props: DropdownProps) => {
+  const [selected, setSelected] = useState(props.selectedOption);
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+
+  const dropdownHandler = () => {
+    setIsDropdownOpen(!isDropdownOpen);
+  };
+
+  const optionSelector = (option: DropdownOption) => {
+    setSelected(option);
+    setIsDropdownOpen(false);
+  };
+
+  return (
+    <DropdownWrapper>
+      <SelectedItem onClick={() => dropdownHandler()}>
+        <Text type={TextType.P1}>{selected.label}</Text>
+        <DownArrow />
+      </SelectedItem>
+      {isDropdownOpen ? (
+        <OptionsWrapper>
+          {props.options.map((el: DropdownOption, index: number) => (
+            <DropdownOption
+              key={index}
+              selected={selected}
+              option={el}
+              onClick={() => optionSelector(el)}
+            >
+              <Text type={TextType.H5}>{el.label}</Text>
+              <Text type={TextType.P3}>{el.value}</Text>
+            </DropdownOption>
+          ))}
+        </OptionsWrapper>
+      ) : null}
+    </DropdownWrapper>
+  );
+};
+
+export default TableDropdown;
diff --git a/app/client/src/components/stories/TableDropdown.stories.tsx b/app/client/src/components/stories/TableDropdown.stories.tsx
new file mode 100644
index 0000000000..6756d92b73
--- /dev/null
+++ b/app/client/src/components/stories/TableDropdown.stories.tsx
@@ -0,0 +1,37 @@
+import React from "react";
+import { withKnobs, select, boolean, text } from "@storybook/addon-knobs";
+import { withDesign } from "storybook-addon-designs";
+import TableDropdown from "../ads/TableDropdown";
+
+export default {
+  title: "Dropdown",
+  component: TableDropdown,
+  decorators: [withKnobs, withDesign],
+};
+
+const options = [
+  {
+    label: "Admin",
+    value: "Can edit, view and invite other user to an app",
+  },
+  {
+    label: "Developer",
+    value: "Can view and invite other user to an app",
+  },
+  {
+    label: "User",
+    value: "Can view and invite other user to an app and...",
+  },
+];
+
+export const TableDropdownStory = () => (
+  <div
+    style={{ padding: "50px 200px", height: "500px", background: "#1A191C" }}
+  >
+    <TableDropdown
+      options={options}
+      onSelect={(selectedValue: string) => console.log(selectedValue)}
+      selectedOption={options[0]}
+    ></TableDropdown>
+  </div>
+);

From 01f63931898add0e7b390b330383314c69d82717 Mon Sep 17 00:00:00 2001
From: NandanAnantharamu <67676905+NandanAnantharamu@users.noreply.github.com>
Date: Mon, 24 Aug 2020 12:16:28 +0530
Subject: [PATCH 07/10] Changed the widget used for search in the test (#406)

---
 .../Entity_Explorer_Widgets_spec.js           | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Widgets_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Widgets_spec.js
index 3f397e4b07..2dd1ba83e5 100644
--- a/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Widgets_spec.js
+++ b/app/client/cypress/integration/Smoke_TestSuite/ExplorerTests/Entity_Explorer_Widgets_spec.js
@@ -1,11 +1,6 @@
-const commonlocators = require("../../../locators/commonlocators.json");
-const dsl = require("../../../fixtures/commondsl.json");
-const widgetsPage = require("../../../locators/Widgets.json");
-const testdata = require("../../../fixtures/testdata.json");
-const pages = require("../../../locators/Pages.json");
+const dsl = require("../../../fixtures/displayWidgetDsl.json");
 const apiwidget = require("../../../locators/apiWidgetslocator.json");
 const explorer = require("../../../locators/explorerlocators.json");
-const pageid = "MyPage";
 
 describe("Entity explorer tests related to widgets and validation", function() {
   beforeEach(() => {
@@ -13,31 +8,26 @@ describe("Entity explorer tests related to widgets and validation", function() {
   });
 
   it("Widget edit/delete/copy to clipboard validation", function() {
-    cy.openPropertyPane("textwidget");
-    cy.widgetText("Api", widgetsPage.textWidget, widgetsPage.textInputval);
-    cy.testCodeMirror("/api/users/2");
     cy.NavigateToEntityExplorer();
-    cy.wait(5000);
-    cy.SearchEntityandOpen("Api");
+    cy.SearchEntityandOpen("Text1");
     cy.get(explorer.collapse)
       .last()
       .click({ force: true });
     cy.get(explorer.property)
       .last()
       .click({ force: true });
-    cy.wait(2000);
     cy.get(apiwidget.propertyList).then(function($lis) {
       expect($lis).to.have.length(2);
-      expect($lis.eq(0)).to.contain("{{Api.isVisible}}");
-      expect($lis.eq(1)).to.contain("{{Api.text}}");
+      expect($lis.eq(0)).to.contain("{{Text1.isVisible}}");
+      expect($lis.eq(1)).to.contain("{{Text1.text}}");
     });
-    cy.GlobalSearchEntity("Api");
-    cy.EditApiNameFromExplorer("ApiUpdated");
-    cy.GlobalSearchEntity("ApiUpdated");
+    cy.GlobalSearchEntity("Text1");
+    cy.EditApiNameFromExplorer("TextUpdated");
+    cy.GlobalSearchEntity("TextUpdated");
     cy.get(apiwidget.propertyList).then(function($lis) {
       expect($lis).to.have.length(2);
-      expect($lis.eq(0)).to.contain("{{ApiUpdated.isVisible}}");
-      expect($lis.eq(1)).to.contain("{{ApiUpdated.text}}");
+      expect($lis.eq(0)).to.contain("{{TextUpdated.isVisible}}");
+      expect($lis.eq(1)).to.contain("{{TextUpdated.text}}");
     });
     cy.DeleteWidgetFromSideBar();
   });

From eb7dcd69a54cb2be436687f208667b51a419ce5c Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Mon, 24 Aug 2020 12:23:38 +0530
Subject: [PATCH 08/10] Fix MongoDB datasource testing fails due to
 unauthorized error (#402)

---
 .../src/main/java/com/external/plugins/MongoPlugin.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
index 0261cb3161..1a7279aeeb 100644
--- a/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
+++ b/app/server/appsmith-plugins/mongoPlugin/src/main/java/com/external/plugins/MongoPlugin.java
@@ -14,6 +14,7 @@ import com.appsmith.external.plugins.BasePlugin;
 import com.appsmith.external.plugins.PluginExecutor;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientURI;
+import com.mongodb.MongoCommandException;
 import com.mongodb.MongoTimeoutException;
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoDatabase;
@@ -326,6 +327,14 @@ public class MongoPlugin extends BasePlugin {
                             log.warn("Timeout connecting to MongoDB from MongoPlugin.", e);
                             return new DatasourceTestResult("Timed out trying to connect to MongoDB host.");
 
+                        } catch(MongoCommandException e) {
+                            // The fact that we got a response saying "Unauthorized" means that the connection to the
+                            // MongoDB instance is valid. It also means we don't have access to the admin database, but
+                            // that's okay for our purposes here.
+                            return "Unauthorized".equals(e.getErrorCodeName())
+                                    ? new DatasourceTestResult()
+                                    : new DatasourceTestResult(e.getMessage());
+
                         } catch (Exception e) {
                             return new DatasourceTestResult(e.getMessage());
 

From 4ef36386fd213e622e424d2404d6748f282c06b4 Mon Sep 17 00:00:00 2001
From: Abhinav Jha <abhinav@appsmith.com>
Date: Mon, 24 Aug 2020 16:20:15 +0530
Subject: [PATCH 09/10] Enable property pane event listeners, so that it is
 contained within the viewport properly when it's size updates (#398)

---
 app/client/src/pages/Editor/Popper.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/client/src/pages/Editor/Popper.tsx b/app/client/src/pages/Editor/Popper.tsx
index 8a8a4abfe7..113ceabd7b 100644
--- a/app/client/src/pages/Editor/Popper.tsx
+++ b/app/client/src/pages/Editor/Popper.tsx
@@ -56,7 +56,6 @@ export default (props: PopperProps) => {
           },
         },
       );
-      _popper.disableEventListeners();
       return () => {
         _popper.destroy();
       };

From bb55029f42f548efcda3c1d931ca9aac79199bd8 Mon Sep 17 00:00:00 2001
From: Abhinav Jha <abhinav@appsmith.com>
Date: Mon, 24 Aug 2020 16:20:50 +0530
Subject: [PATCH 10/10] Fix: Missing form button (#397)

---
 app/client/src/icons/WidgetIcons.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/client/src/icons/WidgetIcons.tsx b/app/client/src/icons/WidgetIcons.tsx
index 41e31c193c..e4c85b4f71 100644
--- a/app/client/src/icons/WidgetIcons.tsx
+++ b/app/client/src/icons/WidgetIcons.tsx
@@ -125,6 +125,11 @@ export const WidgetIcons: {
       <ModalIcon />
     </IconWrapper>
   ),
+  FORM_BUTTON_WIDGET: (props: IconProps) => (
+    <IconWrapper {...props}>
+      <ButtonIcon />
+    </IconWrapper>
+  ),
 };
 
 export type WidgetIcon = typeof WidgetIcons[keyof typeof WidgetIcons];