From b9bb27008e1668bc6f79b1fa4979934131cbc5b4 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sun, 1 Jan 2023 20:10:16 +0100
Subject: [PATCH] web/elements: fix selection of blank elements in
 search-select, fix issue when re-opening dropdown

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 web/src/elements/SearchSelect.ts | 16 +++++++++++-----
 web/src/elements/forms/Form.ts   |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/web/src/elements/SearchSelect.ts b/web/src/elements/SearchSelect.ts
index 012edac45..728378694 100644
--- a/web/src/elements/SearchSelect.ts
+++ b/web/src/elements/SearchSelect.ts
@@ -75,16 +75,23 @@ export class SearchSelect<T> extends AKElement {
         });
     };
 
-    menuId: string;
+    dropdownContainer: HTMLDivElement;
 
     constructor() {
         super();
-        this.menuId = btoa(Math.random().toString()).substring(10, 15);
+        this.dropdownContainer = document.createElement("div");
+    }
+
+    connectedCallback(): void {
+        super.connectedCallback();
+        this.dropdownContainer = document.createElement("div");
+        this.dropdownContainer.dataset["managedBy"] = "ak-search-select";
+        document.body.append(this.dropdownContainer);
     }
 
     disconnectedCallback(): void {
         super.disconnectedCallback();
-        document.querySelectorAll(`#${this.menuId}`).forEach((e) => e.remove());
+        this.dropdownContainer.remove();
     }
 
     /*
@@ -148,7 +155,6 @@ export class SearchSelect<T> extends AKElement {
             html`<div
                 class="pf-c-dropdown pf-m-expanded"
                 ?hidden=${!this.open}
-                id="${this.menuId}"
                 style="position: fixed; inset: 0px auto auto 0px; z-index: 9999; transform: translate(${pos.x}px, ${pos.y +
                 this.offsetHeight}px); width: ${pos.width}px;"
             >
@@ -187,7 +193,7 @@ export class SearchSelect<T> extends AKElement {
                         : html`${renderGroup(groupedItems[0][1])}`}
                 </ul>
             </div>`,
-            document.body,
+            this.dropdownContainer,
             { host: this },
         );
     }
diff --git a/web/src/elements/forms/Form.ts b/web/src/elements/forms/Form.ts
index 486b5bc48..e078c08b4 100644
--- a/web/src/elements/forms/Form.ts
+++ b/web/src/elements/forms/Form.ts
@@ -163,7 +163,7 @@ export class Form<T> extends AKElement {
             } else if (element.tagName.toLowerCase() === "ak-search-select") {
                 const select = element as unknown as SearchSelect<unknown>;
                 try {
-                    json[element.name] = select.value(select.selectedObject);
+                    json[element.name] = select.value(select.selectedObject) || "";
                 } catch {
                     console.debug("authentik/form: SearchSelect.value error");
                 }