Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into macae-v3-dev-marktayl

Author: marktayl1

src/backend/common/database/cosmosdb.py

@@ -235,11 +235,11 @@ async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
         return await self.query_items(query, parameters, Plan)
 
 
-    async def get_all_plans_by_team_id_status(self, team_id: str, status: str) -> List[Plan]:
+    async def get_all_plans_by_team_id_status(self, user_id: str,team_id: str, status: str) -> List[Plan]:
         """Retrieve all plans for a specific team."""
         query = "SELECT * FROM c WHERE c.team_id=@team_id AND c.data_type=@data_type and c.user_id=@user_id and c.overall_status=@status ORDER BY c._ts DESC"
         parameters = [
-            {"name": "@user_id", "value": self.user_id},
+            {"name": "@user_id", "value": user_id},
             {"name": "@team_id", "value": team_id},
             {"name": "@data_type", "value": DataType.plan},
             {"name": "@status", "value": status},

src/backend/common/database/database_base.py

@@ -93,7 +93,7 @@ async def get_all_plans_by_team_id(self, team_id: str) -> List[Plan]:
 
     @abstractmethod
     async def get_all_plans_by_team_id_status(
-        self, team_id: str, status: str
+        self, user_id:str, team_id: str, status: str
     ) -> List[Plan]:
         """Retrieve all plans for a specific team."""
         pass

src/backend/v3/api/router.py

@@ -1214,7 +1214,7 @@ async def get_plans(request: Request):
         return []
 
     all_plans = await memory_store.get_all_plans_by_team_id_status(
-        team_id=current_team.team_id, status=PlanStatus.completed
+        user_id=user_id, team_id=current_team.team_id, status=PlanStatus.completed
     )
 
     return all_plans

src/frontend/src/utils/agentIconUtils.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { 
-    Desktop20Regular, 
-    Code20Regular, 
+import {
+    Desktop20Regular,
+    Code20Regular,
     Building20Regular,
     Organization20Regular,
     Search20Regular,
@@ -113,18 +113,18 @@ const generateHash = (str: string): number => {
  */
 const matchStringToFluentIcon = (iconString: string): React.ComponentType<any> | null => {
     if (!iconString || typeof iconString !== 'string') return null;
-    
+
     // Try exact match first
     if (fluentIconMap[iconString]) {
         return fluentIconMap[iconString];
     }
-    
+
     // Try case-insensitive match
     const lowerIconString = iconString.toLowerCase();
     if (fluentIconMap[lowerIconString]) {
         return fluentIconMap[lowerIconString];
     }
-    
+
     // Try removing common suffixes and prefixes
     const cleanedIconString = iconString
         .replace(/20Regular$/i, '')
@@ -134,11 +134,11 @@ const matchStringToFluentIcon = (iconString: string): React.ComponentType<any> |
         .replace(/^icon/i, '')
         .toLowerCase()
         .trim();
-    
+
     if (fluentIconMap[cleanedIconString]) {
         return fluentIconMap[cleanedIconString];
     }
-    
+
     return null;
 };
 
@@ -200,20 +200,20 @@ const getUniqueAgentIcon = (
     iconStyle: React.CSSProperties
 ): React.ReactNode => {
     const cleanName = TaskService.cleanTextToSpaces(agentName).toLowerCase();
-    
+
     // If we already assigned an icon to this agent, use it
     if (agentIconAssignments[cleanName]) {
         const IconComponent = agentIconAssignments[cleanName];
         return React.createElement(IconComponent, { style: iconStyle });
     }
-    
+
     // Get deterministic icon based on agent name patterns
     // This ensures same names always get the same icon regardless of assignment order
     const selectedIcon = getDeterministicAgentIcon(cleanName);
-    
+
     // Cache the assignment for future lookups
     agentIconAssignments[cleanName] = selectedIcon;
-    
+
     return React.createElement(selectedIcon, { style: iconStyle });
 };
 
@@ -222,8 +222,8 @@ const getUniqueAgentIcon = (
  * with consistent fallback patterns across all components
  */
 export const getAgentIcon = (
-    agentName: string, 
-    planData?: any, 
+    agentName: string,
+    planData?: any,
     planApprovalRequest?: any,
     iconColor: string = 'var(--colorNeutralForeground2)'
 ): React.ReactNode => {
@@ -245,7 +245,7 @@ export const getAgentIcon = (
             if (FluentIconComponent) {
                 return React.createElement(FluentIconComponent, { style: iconStyle });
             }
-            
+
             // Fallback: check if it's in the existing iconMap
             if (iconMap[agent.icon]) {
                 return React.cloneElement(iconMap[agent.icon] as React.ReactElement, {
@@ -259,8 +259,8 @@ export const getAgentIcon = (
     const storedTeam = TeamService.getStoredTeam();
     if (storedTeam?.agents) {
         const cleanAgentName = TaskService.cleanTextToSpaces(agentName);
-        
-        const agent = storedTeam.agents.find(a => 
+
+        const agent = storedTeam.agents.find(a =>
             TaskService.cleanTextToSpaces(a.name).toLowerCase().includes(cleanAgentName.toLowerCase()) ||
             a.type.toLowerCase().includes(cleanAgentName.toLowerCase()) ||
             a.input_key.toLowerCase().includes(cleanAgentName.toLowerCase())
@@ -286,15 +286,15 @@ export const getAgentIcon = (
     // 4. Deterministic icon assignment - ensures same names get same icons
     // Get all agent names from current context for unique assignment
     let allAgentNames: string[] = [];
-    
+
     if (planApprovalRequest?.team) {
         allAgentNames = planApprovalRequest.team;
     } else if (planData?.team?.agents) {
         allAgentNames = planData.team.agents.map((a: any) => a.name || a.type || '');
     } else if (storedTeam?.agents) {
         allAgentNames = storedTeam.agents.map(a => a.name);
     }
-    
+
     return getUniqueAgentIcon(agentName, allAgentNames, iconStyle);
 };
 
@@ -313,13 +313,13 @@ export const clearAgentIconAssignments = (): void => {
  */
 export const getAgentDisplayName = (agentName: string): string => {
     if (!agentName) return 'Assistant';
-    
+
     // Clean and format the name
     let cleanName = TaskService.cleanTextToSpaces(agentName);
-    
+
     // Remove "Agent" suffix if it exists (case insensitive)
     cleanName = cleanName.replace(/\s*agent\s*$/gi, '').trim();
-    
+
     // Convert to proper case
     cleanName = cleanName
         .replace(/\bHRHelper\b/gi, 'HR Helper')
@@ -329,8 +329,8 @@ export const getAgentDisplayName = (agentName: string): string => {
 
     // Convert to proper case
     cleanName = cleanName.replace(/\b\w/g, l => l.toUpperCase());
-    
-    
+
+
     // Handle special cases for better readability
     cleanName = cleanName
         .replace(/\bKb\b/g, 'KB')          // KB instead of Kb
@@ -340,7 +340,7 @@ export const getAgentDisplayName = (agentName: string): string => {
         .replace(/\bAi\b/g, 'AI')          // AI instead of Ai
         .replace(/\bUi\b/g, 'UI')          // UI instead of Ui
         .replace(/\bDb\b/g, 'DB');         // DB instead of Db
-    
+
     return cleanName || 'Assistant';
 };
 
@@ -352,22 +352,37 @@ export const getAgentDisplayNameWithSuffix = (agentName: string): string => {
     return `${baseName} Agent`;
 };
 
+/**
+ * Get agent icon with custom styling override
+ */
 /**
  * Get agent icon with custom styling override
  */
 export const getStyledAgentIcon = (
-    agentName: string, 
+    agentName: string,
     customStyle: React.CSSProperties,
-    planData?: any, 
+    planData?: any,
     planApprovalRequest?: any
 ): React.ReactNode => {
     const icon = getAgentIcon(agentName, planData, planApprovalRequest);
-    
+
     if (React.isValidElement(icon)) {
-        return React.cloneElement(icon, {
-            style: { ...icon.props.style, ...customStyle }
-        });
+        try {
+            // Safely merge styles
+            const mergedStyle = {
+                ...(icon.props as any)?.style,
+                ...customStyle
+            };
+
+            return React.cloneElement(icon as React.ReactElement<any>, {
+                style: mergedStyle
+            });
+        } catch (error) {
+            // Fallback: return original icon if cloning fails
+            console.warn('Failed to apply custom style to agent icon:', error);
+            return icon;
+        }
     }
-    
+
     return icon;
 };