Skip to content
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

Jump to bottom

fix(user-list): prevent applying action to wrong user #19697

Merged
merged 2 commits into from
Mar 4, 2024
Merged

fix(user-list): prevent applying action to wrong user #19697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4250a7f
fix(user-list): prevent applying action to wrong user
JoVictorNunes Feb 28, 2024
ee4919b
fix(user-list): typescript error
JoVictorNunes Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions ...onents/user-list/user-list-content/user-participants/user-list-participants/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ interface RowRendererProps extends ListProps {
meeting: Meeting;
offset: number;
index: number;
openUserAction: string | null;
setOpenUserAction: React.Dispatch<React.SetStateAction<string | null>>;
}
const rowRenderer: React.FC<RowRendererProps> = ({
index, key, style, users, validCurrentUser, offset, meeting, isRTL, pageId,
index, key, style, users, validCurrentUser, offset, meeting, isRTL, pageId, openUserAction, setOpenUserAction,
}) => {
const userIndex = index - offset;
const user = users && users[userIndex];
Expand All @@ -61,6 +63,8 @@ const rowRenderer: React.FC<RowRendererProps> = ({
usersPolicies={meeting.usersPolicies}
isBreakout={meeting.isBreakout}
pageId={pageId}
open={user.userId === openUserAction}
setOpenUserAction={setOpenUserAction}
>
<ListItem user={user} lockSettings={meeting.lockSettings} />
</UserActions>
Expand Down Expand Up @@ -88,6 +92,7 @@ const UserListParticipants: React.FC<UserListParticipantsProps> = ({
const userListRef = React.useRef<HTMLDivElement | null>(null);
const userItemsRef = React.useRef<HTMLDivElement | null>(null);
const [selectedUser, setSelectedUser] = React.useState<HTMLElement>();
const [openUserAction, setOpenUserAction] = React.useState<string | null>(null);
const { roving } = Service;

const isRTL = layoutSelect((i: Layout) => i.isRTL);
Expand Down Expand Up @@ -156,7 +161,15 @@ const UserListParticipants: React.FC<UserListParticipantsProps> = ({
rowRenderer={
(props: RowRendererProps) => rowRenderer(
{
...props, users: users || previousUsersData, validCurrentUser, offset, meeting, isRTL, pageId,
...props,
users: users || previousUsersData,
validCurrentUser,
offset,
meeting,
isRTL,
pageId,
openUserAction,
setOpenUserAction,
},
)
}
Expand Down
45 changes: 24 additions & 21 deletions ...ist/user-list-content/user-participants/user-list-participants/user-actions/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ interface UserActionsProps {
isBreakout: boolean;
children: React.ReactNode;
pageId: string;
open: boolean;
setOpenUserAction: React.Dispatch<React.SetStateAction<string | null>>;
}

interface DropdownItem {
Expand Down Expand Up @@ -212,11 +214,12 @@ const UserActions: React.FC<UserActionsProps> = ({
isBreakout,
children,
pageId,
open,
setOpenUserAction,
}) => {
const intl = useIntl();
const [showNestedOptions, setShowNestedOptions] = useState(false);
const [isConfirmationModalOpen, setIsConfirmationModalOpen] = useState(false);
const [selected, setSelected] = useState(false);
const layoutContextDispatch = layoutDispatch();

const [presentationSetWriters] = useMutation(PRESENTATION_SET_WRITERS);
Expand Down Expand Up @@ -381,7 +384,7 @@ const UserActions: React.FC<UserActionsProps> = ({
label: intl.formatMessage(messages.StartPrivateChat),
onClick: () => {
setPendingChat(user.userId);
setSelected(false);
setOpenUserAction(null);
chatCreateWithUser({
variables: {
userId: user.userId,
Expand Down Expand Up @@ -414,7 +417,7 @@ const UserActions: React.FC<UserActionsProps> = ({
emoji: 'none',
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: 'clear_status',
},
Expand All @@ -425,7 +428,7 @@ const UserActions: React.FC<UserActionsProps> = ({
label: intl.formatMessage(messages.MuteUserAudioLabel),
onClick: () => {
toggleVoice(user.userId, voiceToggle);
setSelected(false);
setOpenUserAction(null);
},
icon: 'mute',
},
Expand All @@ -437,7 +440,7 @@ const UserActions: React.FC<UserActionsProps> = ({
label: intl.formatMessage(messages.UnmuteUserAudioLabel),
onClick: () => {
toggleVoice(user.userId, voiceToggle);
setSelected(false);
setOpenUserAction(null);
},
icon: 'unmute',
dataTest: 'unmuteUser',
Expand All @@ -452,7 +455,7 @@ const UserActions: React.FC<UserActionsProps> = ({
: intl.formatMessage(messages.giveWhiteboardAccess),
onClick: () => {
handleWhiteboardAccessChange();
setSelected(false);
setOpenUserAction(null);
},
icon: 'pen_tool',
dataTest: 'changeWhiteboardAccess',
Expand All @@ -469,7 +472,7 @@ const UserActions: React.FC<UserActionsProps> = ({
userId: user.userId,
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: 'presentation',
dataTest: isMe(user.userId) ? 'takePresenter' : 'makePresenter',
Expand All @@ -485,7 +488,7 @@ const UserActions: React.FC<UserActionsProps> = ({
role: 'MODERATOR',
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: 'promote',
dataTest: 'promoteToModerator',
Expand All @@ -501,7 +504,7 @@ const UserActions: React.FC<UserActionsProps> = ({
role: 'VIEWER',
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: 'user',
dataTest: 'demoteToViewer',
Expand All @@ -518,7 +521,7 @@ const UserActions: React.FC<UserActionsProps> = ({
locked: !userLocked,
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: userLocked ? 'unlock' : 'lock',
dataTest: 'unlockUserButton',
Expand All @@ -533,7 +536,7 @@ const UserActions: React.FC<UserActionsProps> = ({
extId: user.extId,
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: 'user',
},
Expand All @@ -543,7 +546,7 @@ const UserActions: React.FC<UserActionsProps> = ({
label: intl.formatMessage(messages.RemoveUserLabel, { 0: user.name }),
onClick: () => {
setIsConfirmationModalOpen(true);
setSelected(false);
setOpenUserAction(null);
},
icon: 'circle_close',
dataTest: 'removeUser',
Expand All @@ -560,7 +563,7 @@ const UserActions: React.FC<UserActionsProps> = ({
userId: user.userId,
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: 'video_off',
dataTest: 'ejectCamera',
Expand All @@ -575,7 +578,7 @@ const UserActions: React.FC<UserActionsProps> = ({
away: !user.away,
},
});
setSelected(false);
setOpenUserAction(null);
},
icon: 'time',
},
Expand Down Expand Up @@ -607,7 +610,7 @@ const UserActions: React.FC<UserActionsProps> = ({
emoji: key,
},
});
setSelected(false);
setOpenUserAction(null);
setShowNestedOptions(false);
},
icon: (EMOJI_STATUSES as Record<string, string>)[key],
Expand All @@ -632,13 +635,13 @@ const UserActions: React.FC<UserActionsProps> = ({
trigger={
(
<Styled.UserActionsTrigger
isActionsOpen={selected}
selected={selected === true}
isActionsOpen={open}
selected={open}
tabIndex={-1}
onClick={() => setSelected(true)}
onClick={() => setOpenUserAction(user.userId)}
onKeyDown={(e) => {
if (e.key === 'Enter') {
setSelected(true);
setOpenUserAction(user.userId);
}
}}
role="button"
Expand All @@ -650,10 +653,10 @@ const UserActions: React.FC<UserActionsProps> = ({
actions={actions}
selectedEmoji={user.emoji}
onCloseCallback={() => {
setSelected(false);
setOpenUserAction(null);
setShowNestedOptions(false);
}}
open={selected}
open={open}
/>
{isConfirmationModalOpen ? (
<ConfirmationModal
Expand Down