Merge pull request #32866 from appsmithorg/release

23/04 Daily Promotion
appsmithorg · Apr 23, 2024 · 19b9f49 · 19b9f49
2 parents 15df4e6 + 48c6876
commit 19b9f49
Show file tree

Hide file tree

Showing 64 changed files with 641 additions and 1,623 deletions.
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
@@ -299,15 +299,12 @@ jobs:
           CYPRESS_TESTPASSWORD4: ${{ secrets.CYPRESS_TESTPASSWORD4 }}
           CYPRESS_S3_ACCESS_KEY: ${{ secrets.CYPRESS_S3_ACCESS_KEY }}
           CYPRESS_S3_SECRET_KEY: ${{ secrets.CYPRESS_S3_SECRET_KEY }}
-          CYPRESS_GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
           CYPRESS_AIRTABLE_BEARER: ${{ secrets.AIRTABLE_BEARER }}
           CYPRESS_ORACLE_HOST: ${{ secrets.ORACLE_HOST }}
           CYPRESS_ORACLE_SERVICE: ${{ secrets.ORACLE_SERVICE }}
           CYPRESS_ORACLE_USERNAME: ${{ secrets.ORACLE_USERNAME }}
           CYPRESS_ORACLE_PASSWORD: ${{ secrets.ORACLE_PASSWORD }}
           CYPRESS_FIRESTORE_PRIVATE_KEY: ${{ secrets.FIRESTORE_PRIVATE_KEY }}
-          CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN }}
-          CYPRESS_TEST_GITHUB_USER_NAME: ${{ secrets.CYPRESS_TEST_GITHUB_USER_NAME }}
           CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID }}
           CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET }}
           CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID }}

diff --git a/.github/workflows/ci-test-hosted.yml b/.github/workflows/ci-test-hosted.yml
@@ -195,15 +195,12 @@ jobs:
           CYPRESS_TESTPASSWORD4: ${{ secrets.CYPRESS_TESTPASSWORD4 }}
           CYPRESS_S3_ACCESS_KEY: ${{ secrets.CYPRESS_S3_ACCESS_KEY }}
           CYPRESS_S3_SECRET_KEY: ${{ secrets.CYPRESS_S3_SECRET_KEY }}
-          CYPRESS_GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
           CYPRESS_AIRTABLE_BEARER: ${{ secrets.AIRTABLE_BEARER }}
           CYPRESS_ORACLE_HOST: ${{ secrets.ORACLE_HOST }}
           CYPRESS_ORACLE_SERVICE: ${{ secrets.ORACLE_SERVICE }}
           CYPRESS_ORACLE_USERNAME: ${{ secrets.ORACLE_USERNAME }}
           CYPRESS_ORACLE_PASSWORD: ${{ secrets.ORACLE_PASSWORD }}
           CYPRESS_FIRESTORE_PRIVATE_KEY: ${{ secrets.FIRESTORE_PRIVATE_KEY }}
-          CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN }}
-          CYPRESS_TEST_GITHUB_USER_NAME: ${{ secrets.CYPRESS_TEST_GITHUB_USER_NAME }}
           CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID }}
           CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET }}
           CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID }}

diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
@@ -303,15 +303,12 @@ jobs:
           CYPRESS_TESTPASSWORD4: ${{ secrets.CYPRESS_TESTPASSWORD4 }}
           CYPRESS_S3_ACCESS_KEY: ${{ secrets.CYPRESS_S3_ACCESS_KEY }}
           CYPRESS_S3_SECRET_KEY: ${{ secrets.CYPRESS_S3_SECRET_KEY }}
-          CYPRESS_GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
           CYPRESS_AIRTABLE_BEARER: ${{ secrets.AIRTABLE_BEARER }}
           CYPRESS_ORACLE_HOST: ${{ secrets.ORACLE_HOST }}
           CYPRESS_ORACLE_SERVICE: ${{ secrets.ORACLE_SERVICE }}
           CYPRESS_ORACLE_USERNAME: ${{ secrets.ORACLE_USERNAME }}
           CYPRESS_ORACLE_PASSWORD: ${{ secrets.ORACLE_PASSWORD }}
           CYPRESS_FIRESTORE_PRIVATE_KEY: ${{ secrets.FIRESTORE_PRIVATE_KEY }}
