diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-26 08:16:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-26 08:16:57 -0400 |
commit | 23ccfc845ca2350075f6027e16c6206fc7b71716 (patch) | |
tree | 3fd1f896a5a24b43913be03b21c85638dd7c356e /webapp/components/user_settings | |
parent | fe7e9d95b30ae2195fcba68db960866db91ce045 (diff) | |
download | chat-23ccfc845ca2350075f6027e16c6206fc7b71716.tar.gz chat-23ccfc845ca2350075f6027e16c6206fc7b71716.tar.bz2 chat-23ccfc845ca2350075f6027e16c6206fc7b71716.zip |
Move remaining actions over to use redux and v4 endpoints (#6720)
Diffstat (limited to 'webapp/components/user_settings')
4 files changed, 14 insertions, 16 deletions
diff --git a/webapp/components/user_settings/email_notification_setting.jsx b/webapp/components/user_settings/email_notification_setting.jsx index d92a1d0a6..4dd15f0be 100644 --- a/webapp/components/user_settings/email_notification_setting.jsx +++ b/webapp/components/user_settings/email_notification_setting.jsx @@ -1,11 +1,10 @@ -import PropTypes from 'prop-types'; - // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. import React from 'react'; +import PropTypes from 'prop-types'; -import {savePreference} from 'utils/async_client.jsx'; +import {savePreference} from 'actions/user_actions.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import {localizeMessage} from 'utils/utils.jsx'; diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx index 28beff556..1e2ae2386 100644 --- a/webapp/components/user_settings/user_settings_advanced.jsx +++ b/webapp/components/user_settings/user_settings_advanced.jsx @@ -2,21 +2,21 @@ // See License.txt for license information. import $ from 'jquery'; -import * as AsyncClient from 'utils/async_client.jsx'; import SettingItemMin from '../setting_item_min.jsx'; import SettingItemMax from '../setting_item_max.jsx'; -import Constants from 'utils/constants.jsx'; + import PreferenceStore from 'stores/preference_store.jsx'; import UserStore from 'stores/user_store.jsx'; -import * as Utils from 'utils/utils.jsx'; - -import {FormattedMessage} from 'react-intl'; +import Constants from 'utils/constants.jsx'; const PreReleaseFeatures = Constants.PRE_RELEASE_FEATURES; +import * as Utils from 'utils/utils.jsx'; -import PropTypes from 'prop-types'; +import {savePreferences} from 'actions/user_actions.jsx'; import React from 'react'; +import PropTypes from 'prop-types'; +import {FormattedMessage} from 'react-intl'; export default class AdvancedSettingsDisplay extends React.Component { constructor(props) { @@ -133,7 +133,7 @@ export default class AdvancedSettingsDisplay extends React.Component { }); }); - AsyncClient.savePreferences( + savePreferences( preferences, () => { this.updateSection(''); diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx index a5ca79c55..ccc70a108 100644 --- a/webapp/components/user_settings/user_settings_display.jsx +++ b/webapp/components/user_settings/user_settings_display.jsx @@ -7,11 +7,11 @@ import SettingItemMax from '../setting_item_max.jsx'; import ManageLanguages from './manage_languages.jsx'; import ThemeSetting from './user_settings_theme.jsx'; -import * as AsyncClient from 'utils/async_client.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import UserStore from 'stores/user_store.jsx'; import * as Utils from 'utils/utils.jsx'; import * as I18n from 'i18n/i18n.jsx'; +import {savePreferences} from 'actions/user_actions.jsx'; import Constants from 'utils/constants.jsx'; const Preferences = Constants.Preferences; @@ -29,9 +29,8 @@ function getDisplayStateFromStores() { }; } -import PropTypes from 'prop-types'; - import React from 'react'; +import PropTypes from 'prop-types'; export default class UserSettingsDisplay extends React.Component { constructor(props) { @@ -92,7 +91,7 @@ export default class UserSettingsDisplay extends React.Component { value: this.state.collapseDisplay }; - AsyncClient.savePreferences([timePreference, namePreference, fontPreference, channelDisplayModePreference, messageDisplayPreference, collapseDisplayPreference], + savePreferences([timePreference, namePreference, fontPreference, channelDisplayModePreference, messageDisplayPreference, collapseDisplayPreference], () => { this.updateSection(''); }, diff --git a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx index 8aeafd60a..0f0459180 100644 --- a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx @@ -9,7 +9,7 @@ import SettingPicture from 'components/setting_picture.jsx'; import UserStore from 'stores/user_store.jsx'; import ErrorStore from 'stores/error_store.jsx'; -import Client from 'client/web_client.jsx'; +import {Client4} from 'mattermost-redux/client'; import Constants from 'utils/constants.jsx'; import * as Utils from 'utils/utils.jsx'; @@ -1141,7 +1141,7 @@ class UserSettingsGeneralTab extends React.Component { <SettingPicture title={formatMessage(holders.profilePicture)} submit={this.submitPicture} - src={Client.getUsersRoute() + '/' + user.id + '/image?time=' + user.last_picture_update} + src={Client4.getUsersRoute() + '/' + user.id + '/image?time=' + user.last_picture_update} serverError={serverError} clientError={clientError} updateSection={(e) => { |