iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[explore-v2] Fix edit datasource link for druid datasources (#1982) 

* only add imgSrc key if choices contain an imgSrc

* handle table and druid edit links for datasource drop down

* fix linting
This commit is contained in:
Alanna Scott 2017-01-23 10:08:00 -08:00 committed by GitHub
parent 37fb56c61c
commit 9cbd667eb7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
superset/assets/javascripts/explorev2/components/SelectField.jsx
View File

@ -43,15 +43,13 @@ export default class SelectField extends React.Component {
}
getOptions() {
const options = this.props.choices.map((c) => {
let label = c[0];
if (c.length > 1) {
label = c[1];
}
return {
const label = c.length > 1 ? c[1] : c[0];
const newOptions = {
value: c[0],
label,
imgSrc: c[2],
};
if (c[2]) newOptions.imgSrc = c[2];
return newOptions;
});
if (this.props.freeForm) {
// For FreeFormSelect, insert value into options if not exist

7
superset/assets/javascripts/explorev2/stores/fields.js
View File

@ -26,15 +26,20 @@ const TIME_STAMP_OPTIONS = [
['%H:%M:%S', '%H:%M:%S | 01:32:10'],
];
const MAP_DATASOURCE_TYPE_TO_EDIT_URL = {
table: '/tablemodelview/edit',
druid: '/druiddatasourcemodelview/edit',
};
export const fields = {
datasource: {
type: 'SelectField',
label: 'Datasource',
clearable: false,
default: null,
editUrl: '/tablemodelview/edit',
mapStateToProps: (state) => ({
choices: state.datasources || [],
editUrl: MAP_DATASOURCE_TYPE_TO_EDIT_URL[state.datasource_type],
}),
description: '',
},