Skip to content

regression: UserInfoTab Broken #22019

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

Merged
tassoevan merged 1 commit into from
May 12, 2021
Merged

regression: UserInfoTab Broken #22019

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
16 changes: 15 additions & 1 deletion client/views/room/contextualBar/UserInfo/UserInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import MarkdownText from '../../../../components/MarkdownText';
import UTCClock from '../../../../components/UTCClock';
import UserCard from '../../../../components/UserCard';
import VerticalBar from '../../../../components/VerticalBar';
import { useSetting } from '../../../../contexts/SettingsContext';
import { useTranslation } from '../../../../contexts/TranslationContext';
import { useTimeAgo } from '../../../../hooks/useTimeAgo';
import InfoPanel from '../../../InfoPanel';
Expand Down Expand Up @@ -34,6 +35,19 @@ function UserInfo({

const timeAgo = useTimeAgo();

const customFieldsToShowSetting = useSetting('Accounts_CustomFieldsToShowInUserInfo');
const customFieldsToShowObj = JSON.parse(customFieldsToShowSetting);

const customFieldsToShow = customFieldsToShowObj
? Object.values(customFieldsToShowObj).map((value) => {
const role = Object.values(value);
const roleNameToShow = Object.keys(value);
const customField = {};
customField[roleNameToShow] = customFields[role];
return customField;
})
: [];

return (
<VerticalBar.ScrollableContent p='x24' {...props}>
<InfoPanel>
Expand Down Expand Up @@ -129,7 +143,7 @@ function UserInfo({
</InfoPanel.Field>
)}

{customFields.map((customField) =>
{customFieldsToShow.map((customField) =>
Object.values(customField)[0] ? (
<InfoPanel.Field key={Object.keys(customField)[0]}>
<InfoPanel.Label>{t(Object.keys(customField)[0])}</InfoPanel.Label>
Expand Down
18 changes: 2 additions & 16 deletions client/views/room/contextualBar/UserInfo/UserInfoWithData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,9 @@ function UserInfoWithData({
]),
);

const customFieldsToShowSetting = useSetting('Accounts_CustomFieldsToShowInUserInfo');

const user = useMemo(() => {
const { user } = value || { user: {} };

const customFieldsToShowObj = JSON.parse(customFieldsToShowSetting);

const customFieldsToShow = customFieldsToShowObj
? Object.values(customFieldsToShowObj).map((value) => {
const role = Object.values(value);
const roleNameToShow = Object.keys(value);
const customField = {};
customField[roleNameToShow] = user?.customFields[role];
return customField;
})
: [];

const {
_id,
name,
Expand All @@ -78,7 +64,7 @@ function UserInfoWithData({
getRoles(roles).map((role, index) => <UserCard.Role key={index}>{role}</UserCard.Role>),
bio,
phone: user.phone,
customFields: customFieldsToShow,
customFields: user.customFields,
verified: getUserEmailVerified(user),
email: getUserEmailAddress(user),
utcOffset,
Expand All @@ -87,7 +73,7 @@ function UserInfoWithData({
customStatus: statusText,
nickname,
};
}, [value, customFieldsToShowSetting, showRealNames, getRoles]);
}, [value, showRealNames, getRoles]);

return (
<>
Expand Down