[explore] adding y_axis_bounds to force Y axis bounds #2878
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { Col, Row, FormGroup, FormControl } from 'react-bootstrap'; | ||
| import ControlHeader from '../ControlHeader'; | ||
|
|
||
| const propTypes = { | ||
| name: PropTypes.string.isRequired, | ||
| label: PropTypes.string, | ||
| description: PropTypes.string, | ||
| onChange: PropTypes.func, | ||
| value: PropTypes.array, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| label: null, | ||
| description: null, | ||
| onChange: () => {}, | ||
| value: [null, null], | ||
|
There was a problem hiding this comment. i wonder if it would be more clear to store the min/max values as separate keys rather than an array. then we don't have to keep track of which value in the array is min or max. There was a problem hiding this comment. I thought about this and wanted to minimize the |
||
| }; | ||
|
|
||
| export default class BoundsControl extends React.Component { | ||
| constructor(props) { | ||
| super(props); | ||
| this.state = { | ||
| minMax: [ | ||
| props.value[0] === null ? '' : props.value[0], | ||
| props.value[1] === null ? '' : props.value[1], | ||
| ], | ||
| }; | ||
| this.onChange = this.onChange.bind(this); | ||
| this.onMinChange = this.onMinChange.bind(this); | ||
| this.onMaxChange = this.onMaxChange.bind(this); | ||
| } | ||
| onMinChange(event) { | ||
| this.setState({ | ||
| minMax: [ | ||
| event.target.value, | ||
| this.state.minMax[1], | ||
| ], | ||
| }, this.onChange); | ||
| } | ||
| onMaxChange(event) { | ||
| this.setState({ | ||
| minMax: [ | ||
| this.state.minMax[0], | ||
| event.target.value, | ||
| ], | ||
| }, this.onChange); | ||
| } | ||
| onChange() { | ||
| const mm = this.state.minMax; | ||
| const errors = []; | ||
| if (mm[0] && isNaN(mm[0])) { | ||
| errors.push('`From` value should be numeric or empty'); | ||
| } | ||
| if (mm[1] && isNaN(mm[1])) { | ||
| errors.push('`To` value should be numeric or empty'); | ||
| } | ||
| if (errors.length === 0) { | ||
| this.props.onChange([parseFloat(mm[0]), parseFloat(mm[1])], errors); | ||
| } else { | ||
| this.props.onChange([null, null], errors); | ||
| } | ||
| } | ||
| render() { | ||
| return ( | ||
| <div> | ||
| <ControlHeader {...this.props} /> | ||
| <FormGroup controlId="formInlineName" bsSize="small"> | ||
|
|
||
| <Row> | ||
| <Col xs={6} key="from"> | ||
| <FormControl | ||
| type="text" | ||
| placeholder="From" | ||
| onChange={this.onMinChange} | ||
| value={this.state.minMax[0]} | ||
| /> | ||
| </Col> | ||
| <Col xs={6} key="to"> | ||
|
There was a problem hiding this comment. should we use |
||
| <FormControl | ||
| type="text" | ||
| placeholder="To" | ||
| onChange={this.onMaxChange} | ||
| value={this.state.minMax[1]} | ||
| /> | ||
| </Col> | ||
| </Row> | ||
| </FormGroup> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| BoundsControl.propTypes = propTypes; | ||
| BoundsControl.defaultProps = defaultProps; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* eslint-disable no-unused-expressions */ | ||
| import React from 'react'; | ||
| import { FormControl } from 'react-bootstrap'; | ||
| import sinon from 'sinon'; | ||
| import { expect } from 'chai'; | ||
| import { describe, it, beforeEach } from 'mocha'; | ||
| import { mount } from 'enzyme'; | ||
|
|
||
| import BoundsControl from '../../../../javascripts/explore/components/controls/BoundsControl'; | ||
|
|
||
| const defaultProps = { | ||
| name: 'y_axis_bounds', | ||
| label: 'Bounds of the y axis', | ||
| onChange: sinon.spy(), | ||
| }; | ||
|
|
||
| describe('BoundsControl', () => { | ||
| let wrapper; | ||
|
|
||
| beforeEach(() => { | ||
| wrapper = mount(<BoundsControl {...defaultProps} />); | ||
| }); | ||
|
|
||
| it('renders two FormControls', () => { | ||
| expect(wrapper.find(FormControl)).to.have.lengthOf(2); | ||
| }); | ||
|
|
||
| it('errors on non-numeric', () => { | ||
| wrapper.find(FormControl).first().simulate('change', { target: { value: 's' } }); | ||
| expect(defaultProps.onChange.calledWith([null, null])).to.be.true; | ||
| expect(defaultProps.onChange.getCall(0).args[1][0]).to.contain('value should be numeric'); | ||
| }); | ||
| it('casts to numeric', () => { | ||
| wrapper.find(FormControl).first().simulate('change', { target: { value: '1' } }); | ||
| wrapper.find(FormControl).last().simulate('change', { target: { value: '5' } }); | ||
| expect(defaultProps.onChange.calledWith([1, 5])).to.be.true; | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in what case will
controlNamebe falsey here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I introduced support for
nullinvisTypes.jsxas a way to use half of the grid