diff options
Diffstat (limited to 'webapp/components/suggestion')
4 files changed, 8 insertions, 9 deletions
diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx index e9d09205a..f967da3e4 100644 --- a/webapp/components/suggestion/at_mention_provider.jsx +++ b/webapp/components/suggestion/at_mention_provider.jsx @@ -10,7 +10,7 @@ import {autocompleteUsersInChannel} from 'actions/user_actions.jsx'; import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'client/web_client.jsx'; +import {Client4} from 'mattermost-redux/client'; import {Constants, ActionTypes} from 'utils/constants.jsx'; import React from 'react'; @@ -66,7 +66,7 @@ class AtMentionSuggestion extends Suggestion { icon = ( <img className='mention__image' - src={Client.getUsersRoute() + '/' + user.id + '/image?time=' + user.last_picture_update} + src={Client4.getUsersRoute() + '/' + user.id + '/image?time=' + user.last_picture_update} /> ); } diff --git a/webapp/components/suggestion/command_provider.jsx b/webapp/components/suggestion/command_provider.jsx index 30b989d70..4f74ebd55 100644 --- a/webapp/components/suggestion/command_provider.jsx +++ b/webapp/components/suggestion/command_provider.jsx @@ -3,10 +3,10 @@ import React from 'react'; -import * as AsyncClient from 'utils/async_client.jsx'; - import Suggestion from './suggestion.jsx'; +import {getSuggestedCommands} from 'actions/integration_actions.jsx'; + class CommandSuggestion extends Suggestion { render() { const {item, isSelection} = this.props; @@ -35,7 +35,7 @@ class CommandSuggestion extends Suggestion { export default class CommandProvider { handlePretextChanged(suggestionId, pretext) { if (pretext.startsWith('/')) { - AsyncClient.getSuggestedCommands(pretext.toLowerCase(), suggestionId, CommandSuggestion, pretext.toLowerCase()); + getSuggestedCommands(pretext.toLowerCase(), suggestionId, CommandSuggestion, pretext.toLowerCase()); } } } diff --git a/webapp/components/suggestion/search_user_provider.jsx b/webapp/components/suggestion/search_user_provider.jsx index b63206de7..d05d42a54 100644 --- a/webapp/components/suggestion/search_user_provider.jsx +++ b/webapp/components/suggestion/search_user_provider.jsx @@ -7,7 +7,7 @@ import Provider from './provider.jsx'; import {autocompleteUsersInTeam} from 'actions/user_actions.jsx'; import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; -import Client from 'client/web_client.jsx'; +import {Client4} from 'mattermost-redux/client'; import * as Utils from 'utils/utils.jsx'; import {ActionTypes} from 'utils/constants.jsx'; @@ -41,7 +41,7 @@ class SearchUserSuggestion extends Suggestion { <i className='fa fa fa-plus-square'/> <img className='profile-img rounded' - src={Client.getUsersRoute() + '/' + item.id + '/image?time=' + item.last_picture_update} + src={Client4.getUsersRoute() + '/' + item.id + '/image?time=' + item.last_picture_update} /> <div className='mention--align'> <span> diff --git a/webapp/components/suggestion/switch_channel_provider.jsx b/webapp/components/suggestion/switch_channel_provider.jsx index d4828ead3..8412332ea 100644 --- a/webapp/components/suggestion/switch_channel_provider.jsx +++ b/webapp/components/suggestion/switch_channel_provider.jsx @@ -4,7 +4,6 @@ import Suggestion from './suggestion.jsx'; import Provider from './provider.jsx'; -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'; @@ -47,7 +46,7 @@ class SwitchChannelSuggestion extends Suggestion { <div className='pull-left'> <img className='mention__image' - src={Client.getUsersRoute() + '/' + channel.id + '/image?time=' + channel.last_picture_update} + src={Client4.getUsersRoute() + '/' + channel.id + '/image?time=' + channel.last_picture_update} /> </div> ); |