Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…

…refactor-crud-to-custom-repository

.coderabbit.yaml

@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
 language: "en-US"
 early_access: false
-tone_instructions: 'You must talk like teacher.'
+tone_instructions: 'You are an expert code reviewer in Java, TypeScript, JavaScript, and NodeJS. You work in an enterprise software developer team, providing concise and clear code review advice.You only elaborate or provide detailed explanations when requested.' 
 reviews:
   profile: "chill"
   request_changes_workflow: false
@@ -12,6 +12,7 @@ reviews:
   auto_review:
     enabled: true
     drafts: false
+    base_branches: ["pg", "release"]
   path_instructions:
     - path: "app/client/cypress/**/**.*"
       instructions: |
@@ -34,4 +35,4 @@ reviews:
         - Do not use duplicate filenames even with different paths.
         - Avoid using agHelper.Sleep, this.Sleep in any file in code.
 chat:
-  auto_reply: true
+  auto_reply: true

.env.example

@@ -21,11 +21,6 @@ APPSMITH_SIGNUP_DISABLED=
 # Segment
 APPSMITH_SEGMENT_KEY=
 
-# Algolia Search (Docs)
-APPSMITH_ALGOLIA_API_ID=
-APPSMITH_ALGOLIA_API_KEY=
-APPSMITH_ALGOLIA_SEARCH_INDEX_NAME=
-
 #Client log level (debug | error)
 APPSMITH_CLIENT_LOG_LEVEL=
 

.github/workflows/ad-hoc-docker-image.yml

@@ -14,6 +14,11 @@ on:
         required: false
         type: string
         default: ad-hoc
+      pg_tag:
+        description: Postgres tag to use for image
+        required: false
+        type: string
+        default: pg
 
 jobs:
   server-build:
@@ -87,7 +92,17 @@ jobs:
       - name: Generate info.json
         run: |
           if [[ -f scripts/generate_info_json.sh ]]; then
-            scripts/generate_info_json.sh
+            scripts/generate_info_json.sh ${{ inputs.tag }}
+          fi
+
+      - name: Place server artifacts-es
+        run: |
+          run: |
+          if [[ -f scripts/prepare_server_artifacts.sh ]]; then
+            PG_TAG=${{ inputs.pg_tag }} scripts/prepare_server_artifacts.sh
+          else
+            echo "No script found to prepare server artifacts"
+            exit 1
           fi
 
       - name: Set up Depot CLI

.github/workflows/ci-test-custom-script.yml

@@ -148,6 +148,7 @@ jobs:
         working-directory: "."
         run: |
           sudo /etc/init.d/ssh stop ;
+          sudo systemctl disable --now ssh.socket
           mkdir -p ~/git-server/keys
           ted_tag="${{inputs.ted_tag}}"
           docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
@@ -165,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 \
@@ -197,14 +196,13 @@ 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: |
           db_url=$(grep -oP 'APPSMITH_DB_URL=\K[^ ]+' cicontainerlocal/stacks/configuration/docker.env || echo "")
           if [[ -z "$db_url" ]]; then
             echo "::error::APPSMITH_DB_URL not found in the environment file"
-            exit 1
           fi
           if [[ $db_url == "postgresql"* ]]; then
             echo "Database type: Postgres. Ensure PostgreSQL-specific configurations are in place."
@@ -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: |

.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 \
@@ -266,16 +264,18 @@ jobs:
       - name: Set Commit Message
         env:
           EVENT_COMMITS: ${{ toJson(github.event.commits[0].message) }}
+          COMMIT_INFO_AUTHOR: ${{ github.event.commits[0].author.name }}
         run: |
-          if [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'repository_dispatch' ]]; then
-            echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE }}" >> $GITHUB_ENV
-          elif [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'workflow_dispatch' ]]; then
+          if [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'repository_dispatch' ]]; then
+            echo "COMMIT_INFO_MESSAGE=$COMMIT_INFO_MESSAGE" >> $GITHUB_ENV
+          elif [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'workflow_dispatch' ]]; then
             echo "COMMIT_INFO_MESSAGE=Workflow run on PR# ${{ inputs.pr }}" >> $GITHUB_ENV
           else
-            if [[ '${{env.EVENT_COMMITS}}' == 'null' ]]; then
-              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by ${{ env.COMMIT_INFO_AUTHOR }}" >> $GITHUB_ENV
+            if [[ "$EVENT_COMMITS" == "null" ]]; then
+              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by $COMMIT_INFO_AUTHOR" >> $GITHUB_ENV
             else
-              echo "COMMIT_INFO_MESSAGE=$(echo \"${{ env.EVENT_COMMITS }}\" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')" >> $GITHUB_ENV
+              COMMIT_FIRST_LINE=$(echo "$EVENT_COMMITS" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')
+              echo "COMMIT_INFO_MESSAGE=$COMMIT_FIRST_LINE" >> $GITHUB_ENV
             fi
           fi
 
@@ -349,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: |
@@ -373,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