chore: Adding missing function in cypress git sync helper and syncing the common file across the two repositories.

app/client/.babelrc

@@ -1,21 +1,25 @@
 {
   "plugins": [
-    ["module-resolver", {
-      "root": ["./src"],
-      "alias": {
-        "utils": "./src/utils/",
-        "test/*": ["../test/*"],
-        "underscore": "lodash",
-        "constants": "./src/constants/",
-        "components": "./src/components/",
-        "selectors": "./src/selectors/",
-        "reducers": "./src/reducers/",
-        "actions":"./src/actions/",
-        "api": "./src/api/",
-        "assets": "./src/assets/",
-        "sagas": "./src/sagas/",
-        "@appsmith": "./src/ee"
-      }
-    }, "babel-plugin-styled-components"]
+    [
+      "module-resolver",
+      {
+        "root": ["./src"],
+        "alias": {
+          "utils": "./src/utils/",
+          "test/*": ["../test/*"],
+          "underscore": "lodash",
+          "constants": "./src/constants/",
+          "components": "./src/components/",
+          "selectors": "./src/selectors/",
+          "reducers": "./src/reducers/",
+          "actions": "./src/actions/",
+          "api": "./src/api/",
+          "assets": "./src/assets/",
+          "sagas": "./src/sagas/",
+          "@appsmith": "./src/ee"
+        }
+      },
+      "babel-plugin-styled-components"
+    ]
   ]
 }

app/client/.prettierrc

@@ -1,9 +1,9 @@
 {
-	"printWidth": 80,
-	"tabWidth": 2,
-	"useTabs": false,
-	"semi": true,
-	"singleQuote": false,
-	"trailingComma": "all",
-	"arrowParens": "always"
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "trailingComma": "all",
+  "arrowParens": "always"
 }

app/client/.yarn/plugins/plugin-dedupe-on-install.cjs

@@ -1,22 +1,22 @@
 module.exports = {
   name: `plugin-dedupe-on-install`,
   factory: (require) => {
-    const {execute} = require('@yarnpkg/shell')
+    const { execute } = require("@yarnpkg/shell");
     return {
       hooks: {
         // yarn / yarn install / yarn add / yarn dedupe -> afterAllInstalled
         async afterAllInstalled() {
           // use env var to prevent infinite loops
-          if (!process.env.DEDUPED && !process.argv.includes('dedupe')) {
-            process.env.DEDUPED = 'yes'
+          if (!process.env.DEDUPED && !process.argv.includes("dedupe")) {
+            process.env.DEDUPED = "yes";
             // fast check for duplicates
-            if (await execute('yarn dedupe --check')) {
+            if (await execute("yarn dedupe --check")) {
               // run actual dedupe/link step
-              await execute('yarn dedupe')
+              await execute("yarn dedupe");
             }
           }
         },
       },
-    }
+    };
   },
-}
+};

app/client/README.md

@@ -1,5 +1,5 @@
 # Appsmith Client
+
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-<br><br> 
+<br><br>
 For details on setting up your development machine, please refer to the [Setup Guide](../../contributions/ClientSetup.md)
-

app/client/README.old.md

@@ -2,7 +2,7 @@
 
 When you're done, you can delete the content in this README and then update the file with details for others getting started with your repository.
 
