PLT-2989 Incoming webhooks available to all channels user is member of (#3082)
* Removed OPEN_CHANNEL check * Added checks for each type of channel * Added all channels display Used onComponentUpdate, made code clearer * Made requested changes
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
335e5cc4da
Коммит
4353e1fb97
@@ -172,6 +172,8 @@ export default class AddIncomingWebhook extends React.Component {
|
|||||||
id='channelId'
|
id='channelId'
|
||||||
value={this.state.channelId}
|
value={this.state.channelId}
|
||||||
onChange={this.updateChannelId}
|
onChange={this.updateChannelId}
|
||||||
|
selectOpen={true}
|
||||||
|
selectPrivate={true}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -224,6 +224,7 @@ export default class AddOutgoingWebhook extends React.Component {
|
|||||||
id='channelId'
|
id='channelId'
|
||||||
value={this.state.channelId}
|
value={this.state.channelId}
|
||||||
onChange={this.updateChannelId}
|
onChange={this.updateChannelId}
|
||||||
|
selectOpen={true}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,12 +6,24 @@ import React from 'react';
|
|||||||
import Constants from 'utils/constants.jsx';
|
import Constants from 'utils/constants.jsx';
|
||||||
import ChannelStore from 'stores/channel_store.jsx';
|
import ChannelStore from 'stores/channel_store.jsx';
|
||||||
import * as Utils from 'utils/utils.jsx';
|
import * as Utils from 'utils/utils.jsx';
|
||||||
|
import * as AsyncClient from 'utils/async_client.jsx';
|
||||||
|
|
||||||
export default class ChannelSelect extends React.Component {
|
export default class ChannelSelect extends React.Component {
|
||||||
static get propTypes() {
|
static get propTypes() {
|
||||||
return {
|
return {
|
||||||
onChange: React.PropTypes.func,
|
onChange: React.PropTypes.func,
|
||||||
value: React.PropTypes.string
|
value: React.PropTypes.string,
|
||||||
|
selectOpen: React.PropTypes.bool.isRequired,
|
||||||
|
selectPrivate: React.PropTypes.bool.isRequired,
|
||||||
|
selectDm: React.PropTypes.bool.isRequired
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static get defaultProps() {
|
||||||
|
return {
|
||||||
|
selectOpen: false,
|
||||||
|
selectPrivate: false,
|
||||||
|
selectDm: false
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -19,17 +31,16 @@ export default class ChannelSelect extends React.Component {
|
|||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
this.handleChannelChange = this.handleChannelChange.bind(this);
|
this.handleChannelChange = this.handleChannelChange.bind(this);
|
||||||
|
this.compareByDisplayName = this.compareByDisplayName.bind(this);
|
||||||
|
|
||||||
|
AsyncClient.getMoreChannels(true);
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
channels: []
|
channels: ChannelStore.getAll().sort(this.compareByDisplayName)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillMount() {
|
componentDidMount() {
|
||||||
this.setState({
|
|
||||||
channels: ChannelStore.getAll()
|
|
||||||
});
|
|
||||||
|
|
||||||
ChannelStore.addChangeListener(this.handleChannelChange);
|
ChannelStore.addChangeListener(this.handleChannelChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,10 +50,14 @@ export default class ChannelSelect extends React.Component {
|
|||||||
|
|
||||||
handleChannelChange() {
|
handleChannelChange() {
|
||||||
this.setState({
|
this.setState({
|
||||||
channels: ChannelStore.getAll()
|
channels: ChannelStore.getAll().concat(ChannelStore.getMoreAll()).sort(this.compareByDisplayName)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compareByDisplayName(channelA, channelB) {
|
||||||
|
return channelA.display_name.localeCompare(channelB.display_name);
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const options = [
|
const options = [
|
||||||
<option
|
<option
|
||||||
@@ -54,7 +69,25 @@ export default class ChannelSelect extends React.Component {
|
|||||||
];
|
];
|
||||||
|
|
||||||
this.state.channels.forEach((channel) => {
|
this.state.channels.forEach((channel) => {
|
||||||
if (channel.type === Constants.OPEN_CHANNEL) {
|
if (channel.type === Constants.OPEN_CHANNEL && this.props.selectOpen) {
|
||||||
|
options.push(
|
||||||
|
<option
|
||||||
|
key={channel.id}
|
||||||
|
value={channel.id}
|
||||||
|
>
|
||||||
|
{channel.display_name}
|
||||||
|
</option>
|
||||||
|
);
|
||||||
|
} else if (channel.type === Constants.PRIVATE_CHANNEL && this.props.selectPrivate) {
|
||||||
|
options.push(
|
||||||
|
<option
|
||||||
|
key={channel.id}
|
||||||
|
value={channel.id}
|
||||||
|
>
|
||||||
|
{channel.display_name}
|
||||||
|
</option>
|
||||||
|
);
|
||||||
|
} else if (channel.type === Constants.DM_CHANNEL && this.props.selectDm) {
|
||||||
options.push(
|
options.push(
|
||||||
<option
|
<option
|
||||||
key={channel.id}
|
key={channel.id}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user