From 3cb5862c0bf844002139225aae60e5fbc75d03e1 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens@goauthentik.io>
Date: Tue, 19 Nov 2024 03:04:33 +0100
Subject: [PATCH] web/admin: auto-select user path based on selected path

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
---
 web/src/admin/users/UserForm.ts     | 5 ++++-
 web/src/admin/users/UserListPage.ts | 5 ++++-
 web/src/elements/TreeView.ts        | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/web/src/admin/users/UserForm.ts b/web/src/admin/users/UserForm.ts
index 25f3759abb31..c8f5f1e0bd9a 100644
--- a/web/src/admin/users/UserForm.ts
+++ b/web/src/admin/users/UserForm.ts
@@ -20,6 +20,9 @@ export class UserForm extends ModelForm<User, number> {
     @property({ attribute: false })
     group?: Group;
 
+    @property()
+    defaultPath: string = "users";
+
     static get defaultUserAttributes(): { [key: string]: unknown } {
         return {};
     }
@@ -172,7 +175,7 @@ export class UserForm extends ModelForm<User, number> {
             <ak-form-element-horizontal label=${msg("Path")} ?required=${true} name="path">
                 <input
                     type="text"
-                    value="${first(this.instance?.path, "users")}"
+                    value="${first(this.instance?.path, this.defaultPath)}"
                     class="pf-c-form-control"
                     required
                 />
diff --git a/web/src/admin/users/UserListPage.ts b/web/src/admin/users/UserListPage.ts
index 42f3cf64c4ed..215b8882bcdd 100644
--- a/web/src/admin/users/UserListPage.ts
+++ b/web/src/admin/users/UserListPage.ts
@@ -395,7 +395,7 @@ export class UserListPage extends WithBrandConfig(WithCapabilitiesConfig(TablePa
             <ak-forms-modal>
                 <span slot="submit"> ${msg("Create")} </span>
                 <span slot="header"> ${msg("Create User")} </span>
-                <ak-user-form slot="form"> </ak-user-form>
+                <ak-user-form defaultPath=${this.activePath} slot="form"> </ak-user-form>
                 <button slot="trigger" class="pf-c-button pf-m-primary">${msg("Create")}</button>
             </ak-forms-modal>
             <ak-forms-modal .closeAfterSuccessfulSubmit=${false} .cancelText=${msg("Close")}>
@@ -417,6 +417,9 @@ export class UserListPage extends WithBrandConfig(WithCapabilitiesConfig(TablePa
                     <ak-treeview
                         .items=${this.userPaths?.paths || []}
                         activePath=${this.activePath}
+                        @ak-refresh=${(ev: CustomEvent<{ path: string }>) => {
+                            this.activePath = ev.detail.path;
+                        }}
                     ></ak-treeview>
                 </div>
             </div>
diff --git a/web/src/elements/TreeView.ts b/web/src/elements/TreeView.ts
index fc31040d1fbc..5fff2d849219 100644
--- a/web/src/elements/TreeView.ts
+++ b/web/src/elements/TreeView.ts
@@ -89,6 +89,9 @@ export class TreeViewNode extends AKElement {
                                 new CustomEvent(EVENT_REFRESH, {
                                     bubbles: true,
                                     composed: true,
+                                    detail: {
+                                        path: this.fullPath,
+                                    },
                                 }),
                             );
                         }}