Skip to content

[FIX][ENTERPRISE] Auditing RoomAutocomplete #20311

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
sampaiodiego merged 5 commits into from
Jan 23, 2021
Merged

[FIX][ENTERPRISE] Auditing RoomAutocomplete #20311

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2c1b9d
Fix Auditing Autocomplete
ggazzo Jan 22, 2021
fa570f2
Merge branch 'develop' into fix/autocomplete
sampaiodiego Jan 23, 2021
a514747
Update package.json
sampaiodiego Jan 23, 2021
8dbad43
Merge branch 'develop' into fix/autocomplete
sampaiodiego Jan 23, 2021
9c07d48
Update package-lock
sampaiodiego Jan 23, 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
8 changes: 4 additions & 4 deletions ee/client/audit/RoomAutoComplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import { AutoComplete, Option, Options } from '@rocket.chat/fuselage';
import RoomAvatar from '../../../client/components/avatar/RoomAvatar';
import { useEndpointData } from '../../../client/hooks/useEndpointData';

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

const Avatar = ({ value, type, avatarETag, ...props }) => <RoomAvatar size={Options.AvatarSize} room={{ type, _id: value, avatarETag }} {...props} />;

const RoomAutoComplete = React.memo((props) => {
const [filter, setFilter] = useState('');
const { value: data } = useEndpointData('rooms.autocomplete.channelAndPrivate', useMemo(() => query(filter), [filter]));
const options = useMemo(() => (data && data.items.map(({ name, _id, avatarETag, t }) => ({
const options = useMemo(() => (data && data.items.map(({ name, _id, fname, avatarETag, t }) => ({
value: _id,
label: { name, avatarETag, type: t },
label: { name: fname || name, avatarETag, type: t },
}))) || [], [data]);

return <AutoComplete
Expand All @@ -23,7 +23,7 @@ const RoomAutoComplete = React.memo((props) => {
renderSelected={({
value,
label,
}) => <><RoomAvatar size='x20' room={{ _id: value, ...label }} /> {label?.name}</>}
}) => <Option label={label.name} avatar={<Avatar value={value} room={{ _id: value, ...label }} />} />}
renderItem={({ value, label, ...props }) => <Option key={value} {...props} label={label.name} avatar={<Avatar value={value} {...label} />} />}
options={ options }
/>;
Expand Down
92 changes: 53 additions & 39 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,17 @@
"@nivo/heatmap": "^0.61.0",
"@nivo/line": "^0.61.1",
"@nivo/pie": "^0.61.1",
"@rocket.chat/apps-engine": "1.22.0-alpha.4469",
"@rocket.chat/css-in-js": "^0.20.1",
"@rocket.chat/emitter": "^0.20.1",
"@rocket.chat/fuselage": "^0.6.3-dev.164",
"@rocket.chat/fuselage-hooks": "^0.20.1",
"@rocket.chat/fuselage-polyfills": "^0.20.1",
"@rocket.chat/apps-engine": "1.21.0-alpha.4469",
"@rocket.chat/css-in-js": "^0.6.3-dev.169",
"@rocket.chat/emitter": "^0.6.3-dev.169",
"@rocket.chat/fuselage": "^0.6.3-dev.169",
"@rocket.chat/fuselage-hooks": "^0.6.3-dev.169",
"@rocket.chat/fuselage-polyfills": "^0.6.3-dev.161",
"@rocket.chat/fuselage-tokens": "^0.6.3-dev.161",
"@rocket.chat/fuselage-ui-kit": "^0.20.1",
"@rocket.chat/fuselage-ui-kit": "^0.6.3-dev.169",
"@rocket.chat/icons": "^0.6.3-dev.162",
"@rocket.chat/mp3-encoder": "^0.20.1",
"@rocket.chat/ui-kit": "^0.20.1",
"@rocket.chat/mp3-encoder": "^0.6.3-dev.169",
"@rocket.chat/ui-kit": "^0.6.3-dev.169",
"@slack/client": "^4.12.0",
"@types/fibers": "^3.1.0",
"@types/imap": "^0.8.33",
Expand Down