diff --git a/ui/src/kapacitor/apis/index.js b/ui/src/kapacitor/apis/index.js index b4a2a435bd..7290f26166 100644 --- a/ui/src/kapacitor/apis/index.js +++ b/ui/src/kapacitor/apis/index.js @@ -19,6 +19,19 @@ export const createRule = (kapacitor, rule) => { }) } +export const createTickScript = async (kapacitor, rule) => { + try { + return await AJAX({ + method: 'POST', + url: kapacitor.links.rules, + data: rule, + }) + } catch (error) { + console.error(error) + throw error + } +} + export const getRules = kapacitor => { return AJAX({ method: 'GET', @@ -65,12 +78,12 @@ export const createTask = async (kapacitor, {id, dbrps, script, type}) => { try { return await AJAX({ method: 'POST', - url: kapacitor.links.tasks, + url: kapacitor.links.rules, data: { id, type, dbrps, - script, + tickscript: script, }, }) } catch (error) { diff --git a/ui/src/kapacitor/components/TickscriptHeader.js b/ui/src/kapacitor/components/TickscriptHeader.js index 6b19f9e0dc..a16433df51 100644 --- a/ui/src/kapacitor/components/TickscriptHeader.js +++ b/ui/src/kapacitor/components/TickscriptHeader.js @@ -2,34 +2,19 @@ import React, {PropTypes} from 'react' import SourceIndicator from 'shared/components/SourceIndicator' import TickscriptType from 'src/kapacitor/components/TickscriptType' import MultiSelectDBDropdown from 'shared/components/MultiSelectDBDropdown' -import TickscrtiptNewID, { - TickscriptEditID, -} from 'src/kapacitor/components/TickscriptID' + const addName = list => list.map(l => ({...l, name: `${l.db}.${l.rp}`})) const TickscriptHeader = ({ - task: {id, type, dbrps}, + task: {type, dbrps}, source: {name}, onSave, - isEditing, - onStopEdit, - onStartEdit, onChangeType, onSelectDbrps, - isNewTickscript, }) =>
-
- {isNewTickscript - ? - : } -
+
@@ -60,9 +45,6 @@ TickscriptHeader.propTypes = { }), onChangeType: func.isRequired, isEditing: bool.isRequired, - onStartEdit: func.isRequired, - onStopEdit: func.isRequired, - isNewTickscript: bool.isRequired, } export default TickscriptHeader diff --git a/ui/src/kapacitor/containers/TickscriptPage.js b/ui/src/kapacitor/containers/TickscriptPage.js index 0884a3e8a9..1ef8d7eb79 100644 --- a/ui/src/kapacitor/containers/TickscriptPage.js +++ b/ui/src/kapacitor/containers/TickscriptPage.js @@ -59,17 +59,23 @@ class TickscriptPage extends Component { } = this.props let response - if (this._isEditing()) { - response = await updateTask(kapacitor, task, ruleID) - } else { - response = await createTask(kapacitor, task) - } - if (response && response.error) { - return this.setState({validation: response.error}) - } + try { + if (this._isEditing()) { + response = await updateTask(kapacitor, task, ruleID) + } else { + response = await createTask(kapacitor, task) + } - router.push(`/sources/${source.id}/alert-rules`) + if (response && response.code === 500) { + return this.setState({validation: response.message}) + } + + router.push(`/sources/${source.id}/alert-rules`) + } catch (error) { + console.error(error) + throw error + } } handleChangeScript = script => {