21/11 Daily Promotion

.github/workflows/docs/integration-tests-command.md

@@ -22,10 +22,6 @@ The `client-build` job builds the client-side codebase. It uses the configuratio
 
 The `rts-build` job builds the "rts" (real-time suggestions) package of the client-side codebase. It uses the configuration defined in the `.github/workflows/rts-build.yml` file.
 
-### `test-appsmithctl`
-
-The `test-appsmithctl` job runs tests for the `appsmithctl` utility. It uses the configuration from the `.github/workflows/appsmithctl.yml` file.
-
 ### `build-docker-image`
 
 The `build-docker-image` job builds and pushes the Docker image for the application. It depends on the successful completion of the `client-build`, `server-build`, and `rts-build` jobs. The Docker image is built with support for both `linux/arm64` and `linux/amd64` platforms.

.github/workflows/pr-cypress.yml

@@ -45,14 +45,6 @@ jobs:
     with:
       pr: ${{ github.event.number }}
 
-  test-appsmithctl:
-    if: success()
-    name: appsmithctl
-    uses: ./.github/workflows/appsmithctl.yml
-    secrets: inherit
-    with:
-      pr: ${{ github.event.number }}
-
   build-docker-image:
     needs: [client-build, server-build, rts-build]
     # Only run if the build step is successful

CODEOWNERS

@@ -27,12 +27,12 @@ app/client/src/widgets/wds/* @appsmithorg/wds-team @appsmithorg/anvil-team
 app/client/src/layoutSystems/anvil/* @appsmithorg/anvil-team
 
 # App viewers pod
-app/client/src/widgets/* @appsmithorg/app-viewers
-app/client/src/components/propertyControls/* @appsmithorg/app-viewers
-app/client/src/sagas/OneClickBindingSaga.ts @appsmithorg/app-viewers
-app/client/src/WidgetQueryGenerators/* @appsmithorg/app-viewers
-app/client/src/components/editorComponents/WidgetQueryGeneratorForm/* @appsmithorg/app-viewers
-app/client/src/pages/AppViewer/* @appsmithorg/app-viewers
+app/client/src/widgets/* @appsmithorg/widgets-blocks
+app/client/src/components/propertyControls/* @appsmithorg/widgets-blocks
+app/client/src/sagas/OneClickBindingSaga.ts @appsmithorg/widgets-blocks
+app/client/src/WidgetQueryGenerators/* @appsmithorg/widgets-blocks
+app/client/src/components/editorComponents/WidgetQueryGeneratorForm/* @appsmithorg/widgets-blocks
+app/client/src/pages/AppViewer/* @appsmithorg/widgets-blocks
 
 # New Developers Pod
 app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/* @nilanshbansal
@@ -195,6 +195,7 @@ app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/**/* @sh
 # DevOps & Shri
 deploy/**/* @sharat87 @pratapaprasanna
 .github/workflows/*.yml @sharat87
+app/client/packages/ctl/**/* @sharat87 @pratapaprasanna
 app/server/**/pom.xml @sharat87
 app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/BaseAppsmithRepositoryCEImpl.java @sharat87
 app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/params/QueryAllParams.java @sharat87

Dockerfile

@@ -29,17 +29,11 @@ COPY ./app/client/build editor/
 # Add RTS - Application Layer
 COPY ./app/client/packages/rts/dist rts/
 
-ENV PATH /opt/bin:/opt/appsmith/utils/node_modules/.bin:/opt/java/bin:/opt/node/bin:$PATH
+ENV PATH /opt/bin:/opt/java/bin:/opt/node/bin:$PATH
 
 RUN <<END
   set -o errexit
 
-  cd ./utils
-  npm install --only=prod
-  npm install --only=prod -g .
-  rm -rf utils/node_modules/resolve/test
-  cd -
-
   # Make all `*.sh` files executable, excluding `node_modules`.
   find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +
 

app/client/cypress/e2e/Regression/ClientSide/ActionExecution/uiToCode_spec.ts

@@ -49,12 +49,12 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     agHelper.GetNClick(propPane._navigateToType("URL"));
     agHelper.TypeText(
       propPane._actionSelectorFieldByLabel("Enter URL"),
-      "https://www.appsmith.com",
+      "https://www.google.com",
     );
     agHelper.GetNClick(propPane._actionSelectorPopupClose);
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');}}`,
     );
 
     // Add third action
@@ -80,7 +80,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     // Validate the code
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the third action
@@ -97,7 +97,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     // Assert the code for the remaining actions
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the first action
@@ -113,7 +113,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     // Assert the code for the remaining actions
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
+      `{{navigateTo('https://www.google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
     );
   });
 
@@ -132,13 +132,13 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     agHelper.GetNClick(propPane._navigateToType("URL"));
     agHelper.TypeText(
       propPane._actionSelectorFieldByLabel("Enter URL"),
-      "https://www.appsmith.com",
+      "https://www.google.com",
     );
     agHelper.GetNClick(propPane._actionSelectorPopupClose);
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');}}`,
     );
 
     // Add third action
@@ -165,7 +165,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the third action
@@ -197,7 +197,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
   });
 
@@ -216,13 +216,13 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
     agHelper.GetNClick(propPane._navigateToType("URL"));
     agHelper.TypeText(
       propPane._actionSelectorFieldByLabel("Enter URL"),
-      "https://www.appsmith.com",
+      "https://www.google.com",
     );
     agHelper.GetNClick(propPane._actionSelectorPopupClose);
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');}}`,
     );
 
     // Add third action
