Merge branch 'main' into add-ResearchAssitant-Template

Author: UtkarshMishra-Microsoft

.github/workflows/CAdeploy.yml

@@ -109,7 +109,6 @@ jobs:
       - name: Update PowerBI URL
         if: success()
         run: |
-
           set -e
 
           COMMON_PART="-app-service"

.github/workflows/RAdeploy.yml

@@ -239,7 +239,6 @@ jobs:
       - name: Send Notification on Failure
         if: failure()
         run: |
-
           RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
       
           # Construct the email body
@@ -253,4 +252,4 @@ jobs:
           # Send the notification
           curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
             -H "Content-Type: application/json" \
-            -d "$EMAIL_BODY" || echo "Failed to send notification"
+            -d "$EMAIL_BODY" || echo "Failed to send notification"

.github/workflows/build-clientadvisor.yml

@@ -2,11 +2,11 @@ name: Build ClientAdvisor Docker Images
 
 on:
   push:
-    branches: [main]
+    branches: [main, dev, demo]
     paths:
       - ClientAdvisor/**
   pull_request:
-    branches: [main]
+    branches: [main, dev, demo]
     types:
       - opened
       - ready_for_review
@@ -35,5 +35,5 @@ jobs:
       password_secret: ${{ matrix.password_secret }}
       app_name: ${{ matrix.app_name }}
       dockerfile: ${{ matrix.dockerfile }}
-      push: true  # Adjust this logic as necessary
-    secrets: inherit
+      push: ${{ github.event_name == 'push' && github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
+    secrets: inherit

.github/workflows/build-docker.yml

@@ -54,7 +54,7 @@ jobs:
         context: .
         file: ${{ inputs.dockerfile }}
         push: ${{ inputs.push }}
-        cache-from: type=registry,ref=${{ inputs.registry }}/${{ inputs.app_name}}:latest
+        cache-from: type=registry,ref=${{ inputs.registry }}/${{ inputs.app_name}}:${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || 'latest' }}
         tags: |
-          ${{ inputs.registry }}/${{ inputs.app_name}}:dev
+          ${{ inputs.registry }}/${{ inputs.app_name}}:${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || 'latest' }}
           ${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.date.outputs.date }}_${{ github.run_number }}

.github/workflows/build-researchassistant.yml

@@ -2,11 +2,11 @@ name: Build ResearchAssistant Docker Images
 
 on:
   push:
-    branches: [main]
+    branches: [main, dev, demo]
     paths:
       - ResearchAssistant/**
   pull_request:
-    branches: [main]
+    branches: [main, dev, demo]
     types:
       - opened
       - ready_for_review
@@ -32,5 +32,5 @@ jobs:
       password_secret: ${{ matrix.password_secret }}
       app_name: ${{ matrix.app_name }}
       dockerfile: ${{ matrix.dockerfile }}
-      push: true  # Adjust this logic as necessary
-    secrets: inherit
+      push: ${{ github.event_name == 'push' && github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
+    secrets: inherit

.github/workflows/test_client_advisor.yml

@@ -2,12 +2,12 @@ name: Unit Tests - Client Advisor
 
 on:
   push:
-    branches: main
+    branches: [main, dev]
     # Trigger on changes in these specific paths
     paths:
       - 'ClientAdvisor/**'
   pull_request:
-    branches: main
+    branches: [main, dev]
     types:
       - opened
       - ready_for_review
@@ -29,22 +29,6 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
-      - name: Install Backend Dependencies
-        run: |
-          cd ClientAdvisor/App
-          python -m pip install -r requirements.txt
-          python -m pip install coverage pytest-cov
-      - name: Run Backend Tests with Coverage
-        run: |
-          cd ClientAdvisor/App
-          python -m pytest -vv --cov=. --cov-report=xml --cov-report=html --cov-report=term-missing --cov-fail-under=80 --junitxml=coverage-junit.xml
-      - uses: actions/upload-artifact@v4
-        with:
-          name: client-advisor-coverage
-          path: |
-            ClientAdvisor/App/coverage.xml
-            ClientAdvisor/App/coverage-junit.xml
-            ClientAdvisor/App/htmlcov/
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -63,3 +47,20 @@ jobs:
           path: |
             ClientAdvisor/App/frontend/coverage/
             ClientAdvisor/App/frontend/coverage/lcov-report/
+            ClientAdvisor/App/htmlcov/
+      - name: Install Backend Dependencies
+        run: |
+          cd ClientAdvisor/App
+          python -m pip install -r requirements.txt
+          python -m pip install coverage pytest-cov
+      - name: Run Backend Tests with Coverage
+        run: |
+          cd ClientAdvisor/App
+          python -m pytest -vv --cov=. --cov-report=xml --cov-report=html --cov-report=term-missing --cov-fail-under=80 --junitxml=coverage-junit.xml
+      - uses: actions/upload-artifact@v4
+        with:
+          name: client-advisor-coverage
+          path: |
+            ClientAdvisor/App/coverage.xml
+            ClientAdvisor/App/coverage-junit.xml
+            ClientAdvisor/App/htmlcov/