In webhooks UI handle error if channel can't be found, also use display name over url name, plus warning fixes

Этот коммит содержится в:
JoramWilander
2015-10-22 14:16:51 -04:00
родитель 649f42e3fc
Коммит 46f448899b
3 изменённых файлов: 62 добавлений и 26 удалений

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

@@ -128,21 +128,42 @@ export default class ManageOutgoingHooks extends React.Component {
}
const channels = ChannelStore.getAll();
const options = [<option value=''>{'--- Select a channel ---'}</option>];
const options = [];
options.push(
<option
key='select-channel'
value=''
>
{'--- Select a channel ---'}
</option>
);
channels.forEach((channel) => {
if (channel.type === Constants.OPEN_CHANNEL) {
options.push(<option value={channel.id}>{channel.name}</option>);
options.push(
<option
key={'outgoing-hook' + channel.id}
value={channel.id}
>
{channel.display_name}
</option>
);
}
});
const hooks = [];
this.state.hooks.forEach((hook) => {
const c = ChannelStore.get(hook.channel_id);
if (!c && hook.channel_id && hook.channel_id.length !== 0) {
return;
}
let channelDiv;
if (c) {
channelDiv = (
<div className='padding-top'>
<strong>{'Channel: '}</strong>{c.name}
<strong>{'Channel: '}</strong>{c.display_name}
</div>
);
}
@@ -157,7 +178,10 @@ export default class ManageOutgoingHooks extends React.Component {
}
hooks.push(
<div className='font--small'>
<div
key={hook.id}
className='font--small'
>
<div className='padding-top x2 divider-light'></div>
<div className='padding-top x2'>
<strong>{'URLs: '}</strong><span className='word-break--all'>{hook.callback_urls.join(', ')}</span>