chore: dev-v4 to main

Author: Avijit-Microsoft

docs/AVMPostDeploymentGuide.md

@@ -76,9 +76,7 @@ The post-deployment process is automated through a single PowerShell or Bash scr
 
 #### Execute the Script:
 
-1. **Choose the appropriate command based on your deployment method and OS:**
-
-   **If you deployed using custom templates, ARM/Bicep deployments, or `az deployment group` commands:**
+1. **Run the appropriate command based on your OS:**
 
    - **For PowerShell (Windows/Linux/macOS):**
 
@@ -91,23 +89,8 @@ The post-deployment process is automated through a single PowerShell or Bash scr
      bash infra/scripts/selecting_team_config_and_data.sh --resource-group "<your-resource-group-name>"
      ```
 
-   **If you deployed using `azd up` command:**
-
-   - **For PowerShell (Windows/Linux/macOS):**
-
-     ```powershell
-     infra\scripts\Selecting-Team-Config-And-Data.ps1
-     ```
-
-   - **For Bash (Linux/macOS/WSL):**
-     ```bash
-     bash infra/scripts/selecting_team_config_and_data.sh
-     ```
-
    > **Note**: Replace `<your-resource-group-name>` with the actual name of the resource group containing your deployed Azure resources.
 
-   > **💡 Tip**: Since this guide is for AVM deployments, you'll most likely use the first command with the `-ResourceGroup` parameter.
-
 ### Step 3: Provide Required Information
 
 During script execution, you'll be prompted for:

src/frontend/src/components/content/PlanPanelLeft.tsx

@@ -36,7 +36,8 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
   onTeamUpload,
   isHomePage,
   selectedTeam: parentSelectedTeam,
-  onNavigationWithAlert
+  onNavigationWithAlert,
+  isLoadingTeam
 }) => {
   const { dispatchToast } = useToastController("toast");
   const navigate = useNavigate();
@@ -218,7 +219,7 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
 
           {!isHomePage && (
             <TeamSelected
-              selectedTeam={TeamService.getStoredTeam()}
+              selectedTeam={selectedTeam}
             />
           )}
 
@@ -247,6 +248,7 @@ const PlanPanelLeft: React.FC<PlanPanelLefProps> = ({
           onTaskSelect={handleTaskSelect}
           loading={plansLoading}
           selectedTaskId={selectedTaskId ?? undefined}
+          isLoadingTeam={isLoadingTeam}
         />
 
         <PanelFooter>

src/frontend/src/components/content/TaskList.tsx

@@ -22,6 +22,7 @@ const TaskList: React.FC<TaskListProps> = ({
   onTaskSelect,
   loading,
   selectedTaskId,
+  isLoadingTeam
 }) => {
   const renderTaskItem = (task: Task) => {
     const isActive = task.id === selectedTaskId;
@@ -84,7 +85,7 @@ const TaskList: React.FC<TaskListProps> = ({
             Completed
           </AccordionHeader>
           <AccordionPanel>
-            {loading
+            {(loading || isLoadingTeam)
               ? Array.from({ length: 5 }, (_, i) =>
                 renderSkeleton(`completed-${i}`)
               )

src/frontend/src/models/planPanelLeft.tsx

@@ -9,4 +9,5 @@ export interface PlanPanelLefProps {
     isHomePage: boolean;
     selectedTeam?: TeamConfig | null;
     onNavigationWithAlert?: (navigationFn: () => void) => void;
+    isLoadingTeam?: boolean;
 }

src/frontend/src/models/taskList.tsx

@@ -10,4 +10,5 @@ export interface TaskListProps {
     onTaskSelect: (taskId: string) => void;
     loading?: boolean;
     selectedTaskId?: string;
+    isLoadingTeam?: boolean;
 }

src/frontend/src/pages/HomePage.tsx

@@ -200,6 +200,7 @@ const HomePage: React.FC = () => {
                         onTeamUpload={handleTeamUpload}
                         isHomePage={true}
                         selectedTeam={selectedTeam}
+                        isLoadingTeam={isLoadingTeam}
                     />
                     <Content>
                         <ContentToolbar

src/frontend/src/pages/PlanPage.tsx

@@ -715,6 +715,12 @@ const PlanPage: React.FC = () => {
         initializePlanLoading();
     }, [planId, loadPlanData, resetPlanVariables, setErrorLoading]);
 
+    useEffect(() => {
+        if (planData?.team) {
+            setSelectedTeam(planData.team);
+        }
+    }, [planData, setSelectedTeam]);
+
     if (errorLoading) {
         return (
             <CoralShellColumn>