MM-22326 Fix non-DM/GM autocomplete in search box (#4850)

* Fix non-DM/GM autocomplete in search box * Remove unrelated change
mattermost · Feb 10, 2020 · a5bb7a7 · a5bb7a7
1 parent 100a9e5
commit a5bb7a7
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/components/suggestion/search_channel_provider.jsx b/components/suggestion/search_channel_provider.jsx
@@ -27,6 +27,19 @@ function itemToName(item) {
  return item.name;
 }
 
+function itemToTerm(item) {
+ if (item.type === Constants.DM_CHANNEL) {
+ return '@' + item.display_name;
+ }
+ if (item.type === Constants.GM_CHANNEL) {
+ return '@' + item.display_name.replace(/ /g, '');
+ }
+ if (item.type === Constants.OPEN_CHANNEL || item.type === Constants.PRIVATE_CHANNEL) {
+ return item.name;
+ }
+ return item.name;
+}
+
 class SearchChannelSuggestion extends Suggestion {
  render() {
  const {item, isSelection} = this.props;
@@ -96,7 +109,7 @@ export default class SearchChannelProvider extends Provider {
  // MM-12677 When this is migrated this needs to be fixed to pull the user's locale
  //
  const channels = data.sort(sortChannelsByTypeAndDisplayName.bind(null, 'en'));
- const channelNames = channels.map(itemToName);
+ const channelNames = channels.map(itemToTerm);
 
  resultsCallback({
  matchedPretext: channelPrefix,