Merge pull request #2 from Namatek/realrelease

Update From source
Namatek · Dec 3, 2024 · 47f82db · 47f82db
2 parents 59452a4 + abaa168
commit 47f82db
Show file tree

Hide file tree

Showing 366 changed files with 8,895 additions and 3,874 deletions.
diff --git a/.github/config.json b/.github/config.json
diff --git a/.github/workflows/ci-debugging.yml b/.github/workflows/ci-debugging.yml
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml
@@ -453,7 +453,7 @@ jobs:
         if: failure()
         with:
           name: server-logs-${{ matrix.job }}
-          path: app/server/server-logs.log
+          path: ${{ github.workspace }}/app/server/server-logs.log
           overwrite: true
 
       - name: Collect docker log as file

diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
@@ -48,7 +48,13 @@ jobs:
         ports:
           # Opens tcp port 6379 on the host and service container
           - 6379:6379
+      postgres:
+        if: github.base_ref == 'pg' || github.ref_name == 'pg'
+        image: postgres:14
+        ports:
+          - 5432:5432
       mongo:
+        if: github.base_ref == 'release' || github.ref_name == 'release'
         image: mongo
         ports:
           - 27017:27017

diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
@@ -72,13 +72,17 @@ jobs:
         with:
           files: "app/client/**"
 
-      #- name: Run step if any file(s) in the client folder change
-      #  if: steps.changed-files-specific.outputs.any_changed == 'true'
-      #  env:
-      #    ALL_CHANGED_FILES: ${{ steps.changed-files-specific.outputs.all_changed_files }}
-      #  run: |
-      #    echo "One or more files in the server folder has changed."
-      #    echo "List all the files that have changed: $ALL_CHANGED_FILES"
+      # - name: Updating the client changed file variable
+      #   id: changed-files-specific
+      #   run: echo "any_changed=true" >> "$GITHUB_OUTPUT"
+
+      - name: Run step if any file(s) in the client folder change
+        if: steps.changed-files-specific.outputs.any_changed == 'true'
+        env:
+          ALL_CHANGED_FILES: ${{ steps.changed-files-specific.outputs.all_changed_files }}
+        run: |
+         echo "One or more files in the server folder has changed."
+         echo "List all the files that have changed: $ALL_CHANGED_FILES"
 
       - name: Check compliance
         if: inputs.pr != 0 && steps.changed-files-specific.outputs.any_changed == 'true'
@@ -205,11 +209,11 @@ jobs:
           git config --global user.email "$gituseremail"
           git config --global user.name "$gituser"
           git clone https://[email protected]/appsmithorg/cibuildcache.git
-          git lfs install
-          git lfs migrate import --everything --yes
           if [ "$reponame" = "appsmith" ]; then export repodir="CE"; fi
           if [ "$reponame" = "appsmith-ee" ]; then export repodir="EE"; fi
           cd cibuildcache/$repodir/release/client
+          git lfs install
+          git lfs migrate import --everything --yes
           git lfs pull ./build.tar
           mv ./build.tar ../../../../../build.tar
 

diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml
@@ -100,23 +100,23 @@ jobs:
       - name: Print the Github event
         run: echo ${{ github.event_name }}
 
-      # - name: Get changed files in the server folder
-      #   id: changed-files-specific
-      #   uses: tj-actions/changed-files@v44
-      #   with:
-      #     files: "app/server/**"
-      #     write_output_files: true
-
-      - name: Updating the server changed file variable
+      - name: Get changed files in the server folder
         id: changed-files-specific
-        run: echo "any_changed=true" >> "$GITHUB_OUTPUT"
+        uses: tj-actions/changed-files@v44
+        with:
+          files: "app/server/**"
+          write_output_files: true
+
+      # - name: Updating the server changed file variable
+      #   id: changed-files-specific
+      #   run: echo "any_changed=true" >> "$GITHUB_OUTPUT"
 
-      # - name: Run step if any file(s) in the server folder change
-      #   if: steps.changed-files-specific.outputs.any_changed == 'true'
-      #   run: |
-      #     echo "One or more files in the server folder has changed."
-      #     echo "List all the files that have changed:"
-      #     cat "${{ github.workspace }}/.github/outputs/all_changed_files.txt"
+      - name: Run step if any file(s) in the server folder change
+        if: steps.changed-files-specific.outputs.any_changed == 'true'
+        run: |
+          echo "One or more files in the server folder has changed."
+          echo "List all the files that have changed:"
+          cat "${{ github.workspace }}/.github/outputs/all_changed_files.txt"
 
       # In case this is second attempt try restoring status of the prior attempt from cache
       - name: Restore the previous run result
