diff --git a/superset/assets/spec/javascripts/dashboard/fixtures/mockDatasource.js b/superset/assets/spec/fixtures/mockDatasource.js
similarity index 100%
rename from superset/assets/spec/javascripts/dashboard/fixtures/mockDatasource.js
rename to superset/assets/spec/fixtures/mockDatasource.js
diff --git a/superset/assets/spec/javascripts/CRUD/CollectionTable_spec.jsx b/superset/assets/spec/javascripts/CRUD/CollectionTable_spec.jsx
new file mode 100644
index 000000000..695568885
--- /dev/null
+++ b/superset/assets/spec/javascripts/CRUD/CollectionTable_spec.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { expect } from 'chai';
+import { describe, it, beforeEach } from 'mocha';
+import { shallow } from 'enzyme';
+
+import CollectionTable from '../../../src/CRUD/CollectionTable';
+import mockDatasource from '../../fixtures/mockDatasource';
+
+const props = {
+ collection: mockDatasource['7__table'].columns,
+ tableColumns: ['column_name', 'type', 'groupby'],
+};
+
+describe('CollectionTable', () => {
+
+ let wrapper;
+ let el;
+
+ beforeEach(() => {
+ el =
+ {props.children}
+
);
+Frame.propTypes = { children: PropTypes.node };
+
+function createKeyedCollection(arr) {
+ const newArr = arr.map(o => ({
+ ...o,
+ id: o.id || shortid.generate(),
+ }));
+ const map = {};
+ newArr.forEach((o) => {
+ map[o.id] = o;
+ });
+ return map;
+}
+
+export default class CRUDCollection extends React.PureComponent {
+ constructor(props) {
+ super(props);
+ this.state = {
+ expandedColumns: {},
+ collection: createKeyedCollection(props.collection),
+ };
+ this.renderItem = this.renderItem.bind(this);
+ this.onAddItem = this.onAddItem.bind(this);
+ this.renderExpandableSection = this.renderExpandableSection.bind(this);
+ this.getLabel = this.getLabel.bind(this);
+ this.onFieldsetChange = this.onFieldsetChange.bind(this);
+ this.renderTableBody = this.renderTableBody.bind(this);
+ this.changeCollection = this.changeCollection.bind(this);
+ }
+ componentWillReceiveProps(nextProps) {
+ if (nextProps.collection !== this.props.collection) {
+ this.setState({
+ collection: createKeyedCollection(nextProps.collection),
+ });
+ }
+ }
+ onCellChange(id, col, val) {
+ this.changeCollection({
+ ...this.state.collection,
+ [id]: {
+ ...this.state.collection[id],
+ [col]: val,
+ },
+ });
+
+ }
+ onAddItem() {
+ let newItem = this.props.itemGenerator();
+ if (!newItem.id) {
+ newItem = { ...newItem, id: shortid.generate() };
+ }
+ this.changeCollection({
+ ...this.state.collection,
+ [newItem.id]: newItem,
+ });
+ }
+ onFieldsetChange(item) {
+ this.changeCollection({
+ ...this.state.collection,
+ [item.id]: item,
+ });
+ }
+ getLabel(col) {
+ const { columnLabels } = this.props;
+ let label = columnLabels[col] ? columnLabels[col] : col;
+ if (label.startsWith('__')) {
+ label = '';
+ }
+ return label;
+ }
+ changeCollection(collection) {
+ this.setState({ collection });
+ this.props.onChange(Object.keys(collection).map(k => collection[k]));
+ }
+ deleteItem(id) {
+ const newColl = { ...this.state.collection };
+ delete newColl[id];
+ this.changeCollection(newColl);
+ }
+ effectiveTableColumns() {
+ const { tableColumns, allowDeletes, expandFieldset } = this.props;
+ const cols = allowDeletes ? tableColumns.concat(['__actions']) : tableColumns;
+ return expandFieldset ? ['__expand'].concat(cols) : cols;
+ }
+ toggleExpand(id) {
+ this.onCellChange(id, '__expanded', false);
+ this.setState({
+ expandedColumns: {
+ ...this.state.expandedColumns,
+ [id]: !this.state.expandedColumns[id],
+ },
+ });
+ }
+ renderHeaderRow() {
+ const cols = this.effectiveTableColumns();
+ return (
+
+
+ {this.props.expandFieldset && {this.getLabel(col)} )}
+ {this.props.allowDeletes &&
+
+ );
+ }
+ renderExpandableSection(item) {
+ const propsGenerator = () => ({ item, onChange: this.onFieldsetChange });
+ return recurseReactClone(this.props.expandFieldset, Fieldset, propsGenerator);
+ }
+ renderCell(record, col) {
+ const renderer = this.props.itemRenderers[col];
+ const val = record[col];
+ const onChange = this.onCellChange.bind(this, record.id, col);
+ return renderer ? renderer(val, onChange, this.getLabel(col)) : val;
+ }
+ renderItem(record) {
+ const { tableColumns, allowDeletes, expandFieldset } = this.props;
+ /* eslint-disable no-underscore-dangle */
+ const isExpanded = !!this.state.expandedColumns[record.id] || record.__expanded;
+ let tds = [];
+ if (expandFieldset) {
+ tds.push(
+
+ );
+ }
+ tds = tds.concat(tableColumns.map(col => (
+ {this.renderCell(record, col)}
+ )));
+ if (allowDeletes) {
+ tds.push(
+
+ );
+ }
+ const trs = [{tds} ];
+ if (isExpanded) {
+ trs.push(
+
+
+
+ {this.renderExpandableSection(record)}
+
+
+ );
+ }
+ return trs;
+ }
+ renderEmptyCell() {
+ return {this.props.emptyMessage} {content} ;
+ }
+ render() {
+ return (
+
+
+ {this.renderHeaderRow()}
+ {this.renderTableBody()}
+
+
+ {this.props.allowAddItem &&
+
+ }
+ {this.props.extraButtons}
+
+
+
+ {label || fieldKey}
+ {compact && descr &&
+ {descr}
+ }
+ >
+
+ }
+
+ {hookedControl}
+ {descr}
+ }
+
+ );
+ }
+}
+Field.propTypes = propTypes;
+Field.defaultProps = defaultProps;
diff --git a/superset/assets/src/CRUD/Fieldset.jsx b/superset/assets/src/CRUD/Fieldset.jsx
new file mode 100644
index 000000000..6c3c74e9b
--- /dev/null
+++ b/superset/assets/src/CRUD/Fieldset.jsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Form } from 'react-bootstrap';
+
+import { recurseReactClone } from './utils';
+import Field from './Field';
+
+const propTypes = {
+ children: PropTypes.node,
+ onChange: PropTypes.func,
+ item: PropTypes.object,
+ title: PropTypes.node,
+ compact: PropTypes.bool,
+};
+const defaultProps = {
+ compact: false,
+};
+
+export default class Fieldset extends React.PureComponent {
+ constructor(props) {
+ super(props);
+ this.onChange = this.onChange.bind(this);
+ }
+ onChange(fieldKey, val) {
+ return this.props.onChange({
+ ...this.props.item,
+ [fieldKey]: val,
+ });
+ }
+ render() {
+ const { title } = this.props;
+ const propExtender = field => ({
+ onChange: this.onChange,
+ value: this.props.item[field.props.fieldKey],
+ compact: this.props.compact,
+ });
+ return (
+
+ );
+ }
+}
+Fieldset.propTypes = propTypes;
+Fieldset.defaultProps = defaultProps;
diff --git a/superset/assets/src/CRUD/styles.css b/superset/assets/src/CRUD/styles.css
new file mode 100644
index 000000000..1f07c59e0
--- /dev/null
+++ b/superset/assets/src/CRUD/styles.css
@@ -0,0 +1,13 @@
+.CRUD i.fa-caret-down, i.fa-caret-up {
+ width: '5px';
+}
+.CRUD td.expanded = {
+ border-top: '0px';
+ padding: '0px';
+}
+.CRUD .frame = {
+ border: '1px solid #AAA';
+ border-radius: 5;
+ padding: 10;
+ background: '#F4F4F4';
+}
diff --git a/superset/assets/src/CRUD/styles.less b/superset/assets/src/CRUD/styles.less
new file mode 100644
index 000000000..ec632a60b
--- /dev/null
+++ b/superset/assets/src/CRUD/styles.less
@@ -0,0 +1,14 @@
+.CRUD .text-right {
+ text-align: right;
+}
+.CRUD .empty-collection {
+ padding: 10px;
+}
+.CRUD .control-label {
+ font-weight: bold;
+ font-size: 16px;
+}
+
+.CRUD .tiny-cell {
+ width: 5px;
+}
diff --git a/superset/assets/src/CRUD/utils.js b/superset/assets/src/CRUD/utils.js
new file mode 100644
index 000000000..6de8c4b16
--- /dev/null
+++ b/superset/assets/src/CRUD/utils.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+export function recurseReactClone(children, type, propExtender) {
+ /**
+ * Clones a React component's children, and injects new props
+ * where the type specified is matched.
+ */
+ return React.Children.map(children, (child) => {
+ let newChild = child;
+ if (child && child.type === type) {
+ newChild = React.cloneElement(child, propExtender(child));
+ }
+ if (newChild && newChild.props.children) {
+ newChild = React.cloneElement(newChild, {
+ children: recurseReactClone(newChild.props.children, type, propExtender),
+ });
+ }
+ return newChild;
+ });
+}
diff --git a/superset/assets/src/components/Checkbox.jsx b/superset/assets/src/components/Checkbox.jsx
index b0564ae6b..c3b2506ee 100644
--- a/superset/assets/src/components/Checkbox.jsx
+++ b/superset/assets/src/components/Checkbox.jsx
@@ -12,7 +12,9 @@ export default function Checkbox({ checked, onChange, style }) {
{
+ onChange(!checked);
+ }}
style={{
border: '1px solid #aaa',
borderRadius: '2px',
diff --git a/superset/assets/src/components/EditableTitle.jsx b/superset/assets/src/components/EditableTitle.jsx
index 45fea1dcb..5e206c91e 100644
--- a/superset/assets/src/components/EditableTitle.jsx
+++ b/superset/assets/src/components/EditableTitle.jsx
@@ -10,14 +10,18 @@ const propTypes = {
onSaveTitle: PropTypes.func,
noPermitTooltip: PropTypes.string,
showTooltip: PropTypes.bool,
+ emptyText: PropTypes.node,
+ style: PropTypes.object,
};
const defaultProps = {
title: t('Title'),
canEdit: false,
showTooltip: true,
+ onSaveTitle: () => {},
+ emptyText: '',
};
-class EditableTitle extends React.PureComponent {
+export default class EditableTitle extends React.PureComponent {
constructor(props) {
super(props);
this.state = {
@@ -45,10 +49,7 @@ class EditableTitle extends React.PureComponent {
if (!this.props.canEdit || this.state.isEditing) {
return;
}
-
- this.setState({
- isEditing: true,
- });
+ this.setState({ isEditing: true });
}
handleBlur() {
@@ -101,7 +102,6 @@ class EditableTitle extends React.PureComponent {
if (!this.props.canEdit) {
return;
}
-
this.setState({
title: ev.target.value,
});
@@ -110,17 +110,23 @@ class EditableTitle extends React.PureComponent {
handleKeyPress(ev) {
if (ev.key === 'Enter') {
ev.preventDefault();
-
this.handleBlur();
}
}
render() {
- let content = (
+ let value;
+ if (this.state.title) {
+ value = this.state.title;
+ } else if (!this.state.isEditing) {
+ value = this.props.emptyText;
+ }
+ let input = (
- {content}
+ {input}
);
}
@@ -146,13 +152,12 @@ class EditableTitle extends React.PureComponent {
this.props.canEdit && 'editable-title--editable',
this.state.isEditing && 'editable-title--editing',
)}
+ style={this.props.style}
>
- {content}
+ {input}
);
}
}
EditableTitle.propTypes = propTypes;
EditableTitle.defaultProps = defaultProps;
-
-export default EditableTitle;
diff --git a/superset/assets/src/profile/components/TableLoader.jsx b/superset/assets/src/components/TableLoader.jsx
similarity index 94%
rename from superset/assets/src/profile/components/TableLoader.jsx
rename to superset/assets/src/components/TableLoader.jsx
index 462e00993..3f51ee92b 100644
--- a/superset/assets/src/profile/components/TableLoader.jsx
+++ b/superset/assets/src/components/TableLoader.jsx
@@ -2,8 +2,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Table, Tr, Td } from 'reactable';
import $ from 'jquery';
-import Loading from '../../components/Loading';
-import '../../../stylesheets/reactable-pagination.css';
+import Loading from '../components/Loading';
+import '../../stylesheets/reactable-pagination.css';
const propTypes = {
dataEndpoint: PropTypes.string.isRequired,
diff --git a/superset/assets/src/datasource/DatasourceEditor.jsx b/superset/assets/src/datasource/DatasourceEditor.jsx
new file mode 100644
index 000000000..12dfdc0ce
--- /dev/null
+++ b/superset/assets/src/datasource/DatasourceEditor.jsx
@@ -0,0 +1,575 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Alert, Badge, Col, Label, Tabs, Tab, Well } from 'react-bootstrap';
+import shortid from 'shortid';
+import $ from 'jquery';
+
+import { t } from '../locales';
+
+import Button from '../components/Button';
+import Loading from '../components/Loading';
+import CheckboxControl from '../explore/components/controls/CheckboxControl';
+import TextControl from '../explore/components/controls/TextControl';
+import SelectControl from '../explore/components/controls/SelectControl';
+import TextAreaControl from '../explore/components/controls/TextAreaControl';
+import SelectAsyncControl from '../explore/components/controls/SelectAsyncControl';
+import SpatialControl from '../explore/components/controls/SpatialControl';
+import CollectionTable from '../CRUD/CollectionTable';
+import EditableTitle from '../components/EditableTitle';
+import Fieldset from '../CRUD/Fieldset';
+import Field from '../CRUD/Field';
+
+import withToasts from '../messageToasts/enhancers/withToasts';
+
+import './main.css';
+
+const checkboxGenerator = (d, onChange) =>
+ {title} {collection ? collection.length : 0}
+
+ );
+}
+CollectionTabTitle.propTypes = {
+ title: PropTypes.string,
+ collection: PropTypes.array,
+};
+
+function ColumnCollectionTable({
+ columns, onChange, editableColumnName, showExpression, allowAddItem,
+ allowEditDataType, itemGenerator,
+}) {
+ return (
+
+
+ {showExpression &&
+
+ {t('The pattern of the timestamp format, use ')}
+
+ {t('python datetime string pattern')}
+
+ {t(` expression. If time is stored in epoch format, put \`epoch_s\` or
+ \`epoch_ms\`. Leave \`Database Expression\`
+ below empty if timestamp is stored in '
+ String or Integer(epoch) type`)}
+
+ }
+ control={
+ {t(`
+ The database expression to cast internal datetime
+ constants to database date/timestamp type according to the DBAPI.
+ The expression should follow the pattern of
+ %Y-%m-%d %H:%M:%S, based on different DBAPI.
+ The string should be a python string formatter
+ \`Ex: TO_DATE('{}', 'YYYY-MM-DD HH24:MI:SS')\` for Oracle
+ Superset uses default expression based on DB URI if this
+ field is blank.
+ `)}
+
+ }
+ control={
+
+ }
+ columnLabels={{
+ column_name: 'Column',
+ type: 'Data Type',
+ groupby: 'Is Dimension',
+ is_dttm: 'Is Temporal',
+ filterable: 'Is Filterable',
+ }}
+ onChange={onChange}
+ itemRenderers={{
+ column_name: (v, onItemChange) => (
+ editableColumnName ?
+ {d} ,
+ is_dttm: checkboxGenerator,
+ filterable: checkboxGenerator,
+ groupby: checkboxGenerator,
+ }}
+ />);
+}
+ColumnCollectionTable.propTypes = {
+ columns: PropTypes.array.isRequired,
+ onChange: PropTypes.func.isRequired,
+ editableColumnName: PropTypes.bool,
+ showExpression: PropTypes.bool,
+ allowAddItem: PropTypes.bool,
+ allowEditDataType: PropTypes.bool,
+ itemGenerator: PropTypes.func,
+};
+ColumnCollectionTable.defaultProps = {
+ editableColumnName: false,
+ showExpression: false,
+ allowAddItem: false,
+ allowEditDataType: false,
+ itemGenerator: () => ({
+ column_name: '',
+ filterable: true,
+ groupby: true,
+ }),
+};
+
+function StackedField({ label, formElement }) {
+ return (
+
+
{label}
+
{formElement}
+
+ {children}
+
+ );
+}
+FormContainer.propTypes = {
+ children: PropTypes.node,
+};
+
+const propTypes = {
+ datasource: PropTypes.object.isRequired,
+ onChange: PropTypes.func,
+ addSuccessToast: PropTypes.func.isRequired,
+ addDangerToast: PropTypes.func.isRequired,
+};
+const defaultProps = {
+ onChange: () => {},
+};
+export class DatasourceEditor extends React.PureComponent {
+ constructor(props) {
+ super(props);
+ this.state = {
+ datasource: props.datasource,
+ showAlert: true,
+ errors: [],
+ isDruid: props.datasource.type === 'druid',
+ isSqla: props.datasource.type === 'table',
+ databaseColumns: props.datasource.columns.filter(col => !col.expression),
+ calculatedColumns: props.datasource.columns.filter(col => !!col.expression),
+ metadataLoading: false,
+ activeTabKey: 1,
+ };
+
+ this.onChange = this.onChange.bind(this);
+ this.onDatasourcePropChange = this.onDatasourcePropChange.bind(this);
+ this.onDatasourceChange = this.onDatasourceChange.bind(this);
+ this.hideAlert = this.hideAlert.bind(this);
+ this.syncMetadata = this.syncMetadata.bind(this);
+ this.setColumns = this.setColumns.bind(this);
+ this.validateAndChange = this.validateAndChange.bind(this);
+ this.handleTabSelect = this.handleTabSelect.bind(this);
+ }
+ onChange() {
+ const datasource = {
+ ...this.state.datasource,
+ columns: [...this.state.databaseColumns, ...this.state.calculatedColumns],
+ };
+ this.props.onChange(datasource, this.state.errors);
+ }
+ onDatasourceChange(newDatasource) {
+ this.setState({ datasource: newDatasource }, this.validateAndChange);
+ }
+ onDatasourcePropChange(attr, value) {
+ const datasource = { ...this.state.datasource, [attr]: value };
+ this.setState({ datasource }, this.onDatasourceChange(datasource));
+ }
+ setColumns(obj) {
+ this.setState(obj, this.validateAndChange);
+ }
+ validateAndChange() {
+ this.validate(this.onChange);
+ }
+ mergeColumns(cols) {
+ let { databaseColumns } = this.state;
+ let hasChanged;
+ const currentColNames = databaseColumns.map(col => col.column_name);
+ cols.forEach((col) => {
+ if (currentColNames.indexOf(col.name) < 0) {
+ // Adding columns
+ databaseColumns = databaseColumns.concat([{
+ id: shortid.generate(),
+ column_name: col.name,
+ type: col.type,
+ groupby: true,
+ filterable: true,
+ }]);
+ hasChanged = true;
+ }
+ });
+ if (hasChanged) {
+ this.setColumns({ databaseColumns });
+ }
+ }
+ syncMetadata() {
+ const datasource = this.state.datasource;
+ const url = `/datasource/external_metadata/${datasource.type}/${datasource.id}/`;
+ this.setState({ metadataLoading: true });
+ const success = (data) => {
+ this.mergeColumns(data);
+ this.props.addSuccessToast(t('Metadata has been synced'));
+ this.setState({ metadataLoading: false });
+ };
+ const error = (err) => {
+ let msg = t('An error has occurred');
+ if (err.responseJSON && err.responseJSON.error) {
+ msg = err.responseJSON.error;
+ }
+ this.props.addDangerToast(msg);
+ this.setState({ metadataLoading: false });
+ };
+ $.ajax({
+ url,
+ type: 'GET',
+ success,
+ error,
+ });
+ }
+ findDuplicates(arr, accessor) {
+ const seen = {};
+ const dups = [];
+ arr.forEach((obj) => {
+ const item = accessor(obj);
+ if (item in seen) {
+ dups.push(item);
+ } else {
+ seen[item] = null;
+ }
+ });
+ return dups;
+ }
+ validate(callback) {
+ let errors = [];
+ let dups;
+ const datasource = this.state.datasource;
+
+ // Looking for duplicate column_name
+ dups = this.findDuplicates(datasource.columns, obj => obj.column_name);
+ errors = errors.concat(dups.map(name => t('Column name [%s] is duplicated', name)));
+
+ // Looking for duplicate metric_name
+ dups = this.findDuplicates(datasource.metrics, obj => obj.metric_name);
+ errors = errors.concat(dups.map(name => t('Metric name [%s] is duplicated', name)));
+
+ // Making sure calculatedColumns have an expression defined
+ const noFilterCalcCols = this.state.calculatedColumns.filter(
+ col => !col.expression && !col.json);
+ errors = errors.concat(noFilterCalcCols.map(
+ col => t('Calculated column [%s] requires an expression', col.column_name)));
+
+ this.setState({ errors }, callback);
+ }
+ hideAlert() {
+ this.setState({ showAlert: false });
+ }
+ handleTabSelect(activeTabKey) {
+ this.setState({ activeTabKey });
+ }
+ renderSettingsFieldset() {
+ const datasource = this.state.datasource;
+ return (
+
+ data.pks.map((pk, i) => ({
+ value: pk,
+ label: `${data.result[i].first_name} ${data.result[i].last_name}`,
+ }))}
+ />}
+ controlProps={{
+ }}
+ />
+
+ );
+ }
+ renderAdvancedFieldset() {
+ const datasource = this.state.datasource;
+ return (
+
+ { this.state.isSqla &&
+
+ {t('The JSON metric or post aggregation definition.')}
+
+ }
+ control={ );
+ }
+ renderSpatialTab() {
+ const spatials = this.state.datasource.spatials;
+ return (
+ ({
+ name: '',
+ type: '',
+ config: null,
+ })}
+ collection={spatials}
+ allowDeletes
+ itemRenderers={{
+ name: (d, onChange) => (
+
+ {this.state.errors.map(err => {err}
)}
+ );
+ }
+ return null;
+ }
+ renderMetricCollection() {
+ return (
+
+
+
+
+ }
+ collection={this.state.datasource.metrics}
+ onChange={this.onDatasourcePropChange.bind(this, 'metrics')}
+ itemGenerator={() => ({
+ metric_name: '',
+ verbose_name: '',
+ expression: '',
+ })}
+ itemRenderers={{
+ metric_name: (v, onChange) => (
+
+ {this.renderErrors()}
+
+
+ {this.state.activeTabKey === 1 &&
+
+
+ {this.renderSettingsFieldset()}
+
+
+
+ {this.renderAdvancedFieldset()}
+
+
+
+ }
+
+
+ this.setColumns({ databaseColumns })}
+ />
+
+ {t('Sync columns from source')}
+
+ {this.state.metadataLoading &&
+ }
+
+ this.setColumns({ calculatedColumns })}
+ editableColumnName
+ showExpression
+ allowAddItem
+ allowEditDataType
+ itemGenerator={() => ({
+ column_name: '',
+ filterable: true,
+ groupby: true,
+ expression: '',
+ __expanded: true,
+ })}
+ />
+ }
+
+
+
+
+
+
+
+ {t('Are you sure you want to save and apply changes?')}
+
+
+
+
+
+ {t('Datasource Editor for ')}
+ {this.props.datasource.name}
+
+
+
+
+
+ {this.props.show &&
+
+
+
+ 0}
+ >
+ {t('Save')}
+
+ {t('Cancel')}
+ { this.dialog = el; }} />
+
+
+ );
+ }
+}
+
+DatasourceModal.propTypes = propTypes;
+DatasourceModal.defaultProps = defaultProps;
+export default withToasts(DatasourceModal);
diff --git a/superset/assets/src/datasource/main.css b/superset/assets/src/datasource/main.css
new file mode 100644
index 000000000..69fd97a10
--- /dev/null
+++ b/superset/assets/src/datasource/main.css
@@ -0,0 +1,4 @@
+.Datasource .tab-content {
+ height: 600px;
+ overflow: auto;
+}
diff --git a/superset/assets/src/explore/actions/exploreActions.js b/superset/assets/src/explore/actions/exploreActions.js
index 81c23e3ba..b8a883ee7 100644
--- a/superset/assets/src/explore/actions/exploreActions.js
+++ b/superset/assets/src/explore/actions/exploreActions.js
@@ -1,6 +1,4 @@
/* eslint camelcase: 0 */
-import { triggerQuery } from '../../chart/chartAction';
-
const $ = window.$ = require('jquery');
const FAVESTAR_BASE_URL = '/superset/favstar/slice';
@@ -20,21 +18,12 @@ export function setDatasources(datasources) {
return { type: SET_DATASOURCES, datasources };
}
-export const FETCH_DATASOURCE_STARTED = 'FETCH_DATASOURCE_STARTED';
-export function fetchDatasourceStarted() {
- return { type: FETCH_DATASOURCE_STARTED };
-}
-
+export const POST_DATASOURCE_STARTED = 'POST_DATASOURCE_STARTED';
export const FETCH_DATASOURCE_SUCCEEDED = 'FETCH_DATASOURCE_SUCCEEDED';
export function fetchDatasourceSucceeded() {
return { type: FETCH_DATASOURCE_SUCCEEDED };
}
-export const FETCH_DATASOURCE_FAILED = 'FETCH_DATASOURCE_FAILED';
-export function fetchDatasourceFailed(error) {
- return { type: FETCH_DATASOURCE_FAILED, error };
-}
-
export const FETCH_DATASOURCES_STARTED = 'FETCH_DATASOURCES_STARTED';
export function fetchDatasourcesStarted() {
return { type: FETCH_DATASOURCES_STARTED };
@@ -45,9 +34,9 @@ export function fetchDatasourcesSucceeded() {
return { type: FETCH_DATASOURCES_SUCCEEDED };
}
-export const FETCH_DATASOURCES_FAILED = 'FETCH_DATASOURCES_FAILED';
-export function fetchDatasourcesFailed(error) {
- return { type: FETCH_DATASOURCES_FAILED, error };
+export const POST_DATASOURCES_FAILED = 'POST_DATASOURCES_FAILED';
+export function postDatasourcesFailed(error) {
+ return { type: POST_DATASOURCES_FAILED, error };
}
export const RESET_FIELDS = 'RESET_FIELDS';
@@ -55,28 +44,6 @@ export function resetControls() {
return { type: RESET_FIELDS };
}
-export function fetchDatasourceMetadata(datasourceKey, alsoTriggerQuery = false) {
- return function (dispatch) {
- dispatch(fetchDatasourceStarted());
- const url = `/superset/fetch_datasource_metadata?datasourceKey=${datasourceKey}`;
- $.ajax({
- type: 'GET',
- url,
- success: (data) => {
- dispatch(setDatasource(data));
- dispatch(fetchDatasourceSucceeded());
- dispatch(resetControls());
- if (alsoTriggerQuery) {
- dispatch(triggerQuery());
- }
- },
- error(error) {
- dispatch(fetchDatasourceFailed(error.responseJSON.error));
- },
- });
- };
-}
-
export function fetchDatasources() {
return function (dispatch) {
dispatch(fetchDatasourcesStarted());
diff --git a/superset/assets/src/explore/components/ControlPanelsContainer.jsx b/superset/assets/src/explore/components/ControlPanelsContainer.jsx
index ff9754b03..0eac0cf0c 100644
--- a/superset/assets/src/explore/components/ControlPanelsContainer.jsx
+++ b/superset/assets/src/explore/components/ControlPanelsContainer.jsx
@@ -44,7 +44,7 @@ class ControlPanelsContainer extends React.Component {
}
// Applying mapStateToProps if needed
if (mapF) {
- return Object.assign({}, control, mapF(this.props.exploreState, control));
+ return Object.assign({}, control, mapF(this.props.exploreState, control, this.props.actions));
}
return control;
}
diff --git a/superset/assets/src/explore/components/controls/CheckboxControl.jsx b/superset/assets/src/explore/components/controls/CheckboxControl.jsx
index a4138e483..4c15c374e 100644
--- a/superset/assets/src/explore/components/controls/CheckboxControl.jsx
+++ b/superset/assets/src/explore/components/controls/CheckboxControl.jsx
@@ -4,7 +4,7 @@ import ControlHeader from '../ControlHeader';
import Checkbox from '../../../components/Checkbox';
const propTypes = {
- name: PropTypes.string.isRequired,
+ name: PropTypes.string,
value: PropTypes.bool,
label: PropTypes.string,
description: PropTypes.string,
@@ -22,21 +22,25 @@ export default class CheckboxControl extends React.Component {
onChange() {
this.props.onChange(!this.props.value);
}
- render() {
+ renderCheckbox() {
return (
-
-
- {t('Select a datasource')}
-
-
-
- {
- this.setSearchRef(ref);
- }}
- type="text"
- bsSize="sm"
- value={this.state.filter}
- placeholder={t('Search / Filter')}
- onChange={this.changeSearch}
- />
-
- {this.state.loading &&
-
- );
}
renderDatasource() {
const datasource = this.props.datasource;
@@ -195,27 +151,17 @@ class DatasourceControl extends React.PureComponent {
{t('Click to point to another datasource')}
}
>
-
+
{this.props.datasource.name}
- {t("Edit the datasource's configuration")}
+
+ {t('Expand/collapse datasource configuration')}
}
- >
-
-
-
- {t('Show datasource configuration')}
- }
>
}
{this.renderDatasource()}
- {this.renderModal()}
+ //')
+ def external_metadata(self, datasource_type=None, datasource_id=None):
+ """Gets column info from the source system"""
+ orm_datasource = ConnectorRegistry.get_datasource(
+ datasource_type, datasource_id, db.session)
+ return self.json_response(orm_datasource.external_metadata())
+
+
+appbuilder.add_view_no_menu(Datasource)
diff --git a/tests/base_tests.py b/tests/base_tests.py
index a5af0a19c..35ac33500 100644
--- a/tests/base_tests.py
+++ b/tests/base_tests.py
@@ -112,8 +112,12 @@ class SupersetTestCase(unittest.TestCase):
session.commit()
def get_table(self, table_id):
- return db.session.query(SqlaTable).filter_by(
- id=table_id).first()
+ return (
+ db.session
+ .query(SqlaTable)
+ .filter_by(id=table_id)
+ .one()
+ )
def get_or_create(self, cls, criteria, session):
obj = session.query(cls).filter_by(**criteria).first()
@@ -137,8 +141,7 @@ class SupersetTestCase(unittest.TestCase):
return slc
def get_table_by_name(self, name):
- return db.session.query(SqlaTable).filter_by(
- table_name=name).first()
+ return db.session.query(SqlaTable).filter_by(table_name=name).one()
def get_druid_ds_by_name(self, name):
return db.session.query(DruidDatasource).filter_by(
@@ -215,50 +218,3 @@ class SupersetTestCase(unittest.TestCase):
if raise_on_error and 'error' in resp:
raise Exception('run_sql failed')
return resp
-
- def test_gamma_permissions(self):
- def assert_can_read(view_menu):
- self.assertIn(('can_show', view_menu), gamma_perm_set)
- self.assertIn(('can_list', view_menu), gamma_perm_set)
-
- def assert_can_write(view_menu):
- self.assertIn(('can_add', view_menu), gamma_perm_set)
- self.assertIn(('can_download', view_menu), gamma_perm_set)
- self.assertIn(('can_delete', view_menu), gamma_perm_set)
- self.assertIn(('can_edit', view_menu), gamma_perm_set)
-
- def assert_cannot_write(view_menu):
- self.assertNotIn(('can_add', view_menu), gamma_perm_set)
- self.assertNotIn(('can_download', view_menu), gamma_perm_set)
- self.assertNotIn(('can_delete', view_menu), gamma_perm_set)
- self.assertNotIn(('can_edit', view_menu), gamma_perm_set)
- self.assertNotIn(('can_save', view_menu), gamma_perm_set)
-
- def assert_can_all(view_menu):
- assert_can_read(view_menu)
- assert_can_write(view_menu)
-
- gamma_perm_set = set()
- for perm in security_manager.find_role('Gamma').permissions:
- gamma_perm_set.add((perm.permission.name, perm.view_menu.name))
-
- # check read only perms
- assert_can_read('TableModelView')
- assert_cannot_write('DruidColumnInlineView')
-
- # make sure that user can create slices and dashboards
- assert_can_all('SliceModelView')
- assert_can_all('DashboardModelView')
-
- self.assertIn(('can_add_slices', 'Superset'), gamma_perm_set)
- self.assertIn(('can_copy_dash', 'Superset'), gamma_perm_set)
- self.assertIn(('can_created_dashboards', 'Superset'), gamma_perm_set)
- self.assertIn(('can_created_slices', 'Superset'), gamma_perm_set)
- self.assertIn(('can_csv', 'Superset'), gamma_perm_set)
- self.assertIn(('can_dashboard', 'Superset'), gamma_perm_set)
- self.assertIn(('can_explore', 'Superset'), gamma_perm_set)
- self.assertIn(('can_explore_json', 'Superset'), gamma_perm_set)
- self.assertIn(('can_fave_dashboards', 'Superset'), gamma_perm_set)
- self.assertIn(('can_fave_slices', 'Superset'), gamma_perm_set)
- self.assertIn(('can_save_dash', 'Superset'), gamma_perm_set)
- self.assertIn(('can_slice', 'Superset'), gamma_perm_set)
diff --git a/tests/datasource_tests.py b/tests/datasource_tests.py
new file mode 100644
index 000000000..7da7d929f
--- /dev/null
+++ b/tests/datasource_tests.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+"""Unit tests for Superset"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import json
+
+from .base_tests import SupersetTestCase
+from .fixtures.datasource import datasource_post
+
+
+class DatasourceTests(SupersetTestCase):
+
+ requires_examples = True
+
+ def __init__(self, *args, **kwargs):
+ super(DatasourceTests, self).__init__(*args, **kwargs)
+
+ def test_external_metadata(self):
+ self.login(username='admin')
+ tbl_id = self.get_table_by_name('birth_names').id
+ url = '/datasource/external_metadata/table/{}/'.format(tbl_id)
+ resp = self.get_json_resp(url)
+ col_names = {o.get('name') for o in resp}
+ self.assertEquals(
+ col_names,
+ {'sum_boys', 'num', 'gender', 'name', 'ds', 'state', 'sum_girls'},
+ )
+
+ def compare_lists(self, l1, l2, key):
+ l2_lookup = {o.get(key): o for o in l2}
+ for obj1 in l1:
+ obj2 = l2_lookup.get(obj1.get(key))
+ for k in obj1:
+ if k not in 'id' and obj1.get(k):
+ self.assertEquals(obj1.get(k), obj2.get(k))
+
+ def test_save(self):
+ self.login(username='admin')
+ tbl_id = self.get_table_by_name('birth_names').id
+ datasource_post['id'] = tbl_id
+ data = dict(data=json.dumps(datasource_post))
+ resp = self.get_json_resp('/datasource/save/', data)
+ for k in datasource_post:
+ if k == 'columns':
+ self.compare_lists(datasource_post[k], resp[k], 'column_name')
+ elif k == 'metrics':
+ self.compare_lists(datasource_post[k], resp[k], 'metric_name')
+ else:
+ self.assertEquals(resp[k], datasource_post[k])
diff --git a/tests/druid_tests.py b/tests/druid_tests.py
index 426fa9a86..00df0f8ea 100644
--- a/tests/druid_tests.py
+++ b/tests/druid_tests.py
@@ -516,6 +516,21 @@ class DruidTests(SupersetTestCase):
instance.timeseries.call_args[1]['granularity']['period'],
)
+ @patch('superset.connectors.druid.models.PyDruid')
+ def test_external_metadata(self, PyDruid):
+ self.login(username='admin')
+ self.login(username='admin')
+ cluster = self.get_cluster(PyDruid)
+ cluster.refresh_datasources()
+ datasource = cluster.datasources[0]
+ url = '/datasource/external_metadata/druid/{}/'.format(datasource.id)
+ resp = self.get_json_resp(url)
+ col_names = {o.get('name') for o in resp}
+ self.assertEquals(
+ col_names,
+ {'__time', 'dim1', 'dim2', 'metric1'},
+ )
+
if __name__ == '__main__':
unittest.main()
diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/fixtures/datasource.py b/tests/fixtures/datasource.py
new file mode 100644
index 000000000..9f0e47ec6
--- /dev/null
+++ b/tests/fixtures/datasource.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+"""Fixtures for test_datasource.py"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+datasource_post = {
+ 'id': None,
+ 'column_formats': {'ratio': '.2%'},
+ 'description': 'Adding a DESCRip',
+ 'default_endpoint': '',
+ 'filter_select': True,
+ 'name': 'birth_names',
+ 'datasource_name': 'birth_names',
+ 'type': 'table',
+ 'schema': '',
+ 'offset': 66,
+ 'cache_timeout': 55,
+ 'sql': '',
+ 'columns': [
+ {
+ 'id': 504,
+ 'column_name': 'ds',
+ 'verbose_name': '',
+ 'description': None,
+ 'expression': '',
+ 'filterable': True,
+ 'groupby': True,
+ 'is_dttm': True,
+ 'type': 'DATETIME',
+ 'database_expression': '',
+ },
+ {
+ 'id': 505,
+ 'column_name': 'gender',
+ 'verbose_name': None,
+ 'description': None,
+ 'expression': '',
+ 'filterable': True,
+ 'groupby': True,
+ 'is_dttm': False,
+ 'type': 'VARCHAR(16)',
+ 'database_expression': None,
+ },
+ {
+ 'id': 506,
+ 'column_name': 'name',
+ 'verbose_name': None,
+ 'description': None,
+ 'expression': None,
+ 'filterable': True,
+ 'groupby': True,
+ 'is_dttm': None,
+ 'type': 'VARCHAR(255)',
+ 'database_expression': None,
+ },
+ {
+ 'id': 508,
+ 'column_name': 'state',
+ 'verbose_name': None,
+ 'description': None,
+ 'expression': None,
+ 'filterable': True,
+ 'groupby': True,
+ 'is_dttm': None,
+ 'type': 'VARCHAR(10)',
+ 'database_expression': None,
+ },
+ {
+ 'id': 509,
+ 'column_name': 'sum_boys',
+ 'verbose_name': None,
+ 'description': None,
+ 'expression': None,
+ 'filterable': True,
+ 'groupby': True,
+ 'is_dttm': None,
+ 'type': 'BIGINT(20)',
+ 'database_expression': None,
+ },
+ {
+ 'id': 510,
+ 'column_name': 'sum_girls',
+ 'verbose_name': None,
+ 'description': None,
+ 'expression': '',
+ 'filterable': False,
+ 'groupby': False,
+ 'is_dttm': False,
+ 'type': 'BIGINT(20)',
+ 'database_expression': None,
+ },
+ {
+ 'id': 532,
+ 'column_name': 'num',
+ 'verbose_name': None,
+ 'description': None,
+ 'expression': None,
+ 'filterable': True,
+ 'groupby': True,
+ 'is_dttm': None,
+ 'type': 'BIGINT(20)',
+ 'database_expression': None,
+ },
+ {
+ 'id': 522,
+ 'column_name': 'num_california',
+ 'verbose_name': None,
+ 'description': None,
+ 'expression': "CASE WHEN state = 'CA' THEN num ELSE 0 END",
+ 'filterable': False,
+ 'groupby': False,
+ 'is_dttm': False,
+ 'type': 'NUMBER',
+ 'database_expression': None,
+ },
+ ],
+ 'metrics': [
+ {
+ 'id': 824,
+ 'metric_name': 'sum__num',
+ 'verbose_name': 'Babies',
+ 'description': '',
+ 'expression': 'SUM(num)',
+ 'warning_text': '',
+ 'd3format': '',
+ },
+ {
+ 'id': 836,
+ 'metric_name': 'count',
+ 'verbose_name': '',
+ 'description': None,
+ 'expression': 'count(1)',
+ 'warning_text': None,
+ 'd3format': None,
+ },
+ {
+ 'id': 843,
+ 'metric_name': 'ratio',
+ 'verbose_name': 'Ratio Boys/Girls',
+ 'description': 'This represents the ratio of boys/girls',
+ 'expression': 'sum(sum_boys) / sum(sum_girls)',
+ 'warning_text': 'no warning',
+ 'd3format': '.2%',
+ },
+ ],
+}
diff --git a/tests/security_tests.py b/tests/security_tests.py
index 4e1597bc8..fe7564ed1 100644
--- a/tests/security_tests.py
+++ b/tests/security_tests.py
@@ -144,7 +144,7 @@ class RolePermissionTests(SupersetTestCase):
self.assertTrue(security_manager.is_gamma_pvm(
security_manager.find_permission_view_menu('can_show', 'TableModelView')))
- def test_gamma_permissions(self):
+ def test_gamma_permissions_basic(self):
self.assert_can_gamma(get_perm_tuples('Gamma'))
self.assert_cannot_gamma(get_perm_tuples('Gamma'))
self.assert_cannot_alpha(get_perm_tuples('Alpha'))
@@ -175,3 +175,50 @@ class RolePermissionTests(SupersetTestCase):
self.assert_cannot_gamma(granter_set)
self.assert_cannot_alpha(granter_set)
+
+ def test_gamma_permissions(self):
+ def assert_can_read(view_menu):
+ self.assertIn(('can_show', view_menu), gamma_perm_set)
+ self.assertIn(('can_list', view_menu), gamma_perm_set)
+
+ def assert_can_write(view_menu):
+ self.assertIn(('can_add', view_menu), gamma_perm_set)
+ self.assertIn(('can_download', view_menu), gamma_perm_set)
+ self.assertIn(('can_delete', view_menu), gamma_perm_set)
+ self.assertIn(('can_edit', view_menu), gamma_perm_set)
+
+ def assert_cannot_write(view_menu):
+ self.assertNotIn(('can_add', view_menu), gamma_perm_set)
+ self.assertNotIn(('can_download', view_menu), gamma_perm_set)
+ self.assertNotIn(('can_delete', view_menu), gamma_perm_set)
+ self.assertNotIn(('can_edit', view_menu), gamma_perm_set)
+ self.assertNotIn(('can_save', view_menu), gamma_perm_set)
+
+ def assert_can_all(view_menu):
+ assert_can_read(view_menu)
+ assert_can_write(view_menu)
+
+ gamma_perm_set = set()
+ for perm in security_manager.find_role('Gamma').permissions:
+ gamma_perm_set.add((perm.permission.name, perm.view_menu.name))
+
+ # check read only perms
+ assert_can_read('TableModelView')
+ assert_cannot_write('DruidColumnInlineView')
+
+ # make sure that user can create slices and dashboards
+ assert_can_all('SliceModelView')
+ assert_can_all('DashboardModelView')
+
+ self.assertIn(('can_add_slices', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_copy_dash', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_created_dashboards', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_created_slices', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_csv', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_dashboard', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_explore', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_explore_json', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_fave_dashboards', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_fave_slices', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_save_dash', 'Superset'), gamma_perm_set)
+ self.assertIn(('can_slice', 'Superset'), gamma_perm_set)