Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix loading and editing users that don't have any group assignments #8322

Closed
wants to merge 1 commit into from
Closed

Fix loading and editing users that don't have any group assignments #8322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog/unreleased/enhancement-admin-settings-users-role-graph-api-usage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ We've switched over to utilizing user role assignments data from the graph api i
Especially for the list view this leads to improved performance.

https://github.com/owncloud/web/pull/8261
https://github.com/owncloud/web/pull/8322
https://github.com/owncloud/web/issues/8319
2 changes: 1 addition & 1 deletion packages/web-app-admin-settings/src/components/Users/SideBar/EditPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default defineComponent({
const groupOptions = computed(() => {
const { memberOf: selectedGroups } = unref(editUser)
return props.groups
.filter((g) => !selectedGroups.some((s) => s.id === g.id))
.filter((g) => !selectedGroups?.some((s) => s.id === g.id))
.sort((a, b) => a.displayName.localeCompare(b.displayName))
})

Expand Down
16 changes: 9 additions & 7 deletions packages/web-app-admin-settings/src/views/Users.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,13 +437,15 @@ export default defineComponent({
}
},
async updateUserGroupAssignments(user, editUser) {
const groupsToAdd = editUser.memberOf.filter((editUserGroup) => {
return !user.memberOf.some((g) => g.id === editUserGroup.id)
})

const groupsToDelete = user.memberOf.filter((editUserGroup) => {
return !editUser.memberOf.some((g) => g.id === editUserGroup.id)
})
const groupsToAdd =
editUser.memberOf?.filter((editUserGroup) => {
return !user.memberOf?.some((g) => g.id === editUserGroup.id)
}) || []

const groupsToDelete =
user.memberOf?.filter((editUserGroup) => {
return !editUser.memberOf?.some((g) => g.id === editUserGroup.id)
}) || []

for (const groupToAdd of groupsToAdd) {
await this.graphClient.groups.addMember(groupToAdd.id, user.id, this.configuration.server)
Expand Down