refactor: Enhance DeepnoteEnvironmentTreeDataProvider to include environment ID in info items

- Updated the creation of info items in DeepnoteEnvironmentTreeDataProvider to include the environment ID for better identification.
- Modified the createInfoItem method in DeepnoteEnvironmentTreeItem to accept an environment ID, ensuring consistent ID formatting.
- Adjusted unit tests to validate the changes in info item creation and ensure proper functionality.

Signed-off-by: Tomas Kislan <[email protected]>

Author: tkislan

src/kernels/deepnote/environments/deepnoteEnvironmentTreeDataProvider.node.ts

@@ -86,49 +86,64 @@ export class DeepnoteEnvironmentTreeDataProvider implements TreeDataProvider<Dee
             items.push(
                 DeepnoteEnvironmentTreeItem.createInfoItem(
                     'ports',
+                    config.id,
                     `Ports: jupyter=${config.serverInfo.jupyterPort}, lsp=${config.serverInfo.lspPort}`,
                     'port'
                 )
             );
-            items.push(DeepnoteEnvironmentTreeItem.createInfoItem('url', `URL: ${config.serverInfo.url}`, 'globe'));
+            items.push(
+                DeepnoteEnvironmentTreeItem.createInfoItem('url', config.id, `URL: ${config.serverInfo.url}`, 'globe')
+            );
         }
 
         // Python interpreter
         items.push(
             DeepnoteEnvironmentTreeItem.createInfoItem(
                 'python',
+                config.id,
                 `Python: ${config.pythonInterpreter.uri.fsPath}`,
                 'symbol-namespace'
             )
         );
 
         // Venv path
-        items.push(DeepnoteEnvironmentTreeItem.createInfoItem('venv', `Venv: ${config.venvPath.fsPath}`, 'folder'));
+        items.push(
+            DeepnoteEnvironmentTreeItem.createInfoItem('venv', config.id, `Venv: ${config.venvPath.fsPath}`, 'folder')
+        );
 
         // Packages
         if (config.packages && config.packages.length > 0) {
             items.push(
                 DeepnoteEnvironmentTreeItem.createInfoItem(
                     'packages',
+                    config.id,
                     `Packages: ${config.packages.join(', ')}`,
                     'package'
                 )
             );
         } else {
-            items.push(DeepnoteEnvironmentTreeItem.createInfoItem('packages', 'Packages: (none)', 'package'));
+            items.push(
+                DeepnoteEnvironmentTreeItem.createInfoItem('packages', config.id, 'Packages: (none)', 'package')
+            );
         }
 
         // Toolkit version
         if (config.toolkitVersion) {
             items.push(
-                DeepnoteEnvironmentTreeItem.createInfoItem('toolkit', `Toolkit: ${config.toolkitVersion}`, 'versions')
+                DeepnoteEnvironmentTreeItem.createInfoItem(
+                    'toolkit',
+                    config.id,
+                    `Toolkit: ${config.toolkitVersion}`,
+                    'versions'
+                )
             );
         }
 
         // Timestamps
         items.push(
             DeepnoteEnvironmentTreeItem.createInfoItem(
                 'created',
+                config.id,
                 `Created: ${config.createdAt.toLocaleString()}`,
                 'history'
             )
@@ -137,6 +152,7 @@ export class DeepnoteEnvironmentTreeDataProvider implements TreeDataProvider<Dee
         items.push(
             DeepnoteEnvironmentTreeItem.createInfoItem(
                 'lastUsed',
+                config.id,
                 `Last used: ${config.lastUsedAt.toLocaleString()}`,
                 'clock'
             )

src/kernels/deepnote/environments/deepnoteEnvironmentTreeItem.node.ts

@@ -49,11 +49,12 @@ export class DeepnoteEnvironmentTreeItem extends TreeItem {
      */
     public static createInfoItem(
         id: DeepnoteEnvironmentTreeInfoItemId,
+        environmentId: string,
         label: string,
         icon?: string
     ): DeepnoteEnvironmentTreeItem {
         const item = new DeepnoteEnvironmentTreeItem(EnvironmentTreeItemType.InfoItem, undefined, undefined, label);
-        item.id = `info-${id}`;
+        item.id = `info-${environmentId}-${id}`;
 
         if (icon) {
             item.iconPath = new ThemeIcon(icon);

src/kernels/deepnote/environments/deepnoteEnvironmentTreeItem.unit.test.ts

@@ -109,10 +109,10 @@ suite('DeepnoteEnvironmentTreeItem', () => {
                 EnvironmentStatus.Running
             );
 
-            const tooltip = item.tooltip as string;
+            const tooltip = `${item.tooltip}`;
             assert.include(tooltip, 'Test Environment');
             assert.include(tooltip, 'Running');
-            assert.include(tooltip, testInterpreter.uri.fsPath);
+            assert.include(tooltip, testInterpreter.uri.toString(true));
         });
 
         test('should include packages in tooltip when present', () => {
@@ -149,15 +149,20 @@ suite('DeepnoteEnvironmentTreeItem', () => {
         });
 
         test('should create info item with icon', () => {
-            const item = DeepnoteEnvironmentTreeItem.createInfoItem('ports', 'Port: 8888', 'circle-filled');
+            const item = DeepnoteEnvironmentTreeItem.createInfoItem(
+                'ports',
+                'test-config-id',
+                'Port: 8888',
+                'circle-filled'
+            );
 
             assert.strictEqual(item.label, 'Port: 8888');
             assert.instanceOf(item.iconPath, ThemeIcon);
             assert.strictEqual((item.iconPath as ThemeIcon).id, 'circle-filled');
         });
 
         test('should create info item without icon', () => {
-            const item = DeepnoteEnvironmentTreeItem.createInfoItem('ports', 'No icon');
+            const item = DeepnoteEnvironmentTreeItem.createInfoItem('ports', 'test-config-id', 'No icon');
 
             assert.strictEqual(item.label, 'No icon');
             assert.isUndefined(item.iconPath);