log viewer improvements (#147)

ErsatzTV.Application/Logs/LogEntryViewModel.cs

@@ -1,12 +1,12 @@
 using System;
+using Serilog.Events;
 
 namespace ErsatzTV.Application.Logs
 {
     public record LogEntryViewModel(
         int Id,
         DateTime Timestamp,
-        string Level,
+        LogEventLevel Level,
         string Exception,
-        string RenderedMessage,
-        string Properties);
+        string Message);
 }

ErsatzTV.Application/Logs/Mapper.cs

@@ -1,16 +1,45 @@
-using ErsatzTV.Core.Domain;
+using System;
+using System.Collections.Generic;
+using ErsatzTV.Core.Domain;
+using Newtonsoft.Json.Linq;
+using Serilog.Events;
 
 namespace ErsatzTV.Application.Logs
 {
     internal static class Mapper
     {
-        internal static LogEntryViewModel ProjectToViewModel(LogEntry logEntry) =>
-            new(
+        internal static LogEntryViewModel ProjectToViewModel(LogEntry logEntry)
+        {
+            string message = logEntry.RenderedMessage;
+            if (!string.IsNullOrWhiteSpace(logEntry.Properties))
+            {
+                foreach (KeyValuePair<string, JToken> property in JObject.Parse(logEntry.Properties))
+                {
+                    var token = $"{{{property.Key}}}";
+                    if (message.Contains(token))
+                    {
+                        message = message.Replace(token, property.Value.ToString());
+                    }
+
+                    var destructureToken = $"{{@{property.Key}}}";
+                    if (message.Contains(destructureToken))
+                    {
+                        message = message.Replace(destructureToken, property.Value.ToString());
+                    }
+                }
+            }
+
+            if (!Enum.TryParse(logEntry.Level, out LogEventLevel level))
+            {
+                level = LogEventLevel.Debug;
+            }
+
+            return new LogEntryViewModel(
                 logEntry.Id,
                 logEntry.Timestamp,
-                logEntry.Level,
+                level,
                 logEntry.Exception,
-                logEntry.RenderedMessage,
-                logEntry.Properties);
+                message);
+        }
     }
 }

ErsatzTV/Pages/Logs.razor

@@ -6,16 +6,22 @@
 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
     <MudTable FixedHeader="true" Dense="true" Items="_logEntries">
         <HeaderContent>
-            <MudTh>Timestamp</MudTh>
-            <MudTh>Level</MudTh>
+            <MudTh>
+                <MudTableSortLabel SortBy="new Func<LogEntryViewModel, object>(x => x.Timestamp)">
+                    Timestamp
+                </MudTableSortLabel>
+            </MudTh>
+            <MudTh>
+                <MudTableSortLabel SortBy="new Func<LogEntryViewModel, object>(x => x.Level)">
+                    Level
+                </MudTableSortLabel>
+            </MudTh>
             <MudTh>Message</MudTh>
-            <MudTh>Properties</MudTh>
         </HeaderContent>
         <RowTemplate>
             <MudTd DataLabel="Timestamp">@context.Timestamp</MudTd>
             <MudTd DataLabel="Level">@context.Level</MudTd>
-            <MudTd DataLabel="Message">@context.RenderedMessage</MudTd>
-            <MudTd DataLabel="Message">@context.Properties</MudTd>
+            <MudTd DataLabel="Message">@context.Message</MudTd>
         </RowTemplate>
         <PagerContent>
             <MudTablePager/>