[FIX][ENTERPRISE] Auditing RoomAutocomplete (#20311)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
pull/20326/head^2^2
Guilherme Gazzo 5 years ago committed by GitHub
parent b50175e182
commit 24a97278e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      ee/client/audit/RoomAutoComplete.js
  2. 16
      package-lock.json

@ -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
@ -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 }
/>;

16
package-lock.json generated

@ -5954,25 +5954,23 @@
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.171.tgz",
"integrity": "sha512-YWLQeEwRl6LMhUNZILEFOiwCEiA8gzDInQogEX1DNAyLDK17QCKC0JG8iJIWrpBUFt5qg2he3+eRQzk3Mcc+5w==",
"requires": {
"@rocket.chat/css-in-js": "^0.20.1",
"@rocket.chat/fuselage-tokens": "^0.20.1",
"invariant": "^2.2.4",
"react-keyed-flatten-children": "^1.2.0"
},
"dependencies": {
"@rocket.chat/css-in-js": {
"version": "0.20.1",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.20.1.tgz",
"integrity": "sha512-0bgLOKs7+GbuDfI6kdW4eNohkpXmjpSUW8deA6FCsI+Mstatt5uJl/kBm+leyMCJHJk7jDUL37yr5snDsM/t1w==",
"version": "0.6.3-dev.169",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.169.tgz",
"integrity": "sha512-jK60ysCqPXmSjgBHm5S8MZB3kKTFOr56GENL7yc1ETp8aScJaWWisRehBiwXbW22HH/2nYhhvUmp/ek5bB9qVA==",
"requires": {
"@emotion/hash": "^0.8.0",
"stylis": "^4.0.3"
"stylis": "^4.0.6"
}
},
"@rocket.chat/fuselage-tokens": {
"version": "0.20.1",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.20.1.tgz",
"integrity": "sha512-tRzWNvdb9T7nU3U9ZbMue84yvs21aP44tVsV/Gz+UNjWG1cEmpnB73dIj+52orzM+VcU7YSJ+Tv+K8Z87fHCeA=="
"version": "0.6.3-dev.169",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.169.tgz",
"integrity": "sha512-iIoHPlRFYK/zNJxk2zHEk8DzUZJdRIOp9aBo/Ql0CXErcxdDx4XL+hlqHyR17aj1NjgHpn8Elt072MFeXatc/g=="
},
"stylis": {
"version": "4.0.6",

Loading…
Cancel
Save