Add CombinedTags column

Author: thgossler

AzTagger/AzTagger.csproj

@@ -4,7 +4,7 @@
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net9.0-windows7.0</TargetFramework>
 		<UseWindowsForms>true</UseWindowsForms>
-		<Version>1.0.14.0</Version>
+		<Version>1.0.15.0</Version>
 		<Authors>Thomas Gossler</Authors>
 		<Description>
 			A Windows Desktop GUI application for fast and flexible querying of Azure resources
@@ -18,8 +18,8 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 		<ApplicationIcon>images\icon.ico</ApplicationIcon>
-		<AssemblyVersion>1.0.14.0</AssemblyVersion>
-		<FileVersion>1.0.14.0</FileVersion>
+		<AssemblyVersion>1.0.15.0</AssemblyVersion>
+		<FileVersion>1.0.15.0</FileVersion>
 	</PropertyGroup>
 
 

AzTagger/MainForm.cs

@@ -132,6 +132,7 @@ public partial class MainForm : Form
     SubscriptionTags, 
     ResourceGroupTags = ResourceGroupTags_dynamic, 
     ResourceTags = ResourceTags_dynamic
+| extend CombinedTags = bag_merge(ResourceTags, ResourceGroupTags, SubscriptionTags)
 | order by EntityType desc, (tolower(SubscriptionName)) asc, (tolower(ResourceGroup)) asc, (tolower(ResourceName)) asc
 ";
 
@@ -808,7 +809,7 @@ private async void MenuItem_RefreshTags_Click(object sender, EventArgs e)
                 .ToList();
 
             var resourceIds = string.Join(", ", selectedResources.Select(r => $"'{r.Id}'"));
-            var query = _baseQuery + $@"| where Id in ({resourceIds}) | project Id, SubscriptionTags, ResourceGroupTags, ResourceTags";
+            var query = _baseQuery + $@"| where Id in ({resourceIds}) | project Id, SubscriptionTags, ResourceGroupTags, ResourceTags, CombinedTags";
 
             var updatedResources = await _azureService.QueryResourcesAsync(query);
 
@@ -820,6 +821,7 @@ private async void MenuItem_RefreshTags_Click(object sender, EventArgs e)
                     localResource.SubscriptionTags = updatedResource.SubscriptionTags;
                     localResource.ResourceGroupTags = updatedResource.ResourceGroupTags;
                     localResource.ResourceTags = updatedResource.ResourceTags;
+                    localResource.CombinedTags = updatedResource.CombinedTags;
                 }
             }
 
@@ -996,7 +998,8 @@ private void DataGridView_Results_CellMouseEnter(object sender, DataGridViewCell
             if (column != null &&
                 column.DataPropertyName == "ResourceTags" ||
                 column.DataPropertyName == "ResourceGroupTags" ||
-                column.DataPropertyName == "SubscriptionTags")
+                column.DataPropertyName == "SubscriptionTags" ||
+                column.DataPropertyName == "CombinedTags")
             {
                 _currentCellEventArgs = e;
                 _tooltipTimer.Start();
@@ -1039,7 +1042,8 @@ private void ToolTipTimer_Tick(object sender, EventArgs e)
         var column = _gvwResults.Columns[cellEventArgs.ColumnIndex];
         if (column.DataPropertyName == "ResourceTags" ||
             column.DataPropertyName == "ResourceGroupTags" ||
-            column.DataPropertyName == "SubscriptionTags")
+            column.DataPropertyName == "SubscriptionTags" ||
+            column.DataPropertyName == "CombinedTags")
         {
             var tags = cell.Value as IDictionary<string, string>;
             if (tags != null && tags.Count > 0)
@@ -1108,7 +1112,8 @@ private void DataGridView_Results_ColumnHeaderMouseDoubleClick(object sender, Da
         {
             if (columnName == "ResourceTags" ||
                 columnName == "ResourceGroupTags" ||
-                columnName == "SubscriptionTags")
+                columnName == "SubscriptionTags" ||
+                columnName == "CombinedTags")
             {
                 var queryText = $"| where {columnName}[''] =~ ''";
                 _txtSearchQuery.Text = queryText;

AzTagger/Models/Resource.cs

@@ -17,4 +17,5 @@ public class Resource
     public IDictionary<string, string> SubscriptionTags { get; set; }
     public IDictionary<string, string> ResourceGroupTags { get; set; }
     public IDictionary<string, string> ResourceTags { get; set; }
+    public IDictionary<string, string> CombinedTags { get; set; }
 }