Add icon to channel switcher and class prop to status icon

mattermost · Feb 28, 2017 · 89dd0ee · 89dd0ee
1 parent 11ccb9b
commit 89dd0ee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/webapp/components/status_icon.jsx b/webapp/components/status_icon.jsx
@@ -33,15 +33,20 @@ export default class StatusIcon extends React.Component {
 
         return (
             <span
-                className='status'
+                className={'status ' + this.props.className}
                 dangerouslySetInnerHTML={{__html: statusIcon}}
             />
         );
     }
 
 }
 
+StatusIcon.defaultProps = {
+    className: ''
+};
+
 StatusIcon.propTypes = {
     status: React.PropTypes.string,
+    className: React.PropTypes.string,
     type: React.PropTypes.string
 };
diff --git a/webapp/components/suggestion/switch_channel_provider.jsx b/webapp/components/suggestion/switch_channel_provider.jsx
@@ -12,7 +12,7 @@ import Client from 'client/web_client.jsx';
 import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
 import {Constants, ActionTypes} from 'utils/constants.jsx';
 import * as Utils from 'utils/utils.jsx';
-import {sortChannelsByDisplayName} from 'utils/channel_utils.jsx';
+import {sortChannelsByDisplayName, buildGroupChannelName} from 'utils/channel_utils.jsx';
 
 import React from 'react';
 
@@ -25,12 +25,15 @@ class SwitchChannelSuggestion extends Suggestion {
             className += ' suggestion--selected';
         }
 
-        const displayName = item.display_name;
+        let displayName = item.display_name;
         let icon = null;
         if (item.type === Constants.OPEN_CHANNEL) {
             icon = <div className='status'><i className='fa fa-globe'/></div>;
         } else if (item.type === Constants.PRIVATE_CHANNEL) {
             icon = <div className='status'><i className='fa fa-lock'/></div>;
+        } else if (item.type === Constants.GM_CHANNEL) {
+            displayName = buildGroupChannelName(item.id);
+            icon = <div className='status'>{UserStore.getProfileListInChannel(item.id, true).length}</div>;
         } else {
             icon = (
                 <div className='pull-left'>