Issue 362 options dropdown refactor #387
Conversation
|
I'll review this PR later tonight. But if you have the chance before, could change the PR, so that it doesn't touch |
| this.renderSQLOptions = this.renderSQLOptions.bind(this); | ||
| this.renderElasticsearchIndecies = this.renderElasticsearchIndecies.bind(this); | ||
| this.renderElasticsearchDocs = this.renderElasticsearchDocs.bind(this); | ||
| } | ||
|
|
||
| static propTypes = { | ||
| // See type of react-select's Select `value` property |
There was a problem hiding this comment.
I expected selectedTable and selectedIndex to be PropTypes.string (since we used them as keys).
Would PropTypes.string break anything?
|
|
||
| static propTypes = { | ||
| // See type of react-select's Select `value` property | ||
| selectedTable: PropTypes.any, | ||
| selectedIndex: PropTypes.any, | ||
|
|
There was a problem hiding this comment.
I think this line was here to make clear the above comment only applies to selectedTable and selectedIndex.
| this.renderElasticsearchIndecies = this.renderElasticsearchIndecies.bind(this); | ||
| this.renderElasticsearchDocs = this.renderElasticsearchDocs.bind(this); | ||
| } | ||
|
|
||
| renderSQLOptions() { |
There was a problem hiding this comment.
Since this code has moved to <SQLOptions>, let's get rid of this method.
| return (<SQLOptions selectedTable={selectedTable} | ||
| tablesRequest={tablesRequest} | ||
| setTable={setTable} | ||
| />); | ||
| } | ||
|
|
||
| renderElasticsearchIndecies() { |
There was a problem hiding this comment.
Since this code has moved to <ESIndicesOptions>, let's get rid of this method.
| return (<ESIndicesOptions elasticsearchMappingsRequest={EMR} | ||
| setIndex={setIndex} | ||
| selectedIndex={selectedIndex} | ||
| />); | ||
| } | ||
|
|
||
| renderElasticsearchDocs() { |
There was a problem hiding this comment.
Since this code has moved to <ESDocsOptions>, let's get rid of this method.
|
|
||
| export default class ESDocsOptions extends Component { | ||
| static propTypes = { | ||
| selectedTable: PropTypes.any, |
There was a problem hiding this comment.
If we can't use PropTypes.string here, then we should bring back the comment // See type of react-select's Select 'value' property.
| static propTypes = { | ||
| elasticsearchMappingsRequest: PropTypes.object, | ||
| setIndex: PropTypes.func, | ||
| selectedIndex: PropTypes.any |
There was a problem hiding this comment.
If we can't use PropTypes.string here, then we should bring back the comment // See type of react-select's Select 'value' property.
| export default class SQLOptions extends Component { | ||
|
|
||
| static propTypes = { | ||
| selectedTable: PropTypes.any, |
There was a problem hiding this comment.
If we can't use PropTypes.string here, then we should bring back the comment // See type of react-select's Select 'value' property.
|
I'd like new files to be lowercase. How about |
Merge branch 'upstream-master' into Issue-362-OptionsDropdown-Refactor
|
@n-riesco I fixed most of your comments and removed the yarn.lock from the commit. Let me know if you have any additional comments or if you want to just merge this in. Thanks |
|
💃 could you do a
|
|
Thanks |
This is an initial refactoring of the options dialog. I have broken the options dialog into 3 different components. I have not done any refactoring/optimizing of the code at this point. In the next PR I will start adding Jest test for the different components. I am trying to keep the PR's small so I did not add any additional tests at this point.
@n-riesco If you have few minutes would you mind doing a quick review of this code. I welcome any comments or suggestions.
Thanks