Fixed hardcoded team name in InstalledIntegrations

Этот коммит содержится в:
Harrison Healey
2016-03-29 10:53:09 -04:00
родитель 17f10b1aba
Коммит 4029db3905

Просмотреть файл

@@ -6,6 +6,7 @@ import React from 'react';
import * as AsyncClient from 'utils/async_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx';
import ChannelStore from 'stores/channel_store.jsx'; import ChannelStore from 'stores/channel_store.jsx';
import IntegrationStore from 'stores/integration_store.jsx'; import IntegrationStore from 'stores/integration_store.jsx';
import TeamStore from 'stores/team_store.jsx';
import * as Utils from 'utils/utils.jsx'; import * as Utils from 'utils/utils.jsx';
import {FormattedMessage} from 'react-intl'; import {FormattedMessage} from 'react-intl';
@@ -17,7 +18,8 @@ export default class InstalledIntegrations extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.handleChange = this.handleChange.bind(this); this.handleIntegrationChange = this.handleIntegrationChange.bind(this);
this.handleTeamChange = this.handleTeamChange.bind(this);
this.updateFilter = this.updateFilter.bind(this); this.updateFilter = this.updateFilter.bind(this);
this.updateTypeFilter = this.updateTypeFilter.bind(this); this.updateTypeFilter = this.updateTypeFilter.bind(this);
@@ -26,6 +28,7 @@ export default class InstalledIntegrations extends React.Component {
this.deleteOutgoingWebhook = this.deleteOutgoingWebhook.bind(this); this.deleteOutgoingWebhook = this.deleteOutgoingWebhook.bind(this);
this.state = { this.state = {
team: TeamStore.getCurrent(),
incomingWebhooks: [], incomingWebhooks: [],
outgoingWebhooks: [], outgoingWebhooks: [],
typeFilter: '', typeFilter: '',
@@ -34,7 +37,8 @@ export default class InstalledIntegrations extends React.Component {
} }
componentWillMount() { componentWillMount() {
IntegrationStore.addChangeListener(this.handleChange); IntegrationStore.addChangeListener(this.handleIntegrationChange);
TeamStore.addChangeListener(this.handleTeamChange);
if (window.mm_config.EnableIncomingWebhooks === 'true') { if (window.mm_config.EnableIncomingWebhooks === 'true') {
if (IntegrationStore.hasReceivedIncomingWebhooks()) { if (IntegrationStore.hasReceivedIncomingWebhooks()) {
@@ -58,16 +62,23 @@ export default class InstalledIntegrations extends React.Component {
} }
componentWillUnmount() { componentWillUnmount() {
IntegrationStore.removeChangeListener(this.handleChange); IntegrationStore.removeChangeListener(this.handleIntegrationChange);
TeamStore.removeChangeListener(this.handleTeamChange);
} }
handleChange() { handleIntegrationChange() {
this.setState({ this.setState({
incomingWebhooks: IntegrationStore.getIncomingWebhooks(), incomingWebhooks: IntegrationStore.getIncomingWebhooks(),
outgoingWebhooks: IntegrationStore.getOutgoingWebhooks() outgoingWebhooks: IntegrationStore.getOutgoingWebhooks()
}); });
} }
handleTeamChange() {
this.setState({
team: TeamStore.getCurrent()
});
}
updateTypeFilter(e, typeFilter) { updateTypeFilter(e, typeFilter) {
e.preventDefault(); e.preventDefault();
@@ -195,6 +206,10 @@ export default class InstalledIntegrations extends React.Component {
} }
render() { render() {
if (!this.state.team) {
return null;
}
const incomingWebhooks = this.state.incomingWebhooks; const incomingWebhooks = this.state.incomingWebhooks;
const outgoingWebhooks = this.state.outgoingWebhooks; const outgoingWebhooks = this.state.outgoingWebhooks;
@@ -254,7 +269,7 @@ export default class InstalledIntegrations extends React.Component {
</h1> </h1>
<Link <Link
className='add-integrations-link' className='add-integrations-link'
to={'/yourteamhere/integrations/add'} to={`/${this.state.team.name}/integrations/add`}
> >
<button <button
type='button' type='button'