Flip disable logic

pull/1561/head
Andrew Watkins 2017-05-31 09:25:16 -07:00
parent 629ccd0ddc
commit 0a1c6239e4
2 changed files with 12 additions and 6 deletions

View File

@ -153,7 +153,7 @@ class CellEditorOverlay extends Component {
..._.mapValues(queryModifiers, qm => this.queryStateReducer(qm)),
}
const querySavable = query =>
const isQuerySavable = query =>
(!!query.measurement && !!query.database && !!query.fields.length) ||
!!query.rawText
@ -183,7 +183,7 @@ class CellEditorOverlay extends Component {
onSelectGraphType={this.handleSelectGraphType}
onCancel={onCancel}
onSave={this.handleSaveCell}
isSavable={queriesWorkingDraft.every(querySavable)}
isSavable={queriesWorkingDraft.every(isQuerySavable)}
/>
<QueryMaker
source={source}

View File

@ -1,7 +1,13 @@
import React, {PropTypes} from 'react'
import classnames from 'classnames'
const ConfirmButtons = ({onConfirm, item, onCancel, buttonSize, isSavable}) => (
const ConfirmButtons = ({
onConfirm,
item,
onCancel,
buttonSize,
isDisabled,
}) => (
<div className="confirm-buttons">
<button
className={classnames('btn btn-info btn-square', {
@ -15,8 +21,8 @@ const ConfirmButtons = ({onConfirm, item, onCancel, buttonSize, isSavable}) => (
className={classnames('btn btn-success btn-square', {
[buttonSize]: buttonSize,
})}
disabled={!isSavable}
title={isSavable ? 'Save' : 'Cannot save'}
disabled={isDisabled}
title={isDisabled ? 'Cannot Save' : 'Save'}
onClick={() => onConfirm(item)}
>
<span className="icon checkmark" />
@ -31,7 +37,7 @@ ConfirmButtons.propTypes = {
item: oneOfType([shape(), string]),
onCancel: func.isRequired,
buttonSize: string,
isSavable: bool,
isDisabled: bool,
}
ConfirmButtons.defaultProps = {