Fix Edit Tags and View Properties commands for resource groups (#475)

Fixes #468

Author: alexweininger

src/commands/tags/TagFileSystem.ts

@@ -29,13 +29,15 @@ export interface ITagsModel extends AzExtTreeFileSystemItem {
 }
 
 export class ResourceTags implements ITagsModel {
-    constructor(private readonly resource: AzureResource) { }
+    constructor(private readonly resource: AzureResource) {
+        this.displayType = resource.resourceGroup ? 'resource' : 'resource group';
+    }
 
     readonly id: string = this.resource.id;
     readonly subscription: AzureSubscription = this.resource.subscription;
 
     readonly displayName: string = this.resource.name;
-    readonly displayType: ITagsModel['displayType'] = 'resource';
+    readonly displayType: ITagsModel['displayType'];
 
     cTime: number;
     mTime: number;
@@ -44,9 +46,15 @@ export class ResourceTags implements ITagsModel {
         return await callWithTelemetryAndErrorHandling('getTags', async (context): Promise<Tags | undefined> => {
             const subscriptionContext = createSubscriptionContext(this.resource.subscription);
             const client = await createResourceClient([context, subscriptionContext]);
-            // use list because getById is only available for certain api versions and locations
-            const resources = await uiUtils.listAllIterator(client.resources.listByResourceGroup(nonNullValue(this.resource.resourceGroup)));
-            return resources.find(r => r.id === this.id)?.tags;
+
+            if (this.resource.resourceGroup) {
+                // use list because getById is only available for certain api versions and locations
+                const resources = await uiUtils.listAllIterator(client.resources.listByResourceGroup(nonNullValue(this.resource.resourceGroup)));
+                return resources.find(r => r.id === this.id)?.tags;
+            } else {
+                const resourceGroup = await client.resourceGroups.get(nonNullValue(this.resource.name));
+                return resourceGroup.tags;
+            }
         }) ?? {};
     }
 }

src/tree/v2/azure/AzureResourceGroupingManager.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AzExtResourceType, TreeItemIconPath } from '@microsoft/vscode-azext-utils';
+import { AzExtResourceType, nonNullValue, TreeItemIconPath } from '@microsoft/vscode-azext-utils';
 import { AzureResource } from '@microsoft/vscode-azext-utils/hostapi.v2';
 import * as vscode from 'vscode';
 import { azureExtensions } from '../../../azureExtensions';
@@ -67,7 +67,7 @@ export class AzureResourceGroupingManager extends vscode.Disposable {
         }
     }
 
-    private groupBy(parent: ResourceGroupsItem, context: ResourceGroupsTreeContext, resources: AzureResource[], keySelector: (resource: AzureResource) => string, labelSelector: (key: string) => string, iconSelector: (key: string) => TreeItemIconPath | undefined, initialGrouping?: { [key: string]: AzureResource[] }, contextValues?: string[], resourceTypeSelector?: (key: string) => AzExtResourceType | undefined): GroupingItem[] {
+    private groupBy(parent: ResourceGroupsItem, context: ResourceGroupsTreeContext, resources: AzureResource[], keySelector: (resource: AzureResource) => string, labelSelector: (key: string) => string, iconSelector: (key: string) => TreeItemIconPath | undefined, initialGrouping?: { [key: string]: AzureResource[] }, contextValues?: string[], resourceTypeSelector?: (key: string) => AzExtResourceType | undefined, resourceGroupSelector?: (key: string) => AzureResource): GroupingItem[] {
         initialGrouping = initialGrouping ?? {};
 
         const map = resources.reduce(
@@ -93,7 +93,8 @@ export class AzureResourceGroupingManager extends vscode.Disposable {
                 labelSelector(key),
                 map[key],
                 resourceTypeSelector?.(key),
-                parent);
+                parent,
+                resourceGroupSelector?.(key));
         });
     }
 
