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

Change rawStatus to status

pull/10616/head
Andrew Watkins 2017-04-07 13:51:46 -06:00
parent 06bbccc97f
commit d86a7f509b
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/data_explorer/actions/view/index.js
View File

@ -129,12 +129,12 @@ export function updateRawQuery(queryID, text) {
} }
} }
export function editRawQueryStatus(queryID, rawStatus) { export function editQueryStatus(queryID, status) {
return { return {
type: 'EDIT_RAW_QUERY_STATUS', type: 'EDIT_QUERY_STATUS',
payload: { payload: {
queryID, queryID,
rawStatus, status,
}, },
} }
} }

16
ui/src/data_explorer/components/RawQueryEditor.js
View File

@ -50,7 +50,7 @@ const RawQueryEditor = React.createClass({
}, },
render() { render() {
const {query: {rawStatus}} = this.props const {config: {status}} = this.props
const {value} = this.state const {value} = this.state
return ( return (
@ -66,20 +66,20 @@ const RawQueryEditor = React.createClass({
autoComplete="off" autoComplete="off"
spellCheck="false" spellCheck="false"
/> />
{this.renderStatus(rawStatus)} {this.renderStatus(status)}
<Dropdown items={QUERY_TEMPLATES} selected={'Query Templates'} onChoose={this.handleChooseTemplate} className="query-template"/> <Dropdown items={QUERY_TEMPLATES} selected={'Query Templates'} onChoose={this.handleChooseTemplate} className="query-template"/>
</div> </div>
) )
}, },
renderStatus(rawStatus) { renderStatus(status) {
if (!rawStatus) { if (!status) {
return ( return (
<div className="raw-text--status"></div> <div className="raw-text--status"></div>
) )
} }
if (rawStatus.loading) { if (status.loading) {
return ( return (
<div className="raw-text--status"> <div className="raw-text--status">
<LoadingDots /> <LoadingDots />
@ -88,9 +88,9 @@ const RawQueryEditor = React.createClass({
} }
return ( return (
<div className={classNames("raw-text--status", {"raw-text--error": rawStatus.error, "raw-text--success": rawStatus.success, "raw-text--warning": rawStatus.warn})}> <div className={classNames("raw-text--status", {"raw-text--error": status.error, "raw-text--success": status.success, "raw-text--warning": status.warn})}>
<span className={classNames("icon", {stop: rawStatus.error, checkmark: rawStatus.success, "alert-triangle": rawStatus.warn})}></span> <span className={classNames("icon", {stop: status.error, checkmark: status.success, "alert-triangle": status.warn})}></span>
{rawStatus.error || rawStatus.warn || rawStatus.success} {status.error || status.warn || status.success}
</div> </div>
) )
}, },

6
ui/src/data_explorer/reducers/queryConfigs.js
View File

@ -146,10 +146,10 @@ export default function queryConfigs(state = {}, action) {
}) })
} }
case 'EDIT_RAW_QUERY_STATUS': { case 'EDIT_QUERY_STATUS': {
const {queryID, rawStatus} = action.payload const {queryID, status} = action.payload
const nextState = { const nextState = {
[queryID]: {...state[queryID], rawStatus}, [queryID]: {...state[queryID], status},
} }
return {...state, ...nextState} return {...state, ...nextState}

2
ui/src/utils/defaultQueryConfig.js
View File

@ -12,6 +12,6 @@ export default function defaultQueryConfig(id) {
}, },
areTagsAccepted: true, areTagsAccepted: true,
rawText: null, rawText: null,
rawStatus: null, status: null,
} }
} }