Skip to content

feat: merging dev to main#910

Open
Abdul-Microsoft wants to merge 58 commits intomainfrom
dev-v4
Open

feat: merging dev to main#910
Abdul-Microsoft wants to merge 58 commits intomainfrom
dev-v4

Conversation

@Abdul-Microsoft
Copy link
Copy Markdown
Collaborator

Purpose

  • This pull request introduces several important improvements and refactorings across the codebase, primarily focused on standardizing the frontend directory name from frontend to App, enhancing infrastructure validation, and updating deployment workflows. Key changes are grouped below:

Frontend Directory Renaming and Refactoring

  • Renamed all references of the frontend directory from src/frontend to src/App in configuration files, workflow files, documentation, and code workspace settings to standardize naming and avoid confusion. This impacts Docker build contexts, deployment workflows, documentation instructions, and project settings. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12]

CI/CD Workflow Enhancements

  • Added a new workflow .github/workflows/azd-template-validation.yml for scheduled and manual Azure Developer (AZD) template validation, improving template quality assurance.
  • Refactored .github/workflows/azure-dev.yml to focus on deployment (renamed to "Azure Dev Deploy"), with improved steps for environment setup and deployment using azd, and removed template validation logic (now in its own workflow).
  • Introduced .github/workflows/validate-bicep-params.yml to automatically validate Bicep parameter files on schedule and pull requests, and send notifications on failure or success.

Infrastructure as Code Improvements

  • Updated Bicep and ARM templates to add managedIdentities (system-assigned) to the web app resources, improving security and identity management. [1] [2] [3]
  • Ensured the location parameter is passed to the search service update module in Bicep and ARM templates for consistency and correctness. [1] [2]
  • Added a required Bicep version to azure.yaml for improved reproducibility.

These changes collectively improve the maintainability, security, and reliability of the repository's infrastructure and development workflows.

Does this introduce a breaking change?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • ...

Other Information

NirajC-Microsoft and others added 30 commits March 4, 2026 14:21
…ort, AI project, AI Hub, Container App Environment, Fetch Container Image, and Role assignments. These changes streamline the infrastructure code by eliminating unused resources and parameters, ensuring a cleaner and more maintainable codebase.
…ly with a timestamp in the Azure Dev Deploy workflow
- Bump vite version from 7.1.2 to 7.1.11 in frontend package.json
- Update minimatch and mdast-util-to-hast overrides in frontend package.json
- Upgrade werkzeug from 3.1.5 to 3.1.6 in mcp_server pyproject.toml and uv.lock
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR merges the development branch into main, primarily standardizing the frontend path to src/App (with a Vite/Redux refactor), while also tightening infra/deployment validation and aligning IaC templates with managed identity and parameter consistency.

Changes:

  • Migrates/renames the frontend from src/frontend to src/App, introducing Vite + Vitest config, Redux Toolkit store/slices, and reorganized shared “commonComponents”.
  • Updates CI/CD workflows for Docker builds and splits AZD template validation into a dedicated workflow; updates docs and workspace settings accordingly.
  • Improves IaC templates by adding system-assigned managed identity for the web app and ensuring location is passed to the Search service update module; adds a required Bicep version guard.

Reviewed changes

