From 3740b45e1a7c5a783f0115825bb46368164bdfb6 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens@goauthentik.io>
Date: Mon, 13 Feb 2023 11:14:40 +0100
Subject: [PATCH] web/admin: refactor event geo display

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 web/src/admin/Routes.ts                         |  4 ++--
 web/src/admin/events/EventListPage.ts           | 10 +++-------
 .../{EventInfoPage.ts => EventViewPage.ts}      | 17 ++++-------------
 web/src/admin/events/utils.ts                   | 17 +++++++++++++++++
 4 files changed, 26 insertions(+), 22 deletions(-)
 rename web/src/admin/events/{EventInfoPage.ts => EventViewPage.ts} (92%)

diff --git a/web/src/admin/Routes.ts b/web/src/admin/Routes.ts
index 434dd327f..bb695cfa5 100644
--- a/web/src/admin/Routes.ts
+++ b/web/src/admin/Routes.ts
@@ -105,8 +105,8 @@ export const ROUTES: Route[] = [
         return html`<ak-event-list></ak-event-list>`;
     }),
     new Route(new RegExp(`^/events/log/(?<id>${UUID_REGEX})$`), async (args) => {
-        await import("@goauthentik/admin/events/EventInfoPage");
-        return html`<ak-event-info-page .eventID=${args.id}></ak-event-info-page>`;
+        await import("@goauthentik/admin/events/EventViewPage");
+        return html`<ak-event-view .eventID=${args.id}></ak-event-view>`;
     }),
     new Route(new RegExp("^/events/transports$"), async () => {
         await import("@goauthentik/admin/events/TransportListPage");
diff --git a/web/src/admin/events/EventListPage.ts b/web/src/admin/events/EventListPage.ts
index 5bf0e311f..dd1d432f9 100644
--- a/web/src/admin/events/EventListPage.ts
+++ b/web/src/admin/events/EventListPage.ts
@@ -1,9 +1,8 @@
 import "@goauthentik/admin/events/EventInfo";
-import { ActionToLabel } from "@goauthentik/admin/events/utils";
+import { ActionToLabel, EventGeo } from "@goauthentik/admin/events/utils";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { EventWithContext } from "@goauthentik/common/events";
 import { uiConfig } from "@goauthentik/common/ui/config";
-import { KeyUnknown } from "@goauthentik/elements/forms/Form";
 import { PaginatedResponse } from "@goauthentik/elements/table/Table";
 import { TableColumn } from "@goauthentik/elements/table/Table";
 import { TablePage } from "@goauthentik/elements/table/TablePage";
@@ -56,10 +55,6 @@ export class EventListPage extends TablePage<Event> {
     }
 
     row(item: EventWithContext): TemplateResult[] {
-        let geo: KeyUnknown | undefined = undefined;
-        if (Object.hasOwn(item.context, "geo")) {
-            geo = item.context.geo as KeyUnknown;
-        }
         return [
             html`<div>${ActionToLabel(item.action)}</div>
                 <small>${item.app}</small>`,
@@ -77,7 +72,8 @@ export class EventListPage extends TablePage<Event> {
                 : html`-`,
             html`<span>${item.created?.toLocaleString()}</span>`,
             html`<div>${item.clientIp || t`-`}</div>
-                ${geo ? html`<small>${[geo.city, geo.country].join(", ")}</small>` : html``}`,
+
+                <small>${EventGeo(item)}</small>`,
             html`<span>${item.tenant?.name || t`-`}</span>`,
             html`<a href="#/events/log/${item.pk}">
                 <i class="fas fa-share-square"></i>
diff --git a/web/src/admin/events/EventInfoPage.ts b/web/src/admin/events/EventViewPage.ts
similarity index 92%
rename from web/src/admin/events/EventInfoPage.ts
rename to web/src/admin/events/EventViewPage.ts
index d294e0721..117ae2273 100644
--- a/web/src/admin/events/EventInfoPage.ts
+++ b/web/src/admin/events/EventViewPage.ts
@@ -1,10 +1,9 @@
 import "@goauthentik/admin/events/EventInfo";
-import { ActionToLabel } from "@goauthentik/admin/events/utils";
+import { ActionToLabel, EventGeo } from "@goauthentik/admin/events/utils";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { EventWithContext } from "@goauthentik/common/events";
 import { AKElement } from "@goauthentik/elements/Base";
 import "@goauthentik/elements/PageHeader";
-import { KeyUnknown } from "@goauthentik/elements/forms/Form";
 
 import { t } from "@lingui/macro";
 
@@ -21,8 +20,8 @@ import PFBase from "@patternfly/patternfly/patternfly-base.css";
 
 import { EventsApi } from "@goauthentik/api";
 
-@customElement("ak-event-info-page")
-export class EventInfoPage extends AKElement {
+@customElement("ak-event-view")
+export class EventViewPage extends AKElement {
     @property()
     set eventID(value: string) {
         new EventsApi(DEFAULT_CONFIG)
@@ -46,10 +45,6 @@ export class EventInfoPage extends AKElement {
             return html`<ak-page-header icon="pf-icon pf-icon-catalog" header=${t`Loading`}>
             </ak-page-header> `;
         }
-        let geo: KeyUnknown | undefined = undefined;
-        if (Object.hasOwn(this.event.context, "geo")) {
-            geo = this.event.context.geo as KeyUnknown;
-        }
         return html`<ak-page-header
                 icon="pf-icon pf-icon-catalog"
                 header=${t`Event ${this.event.pk}`}
@@ -132,11 +127,7 @@ export class EventInfoPage extends AKElement {
                                     <dd class="pf-c-description-list__description">
                                         <div class="pf-c-description-list__text">
                                             <div>${this.event.clientIp || t`-`}</div>
-                                            ${geo
-                                                ? html`<small
-                                                      >${[geo.city, geo.country].join(", ")}</small
-                                                  >`
-                                                : html``}
+                                            <small>${EventGeo(this.event)}</small>
                                         </div>
                                     </dd>
                                 </div>
diff --git a/web/src/admin/events/utils.ts b/web/src/admin/events/utils.ts
index 7810b94d1..27e3f921e 100644
--- a/web/src/admin/events/utils.ts
+++ b/web/src/admin/events/utils.ts
@@ -1,7 +1,24 @@
+import { EventWithContext } from "@goauthentik/common/events";
+import { KeyUnknown } from "@goauthentik/elements/forms/Form";
+
 import { t } from "@lingui/macro";
 
+import { TemplateResult, html } from "lit";
+
 import { EventActions } from "@goauthentik/api";
 
+export function EventGeo(event: EventWithContext): TemplateResult {
+    let geo: KeyUnknown | undefined = undefined;
+    if (Object.hasOwn(event.context, "geo")) {
+        geo = event.context.geo as KeyUnknown;
+        const parts = [geo.city, geo.country, geo.continent].filter(
+            (v) => v !== "" && v !== undefined,
+        );
+        return html`${parts.join(", ")}`;
+    }
+    return html``;
+}
+
 export function ActionToLabel(action?: EventActions): string {
     if (!action) return "";
     switch (action) {