yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-27 01:48:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct display name for users in UI (#4323)

Browse Source
This commit is contained in:
John Joyce 2022-03-04 16:08:38 -08:00 committed by GitHub
parent 787a7e6dcd
commit b48b215528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
datahub-web-react/src/app/entity/user/UserProfile.tsx
View File

@ -3,12 +3,13 @@ import React from 'react';
import styled from 'styled-components';
import useUserParams from '../../shared/entitySearch/routingUtils/useUserParams';
import { useGetUserQuery } from '../../../graphql/user.generated';
import { EntityRelationshipsResult } from '../../../types.generated';
import { EntityRelationshipsResult, EntityType } from '../../../types.generated';
import UserGroups from './UserGroups';
import { RoutedTabs } from '../../shared/RoutedTabs';
import { UserAssets } from './UserAssets';
import { decodeUrn } from '../shared/utils';
import UserInfoSideBar from './UserInfoSideBar';
import { useEntityRegistry } from '../../useEntityRegistry';
export interface Props {
onTabChange: (selectedTab: string) => void;
@ -55,6 +56,7 @@ export const EmptyValue = styled.div`
export default function UserProfile() {
const { urn: encodedUrn } = useUserParams();
const urn = decodeUrn(encodedUrn);
const entityRegistry = useEntityRegistry();
const { loading, error, data, refetch } = useGetUserQuery({ variables: { urn, groupsCount: GROUP_PAGE_SIZE } });
@ -98,7 +100,10 @@ export default function UserProfile() {
data?.corpUser?.info?.displayName ||
data?.corpUser?.info?.fullName ||
data?.corpUser?.urn,
name: data?.corpUser?.editableProperties?.displayName || data?.corpUser?.info?.fullName || undefined,
name:
data?.corpUser?.editableProperties?.displayName ||
(data?.corpUser && entityRegistry.getDisplayName(EntityType.CorpUser, data?.corpUser)) ||
undefined,
role: data?.corpUser?.editableProperties?.title || data?.corpUser?.info?.title || undefined,
team: data?.corpUser?.editableProperties?.teams?.join(',') || undefined,
email: data?.corpUser?.editableProperties?.email || data?.corpUser?.info?.email || undefined,