From 6aec2b6c55e63faac64d78c8c5c52b3a9e02b2c8 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Fri, 20 Jan 2017 14:22:58 +0100 Subject: [PATCH] Move instances of Client.getInviteInfo() in components to an action (#5130) --- webapp/actions/team_actions.jsx | 16 ++++++++++++++++ .../signup/components/signup_email.jsx | 3 ++- webapp/components/signup/signup_controller.jsx | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/webapp/actions/team_actions.jsx b/webapp/actions/team_actions.jsx index aa8628ba3e..3352faa211 100644 --- a/webapp/actions/team_actions.jsx +++ b/webapp/actions/team_actions.jsx @@ -110,3 +110,19 @@ export function addUserToTeamFromInvite(data, hash, inviteId, success, error) { } ); } + +export function getInviteInfo(inviteId, success, error) { + Client.getInviteInfo( + inviteId, + (inviteData) => { + if (success) { + success(inviteData); + } + }, + (err) => { + if (error) { + error(err); + } + } + ); +} diff --git a/webapp/components/signup/components/signup_email.jsx b/webapp/components/signup/components/signup_email.jsx index aa3493c96b..e8181fd23a 100644 --- a/webapp/components/signup/components/signup_email.jsx +++ b/webapp/components/signup/components/signup_email.jsx @@ -5,6 +5,7 @@ import LoadingScreen from 'components/loading_screen.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import {track} from 'actions/analytics_actions.jsx'; +import {getInviteInfo} from 'actions/team_actions.jsx'; import BrowserStore from 'stores/browser_store.jsx'; @@ -58,7 +59,7 @@ export default class SignupEmail extends React.Component { loading = false; } else if (inviteId && inviteId.length > 0) { loading = true; - Client.getInviteInfo( + getInviteInfo( inviteId, (inviteData) => { if (!inviteData) { diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx index a4cc8f86dd..737431926b 100644 --- a/webapp/components/signup/signup_controller.jsx +++ b/webapp/components/signup/signup_controller.jsx @@ -12,7 +12,7 @@ import BrowserStore from 'stores/browser_store.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import Client from 'client/web_client.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; -import {addUserToTeamFromInvite} from 'actions/team_actions.jsx'; +import {addUserToTeamFromInvite, getInviteInfo} from 'actions/team_actions.jsx'; import logoImage from 'images/logo.png'; import ErrorBar from 'components/error_bar.jsx'; @@ -98,7 +98,7 @@ export default class SignupController extends React.Component { } if (inviteId) { - Client.getInviteInfo( + getInviteInfo( inviteId, (inviteData) => { if (!inviteData) {