From 54739c7ccde8a59508e2e56441bcb4d615ac2c25 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 3 Mar 2020 13:55:26 -0800
Subject: [PATCH] Support grouped system log messages (#5030)

* Support grouped system log messages

* Format source
---
 src/data/system_log.ts                           |  4 ++--
 .../logs/dialog-system-log-detail.ts             | 16 ++++++++++++----
 .../developer-tools/logs/system-log-card.ts      |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/data/system_log.ts b/src/data/system_log.ts
index f780adffe3..8f3e0854e4 100644
--- a/src/data/system_log.ts
+++ b/src/data/system_log.ts
@@ -2,9 +2,9 @@ import { HomeAssistant } from "../types";
 
 export interface LoggedError {
   name: string;
-  message: string;
+  message: [string];
   level: string;
-  source: string;
+  source: [string, number];
   // unix timestamp in seconds
   timestamp: number;
   exception: string;
diff --git a/src/panels/developer-tools/logs/dialog-system-log-detail.ts b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
index 11c075ae1d..4dcbd5fc9a 100644
--- a/src/panels/developer-tools/logs/dialog-system-log-detail.ts
+++ b/src/panels/developer-tools/logs/dialog-system-log-detail.ts
@@ -54,7 +54,8 @@ class DialogSystemLogDetail extends LitElement {
         </h2>
         <paper-dialog-scrollable>
           <p>
-            Logger: ${item.name}
+            Logger: ${item.name}<br />
+            Source: ${item.source.join(":")}
             ${integration
               ? html`
                   <br />
@@ -81,11 +82,18 @@ class DialogSystemLogDetail extends LitElement {
             Last logged:
             ${formatSystemLogTime(item.timestamp, this.hass!.language)}
           </p>
-          ${item.message
+          ${item.message.length > 1
             ? html`
-                <pre>${item.message}</pre>
+                <ul>
+                  ${item.message.map(
+                    (msg) =>
+                      html`
+                        <li>${msg}</li>
+                      `
+                  )}
+                </ul>
               `
-            : html``}
+            : item.message[0]}
           ${item.exception
             ? html`
                 <pre>${item.exception}</pre>
diff --git a/src/panels/developer-tools/logs/system-log-card.ts b/src/panels/developer-tools/logs/system-log-card.ts
index cf619d5c45..ef88fcc2d2 100644
--- a/src/panels/developer-tools/logs/system-log-card.ts
+++ b/src/panels/developer-tools/logs/system-log-card.ts
@@ -62,7 +62,7 @@ export class SystemLogCard extends LitElement {
                         <paper-item @click=${this._openLog} .logItem=${item}>
                           <paper-item-body two-line>
                             <div class="row">
-                              ${item.message}
+                              ${item.message[0]}
                             </div>
                             <div secondary>
                               ${formatSystemLogTime(
@@ -75,7 +75,7 @@ export class SystemLogCard extends LitElement {
                                     this.hass!.localize,
                                     integrations[idx]!
                                   )
-                                : item.source}
+                                : item.source[0]}
                               (${item.level})
                               ${item.count > 1
                                 ? html`