Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2019 from influxdata/bugfix/dup-kapa-name-error-misfire 

BUGFIX: Fix improper banner error for duplicate kapacitor name
pull/10616/head
Andrew Watkins 2017-09-21 15:43:20 -07:00 committed by GitHub
parent 589a800f7d 4d6d1027a9
commit d66730b5c5
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,8 +1,10 @@
## v1.3.9.0 [unreleased] ## v1.3.9.0 [unreleased]
### Bug Fixes ### Bug Fixes
1.[#2004](https://github.com/influxdata/chronograf/pull/2004): Fix DE query templates dropdown disappearance. 1.[#2004](https://github.com/influxdata/chronograf/pull/2004): Fix DE query templates dropdown disappearance
1.[#2006](https://github.com/influxdata/chronograf/pull/2006): Fix no alert for duplicate db name 1.[#2006](https://github.com/influxdata/chronograf/pull/2006): Fix no alert for duplicate db name
1.[#2019](https://github.com/influxdata/chronograf/pull/2006): Fix false error warning for duplicate kapacitor name
1.[#2018](https://github.com/influxdata/chronograf/pull/2018): Fix unresponsive display options and query builder in dashboards 1.[#2018](https://github.com/influxdata/chronograf/pull/2018): Fix unresponsive display options and query builder in dashboards
### Features ### Features
1. [#1885](https://github.com/influxdata/chronograf/pull/1885): Add `fill` options to data explorer and dashboard queries 1. [#1885](https://github.com/influxdata/chronograf/pull/1885): Add `fill` options to data explorer and dashboard queries
1. [#1978](https://github.com/influxdata/chronograf/pull/1978): Support editing kapacitor TICKScript 1. [#1978](https://github.com/influxdata/chronograf/pull/1978): Support editing kapacitor TICKScript

19
ui/src/kapacitor/containers/KapacitorPage.js
View File

@ -24,12 +24,6 @@ class KapacitorPage extends Component {
}, },
exists: false, exists: false,
} }
this.handleInputChange = ::this.handleInputChange
this.handleSubmit = ::this.handleSubmit
this.handleResetToDefaults = ::this.handleResetToDefaults
this._parseKapacitorURL = ::this._parseKapacitorURL
this.checkKapacitorConnection = ::this.checkKapacitorConnection
} }
componentDidMount() { componentDidMount() {
@ -44,7 +38,7 @@ class KapacitorPage extends Component {
}) })
} }
async checkKapacitorConnection(kapacitor) { checkKapacitorConnection = async kapacitor => {
try { try {
await pingKapacitor(kapacitor) await pingKapacitor(kapacitor)
this.setState({exists: true}) this.setState({exists: true})
@ -57,7 +51,7 @@ class KapacitorPage extends Component {
} }
} }
handleInputChange(e) { handleInputChange = e => {
const {value, name} = e.target const {value, name} = e.target
this.setState(prevState => { this.setState(prevState => {
@ -66,7 +60,7 @@ class KapacitorPage extends Component {
}) })
} }
handleSubmit(e) { handleSubmit = e => {
e.preventDefault() e.preventDefault()
const { const {
addFlashMessage, addFlashMessage,
@ -78,8 +72,9 @@ class KapacitorPage extends Component {
const {kapacitor} = this.state const {kapacitor} = this.state
const isNameTaken = kapacitors.some(k => k.name === kapacitor.name) const isNameTaken = kapacitors.some(k => k.name === kapacitor.name)
const isNew = !params.id
if (isNameTaken) { if (isNew && isNameTaken) {
addFlashMessage({ addFlashMessage({
type: 'error', type: 'error',
text: `There is already a Kapacitor configuration named "${kapacitor.name}"`, text: `There is already a Kapacitor configuration named "${kapacitor.name}"`,
@ -121,7 +116,7 @@ class KapacitorPage extends Component {
} }
} }
handleResetToDefaults(e) { handleResetToDefaults = e => {
e.preventDefault() e.preventDefault()
const defaultState = { const defaultState = {
url: this._parseKapacitorURL(), url: this._parseKapacitorURL(),
@ -133,7 +128,7 @@ class KapacitorPage extends Component {
this.setState({kapacitor: {...defaultState}}) this.setState({kapacitor: {...defaultState}})
} }
_parseKapacitorURL() { _parseKapacitorURL = () => {
const parser = document.createElement('a') const parser = document.createElement('a')
parser.href = this.props.source.url parser.href = this.props.source.url