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

Jump to bottom

Fix loading/editing users that do not have a role assignment #8590

Merged
merged 3 commits into from Mar 10, 2023
Merged

Fix loading/editing users that do not have a role assignment #8590

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3127f14
Fix loading/editing users that do not have a role assignment
JammingBen Mar 10, 2023
b9356d9
Display '-' when no role is given
JammingBen Mar 10, 2023
9e1dcbe
Always use app id when editing role assignments
JammingBen Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/web-app-admin-settings/src/components/Users/SideBar/DetailsPanel.vue
View file
Open in desktop
Expand Up @@ -118,8 +118,10 @@ export default defineComponent({
roleDisplayName() {
const assignedRole = this.user.appRoleAssignments[0]

return this.$gettext(
this.roles.find((role) => role.id === assignedRole?.appRoleId)?.displayName || ''
return (
this.$gettext(
this.roles.find((role) => role.id === assignedRole?.appRoleId)?.displayName || ''
) || '-'
)
},
groupsDisplayValue() {
Expand Down
6 changes: 4 additions & 2 deletions packages/web-app-admin-settings/src/components/Users/UsersList.vue
View file
Open in desktop
Expand Up @@ -346,8 +346,10 @@ export default defineComponent({
getRoleDisplayNameByUser(user) {
const assignedRole = user.appRoleAssignments[0]

return this.$gettext(
this.roles.find((role) => role.id === assignedRole?.appRoleId)?.displayName || ''
return (
this.$gettext(
this.roles.find((role) => role.id === assignedRole?.appRoleId)?.displayName || ''
) || '-'
AlexAndBear marked this conversation as resolved.
Show resolved Hide resolved
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-admin-settings/src/views/Users.vue
View file
Open in desktop
Expand Up @@ -696,7 +696,7 @@ export default defineComponent({
updateUserAppRoleAssignments(user, editUser) {
return this.graphClient.users.createUserAppRoleAssignment(user.id, {
appRoleId: editUser.appRoleAssignments[0].appRoleId,
resourceId: editUser.appRoleAssignments[0].resourceId || this.applicationId,
resourceId: this.applicationId,
principalId: editUser.id
})
},
Expand Down