Skip to content

[FIX] Wrong user in user info #21451

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
ggazzo merged 3 commits into from
Apr 16, 2021
Merged

[FIX] Wrong user in user info #21451

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc2d05f
Inconsistensies in user info
gabriellsh Apr 5, 2021
bd11c1b
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
gabriellsh Apr 15, 2021
8ee88ca
fix wrong return
gabriellsh Apr 15, 2021
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
5 changes: 2 additions & 3 deletions client/views/admin/users/UsersPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';
import Page from '../../../components/Page';
import VerticalBar from '../../../components/VerticalBar';
import { useTranslation } from '../../../contexts/TranslationContext';
import { useRouteParameter, useRoute } from '../../../contexts/RouterContext';
import { useRoute, useCurrentRoute } from '../../../contexts/RouterContext';
import { UserInfoWithData } from './UserInfo';
import { EditUserWithData } from './EditUser';
import { AddUser } from './AddUser';
Expand All @@ -28,8 +28,7 @@ function UsersPage() {
usersRoute.push({ context: 'invite' });
};

const context = useRouteParameter('context');
const id = useRouteParameter('id');
const [, { context, id }] = useCurrentRoute();

return <Page flexDirection='row'>
<Page>
Expand Down
14 changes: 13 additions & 1 deletion client/views/room/MemberListRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ import { useRoom } from './providers/RoomProvider';
import { useTab, useTabBarClose, useTabContext } from './providers/ToolboxProvider';
import RoomMembers from './contextualBar/RoomMembers';

const getUid = (room, ownUserId) => {
if (room.uids.length === 1) {
return room.uids.length;
}

const uid = room.uids.filter((uid) => uid !== ownUserId).shift();

// Self DMs used to be created with the userId duplicated.
// Sometimes rooms can have 2 equal uids, but it's a self DM.
return uid ?? room.uids[0];
};

const MemberListRouter = ({ rid }) => {
const username = useTabContext();
const room = useRoom();
Expand All @@ -19,7 +31,7 @@ const MemberListRouter = ({ rid }) => {
return <RoomMembers rid={rid}/>;
}

return <UserInfo width='100%' {...username ? { username } : { uid: room.uids.length === 1 ? room.uids[0] : room.uids.filter((uid) => uid !== ownUserId).shift() }} onClose={onClickClose} rid={rid}/>;
return <UserInfo width='100%' {...username ? { username } : { uid: getUid(room, ownUserId) }} onClose={onClickClose} rid={rid}/>;
};

export default MemberListRouter;