From 6b5b8f4bb9b2977471445675378e5d533386200e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <t@mldk.cz>
Date: Thu, 27 Jan 2022 21:26:47 +0100
Subject: [PATCH] [ui] also add pre-label to result of search getObjects

---
 webui/src/util/search.ts      | 15 ++++++++++-----
 webui/src/views/Search.svelte |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/webui/src/util/search.ts b/webui/src/util/search.ts
index 1cc86c9..7b0c6b9 100644
--- a/webui/src/util/search.ts
+++ b/webui/src/util/search.ts
@@ -6,15 +6,20 @@ export function baseSearch(query: string) {
   return queryFn(() => `(matches ? ? (contains "${query}"))`);
 }
 
-export async function getObjects(entries: UpEntry[]): Promise<string[]> {
+export async function getObjects(
+  entries: UpEntry[]
+): Promise<[string, string][]> {
   const labelled = entries
     .filter((e) => e.attribute == "LBL")
-    .map((e) => e.entity);
+    .map((e) => [e.entity, String(e.value.c)] as [string, string]);
   const aliased = entries
     .filter((e) => e.attribute === "ALIAS")
-    .map(async (e) => {
-      const entry = await fetchEntry(e.entity);
-      return String(entry.value.c);
+    .map(async (aliasEntry) => {
+      const entry = await fetchEntry(aliasEntry.entity);
+      return [String(entry.value.c), String(aliasEntry.value.c)] as [
+        string,
+        string
+      ];
     });
   return labelled.concat(await Promise.all(aliased));
 }
diff --git a/webui/src/views/Search.svelte b/webui/src/views/Search.svelte
index 23e2cc1..6c552d5 100644
--- a/webui/src/views/Search.svelte
+++ b/webui/src/views/Search.svelte
@@ -70,7 +70,7 @@
           {#if objects.length}
             <h2>Objects</h2>
             <ul>
-              {#each objects as address}
+              {#each objects as [address, _]}
                 <li>
                   <UpObjectDisplay
                     {address}