Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o action-redesign/form-center-align
Zeral-Zhang · Dec 4, 2024 · 707ec4f · 707ec4f
2 parents f526f7d + 1078a03
commit 707ec4f
Show file tree

Hide file tree

Showing 411 changed files with 10,619 additions and 4,132 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
@@ -166,10 +166,8 @@ jobs:
             -e APPSMITH_JWT_SECRET=appsmith-cloud-services-jwt-secret-dummy-key \
             -e APPSMITH_ENCRYPTION_SALT=encryption-salt \
             -e APPSMITH_ENCRYPTION_PASSWORD=encryption-password \
-            -e APPSMITH_CLOUD_SERVICES_URL=https://cs-dev.appsmith.com \
             -e APPSMITH_CUSTOMER_PORTAL_URL=https://dev.appsmith.com \
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=https://cs-dev.appsmith.com \
-            -e APPSMITH_CLOUD_SERVER_BASE_URL=https://release.app.appsmith.com \
             -e AUTH0_ISSUER_URL=https://login.release-customer.appsmith.com/ \
             -e AUTH0_CLIENT_ID=dummy-client-id \
             -e AUTH0_CLIENT_SECRET=dummy-secret-id \
@@ -198,7 +196,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: app/client/package.json
-      
+
       - name: Check DB URL
         if: steps.run_result.outputs.run_result != 'success'
         run: |
@@ -455,22 +453,22 @@ 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
         if: always()
         run: |
           docker logs appsmith >& app/server/docker-logs.log
- 
-      - name: Upload server docker logs bundle on failure 
+
+      - name: Upload server docker logs bundle on failure
         uses: actions/upload-artifact@v4
         if: always()
         with:
             name: docker-logs-${{ matrix.job }}
             path: app/server/docker-logs.log
             overwrite: true
-  
+
       # Set status = success
       - name: Save the status of the run
         run: |

diff --git a/.github/workflows/ci-test-limited-with-count.yml b/.github/workflows/ci-test-limited-with-count.yml
@@ -17,7 +17,7 @@ on:
       run_count:
         description: 'Number of times to repeat the test run'
         required: false
-        type: number 
+        type: number
         default: 1
   workflow_call:
     inputs:
@@ -176,10 +176,8 @@ jobs:
             -e APPSMITH_JWT_SECRET=appsmith-cloud-services-jwt-secret-dummy-key \
             -e APPSMITH_ENCRYPTION_SALT=encryption-salt \
             -e APPSMITH_ENCRYPTION_PASSWORD=encryption-password \
-            -e APPSMITH_CLOUD_SERVICES_URL=https://cs-dev.appsmith.com \
             -e APPSMITH_CUSTOMER_PORTAL_URL=https://dev.appsmith.com \
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=https://cs-dev.appsmith.com \
-            -e APPSMITH_CLOUD_SERVER_BASE_URL=https://release.app.appsmith.com \
             -e AUTH0_ISSUER_URL=https://login.release-customer.appsmith.com/ \
             -e AUTH0_CLIENT_ID=dummy-client-id \
             -e AUTH0_CLIENT_SECRET=dummy-secret-id \
@@ -351,18 +349,18 @@ jobs:
             npx cypress-repeat-pro run -n ${{ inputs.run_count }} --force \
                 --spec ${{ env.specs_to_run }} \
                 --config-file "cypress_ci_custom.config.ts"
-            cat cy-repeat-summary.txt  
+            cat cy-repeat-summary.txt
             # Define the path for the failure flag file
             FAILURE_FLAG_FILE="ci_test_status.txt"
-            
+
             # Check for test results and store the status in the file
             if ! grep -q "Total Failed: 0" cy-repeat-summary.txt; then
                 echo "ci_test_failed=true" > "$FAILURE_FLAG_FILE"
             else
                 echo "ci_test_failed=false" > "$FAILURE_FLAG_FILE"
             fi
             cat "$FAILURE_FLAG_FILE"
-            
+
       - name: Trim number of cypress log files
         if: failure()
         run: |
@@ -375,7 +373,7 @@ jobs:
           name: cypress-repeat-logs
           path: ${{ github.workspace }}/app/client/cy-repeat-summary.txt
           overwrite: true
-      
+
       - name: Upload ci_test_status.txt artifact
         if: always()
         uses: actions/upload-artifact@v4

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
@@ -166,10 +172,8 @@ jobs:
             -e APPSMITH_JWT_SECRET=appsmith-cloud-services-jwt-secret-dummy-key \
             -e APPSMITH_ENCRYPTION_SALT=encryption-salt \
             -e APPSMITH_ENCRYPTION_PASSWORD=encryption-password \
-            -e APPSMITH_CLOUD_SERVICES_URL=https://cs-dev.appsmith.com \
             -e APPSMITH_CUSTOMER_PORTAL_URL=https://dev.appsmith.com \
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=https://cs-dev.appsmith.com \
-            -e APPSMITH_CLOUD_SERVER_BASE_URL=https://release.app.appsmith.com \
             -e AUTH0_ISSUER_URL=https://login.release-customer.appsmith.com/ \
             -e AUTH0_CLIENT_ID=dummy-client-id \
             -e AUTH0_CLIENT_SECRET=dummy-secret-id \

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/Binding/JSObjectToListWidget_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Binding/JSObjectToListWidget_Spec.ts
@@ -2,7 +2,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
 import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
-import BottomPane from "../../../../support/Pages/IDE/BottomPane";
+import BottomTabs from "../../../../support/Pages/IDE/BottomTabs";
 
 let valueToTest: any, jsName: any;
 
@@ -19,7 +19,7 @@ describe(
         _.dataManager.dsValues[_.dataManager.defaultEnviorment].mockApiUrl,
       );
       _.apiPage.RunAPI();
-      BottomPane.response.switchResponseType("JSON");
+      BottomTabs.response.switchResponseType("JSON");
       _.apiPage.ReadApiResponsebyKey("name");
       cy.get("@apiResp").then((value) => {
         valueToTest = value;

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
@@ -8,7 +8,7 @@ import {
 import EditorNavigation, {
   EntityType,
 } from "../../../../support/Pages/EditorNavigation";
-import BottomPane from "../../../../support/Pages/IDE/BottomPane";
+import BottomTabs from "../../../../support/Pages/IDE/BottomTabs";
 
 let dsName: any;
 let queryName: string;
@@ -44,10 +44,10 @@ describe(
 
         EditorNavigation.SelectEntityByName(queryName, EntityType.Query);
 
-        BottomPane.response.switchToResponseTab();
-
+        BottomTabs.response.switchToResponseTab();
+        BottomTabs.response.openResponseTypeMenu();
         agHelper.AssertElementVisibility(
-          BottomPane.response.getResponseTypeSelector("TABLE"),
+          BottomTabs.response.locators.responseTypeMenuItem("TABLE"),
         );
       });
     });