Sync Develop to main

.github/dependabot.yml

@@ -0,0 +1,34 @@
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "terraform"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/e2e-playwright-test.yml

@@ -1,4 +1,6 @@
 name: Next-CRM Playwright Tests
+permissions:
+  contents: read
 
 # Controls when the workflow will run
 on:
@@ -16,11 +18,13 @@ jobs:
 
   test:
     if: |
-      (github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') || success()
+      github.event_name == 'workflow_dispatch' || 
+      github.event_name == 'schedule' || 
+      (github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
     runs-on: self-hosted
     container:
       image: ubuntu:24.04
-    environment: Stage # Retrive secrets from 'Stage' environment
+    environment: Stage # Retrieve secrets from 'Stage' environment
     env:
       BASE_URL: ${{ secrets.BASE_URL }}
 
@@ -43,13 +47,13 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v4
       with:
-        node-version-file: "frontend/.nvmrc"
+        node-version: "18"
 
     - name: Cache npm modules
       uses: actions/cache@v4
       with:
-        path: /github/home/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
         restore-keys: |
           ${{ runner.os }}-node-
 
@@ -67,10 +71,12 @@ jobs:
 
     - name: Sanitize branch name
       shell: bash
+      env:
+        UNTRUSTED_PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
       run: |
-        if [ "${{ github.event_name }}" = "pull_request" ]; then
-          # PR → use the source branch name
-          RAW_BRANCH="${{ github.head_ref }}"
+        if [ "${{ github.event_name }}" = "pull_request_review" ]; then
+          # PR Review → use the source branch name
+          RAW_BRANCH="$UNTRUSTED_PR_HEAD_REF"
         else
           # workflow_dispatch or schedule → use whatever ref we were on
           RAW_BRANCH="${GITHUB_REF#refs/heads/}"
@@ -79,7 +85,6 @@ jobs:
         SAFE_BRANCH="${RAW_BRANCH//\//-}"
         echo "SANITIZED_REF=${SAFE_BRANCH}" >> $GITHUB_ENV
         echo "→ Restoring/uploading history under key: ${SAFE_BRANCH}"
-
     - name: Debug—print refs
       run: |
         echo "EVENT_NAME = ${{ github.event_name }}"
@@ -118,8 +123,8 @@ jobs:
     # Install dependencies
     - name: Install dependencies
       run: |
-        npm ci
         cd tests/e2e/
+        npm ci
         npx playwright install --with-deps
 
     - name: Setup Java
@@ -247,13 +252,17 @@ jobs:
 
     - name: Set the email body message for pull request merge or schedule message
       if: ${{ success() || failure() }}
+      env:
+        PR_TITLE: ${{ github.event.pull_request.title }}
+        PR_URL: ${{ github.event.pull_request.html_url }}
       run: |
-        if [ "${GITHUB_EVENT_NAME}" = "pull_request" ]; then
-          echo "message=<p>For the latest pull request merge titled <b><a href='${{ github.event.pull_request.html_url }}'> ${{ github.event.pull_request.title }}</a></b>, the E2E automation tests have been executed on the QE environment. Below is the summary:</p>" >> $GITHUB_ENV
+        if [ "${GITHUB_EVENT_NAME}" = "pull_request_review" ]; then
+          # Sanitize PR_TITLE to prevent environment variable injection
+          SANITIZED_PR_TITLE="$(echo "$PR_TITLE" | tr -d '\n' | tr -d '\r')"
+          echo "message=<p>For the latest pull request titled <b><a href='$PR_URL'> $SANITIZED_PR_TITLE</a></b>, the E2E automation tests have been executed on the QE environment. Below is the summary:</p>" >> $GITHUB_ENV
         else
           echo "message=<p>This is to inform you that the scheduled E2E automation tests have been executed on the QE environment. Below is the summary:</p>" >> $GITHUB_ENV
         fi
-
     - name: Send Report via Email
       if: ${{ success() || failure() }}
       uses: dawidd6/action-send-mail@v3
@@ -262,7 +271,7 @@ jobs:
         server_port: 587
         username: ${{ secrets.QA_WORKFLOW_EMAIL }}
         password: ${{ secrets.QA_WORKFLOW_EMAIL_PASSWORD }}
-        subject: Test Automation Report - Next PMS
+        subject: Test Automation Report - Next CRM
         html_body: |
           <html>
             <head>

next_crm/hooks.py

@@ -11,7 +11,7 @@
 # Apps
 # ------------------
 
-required_apps = ["frappe/erpnext", "rtCamp/frappe-search"]
+required_apps = ["frappe/erpnext", "rtCamp/frappe_search"]
 
 add_to_apps_screen = [
     {

pyproject.toml

@@ -17,7 +17,7 @@ requires = ["flit_core >=3.4,<4"]
 build-backend = "flit_core.buildapi"
 
 # These dependencies are only installed when developer mode is enabled
-[tool.bench.dev-dependencies]
+# [tool.bench.dev-dependencies]
 # package_name = "~=1.1.0"
 
 [tool.ruff]
@@ -59,3 +59,6 @@ typing-modules = ["frappe.types.DF"]
 quote-style = "double"
 indent-style = "space"
 docstring-code-format = true
+
+[tool.bench.frappe-dependencies]
+frappe = ">=15.0.0,<=16.0.0"

tests/e2e/.env.example

@@ -23,4 +23,4 @@ EMP2_NAME=
 EMP3_ID=
 EMP3_EMAIL=
 EMP3_PASS=
-EMP3_NAME=
+EMP3_NAME=