From 6d6caa78527ba3465d3c01c67b38f9af968e47f7 Mon Sep 17 00:00:00 2001
From: Ihor Sysak <sskpr.igor@gmail.com>
Date: Mon, 17 Jul 2023 17:22:38 +0300
Subject: [PATCH 1/2] Added the possibility to add custom headers to the error
 grid page and appropriately hide default headers. Also added the ability to
 filter errors on this page.

---
 .../Internal/ExceptionalSettingsBase.cs       |  33 +++++
 .../Pages/ErrorListPage.cs                    | 115 ++++++++++++------
 2 files changed, 109 insertions(+), 39 deletions(-)

diff --git a/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs b/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs
index 0709ea0d..cc84d0f4 100644
--- a/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs
+++ b/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs
@@ -99,6 +99,39 @@ public void Register(IErrorNotifier notifier)
         /// </summary>
         public Action<Exception, Dictionary<string, string>> GetCustomData { get; set; }
 
+        /// <summary>
+        /// Method of filtering errors; will be called when the error list page is loading.
+        /// </summary>
+        public Func<Error, bool> FilterDataInErrorGrid { get; set; }
+
+        /// <summary>
+        /// Headers to add to the error list grid.
+        /// </summary>
+        public List<string> AddedHeaders { get; set; } = new List<string>();
+
+        /// <summary>
+        /// Method to add custom headers to the error list grid.
+        /// </summary>
+        /// <param name="headers"></param>
+        public void AddCustomDataToErrorGrid(params string[] headers)
+        {
+            AddedHeaders.AddRange(headers);
+        }
+
+        /// <summary>
+        /// Headers to hide from the error list grid.
+        /// </summary>
+        public List<string> ExcludedHeaders { get; set; } = new List<string>();
+
+        /// <summary>
+        /// Method to hide default headers from the error list grid.
+        /// </summary>
+        /// <param name="headers"></param>
+        public void HideDefaultHeadersFromErrorGrid(params string[] headers)
+        {
+            ExcludedHeaders.AddRange(headers);
+        }
+
         /// <summary>
         /// Settings for the rendering of pages.
         /// </summary>
diff --git a/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs b/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs
index 7def1cb2..5cd47183 100644
--- a/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs
+++ b/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs
@@ -1,4 +1,5 @@
 using StackExchange.Exceptional.Internal;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,7 +23,14 @@ public class ErrorListPage : WebPage
         public ErrorListPage(ErrorStore store, ExceptionalSettingsBase settings, string baseURL, List<Error> errors)
             : base(null, settings, store, baseURL, "Error Log")
         {
-            Errors = errors.OrderByDescending(e => e.LastLogDate ?? e.CreationDate).ToList();
+            if (Settings.FilterDataInErrorGrid != null)
+            {
+                Errors = errors.Where(settings.FilterDataInErrorGrid).ToList();
+            }
+            else
+            {
+                Errors = errors.OrderByDescending(e => e.LastLogDate ?? e.CreationDate).ToList();
+            }
         }
 
         /// <summary>