Copilot reviewed 95 out of 209 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
src/tests/backend/v4/orchestration/helper/test_plan_to_mplan_converter.py Removes unused model imports in tests.
src/tests/backend/v4/config/test_settings.py Refactors unittest imports; improves cancellation assertions.
src/tests/backend/common/database/test_database_base.py Tightens exception matching in context-manager test.
src/mcp_server/pyproject.toml Bumps MCP server dependency pins.
src/frontend/src/services/index.tsx Removes old frontend barrel export (path migration).
src/frontend/src/hooks/index.tsx Removes old frontend hooks barrel (path migration).
src/frontend/src/api/index.tsx Removes old frontend API barrel (path migration).
src/frontend/src/api/apiClient.tsx Removes old fetch-based API client (replaced in src/App).
src/backend/requirements.txt Updates backend dependency versions.
src/backend/pyproject.toml Updates backend dependency versions.
src/App/vitest.config.ts Adds Vitest configuration for new frontend.
src/App/vite.config.ts Adjusts Vite config dependency optimization.
src/App/tsconfig.node.json Adds TS config for Vite node config files.
src/App/tsconfig.json Adds TS config for Vite-based React app.
src/App/src/vite-env.d.ts Adds Vite env typings.
src/App/src/utils/utils.tsx Adds date formatting utility.
src/App/src/utils/messageUtils.ts Adds message formatting/extraction utilities.
src/App/src/utils/index.ts Adds utils barrel exports.
src/App/src/utils/errorUtils.tsx Adds user-friendly error helpers.
src/App/src/utils/agentIconUtils.tsx Updates service imports after store refactor.
src/App/src/styles/TaskList.css Adds TaskList styles.
src/App/src/styles/TaskDetails.css Adds TaskDetails styles.
src/App/src/styles/prism-material-oceanic.css Adds Prism theme styling.
src/App/src/styles/PlanPanelLeft.css Adds left panel layout styles.
src/App/src/styles/PlanPage.css Adds PlanPage layout + responsive styles.
src/App/src/styles/PlanCreatePage.css Adds placeholder PlanCreate styles.
src/App/src/styles/Panel.css Adds shared panel toolbar/dialog styles.
src/App/src/styles/HomeInput.css Adds HomeInput component styling.
src/App/src/store/TeamService.tsx Moves Team service under store; trims logs.
src/App/src/store/store.ts Adds Redux store configuration + serializable check config.
src/App/src/store/slices/teamSlice.ts Adds team slice/selectors.
src/App/src/store/slices/streamingSlice.ts Adds streaming slice/selectors.
src/App/src/store/slices/chatSlice.ts Adds chat slice/selectors.
src/App/src/store/slices/appSlice.ts Adds global app slice/selectors.
src/App/src/store/PlanDataService.tsx Updates plan data service logging.
src/App/src/store/NewTaskService.tsx Adds new-task navigation/reset helper.
src/App/src/store/index.ts Adds store barrel exports.
src/App/src/store/hooks.ts Adds typed Redux hooks.
src/App/src/setupTests.tsx Adds test setup (jest-dom matchers).
src/App/src/reportWebVitals.tsx Adds web-vitals reporting helper (TSX).
src/App/src/reportWebVitals.ts Adds web-vitals reporting helper (TS).
src/App/src/react-app-env.d.ts Adds CRA typing reference (legacy).
src/App/src/pages/index.tsx Adds pages barrel exports.
src/App/src/models/Team.tsx Adds Team/Agent models.
src/App/src/models/taskList.tsx Adds Task list models.
src/App/src/models/taskDetails.tsx Updates PlanDetailsProps typing.
src/App/src/models/planPanelLeft.tsx Adds PlanPanelLeft prop model.
src/App/src/models/messages.tsx Adds websocket/message models.
src/App/src/models/inputTask.tsx Adds input-task models.
src/App/src/models/index.tsx Adds models barrel exports.
src/App/src/models/homeInput.tsx Adds HomeInput props + icon map.
src/App/src/models/auth.tsx Adds auth/user models.
src/App/src/models/agentMessage.tsx Adds agent message models.
src/App/src/index.tsx Wraps app in Redux Provider; config bootstrap updates.
src/App/src/index.css Adds global CSS overrides and error-hiding rules.
src/App/src/hooks/useWebSocket.tsx Switches websocket service import to store barrel.
src/App/src/hooks/useTeamSelection.tsx Switches TeamService import to store; trims logs.
src/App/src/hooks/useRAIErrorHandling.tsx Adds RAI error parsing hook.
src/App/src/hooks/usePlanCancellationAlert.tsx Adjusts plan cancellation error handling.
src/App/src/hooks/usePlanActions.tsx Adds thunk-driven plan load/reset hook.
src/App/src/hooks/useAutoScroll.tsx Adds reusable auto-scroll hook.
src/App/src/hooks/index.tsx Adds hooks barrel exports.
src/App/src/components/NotFound/ContentNotFound.tsx Adds not-found component.
src/App/src/components/errors/RAIErrorCard.tsx Adds RAI error UI card component.
src/App/src/components/errors/index.tsx Adds errors barrel export.
src/App/src/components/content/TaskList.tsx Memoizes TaskList component.
src/App/src/components/content/streaming/StreamingUserPlanMessage.tsx Adds user-plan message renderer.
src/App/src/components/content/streaming/StreamingUserPlan.tsx Adds user plan text extraction helper.
src/App/src/components/content/streaming/StreamingPlanState.tsx Adds thinking/execution state renderers.
src/App/src/components/content/streaming/StreamingBufferMessage.tsx Memoizes streaming buffer message component.
src/App/src/components/content/streaming/StreamingAgentMessage.tsx Updates TaskService import to store barrel.
src/App/src/components/content/PlanPanelRight.tsx Memoizes right panel component.
src/App/src/components/content/PlanPanelLeft.tsx Updates imports to commonComponents + store; memoizes.
src/App/src/components/content/PlanChatBody.tsx Updates imports to commonComponents; memoizes.
src/App/src/components/content/PlanChat.tsx Memoizes PlanChat component.
src/App/src/components/content/HomeInput.tsx Updates imports to commonComponents/store; memoizes.
src/App/src/components/content/contoso.tsx Adds inline Contoso logo component.
src/App/src/components/common/TeamSelector.tsx Switches TeamService import to store; trims logs.
src/App/src/components/common/TeamSelected.tsx Adds current team display component.
src/App/src/components/common/PlanCancellationDialog.tsx Adds plan cancellation confirmation dialog.
src/App/src/commonComponents/SYSTEM_OVERVIEW.md Documents commonComponents purpose/structure.
src/App/src/commonComponents/modules/prism-material-oceanic.css Adds shared Prism theme under commonComponents.
src/App/src/commonComponents/modules/ChatExample.tsx Adds example chat mock component.
src/App/src/commonComponents/modules/Chat.tsx Adjusts error handling + no-op click handler.
src/App/src/commonComponents/imports/MsftColor.tsx Adds Microsoft logo SVG component.
src/App/src/commonComponents/imports/ContosoLogo.tsx Adds Contoso logo SVG component.
src/App/src/commonComponents/components/PromptCard.tsx Adds reusable prompt card UI.
src/App/src/commonComponents/components/Progress/ProgressCircle.tsx Adds progress circle component.
src/App/src/commonComponents/components/Panels/UserCard.tsx Adds panel user card component.
src/App/src/commonComponents/components/Panels/PanelRightToolbar.tsx Adds panel right toolbar.
src/App/src/commonComponents/components/Panels/PanelLeftToolbar.tsx Adds panel left toolbar.
src/App/src/commonComponents/components/Panels/PanelLeft.tsx Adds resizable left panel shell.
src/App/src/commonComponents/components/Panels/PanelFooter.tsx Adds left panel footer wrapper.
src/App/src/commonComponents/components/LoadingMessage.tsx Adds loading message component + message list.
src/App/src/commonComponents/components/Layout/README.md Adds layout documentation.
src/App/src/commonComponents/components/Layout/CoralShellRow.tsx Adds horizontal shell layout component.
src/App/src/commonComponents/components/Layout/CoralShellColumn.tsx Adds vertical shell layout component.
src/App/src/commonComponents/components/Header/PanelRightToggles.tsx Updates imports for new commonComponents path.
src/App/src/commonComponents/components/Header/HeaderTools.tsx Adds header tools wrapper component.
src/App/src/commonComponents/components/Header/Header.tsx Adds common header component.
src/App/src/commonComponents/components/eventbus.tsx Adds shared event bus for panel toggles.
src/App/src/commonComponents/components/CoralAccordion/CoralAccordionPanel.tsx Adds accordion panel component.
src/App/src/commonComponents/components/CoralAccordion/CoralAccordionItem.tsx Adds accordion item state provider.
src/App/src/commonComponents/components/CoralAccordion/CoralAccordionHeader.tsx Adds accordion header with chevron.
src/App/src/commonComponents/components/CoralAccordion/CoralAccordionContext.tsx Adds accordion context hook/provider.
src/App/src/commonComponents/components/CoralAccordion/CoralAccordion.tsx Adds accordion wrapper component.
src/App/src/commonComponents/components/Content/ContentToolbar.tsx Adds content toolbar component.
src/App/src/commonComponents/components/Content/Content.tsx Adds content shell component.
src/App/src/App.tsx Adds router + initializes websocket hook.
src/App/src/App.css Adds app-level styles.
src/App/src/api/index.tsx Rebuilds API barrel for new httpClient/apiUtils.
src/App/src/api/config.tsx Removes legacy header builder and logs.
src/App/src/api/apiUtils.ts Adds request cache/retry/debounce/throttle helpers.
src/App/src/api/apiService.tsx Removes debug logs; keeps caching/trackRequest behavior.
src/App/src/api/apiClient.tsx Replaces legacy API client with httpClient adapter.
src/App/requirements.txt Adds Python deps list for frontend server.
src/App/README.md Adds CRA-derived README (frontend docs).
src/App/pyproject.toml Adds Python project metadata for frontend server.
src/App/public/robots.txt Adds robots.txt.
src/App/public/manifest.json Adds web app manifest.
src/App/public/index.html Adds public index.html template.
src/App/public/contosoLogo.svg Adds Contoso SVG asset.
src/App/package.json Adds Redux deps; Vite/Vitest changes; overrides updated.
src/App/migration-commands.txt Adds CRA→Vite migration notes.
src/App/index.html Adds Vite root index.html.
src/App/frontend_server.py Adds FastAPI static server for built frontend + /config.
src/App/Dockerfile Adds multi-stage Docker build for frontend + python server.
src/App/.python-version Pins Python version file.
src/App/.gitignore Adds frontend-specific ignore rules.
src/App/.eslintrc.js Adds ESLint config.
src/App/.env.sample Adds sample env file.
src/App/.dockerignore Adds dockerignore for frontend container build.
Multi-Agent-Custom-Automation-Engine-Solution-Accelerator.code-workspace Updates workspace path hint to src/App.
infra/old/08-2025/modules/role.bicep Removes legacy infra module.
infra/old/08-2025/modules/fetch-container-image.bicep Removes legacy infra module.
infra/old/08-2025/modules/container-app-environment.bicep Removes legacy infra module.
infra/old/08-2025/modules/ai-hub.bicep Removes legacy infra module.
infra/old/08-2025/modules/account/modules/project.bicep Removes legacy infra module.
infra/old/08-2025/modules/account/modules/keyVaultExport.bicep Removes legacy infra module.
infra/old/08-2025/main.parameters.json Removes legacy parameter file.
infra/old/08-2025/bicepconfig.json Removes legacy bicep config.
infra/old/00-older/main2.bicep Removes older infra template.
infra/old/00-older/macae-mini.bicepparam Removes older infra params.
infra/old/00-older/macae-large.bicepparam Removes older infra params.
infra/old/00-older/macae-dev.bicep Removes older dev infra template.
infra/old/00-older/deploy_managed_identity.bicep Removes older managed identity template.
infra/old/00-older/deploy_keyvault.bicep Removes older key vault template.
infra/main.json Syncs generated ARM template with Bicep changes.
infra/main.bicep Adds system-assigned identity + passes location to search module.
infra/main_custom.bicep Adds system-assigned identity to custom variant.
docs/ManualAzureDeployment.md Updates frontend directory reference to src/App.
docs/LocalDevelopmentSetup.md Updates dev setup docs to src/App.
azure.yaml Adds required Bicep version guard.
azure_custom.yaml Updates frontend service project path to src/App.
.github/workflows/job-docker-build.yml Updates Docker build context to src/App.
.github/workflows/docker-build-and-push.yml Updates workflow path filters + build context to src/App.
.github/workflows/azure-dev.yml Refactors workflow to “Azure Dev Deploy” using azd up.
.github/workflows/azd-template-validation.yml Adds dedicated AZD template validation workflow.
.github/dependabot.yml Updates pip dependabot directory to /src/App.
Comments suppressed due to low confidence (1)

src/App/src/commonComponents/components/Header/PanelRightToggles.tsx:17

  • eventBus is imported from ../eventbus.js, but this PR adds eventbus.tsx (no .js file in that path). This will fail module resolution in the frontend build. Import the TSX module (typically without the extension).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Pavan-Microsoft and others added 2 commits April 9, 2026 19:06
…prove JSON error handling in validate_bicep_params.py
refactor: Refactor JSON error handling and remove allowedFqdnList
fix: Filter the files path for pipeline run
Thanusree-Microsoft and others added 3 commits April 10, 2026 10:26
Added notes about tenant security restrictions and Azure OpenAI quota availability.
Added note about security restrictions and WAF-supported version deployment.
docs: Added content in Readme and deploymentguide for SFI issue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.