Merge branch 'dev' of https://github.com/microsoft/content-generation-solution-accelerator into dependabotchanges

Author: Ragini-Microsoft

.github/dependabot.yml

@@ -35,8 +35,8 @@ updates:
   # npm dependencies - grouped
   - package-ecosystem: "npm"
     directories:
-      - "/src/app/frontend"
-      - "/src/app/frontend-server"
+      - "/src/App"
+      - "/src/App/server"
     schedule:
       interval: "monthly"
     target-branch: "dependabotchanges"

.github/workflows/docker-build.yml

@@ -8,8 +8,8 @@ on:
       - demo
     paths:
       - 'src/backend/**'
-      - 'src/app/frontend/**'
-      - 'src/app/frontend-server/**'
+      - 'src/App/src/**'
+      - 'src/App/server/**'
       - '.github/workflows/docker-build.yml'
   pull_request:
     types:
@@ -23,8 +23,8 @@ on:
       - demo
     paths:
       - 'src/backend/**'
-      - 'src/app/frontend/**'
-      - 'src/app/frontend-server/**'
+      - 'src/App/src/**'
+      - 'src/App/server/**'
       - '.github/workflows/docker-build.yml'
   workflow_dispatch:
 
@@ -88,8 +88,8 @@ jobs:
       - name: Build and Push Docker Image for Frontend Server
         uses: docker/build-push-action@v7
         with:
-          context: ./src/app
-          file: ./src/app/WebApp.Dockerfile
+          context: ./src/App
+          file: ./src/App/WebApp.Dockerfile
           push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'  || github.ref_name == 'dependabotchanges'  }}
           tags: |
             ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/content-gen-app:${{ steps.determine_tag.outputs.tagname }}

.github/workflows/job-docker-build.yml

@@ -65,8 +65,8 @@ jobs:
         env:
           DOCKER_BUILD_SUMMARY: false
         with:
-          context: ./src/app
-          file: ./src/app/WebApp.Dockerfile
+          context: ./src/App
+          file: ./src/App/WebApp.Dockerfile
           push: true
           tags: |
             ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}

.github/workflows/test.yml

@@ -28,6 +28,7 @@ on:
 permissions:
   contents: read
   actions: read
+  pull-requests: write
 
 concurrency:
   group: test-${{ github.ref }}
@@ -69,7 +70,19 @@ jobs:
       - name: Run Backend Tests with Coverage
         if: env.skip_backend_tests == 'false'
         run: |
-          pytest --cov=. --cov-report=term-missing --cov-report=xml ./src/tests
+          pytest --cov=. --cov-report=term-missing --cov-report=xml --junitxml=pytest.xml ./src/tests
+
+      - name: Pytest Coverage Comment
+        if: |
+          always() &&
+          github.event_name == 'pull_request' &&
+          github.event.pull_request.head.repo.fork == false &&
+          env.skip_backend_tests == 'false'
+        uses: MishaKav/pytest-coverage-comment@26f986d2599c288bb62f623d29c2da98609e9cd4  # v1.6.0
+        with:
+          pytest-xml-coverage-path: coverage.xml
+          junitxml-path: pytest.xml
+          report-only-changed-files: true
 
       - name: Skip Backend Tests
         if: env.skip_backend_tests == 'true'

.gitignore

@@ -36,15 +36,15 @@ eggs/
 *.swo
 
 # Node
-/src/app/frontend/node_modules/
-/src/app/frontend-server/node_modules/
-/src/app/frontend-server/static/
-/src/app/frontend-server/*.zip
+/src/App/node_modules/
+/src/App/server/node_modules/
+/src/App/server/static/
+/src/App/server/*.zip
 node_modules/
 
 # Build output
-/src/app/static/
-/src/app/frontend/dist/
+/src/App/static/
+/src/App/dist/
 
 # Logs
 *.log

azure_custom.yaml

@@ -11,7 +11,7 @@ infra:
 
 services:
   frontend:
-    project: ./src/app/frontend-server
+    project: ./src/App/server
     language: js
     host: appservice
     dist: ./dist

docs/AZD_DEPLOYMENT.md

@@ -239,7 +239,7 @@ Error: az acr build failed
 **Solution**: Check the Dockerfile and ensure all required files are present:
 ```bash
 # Manual build for debugging
-cd src/app
+cd src/App
 docker build -f WebApp.Dockerfile -t content-gen-app:test .
 ```
 
@@ -251,7 +251,7 @@ Error: az webapp deploy failed
 
 **Solution**: Ensure the frontend builds successfully:
 ```bash
-cd src/app/frontend
+cd src/App
 npm install
 npm run build
 ```

docs/TECHNICAL_GUIDE.md

@@ -142,7 +142,7 @@ pip install -r requirements.txt
 python app.py
 
 # Frontend
-cd src/app/frontend
+cd src/App
 npm install
 npm run dev
 ```

infra/scripts/package_frontend.ps1

@@ -1,16 +1,16 @@
 # Package frontend for App Service deployment
 # This script is called by AZD during prepackage hook
-# Working directory is ./src/app/frontend-server (project directory)
+# Working directory is ./src/App/server (project directory)
 
 $ErrorActionPreference = 'Stop'
 
 Write-Host "Building React frontend..." -ForegroundColor Cyan
 
 # Build React frontend (one level up)
-Push-Location ../frontend
+Push-Location ..
 npm ci --loglevel=error
 if ($LASTEXITCODE -ne 0) { throw "npm ci failed with exit code $LASTEXITCODE" }
-npm run build -- --outDir ../frontend-server/static
+npm run build -- --outDir ./server/static
 if ($LASTEXITCODE -ne 0) { throw "npm run build failed with exit code $LASTEXITCODE" }
 Pop-Location
 

infra/scripts/package_frontend.sh

@@ -3,15 +3,15 @@ set -euo pipefail
 
 # Package frontend for App Service deployment
 # This script is called by AZD during prepackage hook
-# Working directory is ./src/app/frontend-server (project directory)
+# Working directory is ./src/App/server (project directory)
 
 echo "Building React frontend..."
 
 # Build React frontend (one level up)
-cd ../frontend
+cd ..
 npm ci --loglevel=error
-npm run build -- --outDir ../frontend-server/static
-cd ../frontend-server
+npm run build -- --outDir ./server/static
+cd ./server
 
 echo "Packaging frontend server..."