diff options
author | Nicolas Clerc <kernicPanel@nclerc.fr> | 2016-02-15 09:11:35 +0100 |
---|---|---|
committer | Nicolas Clerc <kernicPanel@nclerc.fr> | 2016-03-17 01:45:37 +0100 |
commit | 5e2596598f97e318f1e4e8bd835b08a011fa0b60 (patch) | |
tree | 68b3a9200e9858a7239d45b1869c38c1216d6bda /webapp/components | |
parent | 809779a87f4380b6802314271b06540a31b83f53 (diff) | |
download | chat-5e2596598f97e318f1e4e8bd835b08a011fa0b60.tar.gz chat-5e2596598f97e318f1e4e8bd835b08a011fa0b60.tar.bz2 chat-5e2596598f97e318f1e4e8bd835b08a011fa0b60.zip |
add external slashcommands management
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/suggestion/command_provider.jsx | 4 | ||||
-rw-r--r-- | webapp/components/suggestion/suggestion_box.jsx | 2 | ||||
-rw-r--r-- | webapp/components/textbox.jsx | 1 | ||||
-rw-r--r-- | webapp/components/user_settings/manage_command_hooks.jsx | 43 |
4 files changed, 45 insertions, 5 deletions
diff --git a/webapp/components/suggestion/command_provider.jsx b/webapp/components/suggestion/command_provider.jsx index 36860fa66..204f52483 100644 --- a/webapp/components/suggestion/command_provider.jsx +++ b/webapp/components/suggestion/command_provider.jsx @@ -37,9 +37,9 @@ CommandSuggestion.propTypes = { }; export default class CommandProvider { - handlePretextChanged(suggestionId, pretext) { + handlePretextChanged(suggestionId, pretext, channelId) { if (pretext.startsWith('/')) { - AsyncClient.getSuggestedCommands(pretext, suggestionId, CommandSuggestion); + AsyncClient.getSuggestedCommands(pretext, channelId, suggestionId, CommandSuggestion); } } } diff --git a/webapp/components/suggestion/suggestion_box.jsx b/webapp/components/suggestion/suggestion_box.jsx index e3ec63194..04e4006f1 100644 --- a/webapp/components/suggestion/suggestion_box.jsx +++ b/webapp/components/suggestion/suggestion_box.jsx @@ -111,7 +111,7 @@ export default class SuggestionBox extends React.Component { handlePretextChanged(pretext) { for (const provider of this.props.providers) { - provider.handlePretextChanged(this.suggestionId, pretext); + provider.handlePretextChanged(this.suggestionId, pretext, this.props.channelId); } } diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx index 1a395072e..952026ed5 100644 --- a/webapp/components/textbox.jsx +++ b/webapp/components/textbox.jsx @@ -224,6 +224,7 @@ export default class Textbox extends React.Component { style={{visibility: this.state.preview ? 'hidden' : 'visible'}} listComponent={SuggestionList} providers={this.suggestionProviders} + channelId={this.props.channelId} /> <div ref='preview' diff --git a/webapp/components/user_settings/manage_command_hooks.jsx b/webapp/components/user_settings/manage_command_hooks.jsx index ce353ad64..4053a62aa 100644 --- a/webapp/components/user_settings/manage_command_hooks.jsx +++ b/webapp/components/user_settings/manage_command_hooks.jsx @@ -59,6 +59,7 @@ export default class ManageCommandCmds extends React.Component { this.getCmds = this.getCmds.bind(this); this.addNewCmd = this.addNewCmd.bind(this); this.emptyCmd = this.emptyCmd.bind(this); + this.updateExternalManagement = this.updateExternalManagement.bind(this); this.updateTrigger = this.updateTrigger.bind(this); this.updateURL = this.updateURL.bind(this); this.updateMethod = this.updateMethod.bind(this); @@ -99,7 +100,7 @@ export default class ManageCommandCmds extends React.Component { addNewCmd(e) { e.preventDefault(); - if (this.state.cmd.trigger === '' || this.state.cmd.url === '') { + if (this.state.cmd.url === '' || (this.state.cmd.trigger === '' && !this.state.external_management)) { return; } @@ -189,6 +190,12 @@ export default class ManageCommandCmds extends React.Component { ); } + updateExternalManagement(e) { + var cmd = this.state.cmd; + cmd.external_management = e.target.checked; + this.setState(cmd); + } + updateTrigger(e) { var cmd = this.state.cmd; cmd.trigger = e.target.value; @@ -275,6 +282,14 @@ export default class ManageCommandCmds extends React.Component { key={cmd.id} className='webhook__item webcmd__item' > + <div className='padding-top x2'> + <strong> + <FormattedMessage + id='user.settings.cmds.external_management' + defaultMessage='External management: ' + /> + </strong><span className='word-break--all'>{cmd.external_management ? this.props.intl.formatMessage(holders.autocompleteYes) : this.props.intl.formatMessage(holders.autocompleteNo)}</span> + </div> {triggerDiv} <div className='padding-top x2 webcmd__url'> <strong> @@ -416,7 +431,7 @@ export default class ManageCommandCmds extends React.Component { </div> ); - const disableButton = this.state.cmd.trigger === '' || this.state.cmd.url === ''; + const disableButton = this.state.cmd.url === '' || (this.state.cmd.trigger === '' && !this.state.external_management); return ( <div key='addCommandCmd'> @@ -436,6 +451,30 @@ export default class ManageCommandCmds extends React.Component { <div className='padding-top x2'> <label className='control-label'> <FormattedMessage + id='user.settings.cmds.external_management' + defaultMessage='External management: ' + /> + </label> + <div className='padding-top'> + <div className='checkbox'> + <label> + <input + type='checkbox' + checked={this.state.cmd.external_management} + onChange={this.updateExternalManagement} + /> + <FormattedMessage + id='user.settings.cmds.external_management_help' + defaultMessage=' Let an external integration manage commands.' + /> + </label> + </div> + </div> + </div> + + <div className='padding-top x2'> + <label className='control-label'> + <FormattedMessage id='user.settings.cmds.trigger' defaultMessage='Command Trigger Word: ' /> |