@@ -341,11 +341,11 @@ jobs:
           git config --global user.email "$gituseremail"
           git config --global user.name "$gituser"
           git clone https://[email protected]/appsmithorg/cibuildcache.git
-          git lfs install
-          git lfs migrate import --everything --yes
           if [ "$reponame" = "appsmith" ]; then export repodir="CE"; fi
           if [ "$reponame" = "appsmith-ee" ]; then export repodir="EE"; fi
           cd cibuildcache/$repodir/release/server
+          git lfs install
+          git lfs migrate import --everything --yes
           git lfs pull ./server.jar
           mv ./server.jar ../../../../../server.jar
           cd ../../../../../

diff --git a/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts b/app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
@@ -46,7 +46,7 @@ describe.skip(
 
     it("1. Add and verify fetch details query", () => {
       entityExplorer.CreateNewDsQuery(dataSourceName);
-      agHelper.RenameWithInPane("Fetch_Details");
+      agHelper.RenameQuery("Fetch_Details");
       dataSources.ValidateNSelectDropdown(
         "Operation",
         "Fetch Many",

diff --git a/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts b/app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
@@ -66,7 +66,7 @@ describe.skip(
     it("1. Add query from active ds tab and verify", () => {
       dataSources.CreateQueryForDS(dataSourceName);
       // entityExplorer.CreateNewDsQuery(dataSourceName);
-      agHelper.RenameWithInPane("Fetch_Details");
+      agHelper.RenameQuery("Fetch_Details");
       dataSources.ValidateNSelectDropdown(
         "Operation",
         "Fetch Many",

diff --git a/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
@@ -50,7 +50,7 @@ describe.skip(
 
     it("1. Add and verify fetch details query", () => {
       entityExplorer.CreateNewDsQuery(dataSourceName.readNWrite);
-      agHelper.RenameWithInPane("Fetch_Details");
+      agHelper.RenameQuery("Fetch_Details");
       dataSources.ValidateNSelectDropdown(
         "Operation",
         "Fetch Many",

diff --git a/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts b/app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
@@ -50,7 +50,7 @@ describe.skip(
 
     it("1. Add and verify fetch details query", () => {
       entityExplorer.CreateNewDsQuery(dataSourceName.readOnly);
-      agHelper.RenameWithInPane("Fetch_Details");
+      agHelper.RenameQuery("Fetch_Details");
       dataSources.ValidateNSelectDropdown(
         "Operation",
         "Fetch Many",

diff --git a/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts b/app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
@@ -34,7 +34,7 @@ describe(
 
     it("1. Add and verify fetch details query", () => {
       entityExplorer.CreateNewDsQuery(dataSourceName);
-      agHelper.RenameWithInPane("Fetch_Details");
+      agHelper.RenameQuery("Fetch_Details");
       dataSources.ValidateNSelectDropdown(
         "Operation",
         "Fetch Many",

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28287_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Binding_Bug28287_Spec.ts
@@ -45,9 +45,9 @@ describe(
         EditorNavigation.SelectEntityByName(queryName, EntityType.Query);
 
         BottomPane.response.switchToResponseTab();
-
+        BottomPane.response.openResponseTypeMenu();
         agHelper.AssertElementVisibility(
-          BottomPane.response.getResponseTypeSelector("TABLE"),
+          BottomPane.response.locators.responseTypeMenuItem("TABLE"),
         );
       });
     });

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js
@@ -1,9 +1,9 @@
-const queryLocators = require("../../../../locators/QueryEditor.json");
 import {
   dataSources,
   agHelper,
   entityItems,
 } from "../../../../support/Objects/ObjectsCore";
+import { PluginActionForm } from "../../../../support/Pages/PluginActionForm";
 
 describe(
   "Verify setting tab form controls not to have tooltip and tooltip (underline) styles",
@@ -17,6 +17,7 @@ describe(
   },
   function () {
     let guid, datasourceName;
+    let pluginActionForm = new PluginActionForm();
 
     before("Creates a new Mongo datasource", () => {
       dataSources.CreateDataSource("Mongo");
@@ -28,7 +29,7 @@ describe(
     it("1. We make sure the label in the settings tab does not have any underline styles", function () {
       dataSources.CreateQueryForDS(datasourceName);
 
-      cy.xpath(queryLocators.querySettingsTab).click();
+      pluginActionForm.toolbar.toggleSettings();
 
       cy.get(".label-icon-wrapper")
         .contains("Run the query on page load")

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts
@@ -20,7 +20,7 @@ describe(
         // because I do not need to fill the datasource form and use the same default data
         _.dataSources.CreatePlugIn("PostgreSQL");
         dsName = "Postgres" + uid;
-        _.agHelper.RenameWithInPane(dsName, false);
+        _.agHelper.RenameDatasource(dsName);
         _.dataSources.SaveDatasource();
         _.agHelper.Sleep();
         _.dataSources.EditDatasource();
@@ -39,7 +39,7 @@ describe(
         // because I do not need to fill the datasource form and use the same default data
         _.dataSources.CreatePlugIn("Authenticated API");
         dsName = "AuthDS" + uid;
-        _.agHelper.RenameWithInPane(dsName, false);
+        _.agHelper.RenameDatasource(dsName);
         _.dataSources.FillAuthAPIUrl();
         _.dataSources.SaveDatasource();
         _.agHelper.Sleep();
@@ -62,7 +62,7 @@ describe(
         // because I do not need to fill the datasource form and use the same default data
         _.dataSources.CreatePlugIn("MongoDB");
         dsName = "Mongo" + uid;
-        _.agHelper.RenameWithInPane(dsName, false);
+        _.agHelper.RenameDatasource(dsName);
         _.dataSources.FillMongoDSForm();
         _.dataSources.SaveDatasource();
         _.agHelper.Sleep();
@@ -86,7 +86,7 @@ describe(
         // because I do not need to fill the datasource form and use the same default data
         _.dataSources.CreatePlugIn("MongoDB");
         dsName = "Mongo" + uid;
-        _.agHelper.RenameWithInPane(dsName, false);
+        _.agHelper.RenameDatasource(dsName);
         _.dataSources.FillMongoDSForm();
         _.dataSources.SaveDatasource();
         _.agHelper.Sleep();
@@ -110,7 +110,7 @@ describe(
         // because I do not need to fill the datasource form and use the same default data
         _.dataSources.CreatePlugIn("MongoDB");
         dsName = "Mongo" + uid;
-        _.agHelper.RenameWithInPane(dsName, false);
+        _.agHelper.RenameDatasource(dsName);
         _.dataSources.FillMongoDSForm();
         _.dataSources.SaveDatasource();
         _.agHelper.Sleep();
@@ -133,7 +133,7 @@ describe(
         // because I do not need to fill the datasource form and use the same default data
         _.dataSources.CreatePlugIn("MongoDB");
         dsName = "Mongo" + uid;
-        _.agHelper.RenameWithInPane(dsName, false);
+        _.agHelper.RenameDatasource(dsName);
         _.dataSources.FillMongoDSForm();
         _.dataSources.SaveDatasource();
         _.agHelper.Sleep();

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug19893_spec.ts
@@ -12,7 +12,7 @@ describe(
       cy.get("@guid").then((uid) => {
         dsName = "AuthAPI " + uid;
         _.dataSources.CreatePlugIn("Authenticated API");
-        _.agHelper.RenameWithInPane(dsName, false);
+        _.agHelper.RenameDatasource(dsName);
         _.dataSources.FillAuthAPIUrl();
         _.dataSources.AssertCursorPositionForTextInput(
           _.dataSources._urlInputControl,

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug25148_Spec.ts
@@ -13,7 +13,7 @@ describe(
       cy.get("@guid").then((uid) => {
         dsName = "AuthAPI " + uid;
         dataSources.CreatePlugIn("Authenticated API");
-        agHelper.RenameWithInPane(dsName, false);
+        agHelper.RenameDatasource(dsName);
         dataSources.FillAuthAPIUrl();
         dataSources.SaveDatasource();
         apiPage.CreateApi("API" + uid, "GET", true);

diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts
@@ -29,7 +29,7 @@ describe(
         dataSourceName = "Postgres " + guid;
         dataSources.NavigateToDSCreateNew();
         dataSources.CreatePlugIn("PostgreSQL");
-        agHelper.RenameWithInPane(dataSourceName, false);
+        agHelper.RenameDatasource(dataSourceName);
         dataSources.FillPostgresDSForm(
           "Production",
           false,

diff --git a/...client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js b/...client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js
@@ -41,7 +41,7 @@ describe(
       dataSources.EnterQuery("select * from users");
 
       cy.EvaluateCurrentValue("select * from users");
-      cy.get(".t--action-name-edit-field").click({ force: true });
+
       cy.get("@saveDatasource").then((httpResponse) => {
         datasourceName = httpResponse.response.body.data.name;
         PageLeftPane.switchSegment(PagePaneSegment.Queries);