Add Tenants view

package.json

@@ -238,20 +238,20 @@
                 "category": "Azure"
             },
             {
-                "command": "azureTenant.refresh",
+                "command": "azureTenantsView.refresh",
                 "title": "%azureResourceGroups.refresh%",
                 "category": "Azure",
                 "icon": "$(refresh)"
             },
             {
-                "command": "azureTenant.refreshTree",
+                "command": "azureTenantsView.refreshTree",
                 "title": "%azureResourceGroups.refresh%",
                 "category": "Azure",
                 "icon": "$(refresh)"
             },
             {
-                "command": "azureTenant.signInToTenant",
-                "title": "%azureTenant.signInToTenant%",
+                "command": "azureTenantsView.signInToTenant",
+                "title": "%azureTenantsView.signInToTenant%",
                 "category": "Azure",
                 "icon": "$(sign-in)"
             }
@@ -291,7 +291,7 @@
                     "visibility": "visible"
                 },
                 {
-                    "id": "azureTenant",
+                    "id": "azureTenantsView",
                     "name": "Accounts & Tenants",
                     "visibility": "collapsed"
                 },
@@ -379,8 +379,8 @@
                     "group": "navigation@10"
                 },
                 {
-                    "command": "azureTenant.refreshTree",
-                    "when": "view == azureTenant",
+                    "command": "azureTenantsView.refreshTree",
+                    "when": "view == azureTenantsView",
                     "group": "navigation@10"
                 },
                 {
@@ -461,13 +461,13 @@
                     "group": "9@1"
                 },
                 {
-                    "command": "azureTenant.signInToTenant",
-                    "when": "view == azureTenant && viewItem =~ /tenantNameNotSignedIn/",
+                    "command": "azureTenantsView.signInToTenant",
+                    "when": "view == azureTenantsView && viewItem =~ /tenantNameNotSignedIn/",
                     "group": "inline@1"
                 },
                 {
-                    "command": "azureTenant.signInToTenant",
-                    "when": "view == azureTenant && viewItem =~ /tenantNameNotSignedIn/",
+                    "command": "azureTenantsView.signInToTenant",
+                    "when": "view == azureTenantsView && viewItem =~ /tenantNameNotSignedIn/",
                     "group": "1@1"
                 }
             ],
