QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-22 01:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

DB migration of annotation_layers on slice objects and slimming down annotation object. (#4072)

Browse Source
This commit is contained in:
fabianmenges
2017-12-18 16:11:06 -05:00
committed by Grace Guo
parent 1e79e9cd2a
commit 71e1eea9f4
2 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
superset/assets/javascripts/explore/components/controls/AnnotationLayer.jsx
View File

@@ -104,6 +104,7 @@ export default class AnnotationLayer extends React.PureComponent {
isNew: !this.props.name,
isLoadingOptions: true,
valueOptions: [],
validationErrors: {},
};
this.submitAnnotation = this.submitAnnotation.bind(this);
this.deleteAnnotation = this.deleteAnnotation.bind(this);
@@ -235,11 +236,17 @@ export default class AnnotationLayer extends React.PureComponent {
applyAnnotation() {
if (this.state.name.length) {
const annotation = { ...this.state };
annotation.color = annotation.color === AUTOMATIC_COLOR ? null : annotation.color;
const annotation = {};
Object.keys(this.state).forEach((k) => {
if (this.state[k] !== null) {
annotation[k] = this.state[k];
}
});
delete annotation.isNew;
delete annotation.valueOptions;
delete annotation.isLoadingOptions;
delete annotation.validationErrors;
annotation.color = annotation.color === AUTOMATIC_COLOR ? null : annotation.color;
this.props.addAnnotationLayer(annotation);
this.setState({ isNew: false, oldName: this.state.name });
}