updated summaries to show specific tables on relevant componentTypes

Author: Bircck

Generator/DTO/SolutionComponent.cs

@@ -62,7 +62,8 @@ public record SolutionComponentData(
     string SchemaName,
     SolutionComponentType ComponentType,
     Guid ObjectId,
-    bool IsExplicit);
+    bool IsExplicit,
+    string? RelatedTable = null);
 
 /// <summary>
 /// Collection of solution components grouped by solution.

Generator/DataverseService.cs

@@ -305,6 +305,27 @@ public DataverseService(
                         r => r.MetadataId!.Value,
                         r => r.SchemaName);
 
+                // Build entity lookups for attributes, relationships, and keys (maps component ID to parent entity name)
+                var attributeEntityLookup = entitiesInSolutionMetadata
+                    .SelectMany(e => e.Attributes.Where(a => a.MetadataId.HasValue)
+                        .Select(a => (AttributeId: a.MetadataId!.Value, EntityName: e.DisplayName.ToLabelString() ?? e.LogicalName)))
+                    .ToDictionary(x => x.AttributeId, x => x.EntityName);
+
+                var relationshipEntityLookup = entitiesInSolutionMetadata
+                    .SelectMany(e => e.ManyToManyRelationships.Cast<RelationshipMetadataBase>()
+                        .Concat(e.OneToManyRelationships)
+                        .Concat(e.ManyToOneRelationships)
+                        .Where(r => r.MetadataId.HasValue)
+                        .Select(r => (RelationshipId: r.MetadataId!.Value, EntityName: e.DisplayName.ToLabelString() ?? e.LogicalName)))
+                    .DistinctBy(x => x.RelationshipId)
+                    .ToDictionary(x => x.RelationshipId, x => x.EntityName);
+
+                var keyEntityLookup = entitiesInSolutionMetadata
+                    .SelectMany(e => (e.Keys ?? Array.Empty<EntityKeyMetadata>())
+                        .Where(k => k.MetadataId.HasValue)
+                        .Select(k => (KeyId: k.MetadataId!.Value, EntityName: e.DisplayName.ToLabelString() ?? e.LogicalName)))
+                    .ToDictionary(x => x.KeyId, x => x.EntityName);
+
                 // Build solution name lookup
                 var solutionNameLookup = solutionLookup.ToDictionary(
                     kvp => kvp.Key,
@@ -315,7 +336,10 @@ public DataverseService(
                     solutionNameLookup,
                     entityNameLookup,
                     attributeNameLookup,
-                    relationshipNameLookup);
+                    relationshipNameLookup,
+                    attributeEntityLookup,
+                    relationshipEntityLookup,
+                    keyEntityLookup);
 
                 logger.LogInformation($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}] Extracted components for {solutionComponentCollections.Count} solutions");
             }

Generator/Services/SolutionComponentExtractor.cs

@@ -48,33 +48,39 @@ public class SolutionComponentExtractor
     };
 
     /// <summary>
-    /// Maps component type codes to their Dataverse table, name column, and primary key column for name resolution.
+    /// Maps component type codes to their Dataverse table, name column, primary key column, and optional entity column for name resolution.
     /// Primary key is optional - if null, defaults to tablename + "id".
+    /// EntityColumn is used to get the related table for components like forms and views.
     /// </summary>
