Refactor story values into storiesOf.

pull/10616/head
Hunter Trujillo 2016-12-28 12:06:07 -07:00 committed by Andrew Watkins
parent 72bce4b15c
commit ca2e92ada6
2 changed files with 35 additions and 47 deletions

View File

@ -18,12 +18,12 @@ import * as queryActions from 'src/chronograf/actions/view';
import KapacitorRule from 'src/kapacitor/components/KapacitorRule'; import KapacitorRule from 'src/kapacitor/components/KapacitorRule';
import ValuesSection from 'src/kapacitor/components/ValuesSection'; import ValuesSection from 'src/kapacitor/components/ValuesSection';
const valuesSection = (trigger, range = false) => ( const valuesSection = (trigger, values) => (
<div className="rule-builder"> <div className="rule-builder">
<ValuesSection <ValuesSection
rule={rule({ rule={rule({
trigger, trigger,
range, values,
})} })}
query={query()} query={query()}
onChooseTrigger={action('chooseTrigger')} onChooseTrigger={action('chooseTrigger')}
@ -34,16 +34,41 @@ const valuesSection = (trigger, range = false) => (
storiesOf('ValuesSection', module) storiesOf('ValuesSection', module)
.add('Threshold', () => ( .add('Threshold', () => (
valuesSection('threshold') valuesSection('threshold', {
"operator": "less than",
"rangeOperator": "greater than",
"value": "10",
"rangeValue": "20",
})
)) ))
.add('Threshold with Range', () => ( .add('Threshold within Range', () => (
valuesSection('threshold', true) valuesSection('threshold', {
"operator": "within range",
"rangeOperator": "greater than",
"value": "10",
"rangeValue": "20",
})
)) ))
// .add('Threshold outside of Range', () => (
// valuesSection('threshold', {
// "operator": "otuside of range",
// "rangeOperator": "less than",
// "value": "10",
// "rangeValue": "20",
// })
// ))
.add('Relative', () => ( .add('Relative', () => (
valuesSection('relative') valuesSection('relative', {
"change": "change",
"operator": "greater than",
"shift": "1m",
"value": "10",
})
)) ))
.add('Deadman', () => ( .add('Deadman', () => (
valuesSection('deadman') valuesSection('deadman', {
"period": "10m",
})
)); ));
storiesOf('KapacitorRule', module) storiesOf('KapacitorRule', module)

View File

@ -1,8 +1,8 @@
const rule = ({ const rule = ({
trigger, trigger,
range, values,
}) => { }) => {
let values = { values = {
"rangeOperator": "greater than", "rangeOperator": "greater than",
"change": "change", "change": "change",
"operator": "greater than", "operator": "greater than",
@ -10,46 +10,9 @@ const rule = ({
"value": "10", "value": "10",
"rangeValue": "20", "rangeValue": "20",
"period": "10m", "period": "10m",
...values,
}; };
switch (trigger) {
case 'threshold':
if (range) {
values = {
...values,
"operator": "within range",
"rangeOperator": "greater than",
"value": "10",
"rangeValue": "20",
};
}
else {
values = {
...values,
"operator": "less than",
"rangeOperator": "greater than",
"value": "10",
"rangeValue": "20",
};
}
break;
case 'relative':
values = {
...values,
"change": "change",
"operator": "greater than",
"shift": "1m",
"value": "10",
};
break;
case 'deadman':
values = {
...values,
"period": "10m",
};
break;
}
return ({ return ({
"id": "chronograf-v1-08cdb16b-7874-4c8f-858d-1c07043cb2f5", "id": "chronograf-v1-08cdb16b-7874-4c8f-858d-1c07043cb2f5",
"query": { "query": {