Merge branch 'release' into fix/semi-colon-in-js

# Conflicts:
#	app/client/yarn.lock

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/DuplicateApplication_spec.js

@@ -4,25 +4,21 @@ const commonlocators = require("../../../../locators/commonlocators.json");
 const explorerlocators = require("../../../../locators/explorerlocators.json");
 let duplicateApplicationDsl;
 
-describe("Duplicate application", function() {
+describe("Duplicate application", function () {
   before(() => {
     dsl.dsl.version = 21; // latest migrated version
     cy.addDsl(dsl);
   });
 
-  it("Check whether the duplicate application has the same dsl as the original", function() {
+  it("Check whether the duplicate application has the same dsl as the original", function () {
     cy.get(commonlocators.homeIcon).click({ force: true });
     const appname = localStorage.getItem("AppName");
     cy.get(homePage.searchInput).type(appname);
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
 
-    cy.get(homePage.applicationCard)
-      .first()
-      .trigger("mouseover");
-    cy.get(homePage.appMoreIcon)
-      .first()
-      .click({ force: true });
+    cy.get(homePage.applicationCard).first().trigger("mouseover");
+    cy.get(homePage.appMoreIcon).first().click({ force: true });
     cy.get(homePage.duplicateApp).click({ force: true });
 
     cy.wait("@getPage").should(

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Applications/ForkApplication_spec.js

@@ -3,31 +3,24 @@ const homePage = require("../../../../locators/HomePage.json");
 const commonlocators = require("../../../../locators/commonlocators.json");
 let forkedApplicationDsl;
 
-describe("Fork application across orgs", function() {
+describe("Fork application across orgs", function () {
   before(() => {
     dsl.dsl.version = 21; // latest migrated version
     cy.addDsl(dsl);
   });
 
-  it("Check if the forked application has the same dsl as the original", function() {
+  it("Check if the forked application has the same dsl as the original", function () {
     cy.get(commonlocators.homeIcon).click({ force: true });
     const appname = localStorage.getItem("AppName");
     cy.get(homePage.searchInput).type(appname);
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(2000);
 
-    cy.get(homePage.applicationCard)
-      .first()
-      .trigger("mouseover");
-    cy.get(homePage.appMoreIcon)
-      .first()
-      .click({ force: true });
+    cy.get(homePage.applicationCard).first().trigger("mouseover");
+    cy.get(homePage.appMoreIcon).first().click({ force: true });
     cy.get(homePage.forkAppFromMenu).click({ force: true });
     // select a different org here
-    cy.get(homePage.forkAppOrgList)
-      .children()
-      .last()
-      .click({ force: true });
+    cy.get(homePage.forkAppOrgList).children().last().click({ force: true });
     cy.get(homePage.forkAppOrgButton).click({ force: true });
     cy.wait("@postForkAppOrg").then((httpResponse) => {
       expect(httpResponse.status).to.equal(200);

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/aTobAndbToaBasictest_spec.js

@@ -6,12 +6,12 @@ const widgetsPage = require("../../../../locators/Widgets.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 const testdata = require("../../../../fixtures/testdata.json");
 
-describe("aTob and bToa library tests ", function() {
+describe("aTob and bToa library tests ", function () {
   before(() => {
     cy.addDsl(dsl);
   });
 
-  it("Input widget test with default value for atob method", function() {
+  it("Input widget test with default value for atob method", function () {
     cy.SearchEntityandOpen("Input1");
     cy.get(widgetsPage.defaultInput).type(testdata.atobInput);
     cy.get(commonlocators.editPropCrossButton).click({ force: true });
@@ -22,7 +22,7 @@ describe("aTob and bToa library tests ", function() {
     );
   });
 
-  it("Input widget test with default value for btoa method", function() {
+  it("Input widget test with default value for btoa method", function () {
     cy.SearchEntityandOpen("Input2");
     cy.get(widgetsPage.defaultInput).type(testdata.btoaInput);
     cy.get(commonlocators.editPropCrossButton).click({ force: true });
@@ -33,7 +33,7 @@ describe("aTob and bToa library tests ", function() {
     );
   });
 
-  it("publish widget and validate the data displayed in input widgets value for aToB and bToa", function() {
+  it("publish widget and validate the data displayed in input widgets value for aToB and bToa", function () {
     cy.PublishtheApp();
     cy.get(publish.inputWidget + " " + "input")
       .first()

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/loadashBasictest_spec.js

@@ -6,12 +6,12 @@ const widgetsPage = require("../../../../locators/Widgets.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 const testdata = require("../../../../fixtures/testdata.json");
 
-describe("Loadash basic test with input Widget", function() {
+describe("Loadash basic test with input Widget", function () {
   before(() => {
     cy.addDsl(dsl);
   });
 
-  it("Input widget test with default value from another Input widget", function() {
+  it("Input widget test with default value from another Input widget", function () {
     cy.SearchEntityandOpen("Input1");
     cy.get(widgetsPage.defaultInput).type(testdata.defaultInputBinding);
     cy.get(commonlocators.editPropCrossButton).click({ force: true });
@@ -22,7 +22,7 @@ describe("Loadash basic test with input Widget", function() {
     );
   });
 
-  it("Input widget test with default value for loadash function", function() {
+  it("Input widget test with default value for loadash function", function () {
     cy.SearchEntityandOpen("Input2");
     cy.get(widgetsPage.defaultInput).type(testdata.loadashInput);
     cy.get(commonlocators.editPropCrossButton).click({ force: true });
@@ -33,7 +33,7 @@ describe("Loadash basic test with input Widget", function() {
     );
   });
 
-  it("publish widget and validate the data displayed in input widgets from loadash function", function() {
+  it("publish widget and validate the data displayed in input widgets from loadash function", function () {
     cy.PublishtheApp();
     cy.get(publish.inputWidget + " " + "input")
       .first()

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Binding/momentBasictest_spec.js

@@ -6,12 +6,12 @@ const widgetsPage = require("../../../../locators/Widgets.json");
 const publish = require("../../../../locators/publishWidgetspage.json");
 const testdata = require("../../../../fixtures/testdata.json");
 
-describe("Moment basic test with input Widget", function() {
+describe("Moment basic test with input Widget", function () {
   before(() => {
     cy.addDsl(dsl);
   });
 
-  it("Input widget test with default value from another Input widget", function() {
+  it("Input widget test with default value from another Input widget", function () {
     cy.SearchEntityandOpen("Input1");
     cy.get(widgetsPage.defaultInput).type(testdata.defaultInputBinding);
     cy.get(commonlocators.editPropCrossButton).click({ force: true });
@@ -22,7 +22,7 @@ describe("Moment basic test with input Widget", function() {
     );
   });
 
-  it("Binding second input widget with first input widget and validating", function() {
+  it("Binding second input widget with first input widget and validating", function () {
     cy.SearchEntityandOpen("Input2");
     cy.get(widgetsPage.defaultInput).type(testdata.momentInput);
     cy.get(commonlocators.editPropCrossButton).click({ force: true });
@@ -33,7 +33,7 @@ describe("Moment basic test with input Widget", function() {
     );
   });
 
-  it("publish widget and validate the data displayed in input widgets", function() {
+  it("publish widget and validate the data displayed in input widgets", function () {
     var currentTime = new Date();
     cy.PublishtheApp();
     cy.get(publish.inputWidget + " " + "input")

app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicInput/autocomplete_spec.js

@@ -17,19 +17,15 @@ describe("Dynamic input autocomplete", () => {
       .type("{ctrl}{shift}{downarrow}")
       .then(($cm) => {
         if ($cm.val() !== "") {
-          cy.get(dynamicInputLocators.input)
-            .first()
-            .clear({
-              force: true,
-            });
-        }
-
-        cy.get(dynamicInputLocators.input)
-          .first()
-          .type("{{", {
+          cy.get(dynamicInputLocators.input).first().clear({
             force: true,
-            parseSpecialCharSequences: false,
           });
+        }
+
+        cy.get(dynamicInputLocators.input).first().type("{{", {
+          force: true,
+          parseSpecialCharSequences: false,
+        });
 
         // Tests if autocomplete will open
         cy.get(dynamicInputLocators.hints).should("exist");
@@ -57,17 +53,13 @@ describe("Dynamic input autocomplete", () => {
   it("opens current value popup", () => {
     // Test on widgets pane
     cy.openPropertyPane("buttonwidget");
-    cy.get(dynamicInputLocators.input)
-      .first()
-      .focus();
+    cy.get(dynamicInputLocators.input).first().focus();
     cy.assertEvaluatedValuePopup("string");
     // Test on api pane
     cy.NavigateToAPI_Panel();
     cy.get(apiwidget.createapi).click({ force: true });
     cy.wait("@createNewApi");
-    cy.xpath(apiwidget.headerValue)
-      .first()
-      .focus();
+    cy.xpath(apiwidget.headerValue).first().focus();
     cy.assertEvaluatedValuePopup("string");
   });
 });

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

@@ -37,9 +37,7 @@ const StyledContainerComponent = styled.div<
     cursor: ${(props) => (props.onClickCapture ? "pointer" : "inherit")};
     background: ${(props) =>
       props.onClickCapture
-        ? tinycolor(props.backgroundColor)
-            .darken(5)
-            .toString()
+        ? tinycolor(props.backgroundColor).darken(5).toString()
         : props.backgroundColor};
   }
 }`;

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

@@ -30,10 +30,7 @@ export function PositionedContainer(props: PositionedContainerProps) {
     return (
       generateClassName(props.widgetId) +
       " positioned-widget " +
-      `t--widget-${props.widgetType
-        .split("_")
-        .join("")
-        .toLowerCase()}`
+      `t--widget-${props.widgetType.split("_").join("").toLowerCase()}`
     );
   }, [props.widgetType, props.widgetId]);
   const containerStyle: CSSProperties = useMemo(() => {
@@ -52,10 +49,10 @@ export function PositionedContainer(props: PositionedContainerProps) {
     };
   }, [props.style]);
 
-  const openPropPane = useCallback((e) => openPropertyPane(e, props.widgetId), [
-    props.widgetId,
-    openPropertyPane,
-  ]);
+  const openPropPane = useCallback(
+    (e) => openPropertyPane(e, props.widgetId),
+    [props.widgetId, openPropertyPane],
+  );
 
   return (
     <PositionedWidget

app/client/src/components/editorComponents/CodeEditor/index.tsx

@@ -383,11 +383,8 @@ class CodeEditor extends Component<Props, State> {
       theme,
       useValidationMessage,
     } = this.props;
-    const {
-      isValid,
-      jsErrorMessage,
-      validationMessage,
-    } = this.getPropertyValidation(dynamicData, dataTreePath);
+    const { isValid, jsErrorMessage, validationMessage } =
+      this.getPropertyValidation(dynamicData, dataTreePath);
     const hasError = !isValid || !!jsErrorMessage;
     let evaluated = evaluatedValue;
     if (dataTreePath) {

app/client/src/constants/ReduxActionConstants.tsx

@@ -434,7 +434,8 @@ export const ReduxActionTypes: { [key: string]: string } = {
   UPDATE_API_ACTION_BODY_CONTENT_TYPE: "UPDATE_API_ACTION_BODY_CONTENT_TYPE",
 };
 
-export type ReduxActionType = typeof ReduxActionTypes[keyof typeof ReduxActionTypes];
+export type ReduxActionType =
+  typeof ReduxActionTypes[keyof typeof ReduxActionTypes];
 
 export const ReduxActionErrorTypes: { [key: string]: string } = {
   INITIALIZE_APPSMITH_ERROR: "INITIALIZE_APPSMITH_ERROR",
@@ -545,7 +546,8 @@ export const ReduxFormActionTypes: { [key: string]: string } = {
   ARRAY_PUSH: "@@redux-form/ARRAY_PUSH",
 };
 
-export type ReduxActionErrorType = typeof ReduxActionErrorTypes[keyof typeof ReduxActionErrorTypes];
+export type ReduxActionErrorType =
+  typeof ReduxActionErrorTypes[keyof typeof ReduxActionErrorTypes];
 
 export interface ReduxAction<T> {
   type: ReduxActionType | ReduxActionErrorType;

app/client/src/pages/Editor/APIEditor/Form.tsx

@@ -416,10 +416,8 @@ function ImportedHeaders(props: { headers: any }) {
 function ApiEditorForm(props: Props) {
   const [selectedIndex, setSelectedIndex] = useState(0);
   const [showDatasources, toggleDatasources] = useState(false);
-  const [
-    apiBindHelpSectionVisible,
-    setApiBindHelpSectionVisible,
-  ] = useLocalStorage("apiBindHelpSectionVisible", "true");
+  const [apiBindHelpSectionVisible, setApiBindHelpSectionVisible] =
+    useLocalStorage("apiBindHelpSectionVisible", "true");
 
   const {
     actionConfigurationHeaders,

app/client/src/utils/WidgetPropsUtils.tsx

@@ -403,16 +403,14 @@ export function migrateTabsData(currentDSL: ContainerWidgetProps<WidgetProps>) {
           ...dynamicBindablePropsList,
         ];
       }
-      currentDSL.dynamicPropertyPathList = currentDSL.dynamicPropertyPathList.filter(
-        (each) => {
+      currentDSL.dynamicPropertyPathList =
+        currentDSL.dynamicPropertyPathList.filter((each) => {
           return each.key !== "tabs";
-        },
-      );
-      currentDSL.dynamicBindingPathList = currentDSL.dynamicBindingPathList.filter(
-        (each) => {
+        });
+      currentDSL.dynamicBindingPathList =
+        currentDSL.dynamicBindingPathList.filter((each) => {
           return each.key !== "tabs";
-        },
-      );
+        });
       currentDSL.tabsObj = currentDSL.tabs.reduce(
         (obj: any, tab: any, index: number) => {
           obj = {

app/client/src/utils/autocomplete/TernServer.ts

@@ -511,7 +511,7 @@ class TernServer {
           },
         ],
       },
-      function(error: Error) {
+      function (error: Error) {
         if (error) window.console.error(error);
         else doc.changed = null;
       },
@@ -624,10 +624,10 @@ class TernServer {
     };
     let mouseOnTip = false;
     let old = false;
-    CodeMirror.on(tip, "mousemove", function() {
+    CodeMirror.on(tip, "mousemove", function () {
       mouseOnTip = true;
     });
-    CodeMirror.on(tip, "mouseout", function(e: MouseEvent) {
+    CodeMirror.on(tip, "mouseout", function (e: MouseEvent) {
       const related = e.relatedTarget;
       // @ts-ignore: No types available
       if (!related || !CodeMirror.contains(tip, related)) {
@@ -647,7 +647,7 @@ class TernServer {
     cm.on("blur", f);
     cm.on("scroll", f);
     cm.on("setDoc", f);
-    return function() {
+    return function () {
       cm.off("cursorActivity", f);
       cm.off("blur", f);
       cm.off("scroll", f);

app/client/src/widgets/BaseWidget.tsx

@@ -53,7 +53,7 @@ import { flattenObject } from "utils/helpers";
 
 abstract class BaseWidget<
   T extends WidgetProps,
-  K extends WidgetState
+  K extends WidgetState,
 > extends Component<T, K> {
   static contextType = EditorContext;
 
@@ -473,6 +473,7 @@ export const WidgetOperations = {
   ADD_CHILDREN: "ADD_CHILDREN",
 };
 
-export type WidgetOperation = typeof WidgetOperations[keyof typeof WidgetOperations];
+export type WidgetOperation =
+  typeof WidgetOperations[keyof typeof WidgetOperations];
 
 export default BaseWidget;

app/client/src/widgets/ListWidget/ListWidget.tsx

@@ -208,11 +208,8 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
   };
 
   updateTemplateWidgetProperties = (widget: WidgetProps, itemIndex: number) => {
-    const {
-      dynamicBindingPathList,
-      dynamicTriggerPathList,
-      template,
-    } = this.props;
+    const { dynamicBindingPathList, dynamicTriggerPathList, template } =
+      this.props;
     const { widgetName = "" } = widget;
     // Update properties if they're dynamic
     // `template` property should have an array of values
@@ -376,10 +373,11 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
           "children[0]",
         );
         // Set properties of the container's canvas child widget
-        const updatedListItemContainerCanvas = this.updateNonTemplateWidgetProperties(
-          listItemContainerCanvas,
-          listItemIndex,
-        );
+        const updatedListItemContainerCanvas =
+          this.updateNonTemplateWidgetProperties(
+            listItemContainerCanvas,
+            listItemIndex,
+          );
         // Set the item container's canvas child widget
         set(
           updatedListItemContainer,