web/admin: add ability to add users to a group whilst creating a group

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

web/src/pages/groups/GroupForm.ts

@@ -29,12 +29,13 @@ export class GroupForm extends Form<Group> {
     }
 
     send = (data: Group): Promise<Group> => {
-        if (this.group) {
+        if (this.group?.pk) {
             return new CoreApi(DEFAULT_CONFIG).coreGroupsUpdate({
                 groupUuid: this.group.pk || "",
                 data: data
             });
         } else {
+            data.users = Array.from(this.group?.users || []) as unknown as Set<number>;
             return new CoreApi(DEFAULT_CONFIG).coreGroupsCreate({
                 data: data
             });
@@ -79,7 +80,7 @@ export class GroupForm extends Form<Group> {
                         .confirm=${(items: User[]) => {
                             // Because the model only has the IDs, map the user list to IDs
                             const ids = items.map(u => u.pk || 0);
-                            if (!this.group) return Promise.reject();
+                            if (!this.group) this.group = {} as Group;
                             this.group.users = new Set(Array.from(this.group?.users || []).concat(ids));
                             this.requestUpdate();
                             return Promise.resolve();

web/src/pages/groups/MemberSelectModal.ts

@@ -42,10 +42,10 @@ export class MemberSelectTable extends TableModal<User> {
 
     row(item: User): TemplateResult[] {
         return [
-            html`<a href="#/identity/users/${item.pk}">
+            html`<div>
                 <div>${item.username}</div>
                 <small>${item.name}</small>
-            </a>`,
+            </div>`,
             html`${item.isActive ? t`Yes` : t`No`}`,
             html`${first(item.lastLogin?.toLocaleString(), "-")}`,
         ];