@@ -64,6 +72,10 @@ protected override void RenderInnerHtml(StringBuilder sb)
             }
             else
             {
+                var headers = new List<string>()
+                {
+                    "Type", "Error", "Url", "Remote IP", "Time", "Site", "Server"
+                };
                 var last = Errors.FirstOrDefault(); // oh the irony
                 sb.Append("        <h1>")
                   .Append("<span class=\"js-error-count\">")
@@ -77,17 +89,55 @@ protected override void RenderInnerHtml(StringBuilder sb)
                   .AppendLine(@"        <table class=""js-error-list hover alt-rows error-list"">
           <thead>
             <tr>
-              <th></th>
-              <th>Type</th>
-              <th>Error</th>
-              <th>Url</th>
-              <th>Remote IP</th>
-              <th>Time</th>
-              <th>Site</th>
-              <th>Server</th>
-            </tr>
+              <th></th>");
+
+                headers = headers.Concat(Settings.AddedHeaders).Distinct().Except(Settings.ExcludedHeaders).ToList();
+
+                foreach (var header in headers)
+                {
+                    sb.AppendLine($"              <th>{header}</th>");
+                }
+
+                var displayLogic = new Dictionary<string, Action<Error, StringBuilder>>()
+                {
+                    { "Type", (e, sb) => sb.Append("              <td title=\"").AppendHtmlEncode(e.Type).Append("\">")
+                      .AppendHtmlEncode(e.Type.ToShortTypeName())
+                      .AppendLine("</td>") },
+                    { "Error", (e, sb) => {
+                        sb.Append("              <td class=\"wrap\"><a href=\"").Append(Url(KnownRoutes.Info)).Append("?guid=").Append(e.GUID.ToString())
+                      .Append("\">").Append(e.Message.HasValue() ? e.Message.EncodeTruncateWithEllipsis(250) : "(no message)").Append("</a>");
+                        if (e.DuplicateCount > 1)
+                        {
+                            sb.Append(" <span class=\"duplicate-count\" title=\"number of similar errors occurring close to this error\">(")
+                                .Append(e.DuplicateCount.ToString())
+                                .Append(")</span>");
+                        }
+                        sb.AppendLine("</td>");
+                    } },
+                    { "Url", (e, sb) => {
+                        sb.Append("              <td>");
+                        if (e.UrlPath.HasValue())
+                        {
+                            sb.Append("<span title=\"").AppendHtmlEncode(e.Host).AppendHtmlEncode(e.UrlPath).Append("\">")
+                          .Append(e.UrlPath.EncodeTruncateWithEllipsis(40))
+                          .Append("</span>");
+                        }
+                        sb.AppendLine("</td>");
+                    } },
+                    { "Remote IP", (e, sb) => sb.Append("              <td>").AppendHtmlEncode(e.IPAddress).AppendLine("</td>") },
+                    { "Time", (e, sb) => sb.Append("              <td title=\"")
+                      .Append((e.LastLogDate ?? e.CreationDate).ToUniversalTime().ToString("u"))
+                      .Append("\">")
+                      .AppendHtmlEncode((e.LastLogDate ?? e.CreationDate).ToRelativeTime())
+                      .AppendLine("</td>") },
+                    { "Site", (e, sb) => sb.Append("              <td>").AppendHtmlEncode(e.Host).AppendLine("</td>") },
+                    { "Server", (e, sb) => sb.Append("              <td>").AppendHtmlEncode(e.MachineName).AppendLine("</td>") },
+                };
+
+                sb.AppendLine(@"            </tr>
           </thead>
           <tbody>");
+
                 foreach (var e in Errors)
                 {
                     sb.Append("            <tr data-id=\"").Append(e.GUID.ToString()).Append("\" class=\"error").Append(e.IsProtected ? " js-protected" : "").AppendLine("\">")
@@ -101,36 +151,23 @@ protected override void RenderInnerHtml(StringBuilder sb)
                     {
                         sb.Append(" <span title=\"This error is protected\">").Append(IconLock).Append("</span>");
                     }
-                    sb.AppendLine("</td>")
-                      .Append("              <td title=\"").AppendHtmlEncode(e.Type).Append("\">")
-                      .AppendHtmlEncode(e.Type.ToShortTypeName())
-                      .AppendLine("</td>")
-                      .Append("              <td class=\"wrap\"><a href=\"").Append(Url(KnownRoutes.Info)).Append("?guid=").Append(e.GUID.ToString())
-                      .Append("\">").Append(e.Message.HasValue() ? e.Message.EncodeTruncateWithEllipsis(250) : "(no message)").Append("</a>");
-                    if (e.DuplicateCount > 1)
-                    {
-                        sb.Append(" <span class=\"duplicate-count\" title=\"number of similar errors occurring close to this error\">(")
-                          .Append(e.DuplicateCount.ToString())
-                          .Append(")</span>");
-                    }
-                    sb.AppendLine("</td>")
-                      .Append("              <td>");
-                    if (e.UrlPath.HasValue())
+                    sb.AppendLine("</td>");
+
+                    foreach (var header in headers)
                     {
-                        sb.Append("<span title=\"").AppendHtmlEncode(e.Host).AppendHtmlEncode(e.UrlPath).Append("\">")
-                          .Append(e.UrlPath.EncodeTruncateWithEllipsis(40))
-                          .Append("</span>");
+                        if (displayLogic.TryGetValue(header, out var displayAction))
+                        {
+                            displayAction.Invoke(e, sb);
+                        }
+                        else if (e.CustomData != null && e.CustomData.TryGetValue(header, out var customValue))
+                        {
+                            sb.Append("              <td>").AppendHtmlEncode(customValue).AppendLine("</td>");
+                        }
+                        else
+                        {
+                            sb.Append("              <td></td>");
+                        }
                     }
-                    sb.AppendLine("</td>")
-                      .Append("              <td>").AppendHtmlEncode(e.IPAddress).AppendLine("</td>")
-                      .Append("              <td title=\"")
-                      .Append((e.LastLogDate ?? e.CreationDate).ToUniversalTime().ToString("u"))
-                      .Append("\">")
-                      .AppendHtmlEncode((e.LastLogDate ?? e.CreationDate).ToRelativeTime())
-                      .AppendLine("</td>")
-                      .Append("              <td>").AppendHtmlEncode(e.Host).AppendLine("</td>")
-                      .Append("              <td>").AppendHtmlEncode(e.MachineName).AppendLine("</td>")
-                      .AppendLine("            </tr>");
                 }
                 sb.AppendLine("          </tbody>")
                   .AppendLine("        </table>");
@@ -145,4 +182,4 @@ protected override void RenderInnerHtml(StringBuilder sb)
             }
         }
     }
