This repository has been archived by the owner on Jun 4, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 278
Issue 362 options dropdown refactor #387
Merged
shannonlal
merged 4 commits into
plotly:master
from
shannonlal:Issue-362-OptionsDropdown-Refactor
Mar 3, 2018
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
151 changes: 35 additions & 116 deletions
151
app/components/Settings/OptionsDropdown/OptionsDropdown.react.js
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
58 changes: 58 additions & 0 deletions
58
app/components/Settings/OptionsDropdown/es-docs-options.jsx
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,58 @@ | ||
| import React, {Component} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {keys} from 'ramda'; | ||
| import Select from 'react-select'; | ||
|
|
||
| export default class ESDocsOptions extends Component { | ||
| static propTypes = { | ||
| selectedTable: PropTypes.string, | ||
| selectedIndex: PropTypes.string, | ||
| setTable: PropTypes.func, | ||
| elasticsearchMappingsRequest: PropTypes.object | ||
| } | ||
|
|
||
| /** | ||
| * ES Docs Options is an options drop down | ||
| * @param {object} props - Component Properties | ||
| * @param {object} props.elasticsearchMappingsRequest - The ES Mapping Request | ||
| * @param {object} props.selectedTable - The selected table | ||
| * @param {object} props.selectedIndex - The Selected Index | ||
| * @param {object} props.setTable - The table | ||
| */ | ||
| constructor(props) { | ||
| super(props); | ||
| } | ||
|
|
||
| render() { | ||
| const { | ||
| selectedTable, | ||
| selectedIndex, | ||
| elasticsearchMappingsRequest: EMR, | ||
| setTable | ||
| } = this.props; | ||
|
|
||
| if (!selectedIndex) { | ||
| return null; | ||
| } | ||
|
|
||
| const tablesList = keys(EMR.content[selectedIndex].mappings); | ||
| if (tablesList.length === 0) { | ||
| return <div>{'No docs found'}</div>; | ||
| } | ||
|
|
||
| return ( | ||
| <div className={'dropdown'} | ||
| id="test-table-dropdown" | ||
| > | ||
| <Select | ||
| options={tablesList.map(t => ({label: t, value: t}))} | ||
| value={selectedTable} | ||
| searchable={false} | ||
| onChange={option => { | ||
| setTable(option.value); | ||
| }} | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
app/components/Settings/OptionsDropdown/es-indices-options.jsx
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,63 @@ | ||
| import React, {Component} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {keys} from 'ramda'; | ||
| import Select from 'react-select'; | ||
|
|
||
| export default class ESIndicesOptions extends Component { | ||
| static propTypes = { | ||
| elasticsearchMappingsRequest: PropTypes.object, | ||
| setIndex: PropTypes.func, | ||
| selectedIndex: PropTypes.string | ||
| }; | ||
|
|
||
| /** | ||
| * ES Indicies Options is an options drop down | ||
| * @param {object} props - Component Properties | ||
| * @param {object} props.elasticsearchMappingsRequest - The ES Mapping Request | ||
| * @param {object} props.setIndex - The Set Index Function | ||
| * @param {object} props.selectedIndex - The Selected Index | ||
| */ | ||
| constructor(props) { | ||
| super(props); | ||
| } | ||
|
|
||
| render() { | ||
| const { | ||
| elasticsearchMappingsRequest: EMR, | ||
| setIndex, | ||
| selectedIndex | ||
| } = this.props; | ||
| if (!EMR.status) { | ||
| return null; | ||
| } else if (EMR.status === 'loading') { | ||
| return <div>{'Loading docs'}</div>; | ||
| } else if (EMR.status > 300) { | ||
| // TODO - Make this prettier. | ||
| return ( | ||
| <div> | ||
| <div>{'There was an error loading up your docs'}</div> | ||
| <div style={{color: 'red'}}>{JSON.stringify(EMR)}</div> | ||
| </div> | ||
| ); | ||
| } else if (EMR.status === 200) { | ||
| const indeciesList = keys(EMR.content); | ||
| if (indeciesList.length === 0) { | ||
| return <div>{'No docs found'}</div>; | ||
| } | ||
| return ( | ||
| <div className={'dropdown'} | ||
| id="test-table-dropdown" | ||
| > | ||
| <Select | ||
| options={indeciesList.map(t => ({label: t, value: t}))} | ||
| value={selectedIndex} | ||
| searchable={false} | ||
| onChange={option => { | ||
| setIndex(option.value); | ||
| }} | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
| } |
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,60 @@ | ||
| import React, {Component} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {flatten} from 'ramda'; | ||
| import Select from 'react-select'; | ||
|
|
||
| export default class SQLOptions extends Component { | ||
|
|
||
| static propTypes = { | ||
| selectedTable: PropTypes.string, | ||
| tablesRequest: PropTypes.object, | ||
| setTable: PropTypes.func | ||
| }; | ||
|
|
||
| /** | ||
| * SQLOptions is an options drop down down | ||
| * @param {object} props - Component Properties | ||
| * @param {object} props.selectedTable - The selected table | ||
| * @param {object} props.tablesRequest - The Requested Table | ||
| * @param {function} props.setTable - The set table function | ||
| */ | ||
| constructor(props) { | ||
| super(props); | ||
| } | ||
|
|
||
| render() { | ||
| const {selectedTable, tablesRequest, setTable} = this.props; | ||
| if (!tablesRequest.status) { | ||
| return null; | ||
| } else if (tablesRequest.status === 'loading') { | ||
| return <div>{'Loading tables'}</div>; | ||
| } else if (tablesRequest.status > 300) { | ||
| // TODO - Make this prettier. | ||
| return ( | ||
| <div> | ||
| <div>{'Hm.. there was an error loading up your tables'}</div> | ||
| <div style={{color: 'red'}}>{JSON.stringify(tablesRequest)}</div> | ||
| </div> | ||
| ); | ||
| } else if (tablesRequest.status === 200) { | ||
| const tablesList = flatten(tablesRequest.content); | ||
| if (tablesList.length === 0) { | ||
| return <div>{'No tables found'}</div>; | ||
| } | ||
| return ( | ||
| <div className={'dropdown'} | ||
| id="test-table-dropdown" | ||
| > | ||
| <Select | ||
| options={tablesList.map(t => ({label: t, value: t}))} | ||
| value={selectedTable} | ||
| searchable={false} | ||
| onChange={option => { | ||
| setTable(option.value); | ||
| }} | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
| } |
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.
I expected
selectedTableandselectedIndexto bePropTypes.string(since we used them as keys).Would
PropTypes.stringbreak anything?