-    private static readonly Dictionary<int, (string TableName, string NameColumn, string? PrimaryKey)> ComponentTableMap = new()
+    private static readonly Dictionary<int, (string TableName, string NameColumn, string? PrimaryKey, string? EntityColumn)> ComponentTableMap = new()
     {
-        { 20, ("role", "name", null) },
-        { 26, ("savedquery", "name", null) },
-        { 29, ("workflow", "name", null) },
-        { 50, ("ribboncustomization", "entity", null) },
-        { 59, ("savedqueryvisualization", "name", null) },
-        { 60, ("systemform", "name", "formid") },  // systemform uses formid, not systemformid
-        { 61, ("webresource", "name", null) },
-        { 62, ("sitemap", "sitemapname", null) },
-        { 63, ("connectionrole", "name", null) },
-        { 65, ("hierarchyrule", "name", null) },
-        { 66, ("customcontrol", "name", null) },
-        { 70, ("fieldsecurityprofile", "name", null) },
-        { 80, ("appmodule", "name", "appmoduleid") },  // appmodule uses appmoduleid
-        { 91, ("pluginassembly", "name", null) },
-        { 92, ("sdkmessageprocessingstep", "name", null) },
-        { 300, ("canvasapp", "name", null) },
-        { 372, ("connectionreference", "connectionreferencedisplayname", null) },
-        { 380, ("environmentvariabledefinition", "displayname", null) },
-        { 381, ("environmentvariablevalue", "schemaname", null) },
-        { 418, ("workflow", "name", null) }, // Dataflows are stored in workflow table with category=6
+        { 20, ("role", "name", null, null) },
+        { 26, ("savedquery", "name", null, "returnedtypecode") },  // Views have returnedtypecode for the entity
+        { 29, ("workflow", "name", null, null) },
+        { 50, ("ribboncustomization", "entity", null, null) },
+        { 59, ("savedqueryvisualization", "name", null, null) },
+        { 60, ("systemform", "name", "formid", "objecttypecode") },  // Forms have objecttypecode for the entity
+        { 61, ("webresource", "name", null, null) },
+        { 62, ("sitemap", "sitemapname", null, null) },
+        { 63, ("connectionrole", "name", null, null) },
+        { 65, ("hierarchyrule", "name", null, null) },
+        { 66, ("customcontrol", "name", null, null) },
+        { 70, ("fieldsecurityprofile", "name", null, null) },
+        { 80, ("appmodule", "name", "appmoduleid", null) },  // appmodule uses appmoduleid
+        { 91, ("pluginassembly", "name", null, null) },
+        { 92, ("sdkmessageprocessingstep", "name", null, null) },
+        { 300, ("canvasapp", "name", null, null) },
+        { 372, ("connectionreference", "connectionreferencedisplayname", null, null) },
+        { 380, ("environmentvariabledefinition", "displayname", null, null) },
+        { 381, ("environmentvariablevalue", "schemaname", null, null) },
+        { 418, ("workflow", "name", null, null) }, // Dataflows are stored in workflow table with category=6
     };
 
+    /// <summary>
+    /// Component types that should have a related table displayed.
+    /// </summary>
+    private static readonly HashSet<int> ComponentTypesWithRelatedTable = new() { 2, 10, 14, 26, 60 };  // Attribute, Relationship, EntityKey, SavedQuery (View), SystemForm
+
     public SolutionComponentExtractor(ServiceClient client, ILogger<SolutionComponentExtractor> logger)
     {
         _client = client;
@@ -89,7 +95,10 @@ public async Task<List<SolutionComponentCollection>> ExtractSolutionComponentsAs
         Dictionary<Guid, string> solutionNameLookup,
         Dictionary<Guid, string>? entityNameLookup = null,
         Dictionary<Guid, string>? attributeNameLookup = null,
-        Dictionary<Guid, string>? relationshipNameLookup = null)
+        Dictionary<Guid, string>? relationshipNameLookup = null,
+        Dictionary<Guid, string>? attributeEntityLookup = null,
+        Dictionary<Guid, string>? relationshipEntityLookup = null,
+        Dictionary<Guid, string>? keyEntityLookup = null)
     {
         _logger.LogInformation($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}] Extracting solution components for {solutionIds.Count} solutions");
 
@@ -109,7 +118,7 @@ public async Task<List<SolutionComponentCollection>> ExtractSolutionComponentsAs
             .ToDictionary(g => g.Key, g => g.ToList());
 
         // Resolve names for each component type
-        var nameCache = await BuildNameCacheAsync(rawComponents, entityNameLookup, attributeNameLookup, relationshipNameLookup);
+        var nameCache = await BuildNameCacheAsync(rawComponents, entityNameLookup, attributeNameLookup, relationshipNameLookup, attributeEntityLookup, relationshipEntityLookup, keyEntityLookup);
 
         // Build the result collections
         var result = new List<SolutionComponentCollection>();
@@ -129,7 +138,8 @@ public async Task<List<SolutionComponentCollection>> ExtractSolutionComponentsAs
                     SchemaName: ResolveComponentSchemaName(c, nameCache),
                     ComponentType: (SolutionComponentType)c.ComponentType,
                     ObjectId: c.ObjectId,