@@ -493,7 +493,7 @@
                     "when": "never"
                 },
                 {
-                    "command": "azureTenant.refresh",
+                    "command": "azureTenantsView.refresh",
                     "when": "never"
                 },
                 {

package.nls.json

@@ -15,8 +15,8 @@
     "azureResourceGroups.openInPortal": "Open in Portal",
     "azureResourceGroups.refresh": "Refresh",
     "azureWorkspace.refresh": "Refresh Workspace",
-    "azureTenant.refresh": "Refresh Accounts & Tenants",
-    "azureTenant.signInToTenant": "Sign in to Tenant",
+    "azureTenantsView.refresh": "Refresh Accounts & Tenants",
+    "azureTenantsView.signInToTenant": "Sign in to Tenant",
     "azureResourceGroups.selectedSubscriptions": "Selected Subscriptions",
     "azureResourceGroups.revealResource": "Reveal Resource",
     "azureResourceGroups.viewProperties": "View Properties",

src/commands/registerCommands.ts

@@ -41,7 +41,7 @@ export function registerCommands(): void {
     registerCommand('azureResourceGroups.refreshTree', () => ext.actions.refreshAzureTree());
     registerCommand('azureWorkspace.refreshTree', () => ext.actions.refreshWorkspaceTree());
     registerCommand('azureFocusView.refreshTree', () => ext.actions.refreshFocusTree());
-    registerCommand('azureTenant.refreshTree', () => ext.actions.refreshTenantTree());
+    registerCommand('azureTenantsView.refreshTree', () => ext.actions.refreshTenantTree());
 
     // v1.5 client extensions attach these commands to tree item context menus for refreshing their tree items
     registerCommand('azureResourceGroups.refresh', async (context, node?: ResourceGroupsItem) => {
@@ -65,12 +65,12 @@ export function registerCommands(): void {
         ext.actions.refreshFocusTree(node);
     });
 
-    registerCommand('azureTenant.refresh', async (context, node?: ResourceGroupsItem) => {
+    registerCommand('azureTenantsView.refresh', async (context, node?: ResourceGroupsItem) => {
         await handleAzExtTreeItemRefresh(context, node); // for compatibility with v1.5 client extensions
         ext.actions.refreshTenantTree(node);
     });
 
-    registerCommand('azureTenant.signInToTenant', async (_context, node: TenantTreeItem, account?: AuthenticationSessionAccountInformation) => {
+    registerCommand('azureTenantsView.signInToTenant', async (_context, node: TenantTreeItem, account?: AuthenticationSessionAccountInformation) => {
         await (await ext.subscriptionProviderFactory()).signIn(node.tenantId, account);
         ext.actions.refreshTenantTree(node);
     });

src/extension.ts

@@ -154,7 +154,7 @@ export async function activate(context: vscode.ExtensionContext, perfStats: { lo
     });
 
     const tenantResourcesBranchDataItemCache = new BranchDataItemCache();
-    const tenantResourceTreeDataProvider = registerTenantTree(context, {
+    registerTenantTree(context, {
         tenantResourceProviderManager,
         tenantResourceBranchDataProviderManager,
         refreshEvent: refreshTenantTreeEmitter.event,
@@ -173,7 +173,7 @@ export async function activate(context: vscode.ExtensionContext, perfStats: { lo
                         azureResourceTreeDataProvider,
                         workspaceResourceProviderManager,
                         workspaceResourceBranchDataProviderManager,
-                        workspaceResourceTreeDataProvider
+                        workspaceResourceTreeDataProvider,
                     ),
                     activity: {
                         registerActivity
@@ -188,7 +188,6 @@ export async function activate(context: vscode.ExtensionContext, perfStats: { lo
 
     ext.appResourceTree = new CompatibleAzExtTreeDataProvider(azureResourceTreeDataProvider);
     ext.workspaceTree = new CompatibleAzExtTreeDataProvider(workspaceResourceTreeDataProvider);
-    ext.tenantTree = new CompatibleAzExtTreeDataProvider(tenantResourceTreeDataProvider);
 
     const getSubscriptions: (filter: boolean) => Promise<AzureSubscription[]> =
         async (filter: boolean) => { return await (await getAzureSubscriptionProvider(azureResourceTreeDataProvider)).getSubscriptions(filter) };

src/extensionVariables.ts

@@ -33,7 +33,6 @@ export namespace ext {
     // TODO: do we need this? only used by load more command
     export let workspaceTree: AzExtTreeDataProvider;
     export let workspaceTreeView: TreeView<unknown>;
-    export let tenantTree: AzExtTreeDataProvider;
     export let tenantTreeView: TreeView<unknown>
     export let activityLogTree: AzExtTreeDataProvider;
     export let activityLogTreeItem: ActivityLogTreeItem;

src/tree/OnGetChildrenBase.ts

@@ -19,36 +19,40 @@ export async function OnGetChildrenBase(subscriptionProvider: AzureSubscriptionP
 
     if (subscriptionProvider) {
         if (isLoggingIn()) {
-            return [new GenericItem(
-                localize('signingIn', 'Waiting for Azure sign-in...'),
-                {
-                    commandId: 'azureResourceGroups.logIn',
-                    iconPath: new vscode.ThemeIcon('loading~spin')
-                }
-            )];
-        } else if (!(await subscriptionProvider.isSignedIn())) {
-            children.push(new GenericItem(
-                localize('signInLabel', 'Sign in to Azure...'),
-                {
-                    commandId: 'azureResourceGroups.logIn',
-                    iconPath: new vscode.ThemeIcon('sign-in')
-                }
-            ));
-            if (tdp) {
-                children.push(new GenericItem(
-                    localize('createAccountLabel', 'Create an Azure Account...'),
+            return [
+                new GenericItem(
+                    localize('signingIn', 'Waiting for Azure sign-in...'),
                     {
-                        commandId: 'azureResourceGroups.openUrl',
-                        commandArgs: ['https://aka.ms/VSCodeCreateAzureAccount'],
-                        iconPath: new vscode.ThemeIcon('add')
-                    }));
-                children.push(new GenericItem(
-                    localize('createStudentAccount', 'Create an Azure for Students Account...'),
+                        commandId: 'azureResourceGroups.logIn',
+                        iconPath: new vscode.ThemeIcon('loading~spin')
+                    }
+                )];
+        } else if (!(await subscriptionProvider.isSignedIn())) {
+            children.push(
+                new GenericItem(
+                    localize('signInLabel', 'Sign in to Azure...'),
                     {
-                        commandId: 'azureResourceGroups.openUrl',
-                        commandArgs: ['https://aka.ms/student-account'],
-                        iconPath: new vscode.ThemeIcon('mortar-board')
-                    }));
+                        commandId: 'azureResourceGroups.logIn',
+                        iconPath: new vscode.ThemeIcon('sign-in')
+                    }
+                ));
+            if (tdp) {
+                children.push(
+                    new GenericItem(
+                        localize('createAccountLabel', 'Create an Azure Account...'),
+                        {
+                            commandId: 'azureResourceGroups.openUrl',
+                            commandArgs: ['https://aka.ms/VSCodeCreateAzureAccount'],
+                            iconPath: new vscode.ThemeIcon('add')
+                        }));
+                children.push(
+                    new GenericItem(
+                        localize('createStudentAccount', 'Create an Azure for Students Account...'),
+                        {
+                            commandId: 'azureResourceGroups.openUrl',
+                            commandArgs: ['https://aka.ms/student-account'],
+                            iconPath: new vscode.ThemeIcon('mortar-board')
+                        }));
             }
         }
     }

src/tree/azure/AzureResourceTreeDataProvider.ts

@@ -67,6 +67,7 @@ export class AzureResourceTreeDataProvider extends AzureResourceTreeDataProvider
             return await element.getChildren();
         } else {
             const subscriptionProvider = await getAzureSubscriptionProvider(this);
+            // When a user is signed in 'OnGetChildrenBase' will return the no children
             const children: ResourceGroupsItem[] = await OnGetChildrenBase(subscriptionProvider, this);
 
             if (children.length === 0) {

src/tree/tenants/registerTenantTree.ts

@@ -30,7 +30,7 @@ export function registerTenantTree(context: vscode.ExtensionContext, options: Re
         new TenantResourceTreeDataProvider(tenantResourceBranchDataProviderManager, tenantResourceBranchDataProviderManager.onDidChangeTreeData, refreshEvent, tenantResourceProviderManager, itemCache);
     context.subscriptions.push(tenantResourceTreeDataProvider);
 
-    const treeView = createTreeView('azureTenant', {
+    const treeView = createTreeView('azureTenantsView', {
         canSelectMany: true,
         showCollapseAll: true,
         itemCache,
@@ -60,7 +60,7 @@ async function updateTenantsSetting(_context: IActionContext, tenants: vscode.Tr
         } else if (state === vscode.TreeItemCheckboxState.Checked) {
             const treeItem = await tenantTreeItem.getTreeItem();
             if (treeItem?.contextValue === 'tenantNameNotSignedIn') {
-                await vscode.commands.executeCommand('azureTenant.signInToTenant', tenantTreeItem, tenantTreeItem.account);
+                await vscode.commands.executeCommand('azureTenantsView.signInToTenant', tenantTreeItem, tenantTreeItem.account);
                 ext.actions.refreshTenantTree();
             }
             unselectedTenantsSet.delete(getKeyForTenant(tenantTreeItem.tenantId, tenantTreeItem.account.id));