-*We recommend that you open this README in another tab as you perform the tasks below. You can [watch our video](https://youtu.be/0ocf7u76WSo) for a full demo of all the steps in this tutorial. Open the video in a new tab to avoid leaving Bitbucket.*
+_We recommend that you open this README in another tab as you perform the tasks below. You can [watch our video](https://youtu.be/0ocf7u76WSo) for a full demo of all the steps in this tutorial. Open the video in a new tab to avoid leaving Bitbucket._
 
 ---
 
@@ -13,7 +13,7 @@ You’ll start by editing this README file to learn how to edit a file in Bitbuc
 1. Click **Source** on the left side.
 2. Click the README.md link from the list of files.
 3. Click the **Edit** button.
-4. Delete the following text: *Delete this line to make a change to the README from Bitbucket.*
+4. Delete the following text: _Delete this line to make a change to the README from Bitbucket._
 5. After making your change, click **Commit** and then **Commit** again in the dialog. The commit page will open and you’ll see the change you just made.
 6. Go back to the **Source** page.
 

app/client/cypress/support/Pages/GitSync.ts

@@ -38,12 +38,13 @@ export class GitSync {
   _checkMergeability = "//span[contains(text(), 'Checking mergeability')]";
   public _branchListItem = "[data-testid=t--branch-list-item]";
   public _bottomBarMergeButton = ".t--bottom-bar-merge";
+  private mergeCTA = "[data-testid=t--git-merge-button]";
   public _mergeBranchDropdownDestination =
     ".t--merge-branch-dropdown-destination";
   public _dropdownmenu = ".rc-select-item-option-content";
   private _openRepoButton = "[data-testid=t--git-repo-button]";
   public _commitButton = ".t--commit-button";
-  private _commitCommentInput = ".t--commit-comment-input textarea";
+  public _commitCommentInput = ".t--commit-comment-input textarea";
 
   public _discardChanges = ".t--discard-button";
   public _discardCallout = "[data-testid='t--discard-callout']";
@@ -389,6 +390,18 @@ export class GitSync {
     this.agHelper.AssertElementAbsence(this._checkMergeability, 35000);
   }
 
+  MergeToMaster() {
+    this.CheckMergeConflicts("master");
+    this.agHelper.AssertElementEnabledDisabled(this.mergeCTA, 0, false);
+    this.agHelper.GetNClick(this.mergeCTA);
+    this.assertHelper.AssertNetworkStatus("@mergeBranch");
+    this.agHelper.AssertContains(
+      Cypress.env("MESSAGES").MERGED_SUCCESSFULLY(),
+      "be.visible",
+    );
+    this.CloseGitSyncModal();
+  }
+
   OpenRepositoryAndVerify() {
     this.agHelper.GetNClick(this._openRepoButton);
   }

app/client/generators/widget/templates/component/index.js.hbs

@@ -1,9 +1,5 @@
-import React from "react";
-
-function {{name}}Component(props: {{name}}ComponentProps) {
-  return null;
-}
-
-export interface {{name}}ComponentProps {}
-
-export default {{name}}Component;
+import React from "react"; function
+{{name}}Component(props:
+{{name}}ComponentProps) { return null; } export interface
+{{name}}ComponentProps {} export default
+{{name}}Component;

app/client/generators/widget/templates/constants.js.hbs

@@ -1,2 +1,3 @@
-// This file contains common constants which can be used across the widget configuration file (index.ts), widget and component folders.
-export const {{widgetTypeFormat name}}_CONSTANT = "";
+// This file contains common constants which can be used across the widget
+configuration file (index.ts), widget and component folders. export const
+{{widgetTypeFormat name}}_CONSTANT = "";

app/client/generators/widget/templates/icon.svg.hbs

@@ -1 +1,15 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24"><rect width="22" height="22" x="1" y="1" stroke="#fff" stroke-dasharray="3 1" stroke-width="2"/></svg>
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  fill="none"
+  viewBox="0 0 24 24"
+><rect
+    width="22"
+    height="22"
+    x="1"
+    y="1"
+    stroke="#fff"
+    stroke-dasharray="3 1"
+    stroke-width="2"
+  /></svg>

app/client/generators/widget/templates/index.js.hbs

@@ -1,3 +1 @@
-import Widget from "./widget";
-
-export default Widget;
+import Widget from "./widget"; export default Widget;

app/client/jest.config.js

@@ -89,7 +89,7 @@ module.exports = {
         browserAgentlicenseKey: parseConfig(
           "__APPSMITH_NEW_RELIC_BROWSER_AGENT_LICENSE_KEY__",
         ),
-        browserAgentEndpoint:  parseConfig(
+        browserAgentEndpoint: parseConfig(
           "__APPSMITH_NEW_RELIC_BROWSER_AGENT_ENDPOINT__",
         ),
         otlpLicenseKey: parseConfig("__APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY__"),

app/client/package.json

@@ -354,7 +354,7 @@
     "postcss-nesting": "^12.0.1",
     "postcss-url": "^10.1.3",
     "postinstall-postinstall": "^2.1.0",
-    "prettier": "^3.0.3",
+    "prettier": "3.2.5",
     "prop-types": "^15.8.1",
     "raw-loader": "^4.0.2",
     "react-is": "^16.12.0",

app/client/packages/icons/src/components/Icons/ButtonIcon.tsx

@@ -1,2 +1,24 @@
 import React from "react";
-export const ButtonIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M8.5 5.5v2m0 2v-2m3-2L9.793 7.207a1 1 0 0 1-.707.293H8.5M8.5 9.5v-4m3 4-2-2M3.5 8V7a1.5 1.5 0 1 1 3 0v1a1.5 1.5 0 1 1-3 0"/></svg>;
+export const ButtonIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-opacity=".25"
+      d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M8.5 5.5v2m0 2v-2m3-2L9.793 7.207a1 1 0 0 1-.707.293H8.5M8.5 9.5v-4m3 4-2-2M3.5 8V7a1.5 1.5 0 1 1 3 0v1a1.5 1.5 0 1 1-3 0"
+    />
+  </svg>
+);

app/client/packages/icons/src/components/Icons/CheckboxGroupIcon.tsx

@@ -1,2 +1,17 @@
 import React from "react";
-export const CheckboxGroupIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M5 6.5H2A1.5 1.5 0 0 1 .5 5V2A1.5 1.5 0 0 1 2 .5h3A1.5 1.5 0 0 1 6.5 2v3A1.5 1.5 0 0 1 5 6.5"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m2.5 3.5 1 1 1-2M8.5 2.5h6M8.5 12.5h4M5 14.5H2A1.5 1.5 0 0 1 .5 13v-3A1.5 1.5 0 0 1 2 8.5h3A1.5 1.5 0 0 1 6.5 10v3A1.5 1.5 0 0 1 5 14.5M8.5 4.5h4M8.5 10.5h6"/></svg>;
+export const CheckboxGroupIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M5 6.5H2A1.5 1.5 0 0 1 .5 5V2A1.5 1.5 0 0 1 2 .5h3A1.5 1.5 0 0 1 6.5 2v3A1.5 1.5 0 0 1 5 6.5"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="m2.5 3.5 1 1 1-2M8.5 2.5h6M8.5 12.5h4M5 14.5H2A1.5 1.5 0 0 1 .5 13v-3A1.5 1.5 0 0 1 2 8.5h3A1.5 1.5 0 0 1 6.5 10v3A1.5 1.5 0 0 1 5 14.5M8.5 4.5h4M8.5 10.5h6"
+    />
+  </svg>
+);

app/client/packages/icons/src/components/Icons/CheckboxIcon.tsx

@@ -1,2 +1,17 @@
 import React from "react";
-export const CheckboxIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M11.5 1.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m4.5 7.5 2 2 4-4"/></svg>;
+export const CheckboxIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M11.5 1.5h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="m4.5 7.5 2 2 4-4"
+    />
+  </svg>
+);

app/client/packages/icons/src/components/Icons/CurrencyInputIcon.tsx

@@ -1,2 +1,24 @@
 import React from "react";
-export const CurrencyInputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M7.5 5.5h-3a1 1 0 0 0-1 1v0a1 1 0 0 0 1 1h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-3M5.5 10.5v-6"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/></svg>;
+export const CurrencyInputIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M7.5 5.5h-3a1 1 0 0 0-1 1v0a1 1 0 0 0 1 1h2a1 1 0 0 1 1 1v0a1 1 0 0 1-1 1h-3M5.5 10.5v-6"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-opacity=".25"
+      d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"
+    />
+  </svg>
+);

app/client/packages/icons/src/components/Icons/HeadingIcon.tsx

@@ -1,2 +1,11 @@
 import React from "react";
-export const HeadingIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M.5 1.5h2m2 0h-2m0 0v12m-2 0h4M10.5 1.5h2m2 0h-2m0 0v12m-2 0h4M2.5 7.5h10"/></svg>;
+export const HeadingIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M.5 1.5h2m2 0h-2m0 0v12m-2 0h4M10.5 1.5h2m2 0h-2m0 0v12m-2 0h4M2.5 7.5h10"
+    />
+  </svg>
+);