-                    IsExplicit: c.IsExplicit))
+                    IsExplicit: c.IsExplicit,
+                    RelatedTable: ResolveRelatedTable(c, nameCache)))
                 .OrderBy(c => c.ComponentType)
                 .ThenBy(c => c.Name)
                 .ToList();
@@ -184,13 +194,16 @@ private async Task<List<RawComponentInfo>> QuerySolutionComponentsAsync(List<Gui
         return results;
     }
 
-    private async Task<Dictionary<(int ComponentType, Guid ObjectId), (string Name, string SchemaName)>> BuildNameCacheAsync(
+    private async Task<Dictionary<(int ComponentType, Guid ObjectId), (string Name, string SchemaName, string? RelatedTable)>> BuildNameCacheAsync(
         List<RawComponentInfo> components,
         Dictionary<Guid, string>? entityNameLookup,
         Dictionary<Guid, string>? attributeNameLookup,
-        Dictionary<Guid, string>? relationshipNameLookup)
+        Dictionary<Guid, string>? relationshipNameLookup,
+        Dictionary<Guid, string>? attributeEntityLookup,
+        Dictionary<Guid, string>? relationshipEntityLookup,
+        Dictionary<Guid, string>? keyEntityLookup)
     {
-        var cache = new Dictionary<(int, Guid), (string Name, string SchemaName)>();
+        var cache = new Dictionary<(int, Guid), (string Name, string SchemaName, string? RelatedTable)>();
 
         // Group components by type for batch queries
         var componentsByType = components
@@ -206,7 +219,7 @@ private async Task<List<RawComponentInfo>> QuerySolutionComponentsAsync(List<Gui
                 {
                     if (entityNameLookup.TryGetValue(objectId, out var name))
                     {
-                        cache[(componentType, objectId)] = (name, name);
+                        cache[(componentType, objectId)] = (name, name, null);
                     }
                 }
                 continue;
@@ -218,7 +231,8 @@ private async Task<List<RawComponentInfo>> QuerySolutionComponentsAsync(List<Gui
                 {
                     if (attributeNameLookup.TryGetValue(objectId, out var name))
                     {
-                        cache[(componentType, objectId)] = (name, name);
+                        var relatedTable = attributeEntityLookup?.GetValueOrDefault(objectId);
+                        cache[(componentType, objectId)] = (name, name, relatedTable);
                     }
                 }
                 continue;
@@ -230,18 +244,30 @@ private async Task<List<RawComponentInfo>> QuerySolutionComponentsAsync(List<Gui
                 {
                     if (relationshipNameLookup.TryGetValue(objectId, out var name))
                     {
-                        cache[(componentType, objectId)] = (name, name);
+                        var relatedTable = relationshipEntityLookup?.GetValueOrDefault(objectId);
+                        cache[(componentType, objectId)] = (name, name, relatedTable);
                     }
                 }
                 continue;
             }
 
-            // Skip types that need metadata API (9=OptionSet, 14=EntityKey) - use ObjectId as fallback
-            if (componentType == 9 || componentType == 14)
+            // EntityKey - use keyEntityLookup for related table
+            if (componentType == 14)
             {
                 foreach (var objectId in objectIds)
                 {
-                    cache[(componentType, objectId)] = (objectId.ToString(), objectId.ToString());
+                    var relatedTable = keyEntityLookup?.GetValueOrDefault(objectId);
+                    cache[(componentType, objectId)] = (objectId.ToString(), objectId.ToString(), relatedTable);
+                }
+                continue;
+            }
+
+            // Skip OptionSet - use ObjectId as fallback, no related table
+            if (componentType == 9)
+            {
+                foreach (var objectId in objectIds)
+                {
+                    cache[(componentType, objectId)] = (objectId.ToString(), objectId.ToString(), null);
                 }
                 continue;
             }
@@ -250,29 +276,36 @@ private async Task<List<RawComponentInfo>> QuerySolutionComponentsAsync(List<Gui
             if (ComponentTableMap.TryGetValue(componentType, out var tableInfo))
             {
                 var primaryKey = tableInfo.PrimaryKey ?? tableInfo.TableName + "id";
-                var names = await QueryComponentNamesAsync(tableInfo.TableName, tableInfo.NameColumn, primaryKey, objectIds);
-                foreach (var (objectId, name) in names)
+                var namesAndEntities = await QueryComponentNamesWithEntityAsync(tableInfo.TableName, tableInfo.NameColumn, primaryKey, tableInfo.EntityColumn, objectIds);
+                foreach (var (objectId, name, relatedTable) in namesAndEntities)
                 {
-                    cache[(componentType, objectId)] = (name, name);
+                    cache[(componentType, objectId)] = (name, name, relatedTable);
                 }
             }
         }
 
         return cache;
     }
 
-    private async Task<Dictionary<Guid, string>> QueryComponentNamesAsync(string tableName, string nameColumn, string primaryKey, List<Guid> objectIds)
+    private async Task<List<(Guid ObjectId, string Name, string? RelatedTable)>> QueryComponentNamesWithEntityAsync(
+        string tableName, string nameColumn, string primaryKey, string? entityColumn, List<Guid> objectIds)
     {
-        var result = new Dictionary<Guid, string>();
+        var result = new List<(Guid, string, string?)>();
 
         if (!objectIds.Any())
             return result;
 
         try
         {
+            var columns = new List<string> { primaryKey, nameColumn };
+            if (!string.IsNullOrEmpty(entityColumn))
+            {
+                columns.Add(entityColumn);
+            }
+
             var query = new QueryExpression(tableName)
             {
-                ColumnSet = new ColumnSet(primaryKey, nameColumn),
+                ColumnSet = new ColumnSet(columns.ToArray()),
                 Criteria = new FilterExpression(LogicalOperator.And)
                 {
                     Conditions =
@@ -287,7 +320,25 @@ private async Task<Dictionary<Guid, string>> QueryComponentNamesAsync(string tab
             {
                 var id = entity.GetAttributeValue<Guid>(primaryKey);
                 var name = entity.GetAttributeValue<string>(nameColumn) ?? id.ToString();
-                result[id] = name;
+                string? relatedTable = null;
+
+                if (!string.IsNullOrEmpty(entityColumn) && entity.Contains(entityColumn))
+                {
+                    // The entity column can be a string (logical name) or an int (object type code)
+                    var entityValue = entity[entityColumn];
+                    if (entityValue is string strValue)
+                    {
+                        relatedTable = strValue;
+                    }
+                    else if (entityValue is int intValue)
+                    {
+                        // Object type code - we'd need entity metadata to resolve this
+                        // For now, just store the numeric value as string
+                        relatedTable = intValue.ToString();
+                    }
+                }
+
+                result.Add((id, name, relatedTable));
             }
         }
         catch (Exception ex)
@@ -299,7 +350,7 @@ private async Task<Dictionary<Guid, string>> QueryComponentNamesAsync(string tab
         return result;
     }
 
-    private string ResolveComponentName(RawComponentInfo component, Dictionary<(int, Guid), (string Name, string SchemaName)> cache)
+    private string ResolveComponentName(RawComponentInfo component, Dictionary<(int, Guid), (string Name, string SchemaName, string? RelatedTable)> cache)
     {
         if (cache.TryGetValue((component.ComponentType, component.ObjectId), out var names))
         {
@@ -308,7 +359,7 @@ private string ResolveComponentName(RawComponentInfo component, Dictionary<(int,
         return component.ObjectId.ToString();
     }
 
-    private string ResolveComponentSchemaName(RawComponentInfo component, Dictionary<(int, Guid), (string Name, string SchemaName)> cache)
+    private string ResolveComponentSchemaName(RawComponentInfo component, Dictionary<(int, Guid), (string Name, string SchemaName, string? RelatedTable)> cache)
     {
         if (cache.TryGetValue((component.ComponentType, component.ObjectId), out var names))
         {
@@ -317,5 +368,19 @@ private string ResolveComponentSchemaName(RawComponentInfo component, Dictionary
         return component.ObjectId.ToString();
     }
 
+    private string? ResolveRelatedTable(RawComponentInfo component, Dictionary<(int, Guid), (string Name, string SchemaName, string? RelatedTable)> cache)
+    {
+        if (!ComponentTypesWithRelatedTable.Contains(component.ComponentType))
+        {
+            return null;
+        }
+
+        if (cache.TryGetValue((component.ComponentType, component.ObjectId), out var names))
+        {
+            return names.RelatedTable;
+        }
+        return null;
+    }
+
     private record RawComponentInfo(int ComponentType, Guid ObjectId, Guid SolutionId, bool IsExplicit);
 }