Skip to content

[IMPROVE] Improve the add user drop down for add a user in create channel modal for UserAutoCompleteMultiple #21649

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

Closed
Jeanstaquet wants to merge 21 commits into from
Closed

[IMPROVE] Improve the add user drop down for add a user in create channel modal for UserAutoCompleteMultiple #21649

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
36203dd
Merge pull request #1 from RocketChat/develop
Jeanstaquet Mar 12, 2021
f0ca3f3
Merge pull request #2 from RocketChat/develop
Jeanstaquet Mar 22, 2021
579fecc
Merge pull request #3 from RocketChat/develop
Jeanstaquet Mar 24, 2021
c77a81a
Merge pull request #5 from RocketChat/develop
Jeanstaquet Mar 29, 2021
05fe364
Merge pull request #6 from RocketChat/develop
Jeanstaquet Apr 1, 2021
5d756bd
Merge pull request #7 from RocketChat/develop
Jeanstaquet Apr 7, 2021
9d0361a
Merge pull request #8 from RocketChat/develop
Jeanstaquet Apr 13, 2021
3d57173
Merge pull request #9 from RocketChat/develop
Jeanstaquet Apr 15, 2021
a94b15f
Merge pull request #10 from RocketChat/develop
Jeanstaquet Apr 17, 2021
fe32d92
Adding the new UI
Jeanstaquet Apr 19, 2021
68ce591
Correcting
Jeanstaquet Apr 19, 2021
ad073e2
Adding the key
Jeanstaquet Apr 19, 2021
7efcbe0
Adding the listenners
Jeanstaquet Apr 19, 2021
2a0359e
Lint
Jeanstaquet Apr 19, 2021
4903578
Lint
Jeanstaquet Apr 19, 2021
a3275ea
Lint
Jeanstaquet Apr 19, 2021
4a3c2c6
Merge branch 'develop' into NewAddUserDropDown
Jeanstaquet Apr 19, 2021
e49f411
adding a eslint-disable
Jeanstaquet Apr 19, 2021
54100b1
Merge branch 'NewAddUserDropDown' of https://github.com/Jeanstaquet/R…
Jeanstaquet Apr 19, 2021
b08606c
lint
Jeanstaquet Apr 19, 2021
346d0a5
lint
Jeanstaquet Apr 19, 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
12 changes: 9 additions & 3 deletions ee/client/audit/UserAutoCompleteMultiple/UserAutoCompleteMultiple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import React, { memo, useMemo, useState } from 'react';

import UserAvatar from '../../../../client/components/avatar/UserAvatar';
import { useEndpointData } from '../../../../client/hooks/useEndpointData';
import Avatar from './Avatar';

const query = (term = '') => ({ selector: JSON.stringify({ term }) });

Expand Down Expand Up @@ -40,8 +39,15 @@ const UserAutoCompleteMultiple = (props) => {
</Chip>
))
}
renderItem={({ value, ...props }) => (
<Option key={value} {...props} avatar={<Avatar value={value} />} />
renderItem={({ value, label, ...props }) => (
<Option key={value} {...props}>
<Option.Avatar>
<UserAvatar username={value} size='x20' />
</Option.Avatar>
<Option.Content>
{label} <Option.Description>({value})</Option.Description>
</Option.Content>
</Option>
)}
options={options}
/>
Expand Down