Merge pull request #2113 from mattermost/slash-command-fixes

Multiple minor slash command fixes

2 files changed, 8 insertions, 2 deletions

diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index e0b72157b..90f28822b 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -234,7 +234,7 @@ class UserSettingsModal extends React.Component {
             tabs.push({name: 'developer', uiName: formatMessage(holders.developer), icon: 'glyphicon glyphicon-th'});
         }
 
-        if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true') {
+        if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true' || global.window.mm_config.EnableCommands === 'true') {
             tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'});
         }
         tabs.push({name: 'display', uiName: formatMessage(holders.display), icon: 'glyphicon glyphicon-eye-open'});
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index d5fc10b8f..c8676f45d 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -779,13 +779,19 @@ export function getSuggestedCommands(command, suggestionId, component) {
             var matches = [];
             data.forEach((cmd) => {
                 if (('/' + cmd.trigger).indexOf(command) === 0) {
+                    let s = '/' + cmd.trigger;
+                    if (cmd.auto_complete_hint && cmd.auto_complete_hint.length !== 0) {
+                        s += ' ' + cmd.auto_complete_hint;
+                    }
                     matches.push({
-                        suggestion: '/' + cmd.trigger + ' ' + cmd.auto_complete_hint,
+                        suggestion: s,
                         description: cmd.auto_complete_desc
                     });
                 }
             });
 
+            matches = matches.sort((a, b) => a.suggestion.localeCompare(b.suggestion));
+
             // pull out the suggested commands from the returned data
             const terms = matches.map((suggestion) => suggestion.suggestion);