@@ -249,7 +249,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
+      `{{showAlert('Hello!', '');navigateTo('https://www.google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
     );
 
     // Delete the third action
@@ -286,7 +286,7 @@ describe("UI to Code", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
 
     propPane.ValidateJSFieldValue(
       "onClick",
-      `{{navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
+      `{{navigateTo('https://www.google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
     );
   });
 

app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts

@@ -149,7 +149,7 @@ describe(
       propPane.MoveToTab("Content");
 
       [1, 2, 3, 4, 5].forEach(() => {
-        apiPage.CreateAndFillApi("https://www.appsmith.com/");
+        apiPage.CreateAndFillApi("https://www.google.com/");
       });
 
       EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);

app/client/cypress/e2e/Regression/ServerSide/ActionExecution/Block_Execution.ts

@@ -9,7 +9,7 @@ describe(
   "Block Action Execution when no field is present",
   { tags: ["@tag.Datasource"] },
   () => {
-    const url = "https://www.appsmith.com/";
+    const url = "https://www.google.com/";
     it("1. Ensure API Run button is disabled when no url is present", () => {
       apiPage.CreateApi("FirstAPI", "GET");
       apiPage.AssertRunButtonDisability(true);

app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts

@@ -47,6 +47,7 @@ describe(
         dataSources._dropdownOption,
         "worldCountryInfo",
       );
+      agHelper.GetNClick(dataSources._generatePageBtn);
 
       GenerateCRUDNValidateDeployPage("ABW", "Aruba", "North America", "Code");
 
@@ -93,6 +94,7 @@ describe(
       assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
       agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
       agHelper.GetNClickByContains(dataSources._dropdownOption, "customers");
+      agHelper.GetNClick(dataSources._generatePageBtn);
 
       GenerateCRUDNValidateDeployPage(
         "103",
@@ -110,6 +112,7 @@ describe(
     it("3. Generate CRUD page from datasource present in ACTIVE section", function () {
       EditorNavigation.SelectEntityByName(dsName, EntityType.Datasource);
       dataSources.SelectTableFromPreviewSchemaList("employees");
+      agHelper.GetNClick(dataSources._datasourceCardGeneratePageBtn);
 
       GenerateCRUDNValidateDeployPage(
         "1002",
@@ -311,9 +314,6 @@ describe(
       col3Text: string,
       jsonFromHeader: string,
     ) {
-      agHelper.GetNClick(
-        `${dataSources._generatePageBtn}, ${dataSources._datasourceCardGeneratePageBtn}`,
-      );
       assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
       agHelper.AssertContains("Successfully generated a page");
       //assertHelper.AssertNetworkStatus("@getActions", 200);//Since failing sometimes

app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts

@@ -399,9 +399,7 @@ describe(
       col3Text: string,
       jsonFromHeader: string,
     ) {
-      agHelper.GetNClick(
-        `${dataSources._generatePageBtn}, ${dataSources._datasourceCardGeneratePageBtn}`,
-      );
+      agHelper.GetNClick(dataSources._datasourceCardGeneratePageBtn);
       assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
       agHelper.AssertContains("Successfully generated a page");
       //assertHelper.AssertNetworkStatus("@getActions", 200);//Since failing sometimes

app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts

@@ -38,6 +38,7 @@ describe(
       assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
       agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
       agHelper.GetNClickByContains(dataSources._dropdownOption, "film");
+      agHelper.GetNClick(dataSources._generatePageBtn);
 
       GenerateCRUDNValidateDeployPage(
         "ACADEMY DINOSAUR",
@@ -86,6 +87,7 @@ describe(
       assertHelper.AssertNetworkStatus("@getDatasourceStructure"); //Making sure table dropdown is populated
       agHelper.GetNClick(dataSources._selectTableDropdown, 0, true);
       agHelper.GetNClickByContains(dataSources._dropdownOption, "suppliers");
+      agHelper.GetNClick(dataSources._generatePageBtn);
 
       GenerateCRUDNValidateDeployPage(
         "Exotic Liquids",
@@ -104,6 +106,7 @@ describe(
     it("3. Generate CRUD page from datasource present in ACTIVE section", function () {
       EditorNavigation.SelectEntityByName(dsName, EntityType.Datasource);
       dataSources.SelectTableFromPreviewSchemaList("public.orders");
+      agHelper.GetNClick(dataSources._datasourceCardGeneratePageBtn);
 
       GenerateCRUDNValidateDeployPage(
         "VINET",
@@ -135,9 +138,6 @@ describe(
       col3Text: string,
       jsonFromHeader: string,
     ) {
-      agHelper.GetNClick(
-        `${dataSources._generatePageBtn}, ${dataSources._datasourceCardGeneratePageBtn}`,
-      );
       assertHelper.AssertNetworkStatus("@replaceLayoutWithCRUDPage", 201);
       agHelper.AssertContains("Successfully generated a page");
       //assertHelper.AssertNetworkStatus("@getActions", 200);//Since failing sometimes

app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js

@@ -52,7 +52,7 @@ describe(
         200,
       );
 
-      agHelper.AssertContains("Generate from data");
+      agHelper.AssertContains("Generate a page based on your data");
       agHelper.GetNClick(generatePage.selectTableDropdown);
       agHelper.GetNClickByContains(
         generatePage.dropdownOption,

app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/APIOnLoad_Spec.ts

@@ -46,7 +46,7 @@ describe(
     it("2. Shows when API failed to load on page load.", function () {
       cy.fixture("testdata").then(function (dataSet: any) {
         apiPage.CreateAndFillApi(
-          "https://www.appsmith.com/" + dataSet.methods,
+          "https://www.google.com/" + dataSet.methods,
           "PageLoadApi2",
         );
       });