Move error log <ha-card> + color in log entries (#7382)

src/panels/config/logs/error-log-card.ts

@@ -15,25 +15,29 @@ import { HomeAssistant } from "../../../types";
 class ErrorLogCard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @internalProperty() private _errorLog?: string;
+  @internalProperty() private _errorHTML!: TemplateResult[] | string;
 
   protected render(): TemplateResult {
     return html`
-      <p class="error-log-intro">
+      <div class="error-log-intro">
-        ${this._errorLog
+        ${this._errorHTML
           ? html`
+              <ha-card>
                 <ha-icon-button
                   icon="hass:refresh"
                   @click=${this._refreshErrorLog}
                 ></ha-icon-button>
+                <div class="card-content error-log">
+                  ${this._errorHTML}
+                </div>
+              </ha-card>
             `
           : html`
               <mwc-button raised @click=${this._refreshErrorLog}>
                 ${this.hass.localize("ui.panel.config.logs.load_full_log")}
               </mwc-button>
             `}
-      </p>
+      </div>
-      <div class="error-log">${this._errorLog}</div>
     `;
   }
 
@@ -59,17 +63,42 @@ class ErrorLogCard extends LitElement {
       .error-log {
         @apply --paper-font-code)
           clear: both;
-        white-space: pre-wrap;
+        text-align: left;
-        margin: 16px;
+        padding-top: 12px;
+      }
+
+      .error {
+        color: var(--error-color);
+      }
+
+      .warning {
+        color: var(--warning-color);
       }
     `;
   }
 
   private async _refreshErrorLog(): Promise<void> {
-    this._errorLog = this.hass.localize("ui.panel.config.logs.loading_log");
+    this._errorHTML = this.hass.localize("ui.panel.config.logs.loading_log");
     const log = await fetchErrorLog(this.hass!);
-    this._errorLog =
+
-      log || this.hass.localize("ui.panel.config.logs.no_errors");
+    this._errorHTML = log
+      ? log.split("\n").map((entry) => {
+          if (entry.includes("INFO"))
+            return html`<div class="info">${entry}</div>`;
+
+          if (entry.includes("WARNING"))
+            return html`<div class="warning">${entry}</div>`;
+
+          if (
+            entry.includes("ERROR") ||
+            entry.includes("FATAL") ||
+            entry.includes("CRITICAL")
+          )
+            return html`<div class="error">${entry}</div>`;
+
+          return html`<div>${entry}</div>`;
+        })
+      : this.hass.localize("ui.panel.config.logs.no_errors");
   }
 }
 

src/panels/config/logs/system-log-card.ts

@@ -77,7 +77,9 @@ export class SystemLogCard extends LitElement {
                                     integrations[idx]!
                                   )
                                 : item.source[0]}
-                              (${item.level})
+                              ${html`(<span class="${item.level.toLowerCase()}"
+                                  >${item.level}</span
+                                >)`}
                               ${item.count > 1
                                 ? html`
                                     -
@@ -164,6 +166,14 @@ export class SystemLogCard extends LitElement {
         align-items: center;
         justify-content: center;
       }
+
+      .error {
+        color: var(--error-color);
+      }
+
+      .warning {
+        color: var(--warning-color);
+      }
     `;
   }
 }