Move packages to top level under each environment

Co-authored-by: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com>

Author: Copilot

src/features/views/projectView.ts

@@ -21,8 +21,6 @@ import {
     ProjectEnvironmentInfo,
     ProjectItem,
     ProjectPackage,
-    ProjectPackageRootInfoTreeItem,
-    ProjectPackageRootTreeItem,
     ProjectTreeItem,
     ProjectTreeItemKind,
 } from './treeViewItems';
@@ -34,7 +32,7 @@ export class ProjectView implements TreeDataProvider<ProjectTreeItem> {
     >();
     private projectViews: Map<string, ProjectItem> = new Map();
     private revealMap: Map<string, ProjectEnvironment> = new Map();
-    private packageRoots: Map<string, ProjectPackageRootTreeItem> = new Map();
+    private packageRoots: Map<string, ProjectEnvironment> = new Map();
     private disposables: Disposable[] = [];
     private debouncedUpdateProject = createSimpleDebounce(500, () => this.updateProject());
     public constructor(private envManagers: EnvironmentManagers, private projectManager: PythonProjectManager) {
@@ -83,7 +81,8 @@ export class ProjectView implements TreeDataProvider<ProjectTreeItem> {
 
     private updatePackagesForEnvironment(e: PythonEnvironment): void {
         const views: ProjectTreeItem[] = [];
-        this.packageRoots.forEach((v) => {
+        // Look for environments matching this environment ID and refresh them
+        this.revealMap.forEach((v) => {
             if (v.environment.envId.id === e.envId.id) {
                 views.push(v);
             }
@@ -193,32 +192,24 @@ export class ProjectView implements TreeDataProvider<ProjectTreeItem> {
             const pkgManager = this.envManagers.getPackageManager(uri);
             const environment = environmentItem.environment;
 
-            const views: ProjectTreeItem[] = [];
+            if (!pkgManager) {
+                return [new ProjectEnvironmentInfo(environmentItem, ProjectViews.noPackageManager)];
+            }
 
-            if (pkgManager) {
-                const item = new ProjectPackageRootTreeItem(environmentItem, pkgManager, environment);
-                this.packageRoots.set(uri ? uri.fsPath : 'global', item);
-                views.push(item);
-            } else {
-                views.push(new ProjectEnvironmentInfo(environmentItem, ProjectViews.noPackageManager));
+            let packages = await pkgManager.getPackages(environment);
+            if (!packages) {
+                return [new ProjectEnvironmentInfo(environmentItem, ProjectViews.noPackages)];
             }
-            return views;
-        }
 
-        if (element.kind === ProjectTreeItemKind.packageRoot) {
-            const root = element as ProjectPackageRootTreeItem;
-            const manager = root.manager;
-            const environment = root.environment;
-            let packages = await manager.getPackages(environment);
-            const views: ProjectTreeItem[] = [];
+            // Store the reference for refreshing packages
+            this.packageRoots.set(uri ? uri.fsPath : 'global', environmentItem);
 
-            if (packages) {
-                return packages.map((p) => new ProjectPackage(root, p, manager));
-            } else {
-                views.push(new ProjectPackageRootInfoTreeItem(root, ProjectViews.noPackages));
-            }
+            // Return packages directly under the environment
+            return packages.map((p) => new ProjectPackage(environmentItem, p, pkgManager));
         }
 
+        // We no longer need to handle packageRoot items as they are not created anymore
+
         return undefined;
     }
     getParent(element: ProjectTreeItem): ProviderResult<ProjectTreeItem> {

src/features/views/treeViewItems.ts

@@ -382,7 +382,7 @@ export class ProjectPackage implements ProjectTreeItem {
     public readonly id: string;
     public readonly treeItem: TreeItem;
     constructor(
-        public readonly parent: ProjectPackageRootTreeItem,
+        public readonly parent: ProjectEnvironment,
         public readonly pkg: Package,
         public readonly manager: InternalPackageManager,
     ) {
@@ -395,7 +395,7 @@ export class ProjectPackage implements ProjectTreeItem {
         this.treeItem = item;
     }
 
-    static getId(projectEnv: ProjectPackageRootTreeItem, pkg: Package): string {
+    static getId(projectEnv: ProjectEnvironment, pkg: Package): string {
         return `${projectEnv.id}>>>${pkg.pkgId}`;
     }
 }