From 9859d8981a98be70fdeb14e5c811e9957bb8dda1 Mon Sep 17 00:00:00 2001 From: Jure Triglav <juretriglav@gmail.com> Date: Wed, 29 Jul 2020 11:13:14 +0200 Subject: [PATCH] feat: display name and ORCID id of users --- app/components/component-users-manager/src/User.jsx | 4 ++-- app/components/component-users-manager/src/UsersManager.jsx | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/components/component-users-manager/src/User.jsx b/app/components/component-users-manager/src/User.jsx index 31b144cbcf..c2584007ae 100644 --- a/app/components/component-users-manager/src/User.jsx +++ b/app/components/component-users-manager/src/User.jsx @@ -26,8 +26,8 @@ const User = ({ user }) => { <UserCombo> <UserAvatar user={user} /> <UserInfo> - <Primary>{user.username}</Primary> - <Secondary>{user.email || '(via ORCID)'}</Secondary> + <Primary>{user?.defaultIdentity?.name}</Primary> + <Secondary>{`ORCID: ${user?.username}`}</Secondary> </UserInfo> </UserCombo> </Cell> diff --git a/app/components/component-users-manager/src/UsersManager.jsx b/app/components/component-users-manager/src/UsersManager.jsx index 08e10ec9f8..0e17345e2d 100644 --- a/app/components/component-users-manager/src/UsersManager.jsx +++ b/app/components/component-users-manager/src/UsersManager.jsx @@ -37,6 +37,10 @@ const GET_USERS = gql` admin email profilePicture + defaultIdentity { + id + name + } online created } -- GitLab