app/client/packages/icons/src/components/Icons/IconButtonIcon.tsx

@@ -1,2 +1,19 @@
 import React from "react";
-export const IconButtonIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3"/><path stroke="#000" stroke-linecap="round" d="M5.5 7.5h4M7.5 9.5v-4"/></svg>;
+export const IconButtonIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M12.5 2.5h-10a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-opacity=".25"
+      d="M14.5 8.5v3a2 2 0 0 1-2 2h-10a2 2 0 0 1-2-2v-3"
+    />
+    <path stroke="#000" stroke-linecap="round" d="M5.5 7.5h4M7.5 9.5v-4" />
+  </svg>
+);

app/client/packages/icons/src/components/Icons/InlineButtonsIcon.tsx

@@ -1,2 +1,17 @@
 import React from "react";
-export const InlineButtonsIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="square" stroke-opacity=".25" d="M8.5 8.5v1a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2v-1M7.5 8.5v1a2 2 0 0 1-2 2h-3a2 2 0 0 1-2-2v-1"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M13.5 3.5h-3a2 2 0 0 0-2 2v3a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2M2.5 3.5h3a2 2 0 0 1 2 2v3a2 2 0 0 1-2 2h-3a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2"/></svg>;
+export const InlineButtonsIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="square"
+      stroke-opacity=".25"
+      d="M8.5 8.5v1a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2v-1M7.5 8.5v1a2 2 0 0 1-2 2h-3a2 2 0 0 1-2-2v-1"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M13.5 3.5h-3a2 2 0 0 0-2 2v3a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2M2.5 3.5h3a2 2 0 0 1 2 2v3a2 2 0 0 1-2 2h-3a2 2 0 0 1-2-2v-3a2 2 0 0 1 2-2"
+    />
+  </svg>
+);

app/client/packages/icons/src/components/Icons/InputIcon.tsx

@@ -1,2 +1,24 @@
 import React from "react";
-export const InputIcon = () => <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m7.5 9.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".25" d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"/></svg>;
+export const InputIcon = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none">
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="m7.5 9.5-.5-1m-3.5 1 .5-1m0 0 1.5-3 1.5 3m-3 0h3"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      stroke-opacity=".25"
+      d="M12.5 6.5h1m1 0h-1m0 0v8m-1 0h2"
+    />
+    <path
+      stroke="#000"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      d="M14.5 2.5h-12a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7"
+    />
+  </svg>
+);