Skip to content

Commit

Permalink
Merge pull request #8271 from opencrvs/ocrvs-7436
Browse files Browse the repository at this point in the history
ocrvs-7436: misc bugs
  • Loading branch information
Zangetsu101 authored Jan 1, 2025
2 parents f13a825 + d1de9c3 commit 81ce315
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
9 changes: 5 additions & 4 deletions packages/client/src/views/SysAdmin/Team/user/UserList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -507,17 +507,18 @@ function UserListComponent(props: IProps) {

return {
image: (
<AvatarSmall
name={name}
avatar={avatar || undefined}
<Link
onClick={() =>
navigate(
formatUrl(routes.USER_PROFILE, {
userId: String(user.id)
})
)
}
/>
disabled={!canReadUser(user)}
>
<AvatarSmall name={name} avatar={avatar || undefined} />
</Link>
),
label: (
<Link
Expand Down
4 changes: 3 additions & 1 deletion packages/gateway/src/features/user/root-resolvers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ export const resolvers: GQLResolver = {
!inScope(authHeader, [
SCOPES.USER_READ,
SCOPES.USER_READ_MY_OFFICE,
SCOPES.USER_READ_MY_JURISDICTION
SCOPES.USER_READ_MY_JURISDICTION,
SCOPES.USER_UPDATE,
SCOPES.USER_UPDATE_MY_JURISDICTION
]) &&
!isTokenOwner(authHeader, userId!)
) {
Expand Down

0 comments on commit 81ce315

Please sign in to comment.