IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-2989 Incoming webhooks available to all channels user is member of (#3082)

Browse Source 
* Removed OPEN_CHANNEL check

* Added checks for each type of channel

* Added all channels display

Used onComponentUpdate, made code clearer

* Made requested changes
This commit is contained in:
David Lu
2016-05-26 05:36:51 -07:00
committed by Christopher Speller
parent 335e5cc4da
commit 4353e1fb97
3 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/backstage/add_incoming_webhook.jsx
View File

@@ -172,6 +172,8 @@ export default class AddIncomingWebhook extends React.Component {
id='channelId'
value={this.state.channelId}
onChange={this.updateChannelId}
selectOpen={true}
selectPrivate={true}
/>
</div>
</div>

1
webapp/components/backstage/add_outgoing_webhook.jsx
View File

@@ -224,6 +224,7 @@ export default class AddOutgoingWebhook extends React.Component {
id='channelId'
value={this.state.channelId}
onChange={this.updateChannelId}
selectOpen={true}
/>
</div>
</div>

51
webapp/components/channel_select.jsx
View File

@@ -6,12 +6,24 @@ import React from 'react';
import Constants from 'utils/constants.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import * as Utils from 'utils/utils.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
export default class ChannelSelect extends React.Component {
static get propTypes() {
return {
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);
this.handleChannelChange = this.handleChannelChange.bind(this);
this.compareByDisplayName = this.compareByDisplayName.bind(this);
AsyncClient.getMoreChannels(true);
this.state = {
channels: []
channels: ChannelStore.getAll().sort(this.compareByDisplayName)
};
}
componentWillMount() {
this.setState({
channels: ChannelStore.getAll()
});
componentDidMount() {
ChannelStore.addChangeListener(this.handleChannelChange);
}
@@ -39,10 +50,14 @@ export default class ChannelSelect extends React.Component {
handleChannelChange() {
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() {
const options = [
<option
@@ -54,7 +69,25 @@ export default class ChannelSelect extends React.Component {
];
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(
<option
key={channel.id}