Merge pull request #459 from appsmithorg/release

Release

Author: mohanarpit

app/client/cypress/integration/Smoke_TestSuite/ApiFlow/CurlImportFlow_spec.js

@@ -6,9 +6,7 @@ describe("Test curl import flow", function() {
     localStorage.setItem("ApiPaneV2", "ApiPaneV2");
     cy.NavigateToApiEditor();
     cy.get(ApiEditor.curlImage).click({ force: true });
-    cy.get("textarea").type(
-      "curl -X GET http://app.appsmith.com/scrap/api?slugifiedName=Freshdesk&ownerName=volodimir.kudriachenko",
-    );
+    cy.get("textarea").type("curl -X GET https://mock-api.appsmith.com/users");
     cy.importCurl();
     cy.get("@curlImport").then(response => {
       cy.expect(response.response.body.responseMeta.success).to.eq(true);

app/client/package.json

@@ -16,8 +16,9 @@
     "@craco/craco": "^5.6.1",
     "@manaflair/redux-batch": "^1.0.0",
     "@optimizely/optimizely-sdk": "^4.0.0",
-    "@sentry/browser": "^5.6.3",
-    "@sentry/webpack-plugin": "^1.10.0",
+    "@sentry/react": "^5.22.0",
+    "@sentry/tracing": "^5.22.0",
+    "@sentry/webpack-plugin": "^1.12.1",
     "@types/chance": "^1.0.7",
     "@types/lodash": "^4.14.120",
     "@types/moment-timezone": "^0.5.10",
@@ -55,6 +56,7 @@
     "fusioncharts": "^3.15.0-sr.1",
     "history": "^4.10.1",
     "husky": "^3.0.5",
+    "immer": "^7.0.8",
     "instantsearch.css": "^7.4.2",
     "instantsearch.js": "^4.4.1",
     "interweave": "^12.1.1",

app/client/src/actions/actionActions.ts

@@ -67,6 +67,38 @@ export const runAction = (id: string, paginationField?: PaginationField) => {
   };
 };
 
+export const runActionInit = (
+  id: string,
+  paginationField?: PaginationField,
+) => {
+  return {
+    type: ReduxActionTypes.RUN_ACTION_INIT,
+    payload: {
+      id,
+      paginationField,
+    },
+  };
+};
+
+export const showRunActionConfirmModal = (show: boolean) => {
+  return {
+    type: ReduxActionTypes.SHOW_RUN_ACTION_CONFIRM_MODAL,
+    payload: show,
+  };
+};
+
+export const cancelRunActionConfirmModal = () => {
+  return {
+    type: ReduxActionTypes.CANCEL_RUN_ACTION_CONFIRM_MODAL,
+  };
+};
+
+export const acceptRunActionConfirmModal = () => {
+  return {
+    type: ReduxActionTypes.ACCEPT_RUN_ACTION_CONFIRM_MODAL,
+  };
+};
+
 export const updateAction = (payload: { id: string }) => {
   return batchAction({
     type: ReduxActionTypes.UPDATE_ACTION_INIT,
@@ -196,6 +228,13 @@ export const updateActionProperty = (
   });
 };
 
+export const setActionsToExecuteOnPageLoad = (actions: string[]) => {
+  return {
+    type: ReduxActionTypes.SET_ACTION_TO_EXECUTE_ON_PAGELOAD,
+    payload: actions,
+  };
+};
+
 export default {
   createAction: createActionRequest,
   fetchActions,

app/client/src/api/ActionAPI.tsx

@@ -182,6 +182,12 @@ class ActionAPI extends API {
   static executeQuery(executeAction: any): AxiosPromise<ActionApiResponse> {
     return API.post(ActionAPI.url + "/execute", executeAction);
   }
+
+  static toggleActionExecuteOnLoad(actionId: string, shouldExecute: boolean) {
+    return API.put(ActionAPI.url + `/executeOnLoad/${actionId}`, undefined, {
+      flag: shouldExecute.toString(),
+    });
+  }
 }
 
 export default ActionAPI;

app/client/src/api/PageApi.tsx

@@ -45,7 +45,11 @@ export type FetchPublishedPageResponse = ApiResponse & {
 };
 
 export interface SavePageResponse extends ApiResponse {
-  pageId: string;
+  data: {
+    id: string;
+    layoutOnLoadActions: PageAction[][];
+    dsl: Partial<ContainerWidgetProps<any>>;
+  };
 }
 
 export interface CreatePageRequest {

app/client/src/components/designSystems/appsmith/ChartComponent.tsx

@@ -231,10 +231,20 @@ class ChartComponent extends React.Component<ChartComponentProps> {
   componentDidMount() {
     this.createGraph();
     FusionCharts.ready(() => {
-      this.chartInstance.render();
+      /* Component could be unmounted before FusionCharts is ready, 
+      this check ensure we don't render on unmounted component */
+      if (this.chartInstance) {
+        this.chartInstance.render();
+      }
     });
   }
 
+  componentWillUnmount() {
+    if (this.chartInstance) {
+      this.chartInstance = null;
+    }
+  }
+
   componentDidUpdate(prevProps: ChartComponentProps) {
     if (!_.isEqual(prevProps, this.props)) {
       const chartType = this.getChartType();

app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx

@@ -291,7 +291,7 @@ export const TableHeaderWrapper = styled.div<{
   .show-page-items {
     display: ${props => (props.width < 700 ? "none" : "flex")};
   }
-  overflow-x: scroll;
+  overflow-x: auto;
   overflow-y: hidden;
   height: ${props => props.tableSizes.TABLE_HEADER_HEIGHT}px;
   min-height: ${props => props.tableSizes.TABLE_HEADER_HEIGHT}px;
@@ -325,7 +325,7 @@ export const TableIconWrapper = styled.div<{
   box-shadow: ${props =>
     props.selected ? `inset 0px 4px 0px ${Colors.GREEN}` : "none"};
   width: 48px;
-  height: 45px;
+  height: 42px;
   display: flex;
   align-items: center;
   justify-content: center;

app/client/src/components/designSystems/appsmith/TableUtilities.tsx

@@ -718,7 +718,12 @@ export function sortTableFunction(
     )?.metaProperties?.type || ColumnTypes.TEXT;
   return tableData.sort(
     (a: { [key: string]: any }, b: { [key: string]: any }) => {
-      if (a[sortedColumn] !== undefined && b[sortedColumn] !== undefined) {
+      if (
+        a[sortedColumn] !== undefined &&
+        a[sortedColumn] !== null &&
+        b[sortedColumn] !== undefined &&
+        b[sortedColumn] !== null
+      ) {
         switch (columnType) {
           case ColumnTypes.CURRENCY:
           case ColumnTypes.NUMBER:

app/client/src/components/editorComponents/ErrorBoundry.tsx

@@ -1,6 +1,6 @@
 import React, { ReactNode } from "react";
 import styled from "styled-components";
-import * as Sentry from "@sentry/browser";
+import * as Sentry from "@sentry/react";
 
 type Props = { isValid: boolean; children: ReactNode };
 type State = { hasError: boolean };

app/client/src/components/formControls/DynamicTextFieldControl.tsx

@@ -24,7 +24,7 @@ import {
 const Wrapper = styled.div`
   .dynamic-text-field {
     border-radius: 4px;
-    border: 1px solid #d0d7dd;
+    border: none;
     font-size: 14px;
     height: calc(100vh / 4);
   }