habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web/admin: improve UI for removing users from groups and groups from users

Browse Source 
no longer deletes users/groups when they are removed from the opposite

closes #4251 closes #3964

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2022-12-21 19:16:00 +01:00
parent 042865c606
commit 3b61c6f9b9
16 changed files with 258 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
web/src/admin/groups/RelatedGroupList.ts
View File

@ -13,7 +13,7 @@ import { t } from "@lingui/macro";
import { TemplateResult, html } from "lit";
import { customElement, property } from "lit/decorators.js";
import { CoreApi, Group } from "@goauthentik/api";
import { CoreApi, Group, User } from "@goauthentik/api";
@customElement("ak-group-related-list")
export class RelatedGroupList extends Table<Group> {
@ -25,8 +25,8 @@ export class RelatedGroupList extends Table<Group> {
@property()
order = "name";
@property({ type: Number })
targetUser?: number;
@property({ attribute: false })
targetUser?: User;
async apiEndpoint(page: number): Promise<PaginatedResponse<Group>> {
return new CoreApi(DEFAULT_CONFIG).coreGroupsList({
@ -34,7 +34,7 @@ export class RelatedGroupList extends Table<Group> {
page: page,
pageSize: (await uiConfig()).pagination.perPage,
search: this.search || "",
membersByPk: this.targetUser ? [this.targetUser] : [],
membersByPk: this.targetUser ? [this.targetUser.pk] : [],
});
}
@ -51,20 +51,23 @@ export class RelatedGroupList extends Table<Group> {
const disabled = this.selectedElements.length < 1;
return html`<ak-forms-delete-bulk
objectLabel=${t`Group(s)`}
actionLabel=${t`Remove from Group(s)`}
actionSubtext=${t`Are you sure you want to remove users ${this.targetUser?.username} from the following groups?`}
.objects=${this.selectedElements}
.usedBy=${(item: Group) => {
return new CoreApi(DEFAULT_CONFIG).coreGroupsUsedByList({
groupUuid: item.pk,
});
}}
.delete=${(item: Group) => {
return new CoreApi(DEFAULT_CONFIG).coreGroupsDestroy({
groupUuid: item.pk,
const newGroups = this.targetUser?.groups.filter((group) => {
return group != item.pk;
});
return new CoreApi(DEFAULT_CONFIG).coreUsersPartialUpdate({
id: this.targetUser?.pk || 0,
patchedUserRequest: {
groups: newGroups,
},
});
}}
>
<button ?disabled=${disabled} slot="trigger" class="pf-c-button pf-m-danger">
${t`Delete`}
${t`Remove`}
</button>
</ak-forms-delete-bulk>`;
}