@@ -142,7 +143,9 @@ export class AzureResourceGroupingManager extends vscode.Disposable {
             key => key,
             () => treeUtils.getIconPath('resourceGroup'),
             initialGrouping,
-            ['azureResourceGroup']);
+            ['azureResourceGroup'],
+            undefined,
+            key => nonNullValue(resourceGroups.find(resource => resource.name.toLowerCase() === key.toLowerCase())));
 
         return groupedResources;
     }

src/tree/v2/azure/GroupingItem.ts

@@ -5,8 +5,9 @@
 
 import { OpenInPortalOptions } from '@microsoft/vscode-azext-azureutils';
 import { AzExtResourceType, createContextValue, ISubscriptionContext, TreeItemIconPath } from '@microsoft/vscode-azext-utils';
-import { AzureResource, AzureResourceBranchDataProvider, AzureResourceModel, AzureSubscription } from '@microsoft/vscode-azext-utils/hostapi.v2';
+import { AzureResource, AzureResourceBranchDataProvider, AzureResourceModel, AzureSubscription, ViewPropertiesModel } from '@microsoft/vscode-azext-utils/hostapi.v2';
 import * as vscode from 'vscode';
+import { ITagsModel, ResourceTags } from '../../../commands/tags/TagFileSystem';
 import { getIconPath } from '../../../utils/azureUtils';
 import { BranchDataItemOptions } from '../BranchDataProviderItem';
 import { ResourceGroupsItem } from '../ResourceGroupsItem';
@@ -25,6 +26,9 @@ function createPortalUrl(subscription: AzureSubscription, id: string, options?:
 export class GroupingItem implements ResourceGroupsItem {
     private description: string | undefined;
 
+    readonly viewProperties?: ViewPropertiesModel;
+    readonly tagsModel?: ITagsModel;
+
     constructor(
         public readonly context: ResourceGroupsTreeContext,
         private readonly resourceItemFactory: ResourceItemFactory<AzureResource>,
@@ -34,8 +38,17 @@ export class GroupingItem implements ResourceGroupsItem {
         public readonly label: string,
         public readonly resources: AzureResource[],
         public readonly resourceType: AzExtResourceType | undefined,
-        public readonly parent?: ResourceGroupsItem
-    ) { }
+        public readonly parent?: ResourceGroupsItem,
+        resourceGroup?: AzureResource,
+    ) {
+        if (resourceGroup) {
+            this.tagsModel = new ResourceTags(resourceGroup);
+            this.viewProperties = {
+                label: resourceGroup.name,
+                data: resourceGroup.raw
+            };
+        }
+    }
 
     // Needed for context menu commands on the group tree items. E.g. "Create..."
     public get subscription(): ISubscriptionContext {
@@ -98,8 +111,8 @@ export class GroupingItem implements ResourceGroupsItem {
     }
 }
 
-export type GroupingItemFactory = (context: ResourceGroupsTreeContext, contextValues: string[] | undefined, iconPath: TreeItemIconPath | undefined, label: string, resources: AzureResource[], resourceType: AzExtResourceType | undefined, parent: ResourceGroupsItem) => GroupingItem;
+export type GroupingItemFactory = (context: ResourceGroupsTreeContext, contextValues: string[] | undefined, iconPath: TreeItemIconPath | undefined, label: string, resources: AzureResource[], resourceType: AzExtResourceType | undefined, parent: ResourceGroupsItem, resourceGroup?: AzureResource) => GroupingItem;
 
 export function createGroupingItemFactory(resourceItemFactory: ResourceItemFactory<AzureResource>, branchDataProviderFactory: BranchDataProviderFactory): GroupingItemFactory {
-    return (context, contextValues, iconPath, label, resources, resourceType, parent) => new GroupingItem(context, resourceItemFactory, branchDataProviderFactory, contextValues, iconPath, label, resources, resourceType, parent);
+    return (context, contextValues, iconPath, label, resources, resourceType, parent, resourceGroup) => new GroupingItem(context, resourceItemFactory, branchDataProviderFactory, contextValues, iconPath, label, resources, resourceType, parent, resourceGroup);
 }