Added pretty printing of type names for dashboard

leosperry · Oct 26, 2024 · 8dc5f31 · 8dc5f31
1 parent de2c1d9
commit 8dc5f31
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/HaKafkaNet/Implementations/Automations/BaseAutomations/ConditionalAutomation.cs b/src/HaKafkaNet/Implementations/Automations/BaseAutomations/ConditionalAutomation.cs
@@ -21,7 +21,6 @@ public virtual AutomationMetaData GetMetaData()
             Name = thisType.Name,
             Description = thisType.FullName,
             Enabled = true,
-            UnderlyingType = thisType.Name
         };
     }
 

diff --git a/src/HaKafkaNet/Implementations/Automations/Wrappers/AutomationWrapper.cs b/src/HaKafkaNet/Implementations/Automations/Wrappers/AutomationWrapper.cs
@@ -1,4 +1,6 @@
 
+using System.Text;
+
 namespace HaKafkaNet;
 
 [ExcludeFromDiscovery]
@@ -88,13 +90,10 @@ AutomationMetaData GetOrMakeMeta(string source)
                 Description = underlyingType.FullName,
                 Enabled = true,
                 KeyRequest = GenerateKey(source, underlyingType.Name),
-                UnderlyingType = underlyingType.Name
             };
         }
-        if (meta.UnderlyingType is null)
-        {
-            meta.UnderlyingType = underlyingType.Name;
-        }
+
+        meta.UnderlyingType = underlyingType.PrettyPrint();
 
         if (string.IsNullOrEmpty(meta.KeyRequest))
         {
@@ -138,4 +137,24 @@ private string GenerateKey(string source, string name)
     }    
 
     public IEnumerable<string> TriggerEntityIds() => _triggers;
+
+}
+
+static class PrettyPrintTypeNameExtensions
+{
+    public static string PrettyPrint(this Type type)
+    {
+        if (!type.IsGenericType)
+        {
+            return type.Name;
+        }
+        StringBuilder builder = new();
+        builder.Append(type.Name.Substring(0, type.Name.IndexOf('`')));
+        builder.Append('<');
+        builder.Append(string.Join(", ", type.GetGenericArguments().Select(t => t.PrettyPrint())));
+        builder.Append('>');
+
+        return builder.ToString();
+    }
 }
+
diff --git a/src/HaKafkaNet/Models/AutomationMetaData.cs b/src/HaKafkaNet/Models/AutomationMetaData.cs
@@ -30,7 +30,6 @@ internal static AutomationMetaData Create(object automation)
             Name = automation.GetType().Name,
             Description = automation.GetType().Name,
             Enabled = true,
-            UnderlyingType = automation.GetType().Name
         };
     }
 }