-          CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN }}
-          CYPRESS_TEST_GITHUB_USER_NAME: ${{ secrets.CYPRESS_TEST_GITHUB_USER_NAME }}
           CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID }}
           CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET }}
           CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID }}

diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js
@@ -3,6 +3,10 @@ import EditorNavigation, {
   PageLeftPane,
   PagePaneSegment,
 } from "../../../../support/Pages/EditorNavigation";
+import {
+  createMessage,
+  EDITOR_PANE_TEXTS,
+} from "../../../../../src/ce/constants/messages";
 
 const testdata = require("../../../../fixtures/testdata.json");
 const apiwidget = require("../../../../locators/apiWidgetslocator.json");
@@ -24,33 +28,47 @@ describe(
       homePage.CreateAppInWorkspace("EmptyMsgCheck");
       PageLeftPane.switchSegment(PagePaneSegment.UI);
       agHelper.AssertElementVisibility(
-        locator._visibleTextSpan("Drag & drop widgets to create your app"),
+        locator._visibleTextSpan(
+          createMessage(EDITOR_PANE_TEXTS.widget_blank_state_description),
+        ),
+      );
+      agHelper.AssertElementVisibility(
+        locator._visibleTextSpan(
+          createMessage(EDITOR_PANE_TEXTS.widget_add_button),
+        ),
       );
-      agHelper.AssertElementVisibility(locator._visibleTextSpan("New widget"));
       PageLeftPane.switchSegment(PagePaneSegment.Queries);
       agHelper.AssertElementVisibility(
         locator._visibleTextSpan(
-          "Write your first query or API to access data",
+          createMessage(EDITOR_PANE_TEXTS.query_blank_state_description),
         ),
       );
       agHelper.AssertElementVisibility(
-        locator._visibleTextSpan("No queries to display"),
+        locator._visibleTextSpan(
+          createMessage(EDITOR_PANE_TEXTS.query_blank_state),
+        ),
       );
       agHelper.AssertElementVisibility(
-        locator._visibleTextSpan("New query / API"),
+        locator._visibleTextSpan(
+          createMessage(EDITOR_PANE_TEXTS.query_add_button),
+        ),
       );
 
       PageLeftPane.switchSegment(PagePaneSegment.JS);
       agHelper.AssertElementVisibility(
         locator._visibleTextSpan(
-          "Use JS to transform your data or write business logic",
+          createMessage(EDITOR_PANE_TEXTS.js_blank_state_description),
         ),
       );
       agHelper.AssertElementVisibility(
-        locator._visibleTextSpan("No JS objects to display"),
+        locator._visibleTextSpan(
+          createMessage(EDITOR_PANE_TEXTS.js_blank_state),
+        ),
       );
       agHelper.AssertElementVisibility(
-        locator._visibleTextSpan("New JS object"),
+        locator._visibleTextSpan(
+          createMessage(EDITOR_PANE_TEXTS.js_add_button),
+        ),
       );
     });
 

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/ImportEmptyRepo_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitImport/ImportEmptyRepo_spec.js
@@ -17,14 +17,12 @@ describe("Git import empty repository", { tags: ["@tag.Git"] }, function () {
     cy.generateUUID().then((uid) => {
       repoName = uid;
       _.gitSync.CreateTestGiteaRepo(repoName);
-      //cy.createTestGithubRepo(repoName);
     });
   });
 
   it("1. Bug #12749 Git Import - Empty Repo NullPointerException", () => {
     cy.generateUUID().then((uid) => {
       repoName = uid;
-      //cy.createTestGithubRepo(repoName);
       _.gitSync.CreateTestGiteaRepo(repoName);
       _.gitSync.ImportAppFromGit(undefined, repoName, false);
       cy.wait("@importFromGit").then((interception) => {
@@ -38,6 +36,5 @@ describe("Git import empty repository", { tags: ["@tag.Git"] }, function () {
   });
   after(() => {
     _.gitSync.DeleteTestGithubRepo(repoName);
-    //cy.deleteTestGithubRepo(repoName);
   });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Deploy_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/Deploy_spec.js
@@ -55,6 +55,5 @@ describe("Git sync modal: deploy tab", { tags: ["@tag.Git"] }, function () {
 
   after(() => {
     _.gitSync.DeleteTestGithubRepo(repoName);
-    //cy.deleteTestGithubRepo(repoName);
   });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DisconnectGit_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/DisconnectGit_spec.js
@@ -111,6 +111,5 @@ describe("Git disconnect modal:", { tags: ["@tag.Git"] }, function () {
 
   after(() => {
     _.gitSync.DeleteTestGithubRepo(repoName);
-    //cy.deleteTestGithubRepo(repoName);
   });
 });
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBugs_spec.js
@@ -265,7 +265,7 @@ describe("Git sync Bug #10773", { tags: ["@tag.Git"] }, function () {
         agHelper.GetNClick(gitSync.gitConnectNextBtn);
         agHelper.TypeText(
           gitSync.remoteUrlInput,
-          `${dataManager.GITEA_API_URL_TED}/${repoName}.git`,
+          `${dataManager.GIT_CLONE_URL}/${repoName}.git`,
         );
         agHelper.GetNClick(gitSync.gitConnectNextBtn);
 

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/MergeViaRemote_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/MergeViaRemote_spec.ts
@@ -121,28 +121,5 @@ describe(
         expect(location.pathname).includes(legacyPathname);
       });
     });
-
-    //   // _.gitSync.DeleteTestGithubRepo(repoName);
-    //   // //cy.deleteTestGithubRepo(repoName);
-    //   // // TODO remove when app deletion with conflicts is fixed
-    //   // cy.get(homePage.homeIcon).click({ force: true });
-    //   // cy.get(homePage.createNew)
-    //   //   .first()
-    //   //   .click({ force: true });
-    //   // cy.wait("@createNewApplication").should(
-    //   //   "have.nested.property",
-    //   //   "response.body.responseMeta.status",
-    //   //   201,
-    //   // );
-    //   // cy.get("#loading").should("not.exist");
-    //   // cy.wait(2000);
-    //   // cy.AppSetupForRename();
-    //   // cy.get(homePage.applicationName).type(repoName + "{enter}");
-    //   // cy.wait("@updateApplication").should(
-    //   //   "have.nested.property",
-    //   //   "response.body.responseMeta.status",
-    //   //   200,
-    //   // );
-    // });
   },
 );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/SwitchBranches_spec.js
@@ -187,7 +187,8 @@ describe("Git sync:", { tags: ["@tag.Git"] }, function () {
     // cy.get("@gitbranchName").then((branName) => {
     //   tempBranch = branName;
     // });
-    cy.renameBranchViaGithubApi(repoName, tempBranch, tempBranchRenamed);
+    // rename branch API missing in TED.
+    // cy.renameBranchViaGithubApi(repoName, tempBranch, tempBranchRenamed);
     cy.get(gitSyncLocators.branchButton).click();
     cy.get(gitSyncLocators.branchSearchInput).type(`{selectall}${tempBranch}`);
     const tempBranchRegex = new RegExp(`^${tempBranch}$`);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithTheming/GitWithTheming_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithTheming/GitWithTheming_spec.js
@@ -22,17 +22,12 @@ describe("Git with Theming:", { tags: ["@tag.Git"] }, function () {
         );
       });
     });
-    // cy.generateUUID().then((uid) => {
-    //   repoName = uid;
+
     _.gitSync.CreateNConnectToGit();
     cy.get("@gitRepoName").then((repName) => {
       repoName = repName;
       _.gitSync.CreateGitBranch(repoName);
     });
-
-    // cy.createTestGithubRepo(repoName);
-    // cy.connectToGitRepo(repoName);
-    //});
   });
   it("1. Bug #13860 Theming is not getting applied on view mode when the app is connected to Git", function () {
     _.appSettings.OpenAppSettings();

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Image/Image_spec.js
@@ -74,7 +74,7 @@ describe(
       cy.openPropertyPane("imagewidget");
       // Invalid image url
       const invalidImageUrl =
-        "http://host.docker.internal:5000/photo-not-exists.jpeg";
+        "http://host.docker.internal:4200/photo-not-exists.jpeg";
       cy.testCodeMirror(invalidImageUrl);
 
       // Show off error message