-}
\ No newline at end of file
+}

From 7d4105fb3347a8f8cb7f904268eb53a62f65ed6d Mon Sep 17 00:00:00 2001
From: Ihor Sysak <sskpr.igor@gmail.com>
Date: Tue, 18 Jul 2023 14:09:33 +0300
Subject: [PATCH 2/2] removed useless methods

---
 .../Internal/ExceptionalSettingsBase.cs       | 31 +++----------------
 .../Pages/ErrorListPage.cs                    |  2 +-
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs b/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs
index cc84d0f4..2da3b66a 100644
--- a/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs
+++ b/src/StackExchange.Exceptional.Shared/Internal/ExceptionalSettingsBase.cs
@@ -100,37 +100,16 @@ public void Register(IErrorNotifier notifier)
         public Action<Exception, Dictionary<string, string>> GetCustomData { get; set; }
 
         /// <summary>
-        /// Method of filtering errors; will be called when the error list page is loading.
+        /// Method to filter errors.
+        /// The method takes an `Error` object as input and returns a boolean value indicating whether the object should be filtered.
         /// </summary>
         public Func<Error, bool> FilterDataInErrorGrid { get; set; }
 
         /// <summary>
-        /// Headers to add to the error list grid.
+        /// Method to get the default columns for a list of strings.
+        /// The list of strings can be manipulated to remove or add columns.
         /// </summary>
-        public List<string> AddedHeaders { get; set; } = new List<string>();
-
-        /// <summary>
-        /// Method to add custom headers to the error list grid.
-        /// </summary>
-        /// <param name="headers"></param>
-        public void AddCustomDataToErrorGrid(params string[] headers)
-        {
-            AddedHeaders.AddRange(headers);
-        }
-
-        /// <summary>
-        /// Headers to hide from the error list grid.
-        /// </summary>
-        public List<string> ExcludedHeaders { get; set; } = new List<string>();
-
-        /// <summary>
-        /// Method to hide default headers from the error list grid.
-        /// </summary>
-        /// <param name="headers"></param>
-        public void HideDefaultHeadersFromErrorGrid(params string[] headers)
-        {
-            ExcludedHeaders.AddRange(headers);
-        }
+        public Action<List<string>> GetColumns { get; set; }
 
         /// <summary>
         /// Settings for the rendering of pages.
diff --git a/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs b/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs
index 5cd47183..81305927 100644
--- a/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs
+++ b/src/StackExchange.Exceptional.Shared/Pages/ErrorListPage.cs
@@ -91,7 +91,7 @@ protected override void RenderInnerHtml(StringBuilder sb)
             <tr>
               <th></th>");
 
-                headers = headers.Concat(Settings.AddedHeaders).Distinct().Except(Settings.ExcludedHeaders).ToList();
+                Settings.GetColumns?.Invoke(headers);
 
                 foreach (var header in headers)
                 {