summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/generated_setting.jsx
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-08-02 01:36:54 -0700
committerGitHub <noreply@github.com>2017-08-02 01:36:54 -0700
commit65817e13c7900ea81947e40e177459cfea8acee4 (patch)
tree8dfc88db36844e4186b4110753be8de976da6371 /webapp/components/admin_console/generated_setting.jsx
parentc6bf235ec2a8613d8ef35607e2aeb8c0cb629f45 (diff)
downloadchat-65817e13c7900ea81947e40e177459cfea8acee4.tar.gz
chat-65817e13c7900ea81947e40e177459cfea8acee4.tar.bz2
chat-65817e13c7900ea81947e40e177459cfea8acee4.zip
PLT-6965 jira integration (plus plugin scaffolding) (#6918)
* plugin scaffolding / jira integration * add vendored testify packages * webhook fix * don't change i18n ids * support configuration watching * add basic jira plugin configuration to admin console * fix eslint errors * fix another eslint warning * polish * undo unintentional config.json commit >:( * test fix * add jira plugin diagnostics, remove dm support, add bot tag, generate web-safe secrets * rebase, implement requested changes * requested changes * remove tests and minimize makefile change * add missing license headers * add missing comma * remove bad line from Makefile
Diffstat (limited to 'webapp/components/admin_console/generated_setting.jsx')
-rw-r--r--webapp/components/admin_console/generated_setting.jsx13
1 files changed, 12 insertions, 1 deletions
diff --git a/webapp/components/admin_console/generated_setting.jsx b/webapp/components/admin_console/generated_setting.jsx
index b6a495f93..2fed2f42f 100644
--- a/webapp/components/admin_console/generated_setting.jsx
+++ b/webapp/components/admin_console/generated_setting.jsx
@@ -20,7 +20,8 @@ export default class GeneratedSetting extends React.Component {
disabled: PropTypes.bool.isRequired,
disabledText: PropTypes.node,
helpText: PropTypes.node.isRequired,
- regenerateText: PropTypes.node
+ regenerateText: PropTypes.node,
+ regenerateHelpText: PropTypes.node
};
}
@@ -58,6 +59,15 @@ export default class GeneratedSetting extends React.Component {
);
}
+ let regenerateHelpText = null;
+ if (this.props.regenerateHelpText) {
+ regenerateHelpText = (
+ <div className='help-text'>
+ {this.props.regenerateHelpText}
+ </div>
+ );
+ }
+
return (
<div className='form-group'>
<label
@@ -88,6 +98,7 @@ export default class GeneratedSetting extends React.Component {
{this.props.regenerateText}
</button>
</div>
+ {regenerateHelpText}
</div>
</div>
);