Moved public and private channels into separate sections in the search autocomplete

web/react/components/edit_channel_purpose_modal.jsx

@@ -3,6 +3,8 @@
 
 const AsyncClient = require('../utils/async_client.jsx');
 const Client = require('../utils/client.jsx');
+const Utils = require('../utils/utils.jsx');
+
 const Modal = ReactBootstrap.Modal;
 
 export default class EditChannelPurposeModal extends React.Component {
@@ -75,11 +77,6 @@ export default class EditChannelPurposeModal extends React.Component {
             title = <span>{'Edit Purpose for '}<span className='name'>{this.props.channel.display_name}</span></span>;
         }
 
-        let channelTerm = 'Channel';
-        if (this.props.channel.channelType === 'P') {
-            channelTerm = 'Group';
-        }
-
         return (
             <Modal
                 className='modal-edit-channel-purpose'
@@ -93,7 +90,7 @@ export default class EditChannelPurposeModal extends React.Component {
                     </Modal.Title>
                 </Modal.Header>
                 <Modal.Body>
-                    <p>{`Describe how this ${channelTerm} should be used.`}</p>
+                    <p>{`Describe how this ${Utils.getChannelTerm(this.props.channel.channelType)} should be used.`}</p>
                     <textarea
                         ref='purpose'
                         className='form-control no-resize'

web/react/components/search_autocomplete.jsx

@@ -6,6 +6,7 @@ const KeyCodes = require('../utils/constants.jsx').KeyCodes;
 const Popover = ReactBootstrap.Popover;
 const UserStore = require('../stores/user_store.jsx');
 const Utils = require('../utils/utils.jsx');
+const Constants = require('../utils/constants.jsx');
 
 const patterns = new Map([
     ['channels', /\b(?:in|channel):\s*(\S*)$/i],
@@ -26,6 +27,9 @@ export default class SearchAutocomplete extends React.Component {
         this.scrollToItem = this.scrollToItem.bind(this);
         this.updateSuggestions = this.updateSuggestions.bind(this);
 
+        this.renderChannelSuggestion = this.renderChannelSuggestion.bind(this);
+        this.renderUserSuggestion = this.renderUserSuggestion.bind(this);
+
         this.state = {
             show: false,
             mode: '',
@@ -230,17 +234,9 @@ export default class SearchAutocomplete extends React.Component {
         });
     }
 
-    render() {
+    renderChannelSuggestion(channel) {
-        if (!this.state.show || this.state.suggestions.length === 0) {
-            return null;
-        }
-
-        let suggestions = [];
-
-        if (this.state.mode === 'channels') {
-            suggestions = this.state.suggestions.map((channel, index) => {
         let className = 'search-autocomplete__item';
-                if (this.state.selection === index) {
+        if (channel.name === this.getSelection()) {
             className += ' selected';
         }
 
@@ -254,11 +250,11 @@ export default class SearchAutocomplete extends React.Component {
                 {channel.name}
             </div>
         );
-            });
+    }
-        } else if (this.state.mode === 'users') {
+
-            suggestions = this.state.suggestions.map((user, index) => {
+    renderUserSuggestion(user) {
         let className = 'search-autocomplete__item';
-                if (this.state.selection === index) {
+        if (user.username === this.getSelection()) {
             className += ' selected';
         }
 
@@ -276,7 +272,43 @@ export default class SearchAutocomplete extends React.Component {
                 {user.username}
             </div>
         );
-            });
+    }
+
+    render() {
+        if (!this.state.show || this.state.suggestions.length === 0) {
+            return null;
+        }
+
+        let suggestions = [];
+
+        if (this.state.mode === 'channels') {
+            const publicChannels = this.state.suggestions.filter((channel) => channel.type === Constants.OPEN_CHANNEL);
+            if (publicChannels.length > 0) {
+                suggestions.push(
+                    <div
+                        key='public-channel-divider'
+                        className='search-autocomplete__divider'
+                    >
+                        {'Public ' + Utils.getChannelTerm(Constants.OPEN_CHANNEL) + 's'}
+                    </div>
+                );
+                suggestions = suggestions.concat(publicChannels.map(this.renderChannelSuggestion));
+            }
+
+            const privateChannels = this.state.suggestions.filter((channel) => channel.type === Constants.PRIVATE_CHANNEL);
+            if (privateChannels.length > 0) {
+                suggestions.push(
+                    <div
+                        key='private-channel-divider'
+                        className='search-autocomplete__divider'
+                    >
+                        {'Private ' + Utils.getChannelTerm(Constants.PRIVATE_CHANNEL) + 's'}
+                    </div>
+                );
+                suggestions = suggestions.concat(privateChannels.map(this.renderChannelSuggestion));
+            }
+        } else if (this.state.mode === 'users') {
+            suggestions = this.state.suggestions.map(this.renderUserSuggestion);
         }
 
         return (

web/react/utils/utils.jsx

@@ -1125,3 +1125,12 @@ export function sortByDisplayName(a, b) {
     }
     return 0;
 }
+
+export function getChannelTerm(channelType) {
+    let channelTerm = 'Channel';
+    if (channelType === Constants.PRIVATE_CHANNEL) {
+        channelTerm = 'Group';
+    }
+
+    return channelTerm;
+}