From 5d7e9ded17949adf41384cb4011c2daf314b4f02 Mon Sep 17 00:00:00 2001 From: Jared Scheib Date: Tue, 18 Jul 2017 14:25:39 -0700 Subject: [PATCH] Rename RuleMessageConfig to RuleMessageOptions for clarity --- ui/src/kapacitor/components/RuleMessage.js | 4 ++-- ...MessageConfig.js => RuleMessageOptions.js} | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) rename ui/src/kapacitor/components/{RuleMessageConfig.js => RuleMessageOptions.js} (84%) diff --git a/ui/src/kapacitor/components/RuleMessage.js b/ui/src/kapacitor/components/RuleMessage.js index 010e219646..1440999aaf 100644 --- a/ui/src/kapacitor/components/RuleMessage.js +++ b/ui/src/kapacitor/components/RuleMessage.js @@ -1,7 +1,7 @@ import React, {Component, PropTypes} from 'react' import classnames from 'classnames' -import RuleMessageConfig from 'src/kapacitor/components/RuleMessageConfig' +import RuleMessageOptions from 'src/kapacitor/components/RuleMessageOptions' import RuleMessageText from 'src/kapacitor/components/RuleMessageText' import RuleMessageTemplates from 'src/kapacitor/components/RuleMessageTemplates' @@ -67,7 +67,7 @@ class RuleMessage extends Component { )} - { - const isConfigTypeDefault = +const RuleMessageOptions = ({rule, alert, updateAlertNodes, updateDetails}) => { + const isDetailsTypeDefault = Object.keys(DEFAULT_ALERT_PLACEHOLDERS).find(a => a === alert) && Object.keys(DEFAULT_ALERT_LABELS).find(a => a === alert) - return isConfigTypeDefault - ? - : { const {func, shape, string} = PropTypes -RuleMessageConfig.propTypes = { +RuleMessageOptions.propTypes = { rule: shape({}).isRequired, alert: string, updateAlertNodes: func.isRequired, updateDetails: func.isRequired, } -class DefaultConfig extends Component { +class DefaultOptions extends Component { constructor(props) { super(props) } @@ -59,13 +59,13 @@ class DefaultConfig extends Component { } } -DefaultConfig.propTypes = { +DefaultOptions.propTypes = { rule: shape({}).isRequired, alert: string, updateAlertNodes: func.isRequired, } -class NonDefaultConfig extends Component { +class NonDefaultOptions extends Component { constructor(props) { super(props) } @@ -93,10 +93,10 @@ class NonDefaultConfig extends Component { } } -NonDefaultConfig.propTypes = { +NonDefaultOptions.propTypes = { rule: shape({}).isRequired, alert: string, updateDetails: func.isRequired, } -export default RuleMessageConfig +export default RuleMessageOptions