diff --git a/superset/assets/src/chart/Chart.jsx b/superset/assets/src/chart/Chart.jsx
index c0d391673fc7a..cfc6ce8a97053 100644
--- a/superset/assets/src/chart/Chart.jsx
+++ b/superset/assets/src/chart/Chart.jsx
@@ -20,6 +20,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import { Alert } from 'react-bootstrap';
+import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
import { Logger, LOG_ACTIONS_RENDER_CHART_CONTAINER } from '../logger/LogUtils';
import Loading from '../components/Loading';
import RefreshChartOverlay from '../components/RefreshChartOverlay';
@@ -70,7 +71,7 @@ class Chart extends React.PureComponent {
}
componentDidMount() {
if (this.props.triggerQuery) {
- if (this.props.chartId > 0) {
+ if (this.props.chartId > 0 && isFeatureEnabled(FeatureFlag.CLIENT_CACHE)) {
// Load saved chart with a GET request
this.props.actions.getSavedChart(
this.props.formData,
diff --git a/superset/assets/src/chart/chartAction.js b/superset/assets/src/chart/chartAction.js
index 3909dadd85967..dc9eb322d4cf1 100644
--- a/superset/assets/src/chart/chartAction.js
+++ b/superset/assets/src/chart/chartAction.js
@@ -21,6 +21,7 @@
/* eslint no-param-reassign: ["error", { "props": false }] */
import { t } from '@superset-ui/translation';
import { SupersetClient } from '@superset-ui/connection';
+import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
import { getExploreUrlAndPayload, getAnnotationJsonUrl } from '../explore/exploreUtils';
import { requiresQuery, ANNOTATION_SOURCE_TYPES } from '../modules/AnnotationTypes';
import { addDangerToast } from '../messageToasts/actions';
@@ -194,7 +195,9 @@ export function exploreJSON(formData, force = false, timeout = 60, key, method)
};
}
- const clientMethod = method === 'GET' ? SupersetClient.get : SupersetClient.post;
+ const clientMethod = method === 'GET' && isFeatureEnabled(FeatureFlag.CLIENT_CACHE)
+ ? SupersetClient.get
+ : SupersetClient.post;
const queryPromise = clientMethod(querySettings)
.then(({ json }) => {
dispatch(logEvent(LOG_ACTIONS_LOAD_CHART, {
diff --git a/superset/assets/src/components/AnchorLink.jsx b/superset/assets/src/components/AnchorLink.jsx
new file mode 100644
index 0000000000000..b33ee605cd444
--- /dev/null
+++ b/superset/assets/src/components/AnchorLink.jsx
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import PropTypes from 'prop-types';
+import { t } from '@superset-ui/translation';
+
+import URLShortLinkButton from './URLShortLinkButton';
+import getDashboardUrl from '../dashboard/util/getDashboardUrl';
+
+const propTypes = {
+ anchorLinkId: PropTypes.string.isRequired,
+ filters: PropTypes.object,
+ showShortLinkButton: PropTypes.bool,
+ placement: PropTypes.oneOf(['right', 'left', 'top', 'bottom']),
+};
+
+const defaultProps = {
+ showShortLinkButton: false,
+ placement: 'right',
+ filters: {},
+};
+
+
+class AnchorLink extends React.PureComponent {
+ constructor(props) {
+ super(props);
+
+ this.handleClickAnchorLink = this.handleClickAnchorLink.bind(this);
+ }
+
+ componentDidMount() {
+ const hash = this.getLocationHash();
+ const { anchorLinkId } = this.props;
+
+ if (hash && anchorLinkId === hash) {
+ const directLinkComponent = document.getElementById(anchorLinkId);
+ if (directLinkComponent) {
+ setTimeout(() => {
+ directLinkComponent.scrollIntoView({
+ block: 'center',
+ behavior: 'smooth',
+ });
+ }, 1000);
+ }
+ }
+ }
+
+ getLocationHash() {
+ return (window.location.hash || '').substring(1);
+ }
+
+ handleClickAnchorLink(ev) {
+ ev.preventDefault();
+ history.pushState(null, null, `#${this.props.anchorLinkId}`);
+ }
+
+ render() {
+ const { anchorLinkId, filters, showShortLinkButton, placement } = this.props;
+ return (
+
+ {showShortLinkButton &&
+ 
@@ -87,6 +88,7 @@ class URLShortLinkButton extends React.Component {
URLShortLinkButton.defaultProps = {
url: window.location.href.substring(window.location.origin.length),
+ placement: 'left',
emailSubject: '',
emailContent: '',
};
diff --git a/superset/assets/src/components/URLShortLinkModal.jsx b/superset/assets/src/components/URLShortLinkModal.jsx
index 2fc01c60eddeb..d6bf3f67224ec 100644
--- a/superset/assets/src/components/URLShortLinkModal.jsx
+++ b/superset/assets/src/components/URLShortLinkModal.jsx
@@ -30,6 +30,7 @@ const propTypes = {
emailContent: PropTypes.string,
addDangerToast: PropTypes.func.isRequired,
isMenuItem: PropTypes.bool,
+ title: PropTypes.string,
triggerNode: PropTypes.node.isRequired,
};
@@ -65,7 +66,7 @@ class URLShortLinkModal extends React.Component {
isMenuItem={this.props.isMenuItem}
triggerNode={this.props.triggerNode}
beforeOpen={this.getCopyUrl}
- modalTitle={t('Share Dashboard')}
+ modalTitle={this.props.title || t('Share Dashboard')}
modalBody={
- SupersetClient.post({
+ return dispatch => {
+ dispatch({ type: UPDATE_COMPONENTS_PARENTS_LIST });
+
+ return SupersetClient.post({
endpoint: `/superset/${path}/${id}/`,
postPayload: { data },
})
- .then(response =>
- Promise.all([
- dispatch(saveDashboardRequestSuccess()),
- dispatch(
- addSuccessToast(t('This dashboard was saved successfully.')),
- ),
- ]).then(() => Promise.resolve(response)),
- )
+ .then(response => {
+ dispatch(saveDashboardRequestSuccess());
+ dispatch(addSuccessToast(t('This dashboard was saved successfully.')));
+ return response;
+ })
.catch(response =>
getClientErrorObject(response).then(({ error }) =>
dispatch(
@@ -163,6 +163,7 @@ export function saveDashboardRequest(data, id, saveType) {
),
),
);
+ };
}
export function fetchCharts(chartList = [], force = false, interval = 0) {
diff --git a/superset/assets/src/dashboard/actions/sliceEntities.js b/superset/assets/src/dashboard/actions/sliceEntities.js
index e98d28bcc457d..efee23eec3509 100644
--- a/superset/assets/src/dashboard/actions/sliceEntities.js
+++ b/superset/assets/src/dashboard/actions/sliceEntities.js
@@ -77,6 +77,7 @@ export function fetchAllSlices(userId) {
description_markdown: slice.description_markeddown,
viz_type: slice.viz_type,
modified: slice.modified,
+ changed_on_humanized: slice.changed_on_humanized,
};
}
});
diff --git a/superset/assets/src/dashboard/components/DashboardBuilder.jsx b/superset/assets/src/dashboard/components/DashboardBuilder.jsx
index 7bd6f6f39b373..12c8ff3368cbd 100644
--- a/superset/assets/src/dashboard/components/DashboardBuilder.jsx
+++ b/superset/assets/src/dashboard/components/DashboardBuilder.jsx
@@ -36,6 +36,7 @@ import ToastPresenter from '../../messageToasts/containers/ToastPresenter';
import WithPopoverMenu from './menu/WithPopoverMenu';
import getDragDropManager from '../util/getDragDropManager';
+import findTabIndexByComponentId from '../util/findTabIndexByComponentId';
import {
BUILDER_PANE_TYPE,
@@ -57,9 +58,13 @@ const propTypes = {
setColorSchemeAndUnsavedChanges: PropTypes.func.isRequired,
colorScheme: PropTypes.string,
handleComponentDrop: PropTypes.func.isRequired,
+ toggleBuilderPane: PropTypes.func.isRequired,
+ directPathToChild: PropTypes.arrayOf(PropTypes.string),
};
const defaultProps = {
+ showBuilderPane: false,
+ directPathToChild: [],
colorScheme: undefined,
};
@@ -75,8 +80,19 @@ class DashboardBuilder extends React.Component {
constructor(props) {
super(props);
+
+ const { dashboardLayout, directPathToChild } = props;
+ const dashboardRoot = dashboardLayout[DASHBOARD_ROOT_ID];
+ const rootChildId = dashboardRoot.children[0];
+ const topLevelTabs =
+ rootChildId !== DASHBOARD_GRID_ID && dashboardLayout[rootChildId];
+ const tabIndex = findTabIndexByComponentId({
+ currentComponent: topLevelTabs || dashboardLayout[DASHBOARD_ROOT_ID],
+ directPathToChild,
+ });
+
this.state = {
- tabIndex: 0, // top-level tabs
+ tabIndex,
};
this.handleChangeTab = this.handleChangeTab.bind(this);
this.handleDeleteTopLevelTabs = this.handleDeleteTopLevelTabs.bind(this);
diff --git a/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx b/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx
index 5aa468b742aa3..b96096517964c 100644
--- a/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx
+++ b/superset/assets/src/dashboard/components/HeaderActionsDropdown.jsx
@@ -191,7 +191,11 @@ class HeaderActionsDropdown extends React.PureComponent {
)}
diff --git a/superset/assets/src/dashboard/components/SliceHeaderControls.jsx b/superset/assets/src/dashboard/components/SliceHeaderControls.jsx
index 18a92071f9d1a..65565f07cb29d 100644
--- a/superset/assets/src/dashboard/components/SliceHeaderControls.jsx
+++ b/superset/assets/src/dashboard/components/SliceHeaderControls.jsx
@@ -21,9 +21,14 @@ import PropTypes from 'prop-types';
import moment from 'moment';
import { Dropdown, MenuItem } from 'react-bootstrap';
import { t } from '@superset-ui/translation';
+import URLShortLinkModal from '../../components/URLShortLinkModal';
+import getDashboardUrl from '../util/getDashboardUrl';
const propTypes = {
slice: PropTypes.object.isRequired,
+ componentId: PropTypes.string.isRequired,
+ filters: PropTypes.object.isRequired,
+ addDangerToast: PropTypes.func.isRequired,
isCached: PropTypes.bool,
isExpanded: PropTypes.bool,
cachedDttm: PropTypes.string,
@@ -97,7 +102,15 @@ class SliceHeaderControls extends React.PureComponent {
}
render() {
- const { slice, isCached, cachedDttm, updatedDttm } = this.props;
+ const {
+ slice,
+ isCached,
+ cachedDttm,
+ updatedDttm,
+ filters,
+ componentId,
+ addDangerToast,
+ } = this.props;
const cachedWhen = moment.utc(cachedDttm).fromNow();
const updatedWhen = updatedDttm ? moment.utc(updatedDttm).fromNow() : '';
const refreshTooltip = isCached
@@ -145,6 +158,18 @@ class SliceHeaderControls extends React.PureComponent {
{t('Explore chart')}
)}
+
+ {t('Share chart')}}
+ />
);
diff --git a/superset/assets/src/dashboard/components/gridComponents/Chart.jsx b/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
index d8b01d011beab..ff1120835534e 100644
--- a/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
+++ b/superset/assets/src/dashboard/components/gridComponents/Chart.jsx
@@ -33,6 +33,7 @@ import {
const propTypes = {
id: PropTypes.number.isRequired,
+ componentId: PropTypes.string.isRequired,
width: PropTypes.number.isRequired,
height: PropTypes.number.isRequired,
updateSliceName: PropTypes.func.isRequired,
@@ -55,6 +56,7 @@ const propTypes = {
supersetCanExplore: PropTypes.bool.isRequired,
supersetCanCSV: PropTypes.bool.isRequired,
sliceCanEdit: PropTypes.bool.isRequired,
+ addDangerToast: PropTypes.func.isRequired,
};
const defaultProps = {
@@ -184,6 +186,7 @@ class Chart extends React.Component {
render() {
const {
id,
+ componentId,
chart,
slice,
datasource,
@@ -198,6 +201,7 @@ class Chart extends React.Component {
supersetCanExplore,
supersetCanCSV,
sliceCanEdit,
+ addDangerToast,
} = this.props;
const { width } = this.state;
@@ -233,6 +237,9 @@ class Chart extends React.Component {
supersetCanExplore={supersetCanExplore}
supersetCanCSV={supersetCanCSV}
sliceCanEdit={sliceCanEdit}
+ componentId={componentId}
+ filters={filters}
+ addDangerToast={addDangerToast}
/>
{/*
diff --git a/superset/assets/src/dashboard/components/gridComponents/ChartHolder.jsx b/superset/assets/src/dashboard/components/gridComponents/ChartHolder.jsx
index 56e2918b35833..836c0e726d5de 100644
--- a/superset/assets/src/dashboard/components/gridComponents/ChartHolder.jsx
+++ b/superset/assets/src/dashboard/components/gridComponents/ChartHolder.jsx
@@ -20,6 +20,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import Chart from '../../containers/Chart';
+import AnchorLink from '../../../components/AnchorLink';
import DeleteComponentButton from '../DeleteComponentButton';
import DragDroppable from '../dnd/DragDroppable';
import HoverMenu from '../menu/HoverMenu';
@@ -148,7 +149,9 @@ class ChartHolder extends React.Component {
ref={dragSourceRef}
className="dashboard-component dashboard-component-chart-holder"
>
+ {!editMode &&
diff --git a/superset/assets/src/dashboard/components/gridComponents/Tab.jsx b/superset/assets/src/dashboard/components/gridComponents/Tab.jsx
index 764702d06b548..49a0f187fb5d7 100644
--- a/superset/assets/src/dashboard/components/gridComponents/Tab.jsx
+++ b/superset/assets/src/dashboard/components/gridComponents/Tab.jsx
@@ -22,6 +22,7 @@ import PropTypes from 'prop-types';
import DashboardComponent from '../../containers/DashboardComponent';
import DragDroppable from '../dnd/DragDroppable';
import EditableTitle from '../../../components/EditableTitle';
+import AnchorLink from '../../../components/AnchorLink';
import DeleteComponentModal from '../DeleteComponentModal';
import WithPopoverMenu from '../menu/WithPopoverMenu';
import { componentShape } from '../../util/propShapes';
@@ -41,6 +42,7 @@ const propTypes = {
onDropOnTab: PropTypes.func,
onDeleteTab: PropTypes.func,
editMode: PropTypes.bool.isRequired,
+ filters: PropTypes.object.isRequired,
// grid related
availableColumnCount: PropTypes.number,
@@ -195,7 +197,14 @@ export default class Tab extends React.PureComponent {
renderTab() {
const { isFocused } = this.state;
- const { component, parentComponent, index, depth, editMode } = this.props;
+ const {
+ component,
+ parentComponent,
+ index,
+ depth,
+ editMode,
+ filters,
+ } = this.props;
const deleteTabIcon = (
@@ -87,6 +88,7 @@ class URLShortLinkButton extends React.Component {
URLShortLinkButton.defaultProps = {
url: window.location.href.substring(window.location.origin.length),
+ placement: 'left',
emailSubject: '',
emailContent: '',
};
diff --git a/superset/assets/src/components/URLShortLinkModal.jsx b/superset/assets/src/components/URLShortLinkModal.jsx
index 2fc01c60eddeb..d6bf3f67224ec 100644
--- a/superset/assets/src/components/URLShortLinkModal.jsx
+++ b/superset/assets/src/components/URLShortLinkModal.jsx
@@ -30,6 +30,7 @@ const propTypes = {
emailContent: PropTypes.string,
addDangerToast: PropTypes.func.isRequired,
isMenuItem: PropTypes.bool,
+ title: PropTypes.string,
triggerNode: PropTypes.node.isRequired,
};
@@ -65,7 +66,7 @@ class URLShortLinkModal extends React.Component {
isMenuItem={this.props.isMenuItem}
triggerNode={this.props.triggerNode}
beforeOpen={this.getCopyUrl}
- modalTitle={t('Share Dashboard')}
+ modalTitle={this.props.title || t('Share Dashboard')}
modalBody={
@@ -238,6 +247,14 @@ export default class Tab extends React.PureComponent {
onSaveTitle={this.handleChangeText}
showTooltip={false}
/>
+ {!editMode && (
+ = 5 ? 'left' : 'right'}
+ />
+ )}
{dropIndicatorProps && }
diff --git a/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx b/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx
index dc9d59939a0db..2b8934e9f668c 100644
--- a/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx
+++ b/superset/assets/src/dashboard/components/gridComponents/Tabs.jsx
@@ -25,6 +25,7 @@ import DragHandle from '../dnd/DragHandle';
import DashboardComponent from '../../containers/DashboardComponent';
import DeleteComponentButton from '../DeleteComponentButton';
import HoverMenu from '../menu/HoverMenu';
+import findTabIndexByComponentId from '../../util/findTabIndexByComponentId';
import { componentShape } from '../../util/propShapes';
import { NEW_TAB_ID, DASHBOARD_ROOT_ID } from '../../util/constants';
import { RENDER_TAB, RENDER_TAB_CONTENT } from './Tab';
@@ -45,6 +46,7 @@ const propTypes = {
editMode: PropTypes.bool.isRequired,
renderHoverMenu: PropTypes.bool,
logEvent: PropTypes.func.isRequired,
+ directPathToChild: PropTypes.arrayOf(PropTypes.string),
// grid related
availableColumnCount: PropTypes.number,
@@ -67,6 +69,7 @@ const defaultProps = {
renderHoverMenu: true,
availableColumnCount: 0,
columnWidth: 0,
+ directPathToChild: [],
onChangeTab() {},
onResizeStart() {},
onResize() {},
@@ -76,8 +79,13 @@ const defaultProps = {
class Tabs extends React.PureComponent {
constructor(props) {
super(props);
+ const tabIndex = findTabIndexByComponentId({
+ currentComponent: props.component,
+ directPathToChild: props.directPathToChild,
+ });
+
this.state = {
- tabIndex: 0,
+ tabIndex,
};
this.handleClickTab = this.handleClickTab.bind(this);
this.handleDeleteComponent = this.handleDeleteComponent.bind(this);
diff --git a/superset/assets/src/dashboard/containers/Chart.jsx b/superset/assets/src/dashboard/containers/Chart.jsx
index 5b14c1bade1b0..d47c7c97ac5bf 100644
--- a/superset/assets/src/dashboard/containers/Chart.jsx
+++ b/superset/assets/src/dashboard/containers/Chart.jsx
@@ -23,10 +23,11 @@ import {
changeFilter as addFilter,
toggleExpandSlice,
} from '../actions/dashboardState';
+import { updateComponents } from '../actions/dashboardLayout';
+import { addDangerToast } from '../../messageToasts/actions';
import { refreshChart } from '../../chart/chartAction';
import { logEvent } from '../../logger/actions';
import getFormDataWithExtraFilters from '../util/charts/getFormDataWithExtraFilters';
-import { updateComponents } from '../actions/dashboardLayout';
import Chart from '../components/gridComponents/Chart';
const EMPTY_FILTERS = {};
@@ -74,6 +75,7 @@ function mapDispatchToProps(dispatch) {
return bindActionCreators(
{
updateComponents,
+ addDangerToast,
toggleExpandSlice,
addFilter,
refreshChart,
diff --git a/superset/assets/src/dashboard/containers/DashboardBuilder.jsx b/superset/assets/src/dashboard/containers/DashboardBuilder.jsx
index 3c6514a2f736c..cb3ca3ee898a2 100644
--- a/superset/assets/src/dashboard/containers/DashboardBuilder.jsx
+++ b/superset/assets/src/dashboard/containers/DashboardBuilder.jsx
@@ -33,6 +33,8 @@ function mapStateToProps({ dashboardLayout: undoableLayout, dashboardState }) {
return {
dashboardLayout: undoableLayout.present,
editMode: dashboardState.editMode,
+ showBuilderPane: dashboardState.showBuilderPane,
+ directPathToChild: dashboardState.directPathToChild,
builderPaneType: dashboardState.builderPaneType,
colorScheme: dashboardState.colorScheme,
};
diff --git a/superset/assets/src/dashboard/containers/DashboardComponent.jsx b/superset/assets/src/dashboard/containers/DashboardComponent.jsx
index 180fcd3c93709..a1a1c375e957c 100644
--- a/superset/assets/src/dashboard/containers/DashboardComponent.jsx
+++ b/superset/assets/src/dashboard/containers/DashboardComponent.jsx
@@ -43,6 +43,11 @@ const propTypes = {
updateComponents: PropTypes.func.isRequired,
handleComponentDrop: PropTypes.func.isRequired,
logEvent: PropTypes.func.isRequired,
+ directPathToChild: PropTypes.arrayOf(PropTypes.string),
+};
+
+const defaultProps = {
+ directPathToChild: [],
};
function mapStateToProps(
@@ -56,6 +61,8 @@ function mapStateToProps(
component,
parentComponent: dashboardLayout[parentId],
editMode: dashboardState.editMode,
+ filters: dashboardState.filters,
+ directPathToChild: dashboardState.directPathToChild,
};
// rows and columns need more data about their child dimensions
@@ -98,6 +105,7 @@ class DashboardComponent extends React.PureComponent {
}
DashboardComponent.propTypes = propTypes;
+DashboardComponent.defaultProps = defaultProps;
export default connect(
mapStateToProps,
diff --git a/superset/assets/src/dashboard/fixtures/emptyDashboardLayout.js b/superset/assets/src/dashboard/fixtures/emptyDashboardLayout.js
index f5799b0171f14..d693aca878c17 100644
--- a/superset/assets/src/dashboard/fixtures/emptyDashboardLayout.js
+++ b/superset/assets/src/dashboard/fixtures/emptyDashboardLayout.js
@@ -39,6 +39,7 @@ export default {
type: DASHBOARD_GRID_TYPE,
id: DASHBOARD_GRID_ID,
children: [],
+ parents: [DASHBOARD_ROOT_ID],
meta: {},
},
diff --git a/superset/assets/src/dashboard/reducers/dashboardLayout.js b/superset/assets/src/dashboard/reducers/dashboardLayout.js
index c880a24c78659..23459e029f87d 100644
--- a/superset/assets/src/dashboard/reducers/dashboardLayout.js
+++ b/superset/assets/src/dashboard/reducers/dashboardLayout.js
@@ -24,6 +24,7 @@ import {
import componentIsResizable from '../util/componentIsResizable';
import findParentId from '../util/findParentId';
import getComponentWidthFromDrop from '../util/getComponentWidthFromDrop';
+import updateComponentParentsList from '../util/updateComponentParentsList';
import newComponentFactory from '../util/newComponentFactory';
import newEntitiesFromDrop from '../util/newEntitiesFromDrop';
import reorderItem from '../util/dnd-reorder';
@@ -32,6 +33,7 @@ import { ROW_TYPE, TAB_TYPE, TABS_TYPE } from '../util/componentTypes';
import {
UPDATE_COMPONENTS,
+ UPDATE_COMPONENTS_PARENTS_LIST,
DELETE_COMPONENT,
CREATE_COMPONENT,
MOVE_COMPONENT,
@@ -255,6 +257,21 @@ const actionHandlers = {
return nextEntities;
},
+
+ [UPDATE_COMPONENTS_PARENTS_LIST](state) {
+ const nextState = {
+ ...state,
+ };
+
+ updateComponentParentsList({
+ currentComponent: nextState[DASHBOARD_ROOT_ID],
+ layout: nextState,
+ });
+
+ return {
+ ...nextState,
+ };
+ },
};
export default function layoutReducer(state = {}, action) {
diff --git a/superset/assets/src/dashboard/reducers/getInitialState.js b/superset/assets/src/dashboard/reducers/getInitialState.js
index 69396de786fb2..fb5ff75239fab 100644
--- a/superset/assets/src/dashboard/reducers/getInitialState.js
+++ b/superset/assets/src/dashboard/reducers/getInitialState.js
@@ -72,7 +72,11 @@ export default function(bootstrapData) {
// dashboard layout
const { position_json: positionJson } = dashboard;
- const layout = positionJson || getEmptyLayout();
+ // new dash: positionJson could be {} or null
+ const layout =
+ positionJson && Object.keys(positionJson).length > 0
+ ? positionJson
+ : getEmptyLayout();
// create a lookup to sync layout names with slice names
const chartIdToLayoutId = {};
@@ -164,6 +168,14 @@ export default function(bootstrapData) {
future: [],
};
+ // find direct link component and path from root
+ const directLinkComponentId = (window.location.hash || '#').substring(1);
+ let directPathToChild = [];
+ if (layout[directLinkComponentId]) {
+ directPathToChild = (layout[directLinkComponentId].parents || []).slice();
+ directPathToChild.push(directLinkComponentId);
+ }
+
return {
datasources,
sliceEntities: { ...initSliceEntities, slices, isLoading: false },
@@ -194,6 +206,7 @@ export default function(bootstrapData) {
sliceIds: Array.from(sliceIds),
refresh: false,
filters,
+ directPathToChild,
expandedSlices: dashboard.metadata.expanded_slices || {},
refreshFrequency: dashboard.metadata.refresh_frequency || 0,
css: dashboard.css || '',
diff --git a/superset/assets/src/syncBackend.js b/superset/assets/src/dashboard/util/findTabIndexByComponentId.js
similarity index 55%
rename from superset/assets/src/syncBackend.js
rename to superset/assets/src/dashboard/util/findTabIndexByComponentId.js
index ae61bf3b370ab..eed141e44f585 100644
--- a/superset/assets/src/syncBackend.js
+++ b/superset/assets/src/dashboard/util/findTabIndexByComponentId.js
@@ -16,28 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-/* eslint no-console: 0 */
-import fs from 'fs';
-import path from 'path';
-import { controls } from './explore/controls';
-
-function exportFile(fileLocation, content) {
- fs.writeFile(fileLocation, content, function (err) {
- if (err) {
- console.log(`File ${fileLocation} was not saved... :(`);
- } else {
- console.log(`File ${fileLocation} was saved!`);
- }
- });
-}
+export default function findTabIndexByComponentId({
+ currentComponent,
+ directPathToChild = [],
+}) {
+ if (
+ !currentComponent ||
+ directPathToChild.length === 0 ||
+ directPathToChild.indexOf(currentComponent.id) === -1
+ ) {
+ return 0;
+ }
-function main() {
- const APP_DIR = path.resolve(__dirname, './');
- const dir = APP_DIR + '/../dist/';
- if (!fs.existsSync(dir)) {
- fs.mkdirSync(dir);
+ const currentComponentIdx = directPathToChild.findIndex(
+ id => id === currentComponent.id,
+ );
+ const nextParentId = directPathToChild[currentComponentIdx + 1];
+ if (currentComponent.children.indexOf(nextParentId) >= 0) {
+ return currentComponent.children.findIndex(
+ childId => childId === nextParentId,
+ );
}
- const blob = { controls };
- exportFile(APP_DIR + '/../backendSync.json', JSON.stringify(blob, null, 2));
+ return 0;
}
-main();
diff --git a/superset/assets/src/dashboard/util/getDashboardUrl.js b/superset/assets/src/dashboard/util/getDashboardUrl.js
index 9b8cada1d386f..243c8cbe65f81 100644
--- a/superset/assets/src/dashboard/util/getDashboardUrl.js
+++ b/superset/assets/src/dashboard/util/getDashboardUrl.js
@@ -18,7 +18,8 @@
*/
/* eslint camelcase: 0 */
-export default function getDashboardUrl(pathname, filters = {}) {
+export default function getDashboardUrl(pathname, filters = {}, hash = '') {
const preselect_filters = encodeURIComponent(JSON.stringify(filters));
- return `${pathname}?preselect_filters=${preselect_filters}`;
+ const hashSection = hash ? `#${hash}` : '';
+ return `${pathname}?preselect_filters=${preselect_filters}${hashSection}`;
}
diff --git a/superset/assets/src/dashboard/util/getEmptyLayout.js b/superset/assets/src/dashboard/util/getEmptyLayout.js
index 28d3187c806c1..a58866cd350a0 100644
--- a/superset/assets/src/dashboard/util/getEmptyLayout.js
+++ b/superset/assets/src/dashboard/util/getEmptyLayout.js
@@ -36,6 +36,7 @@ export default function() {
type: DASHBOARD_GRID_TYPE,
id: DASHBOARD_GRID_ID,
children: [],
+ parents: [DASHBOARD_ROOT_ID],
},
};
}
diff --git a/superset/assets/src/dashboard/util/updateComponentParentsList.js b/superset/assets/src/dashboard/util/updateComponentParentsList.js
new file mode 100644
index 0000000000000..48f01e20a61d5
--- /dev/null
+++ b/superset/assets/src/dashboard/util/updateComponentParentsList.js
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export default function updateComponentParentsList({
+ currentComponent,
+ layout = {},
+}) {
+ if (currentComponent && layout[currentComponent.id]) {
+ const parentsList = (currentComponent.parents || []).slice();
+ parentsList.push(currentComponent.id);
+
+ currentComponent.children.forEach(childId => {
+ layout[childId].parents = parentsList; // eslint-disable-line no-param-reassign
+ updateComponentParentsList({
+ currentComponent: layout[childId],
+ layout,
+ });
+ });
+ }
+}
diff --git a/superset/assets/src/explore/components/ExploreChartHeader.jsx b/superset/assets/src/explore/components/ExploreChartHeader.jsx
index 6a30a197ba85c..4acd88095dbcf 100644
--- a/superset/assets/src/explore/components/ExploreChartHeader.jsx
+++ b/superset/assets/src/explore/components/ExploreChartHeader.jsx
@@ -123,7 +123,7 @@ class ExploreChartHeader extends React.PureComponent {
chartUpdateStartTime,
latestQueryFormData,
queryResponse } = this.props.chart;
- const chartSucceeded = ['success', 'rendered'].indexOf(this.props.chart.chartStatus) > 0;
+ const chartFinished = ['failed', 'rendered', 'success'].includes(this.props.chart.chartStatus);
return (
- {chartSucceeded && queryResponse &&
+ {chartFinished && queryResponse &&
{
- const d = [];
- Object.keys(keymap).forEach((k) => {
- d.push({
- name: k,
- descr: keymap[k],
- key: k,
- });
- });
- return d;
-};
+const getHotKeys = () => Object.keys(keymap).map(k => ({
+ name: k,
+ descr: keymap[k],
+ key: k,
+}));
const propTypes = {
actions: PropTypes.object.isRequired,
@@ -330,7 +324,7 @@ class ExploreViewContainer extends React.Component {
)}
-
+
+
{
+ const dashboardIds = this.props.dashboards.map(dashboard => dashboard.value);
+ let recentDashboard = sessionStorage.getItem('save_chart_recent_dashboard');
+ recentDashboard = recentDashboard && parseInt(recentDashboard, 10);
+ if (recentDashboard !== null && dashboardIds.indexOf(recentDashboard) !== -1) {
+ this.setState({ saveToDashboardId: recentDashboard, addToDash: 'existing' });
+ }
+ });
}
onChange(name, event) {
switch (name) {
@@ -125,6 +132,11 @@ class SaveModal extends React.Component {
sliceParams.goto_dash = gotodash;
this.props.actions.saveSlice(this.props.form_data, sliceParams).then(({ data }) => {
+ if (data.dashboard_id === null) {
+ sessionStorage.removeItem('save_chart_recent_dashboard');
+ } else {
+ sessionStorage.setItem('save_chart_recent_dashboard', data.dashboard_id);
+ }
// Go to new slice url or dashboard url
if (gotodash) {
window.location = supersetURL(data.dashboard);
diff --git a/superset/assets/src/explore/controlPanels/WordCloud.js b/superset/assets/src/explore/controlPanels/WordCloud.js
index d7dd43de063bf..79c8fc1aed07f 100644
--- a/superset/assets/src/explore/controlPanels/WordCloud.js
+++ b/superset/assets/src/explore/controlPanels/WordCloud.js
@@ -17,6 +17,7 @@
* under the License.
*/
import { t } from '@superset-ui/translation';
+import { nonEmpty } from '../validators';
export default {
controlPanelSections: [
@@ -32,6 +33,7 @@ export default {
},
{
label: t('Options'),
+ expanded: true,
controlSetRows: [
['size_from', 'size_to'],
['rotation'],
@@ -39,4 +41,19 @@ export default {
],
},
],
+ controlOverrides: {
+ series: {
+ validators: [nonEmpty],
+ clearable: false,
+ },
+ row_limit: {
+ default: 100,
+ },
+ size_from: {
+ default: 10,
+ },
+ size_to: {
+ default: 70,
+ },
+ },
};
diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 3b75d63b9d3b7..6f2e5e904476c 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -1309,10 +1309,11 @@ export const controls = {
rotation: {
type: 'SelectControl',
- label: t('Rotation'),
+ label: t('Word Rotation'),
choices: formatSelectOptions(['random', 'flat', 'square']),
renderTrigger: true,
- default: 'flat',
+ default: 'square',
+ clearable: false,
description: t('Rotation to apply to words in the cloud'),
},
@@ -1402,7 +1403,7 @@ export const controls = {
size_from: {
type: 'TextControl',
isInt: true,
- label: t('Font Size From'),
+ label: t('Minimum Font Size'),
renderTrigger: true,
default: '20',
description: t('Font size for the smallest value in the list'),
@@ -1411,7 +1412,7 @@ export const controls = {
size_to: {
type: 'TextControl',
isInt: true,
- label: t('Font Size To'),
+ label: t('Maximum Font Size'),
renderTrigger: true,
default: '150',
description: t('Font size for the biggest value in the list'),
diff --git a/superset/assets/src/featureFlags.ts b/superset/assets/src/featureFlags.ts
index 54eee94829ae6..8638a5471f7c9 100644
--- a/superset/assets/src/featureFlags.ts
+++ b/superset/assets/src/featureFlags.ts
@@ -21,6 +21,7 @@
export enum FeatureFlag {
SCOPED_FILTER = 'SCOPED_FILTER',
OMNIBAR = 'OMNIBAR',
+ CLIENT_CACHE = 'CLIENT_CACHE',
}
export type FeatureFlagMap = {
diff --git a/superset/assets/stylesheets/superset.less b/superset/assets/stylesheets/superset.less
index 587851ea00e8d..d25dc6b73ccfc 100644
--- a/superset/assets/stylesheets/superset.less
+++ b/superset/assets/stylesheets/superset.less
@@ -291,6 +291,51 @@ table.table-no-hover tr:hover {
cursor: text;
}
+.anchor-link-container {
+ position: absolute;
+ z-index: 5;
+
+ .btn.btn-sm, .btn.btn-sm:active {
+ border: none;
+ padding-top: 0;
+ padding-bottom: 0;
+ background: none;
+ box-shadow: none;
+ }
+
+ .fa.fa-link {
+ position: relative;
+ top: 2px;
+ right: 0;
+ visibility: hidden;
+ font-size: 11px;
+ text-align: center;
+ vertical-align: middle;
+ }
+}
+
+.nav.nav-tabs li .anchor-link-container {
+ top: 0;
+ right: -32px;
+}
+
+.dashboard-component.dashboard-component-header .anchor-link-container {
+ .fa.fa-link {
+ font-size: 16px;
+ }
+}
+
+.nav.nav-tabs li:hover,
+.dashboard-component.dashboard-component-header:hover {
+ .anchor-link-container {
+ cursor: pointer;
+
+ .fa.fa-link {
+ visibility: visible;
+ }
+ }
+}
+
.m-r-5 {
margin-right: 5px;
}
@@ -535,3 +580,6 @@ tr.reactable-column-header th.reactable-header-sortable {
.align-right {
text-align: right;
}
+td.filtered {
+ background-color: lighten(desaturate(@brand-primary, 50%), 50%);
+}
diff --git a/superset/config.py b/superset/config.py
index 8781d3d04286b..241d0396eddf2 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -200,7 +200,10 @@
# For example, DEFAULT_FEATURE_FLAGS = { 'FOO': True, 'BAR': False } here
# and FEATURE_FLAGS = { 'BAR': True, 'BAZ': True } in superset_config.py
# will result in combined feature flags of { 'FOO': True, 'BAR': True, 'BAZ': True }
-DEFAULT_FEATURE_FLAGS = {}
+DEFAULT_FEATURE_FLAGS = {
+ # Experimental feature introducing a client (browser) cache
+ 'CLIENT_CACHE': False,
+}
# A function that receives a dict of all feature flags
# (DEFAULT_FEATURE_FLAGS merged with FEATURE_FLAGS)
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index eed92a688e88d..57db0ad4684d1 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -347,7 +347,7 @@ class BaseColumn(AuditMixinNullable, ImportMixin):
__tablename__ = None # {connector_name}_column
id = Column(Integer, primary_key=True)
- column_name = Column(String(255))
+ column_name = Column(String(255), nullable=False)
verbose_name = Column(String(1024))
is_active = Column(Boolean, default=True)
type = Column(String(32))
@@ -411,7 +411,7 @@ class BaseMetric(AuditMixinNullable, ImportMixin):
__tablename__ = None # {connector_name}_metric
id = Column(Integer, primary_key=True)
- metric_name = Column(String(512))
+ metric_name = Column(String(255), nullable=False)
verbose_name = Column(String(1024))
metric_type = Column(String(32))
description = Column(Text)
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 8440a25099a35..43a092c20c548 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -269,9 +269,7 @@ class DruidColumn(Model, BaseColumn):
__tablename__ = 'columns'
__table_args__ = (UniqueConstraint('column_name', 'datasource_id'),)
- datasource_id = Column(
- Integer,
- ForeignKey('datasources.id'))
+ datasource_id = Column(Integer, ForeignKey('datasources.id'))
# Setting enable_typechecks=False disables polymorphic inheritance.
datasource = relationship(
'DruidDatasource',
@@ -343,15 +341,14 @@ class DruidMetric(Model, BaseMetric):
__tablename__ = 'metrics'
__table_args__ = (UniqueConstraint('metric_name', 'datasource_id'),)
- datasource_id = Column(
- Integer,
- ForeignKey('datasources.id'))
+ datasource_id = Column(Integer, ForeignKey('datasources.id'))
+
# Setting enable_typechecks=False disables polymorphic inheritance.
datasource = relationship(
'DruidDatasource',
backref=backref('metrics', cascade='all, delete-orphan'),
enable_typechecks=False)
- json = Column(Text)
+ json = Column(Text, nullable=False)
export_fields = (
'metric_name', 'verbose_name', 'metric_type', 'datasource_id',
@@ -417,7 +414,7 @@ class DruidDatasource(Model, BaseDatasource):
baselink = 'druiddatasourcemodelview'
# Columns
- datasource_name = Column(String(255))
+ datasource_name = Column(String(255), nullable=False)
is_hidden = Column(Boolean, default=False)
filter_select_enabled = Column(Boolean, default=True) # override default
fetch_values_from = Column(String(100))
@@ -427,7 +424,6 @@ class DruidDatasource(Model, BaseDatasource):
'DruidCluster', backref='datasources', foreign_keys=[cluster_name])
owners = relationship(owner_class, secondary=druiddatasource_user,
backref='druiddatasources')
- UniqueConstraint('cluster_name', 'datasource_name')
export_fields = (
'datasource_name', 'is_hidden', 'description', 'default_endpoint',
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 64933708db6b1..f178db458bbf1 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -100,7 +100,7 @@ class TableColumn(Model, BaseColumn):
backref=backref('columns', cascade='all, delete-orphan'),
foreign_keys=[table_id])
is_dttm = Column(Boolean, default=False)
- expression = Column(Text, default='')
+ expression = Column(Text)
python_date_format = Column(String(255))
database_expression = Column(String(255))
@@ -209,7 +209,7 @@ class SqlMetric(Model, BaseMetric):
'SqlaTable',
backref=backref('metrics', cascade='all, delete-orphan'),
foreign_keys=[table_id])
- expression = Column(Text)
+ expression = Column(Text, nullable=False)
export_fields = (
'metric_name', 'verbose_name', 'metric_type', 'table_id', 'expression',
diff --git a/superset/data/airports.csv.gz b/superset/data/airports.csv.gz
deleted file mode 100644
index 3043486664476..0000000000000
Binary files a/superset/data/airports.csv.gz and /dev/null differ
diff --git a/superset/data/bart-lines.json.gz b/superset/data/bart-lines.json.gz
deleted file mode 100644
index 91f50fbe6accc..0000000000000
Binary files a/superset/data/bart-lines.json.gz and /dev/null differ
diff --git a/superset/data/bart_lines.py b/superset/data/bart_lines.py
index 3244a0a9cba23..f4e0b1f09cfca 100644
--- a/superset/data/bart_lines.py
+++ b/superset/data/bart_lines.py
@@ -14,9 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import gzip
import json
-import os
import pandas as pd
import polyline
@@ -24,16 +22,17 @@
from superset import db
from superset.utils.core import get_or_create_main_db
-from .helpers import DATA_FOLDER, TBL
+from .helpers import TBL, get_example_data
def load_bart_lines():
tbl_name = 'bart_lines'
- with gzip.open(os.path.join(DATA_FOLDER, 'bart-lines.json.gz')) as f:
- df = pd.read_json(f, encoding='latin-1')
- df['path_json'] = df.path.map(json.dumps)
- df['polyline'] = df.path.map(polyline.encode)
- del df['path']
+ content = get_example_data('bart-lines.json.gz')
+ df = pd.read_json(content, encoding='latin-1')
+ df['path_json'] = df.path.map(json.dumps)
+ df['polyline'] = df.path.map(polyline.encode)
+ del df['path']
+
df.to_sql(
tbl_name,
db.engine,
diff --git a/superset/data/birth_france_data_for_country_map.csv b/superset/data/birth_france_data_for_country_map.csv
deleted file mode 100644
index 5de8d4551fa0d..0000000000000
--- a/superset/data/birth_france_data_for_country_map.csv
+++ /dev/null
@@ -1,97 +0,0 @@
-DEPT_ID,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
-FR-01,6866,6706,6976,7228,6949,7323,7157,7282,7265,7242,7296,7354
-FR-02,6841,6761,6889,7041,6847,7012,6941,7050,6939,6755,6559,6468
-FR-03,3391,3335,3363,3503,3277,3289,3308,3402,3196,3288,3198,3152
-FR-04,1460,1522,1514,1536,1569,1569,1513,1547,1578,1561,1629,1538
-FR-05,1408,1403,1395,1461,1448,1441,1513,1470,1399,1441,1406,1383
-FR-06,11144,11514,11631,11754,11633,12275,11949,12257,11999,12087,12149,12170
-FR-07,3367,3176,3414,3484,3484,3447,3307,3380,3360,3405,3179,3254
-FR-08,3532,3422,3420,3343,3552,3522,3312,3254,3137,3258,3021,2966
-FR-09,1350,1412,1389,1499,1570,1493,1452,1473,1404,1425,1413,1364
-FR-10,3428,3553,3692,3685,3619,3721,3745,3722,3635,3587,3436,3377
-FR-11,3421,3321,3502,3661,3723,3778,3797,3770,3789,3669,3618,3516
-FR-12,2558,2614,2701,2829,2769,2748,2640,2694,2682,2615,2475,2555
-FR-13,23908,24056,24411,25371,25126,25412,25547,26410,25889,26328,26762,26384
-FR-14,8231,8257,8251,8531,8310,8183,8304,8111,8041,7833,7644,7466
-FR-15,1344,1396,1391,1398,1357,1300,1377,1274,1237,1230,1290,1214
-FR-16,3401,3514,3570,3653,3618,3666,3408,3564,3459,3490,3472,3378
-FR-17,5935,5900,6069,6089,5903,6136,6209,6185,6065,5916,5778,5846
-FR-18,3301,3271,3313,3231,3341,3303,3229,3341,3159,3120,3128,3097
-FR-19,2133,2250,2319,2327,2245,2263,2231,2247,2196,2163,2055,2094
-FR-21,6079,6052,5844,5986,6015,5960,5852,5963,5906,5905,5769,5779
-FR-22,6413,6317,6287,6743,6473,6494,6559,6438,6221,6184,5927,5790
-FR-23,1011,957,1054,1038,1013,1029,1044,919,967,998,897,879
-FR-24,3607,3690,3662,3758,3760,3832,3672,3665,3645,3547,3486,3479
-FR-25,6529,6798,6782,6993,6804,7097,6914,7105,6826,6778,6732,6659
-FR-26,5525,5703,5579,5945,5833,5927,5846,5915,5978,5912,6026,5965
-FR-27,7213,7220,7386,7402,7471,7717,7714,7715,7738,7676,7352,7242
-FR-28,5370,5363,5585,5632,5440,5677,5573,5716,5540,5548,5312,5295
-FR-29,9900,9963,9851,10184,9962,10040,9733,9823,9615,9597,9277,9088
-FR-2A,1232,1228,1348,1337,1284,1370,1422,1408,1422,1398,1317,1371
-FR-2B,1455,1444,1525,1474,1564,1569,1580,1591,1662,1612,1599,1616
-FR-30,7446,7777,7901,8384,8190,8449,8354,8494,8467,8196,8427,8216
-FR-31,13989,13900,14233,14957,14968,15415,15317,15770,16031,16347,16290,16641
-FR-32,1635,1625,1666,1580,1669,1689,1718,1671,1587,1668,1648,1643
-FR-33,15610,15819,15722,16539,16514,16636,17072,17271,17098,17097,17265,17303
-FR-34,11380,11562,11636,12191,12252,12564,12531,12658,13000,12902,12899,13008
-FR-35,12134,12072,12405,12687,12606,12837,12917,12876,13033,12892,12729,12555
-FR-36,2312,2314,2394,2283,2341,2371,2178,2221,2137,2136,2006,2030
-FR-37,6620,6594,6644,6813,6434,6811,6828,6886,6696,6796,6594,6718
-FR-38,14885,15356,15447,15830,15646,15999,15916,16136,15739,15948,15724,15664
-FR-39,2964,3017,2924,3021,3037,3045,2897,2865,2758,2741,2675,2637
-FR-40,3477,3621,3574,3755,3953,3862,3914,3993,3853,3880,3864,3696
-FR-41,3617,3678,3724,3815,3752,3847,3786,3777,3667,3704,3581,3517
-FR-42,8804,8906,8975,9184,9222,9357,9174,9403,9357,9473,9086,9183
-FR-43,2458,2416,2485,2426,2301,2398,2390,2348,2300,2244,2247,2157
-FR-44,15795,15988,16301,16530,16664,16763,16766,17159,16747,16821,16822,16700
-FR-45,8265,8424,8200,8635,8644,8524,8499,8757,8686,8689,8526,8355
-FR-46,1537,1430,1477,1563,1511,1555,1435,1506,1423,1487,1345,1415
-FR-47,3173,3245,3341,3426,3399,3378,3445,3359,3397,3332,3361,3347
-FR-48,768,772,760,784,781,779,798,736,695,711,663,651
-FR-49,10018,10085,10148,10548,10227,10270,10165,10312,10320,10061,10016,9781
-FR-50,5490,5487,5538,5448,5356,5384,5231,5238,5193,5282,4998,4911
-FR-51,6916,6979,7108,7118,6932,7065,7061,7182,7070,6761,7000,6887
-FR-52,2100,2095,2029,2104,2062,2037,1944,1889,1916,1847,1923,1881
-FR-53,3846,3932,3981,4118,3835,3912,3897,3962,3733,3750,3656,3456
-FR-54,8398,8671,8542,8743,8421,8559,8487,8536,8499,8387,8197,8135
-FR-55,2218,2287,2158,2294,2296,2220,2122,2221,2119,2107,2070,1928
-FR-56,7817,8036,7802,8221,7968,8288,7942,8029,7894,7909,7645,7554
-FR-57,11710,11970,12048,12114,11853,12012,11831,11856,11474,11579,11421,11385
-FR-58,2123,2181,2115,2137,2151,2049,1986,1982,1999,1942,1850,1801
-FR-59,36099,36257,35960,36858,36531,36572,36508,36703,36678,36513,36354,35923
-FR-60,10696,10630,10753,11144,11097,11162,11013,10960,11032,10941,10814,10802
-FR-61,3323,3243,3117,3276,3316,3185,3248,3192,3105,2933,2834,2810
-FR-62,18888,19304,19407,19780,19668,19902,19661,19784,19720,19017,19054,18809
-FR-63,6576,6632,6701,6902,6896,6865,6774,7131,6828,6933,6699,6908
-FR-64,6436,6338,6395,6680,6288,6455,6652,6569,6459,6490,6269,6497
-FR-65,2144,2186,2095,2284,2266,2095,2161,2149,2110,2201,2057,2111
-FR-66,4456,4320,4563,4779,4638,4756,4837,4869,4843,4943,4914,4800
-FR-67,13024,12828,13195,13388,13152,13231,13218,13346,13030,12895,13043,13262
-FR-68,9045,8945,8912,9324,8941,8909,8938,9177,8927,8818,8713,8826
-FR-69,23376,23796,24270,24808,24465,25120,25528,25973,25921,26294,25914,26712
-FR-70,2675,2773,2827,2975,2888,2755,2785,2761,2643,2609,2510,2458
-FR-71,5717,5709,5789,5876,5736,5860,5838,5865,5811,5752,5514,5552
-FR-72,6871,6935,6770,7133,6808,6909,6957,6942,6810,6703,6645,6664
-FR-73,4687,4736,4795,4903,5000,4971,4863,5074,4917,4786,4762,4798
-FR-74,8839,8753,8967,9124,8939,9333,9271,9521,9476,9829,9893,9982
-FR-75,31493,31817,31378,31748,30820,30623,31063,31447,30094,29291,28945,29134
-FR-76,15862,15650,15691,16004,16066,16041,15947,16338,16146,16014,15574,15199
-FR-77,17501,17729,18317,18986,18978,19240,19331,19712,19824,19678,19331,19708
-FR-78,19937,19431,19766,20438,19899,19895,19868,20312,19886,19827,19886,19525
-FR-79,3994,4100,4191,4057,4037,4331,4157,4060,4006,4029,3986,3718
-FR-80,7134,7035,7024,7021,6939,7094,6838,7103,6989,6843,6743,6506
-FR-81,3579,3611,3837,3933,3869,4056,4030,3925,4006,3939,3829,3831
-FR-82,2398,2591,2590,2823,2858,2932,2935,2926,2978,2940,2827,2829
-FR-83,10388,10622,10646,10889,10938,11131,10955,11159,11146,11240,10917,11123
-FR-84,6547,6629,6608,6805,6694,7000,7014,6967,7008,7107,7171,7058
-FR-85,6874,7062,7299,7589,7647,7629,7718,7601,7442,7436,7164,7070
-FR-86,4594,4568,4725,4850,4753,4909,4953,5006,4885,4880,4708,4686
-FR-87,3449,3659,3834,3754,3829,3891,3985,3848,3907,3825,3723,3724
-FR-88,4291,4264,4310,4416,4274,4215,4252,4057,3883,3715,3796,3679
-FR-89,3710,3844,3821,3929,3917,4045,3991,3842,3699,3729,3780,3621
-FR-90,1896,1766,1837,1888,1880,1818,1822,1802,1794,1763,1675,1707
-FR-91,17122,17614,17753,18281,17932,18134,18040,18509,18493,18506,18510,18903
-FR-92,24607,24649,24588,25426,24937,25217,25192,25194,25083,24790,24614,24675
-FR-93,25868,26313,26760,27916,27743,28062,28313,28513,28362,28675,28687,29471
-FR-94,19637,19866,19947,20948,20331,20736,21022,21391,20991,20967,20748,21566
-FR-95,17346,17863,18012,19015,18624,18761,18728,19506,19551,19495,19550,19737
\ No newline at end of file
diff --git a/superset/data/birth_names.json.gz b/superset/data/birth_names.json.gz
deleted file mode 100644
index 2652cf7242a91..0000000000000
Binary files a/superset/data/birth_names.json.gz and /dev/null differ
diff --git a/superset/data/birth_names.py b/superset/data/birth_names.py
index 379fdc806c346..4f11ac5b7dd92 100644
--- a/superset/data/birth_names.py
+++ b/superset/data/birth_names.py
@@ -14,9 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import gzip
import json
-import os
import textwrap
import pandas as pd
@@ -28,7 +26,7 @@
from .helpers import (
config,
Dash,
- DATA_FOLDER,
+ get_example_data,
get_slice_json,
merge_slice,
Slice,
@@ -39,8 +37,8 @@
def load_birth_names():
"""Loading birth name dataset from a zip file in the repo"""
- with gzip.open(os.path.join(DATA_FOLDER, 'birth_names.json.gz')) as f:
- pdf = pd.read_json(f)
+ data = get_example_data('birth_names.json.gz')
+ pdf = pd.read_json(data)
pdf.ds = pd.to_datetime(pdf.ds, unit='ms')
pdf.to_sql(
'birth_names',
diff --git a/superset/data/countries.json.gz b/superset/data/countries.json.gz
deleted file mode 100644
index 6c71c0c43232c..0000000000000
Binary files a/superset/data/countries.json.gz and /dev/null differ
diff --git a/superset/data/country_map.py b/superset/data/country_map.py
index c1c2b417b5858..e74638bfbc713 100644
--- a/superset/data/country_map.py
+++ b/superset/data/country_map.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
import datetime
-import os
import pandas as pd
from sqlalchemy import BigInteger, Date, String
@@ -24,7 +23,7 @@
from superset.connectors.sqla.models import SqlMetric
from superset.utils import core as utils
from .helpers import (
- DATA_FOLDER,
+ get_example_data,
get_slice_json,
merge_slice,
misc_dash_slices,
@@ -35,8 +34,9 @@
def load_country_map_data():
"""Loading data for map with country map"""
- csv_path = os.path.join(DATA_FOLDER, 'birth_france_data_for_country_map.csv')
- data = pd.read_csv(csv_path, encoding='utf-8')
+ csv_bytes = get_example_data(
+ 'birth_france_data_for_country_map.csv', is_gzip=False, make_bytes=True)
+ data = pd.read_csv(csv_bytes, encoding='utf-8')
data['dttm'] = datetime.datetime.now().date()
data.to_sql( # pylint: disable=no-member
'birth_france_by_region',
diff --git a/superset/data/energy.json.gz b/superset/data/energy.json.gz
deleted file mode 100644
index 624d71db683a9..0000000000000
Binary files a/superset/data/energy.json.gz and /dev/null differ
diff --git a/superset/data/energy.py b/superset/data/energy.py
index c04eb46c489dd..e1d48e76a75af 100644
--- a/superset/data/energy.py
+++ b/superset/data/energy.py
@@ -16,8 +16,6 @@
# under the License.
"""Loads datasets, dashboards and slices in a new superset instance"""
# pylint: disable=C,R,W
-import gzip
-import os
import textwrap
import pandas as pd
@@ -26,14 +24,16 @@
from superset import db
from superset.connectors.sqla.models import SqlMetric
from superset.utils import core as utils
-from .helpers import DATA_FOLDER, merge_slice, misc_dash_slices, Slice, TBL
+from .helpers import (
+ DATA_FOLDER, get_example_data, merge_slice, misc_dash_slices, Slice, TBL,
+)
def load_energy():
"""Loads an energy related dataset to use with sankey and graphs"""
tbl_name = 'energy_usage'
- with gzip.open(os.path.join(DATA_FOLDER, 'energy.json.gz')) as f:
- pdf = pd.read_json(f)
+ data = get_example_data('energy.json.gz')
+ pdf = pd.read_json(data)
pdf.to_sql(
tbl_name,
db.engine,
diff --git a/superset/data/flight_data.csv.gz b/superset/data/flight_data.csv.gz
deleted file mode 100644
index bbdebdfafcba7..0000000000000
Binary files a/superset/data/flight_data.csv.gz and /dev/null differ
diff --git a/superset/data/flights.py b/superset/data/flights.py
index 1ed575b44d777..25112444fc29d 100644
--- a/superset/data/flights.py
+++ b/superset/data/flights.py
@@ -14,26 +14,23 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import gzip
-import os
-
import pandas as pd
from sqlalchemy import DateTime
from superset import db
from superset.utils import core as utils
-from .helpers import DATA_FOLDER, TBL
+from .helpers import get_example_data, TBL
def load_flights():
"""Loading random time series data from a zip file in the repo"""
tbl_name = 'flights'
- with gzip.open(os.path.join(DATA_FOLDER, 'flight_data.csv.gz')) as f:
- pdf = pd.read_csv(f, encoding='latin-1')
+ data = get_example_data('flight_data.csv.gz', make_bytes=True)
+ pdf = pd.read_csv(data, encoding='latin-1')
# Loading airports info to join and get lat/long
- with gzip.open(os.path.join(DATA_FOLDER, 'airports.csv.gz')) as f:
- airports = pd.read_csv(f, encoding='latin-1')
+ airports_bytes = get_example_data('airports.csv.gz', make_bytes=True)
+ airports = pd.read_csv(airports_bytes, encoding='latin-1')
airports = airports.set_index('IATA_CODE')
pdf['ds'] = pdf.YEAR.map(str) + '-0' + pdf.MONTH.map(str) + '-0' + pdf.DAY.map(str)
diff --git a/superset/data/helpers.py b/superset/data/helpers.py
index d6192b64eb320..f876dc9105ada 100644
--- a/superset/data/helpers.py
+++ b/superset/data/helpers.py
@@ -16,13 +16,19 @@
# under the License.
"""Loads datasets, dashboards and slices in a new superset instance"""
# pylint: disable=C,R,W
+from io import BytesIO
import json
import os
+import zlib
+
+import requests
from superset import app, db
from superset.connectors.connector_registry import ConnectorRegistry
from superset.models import core as models
+BASE_URL = 'https://github.com/apache-superset/examples-data/blob/master/'
+
# Shortcuts
DB = models.Database
Slice = models.Slice
@@ -60,3 +66,12 @@ def get_slice_json(defaults, **kwargs):
d = defaults.copy()
d.update(kwargs)
return json.dumps(d, indent=4, sort_keys=True)
+
+
+def get_example_data(filepath, is_gzip=True, make_bytes=False):
+ content = requests.get(f'{BASE_URL}{filepath}?raw=true').content
+ if is_gzip:
+ content = zlib.decompress(content, zlib.MAX_WBITS|16)
+ if make_bytes:
+ content = BytesIO(content)
+ return content
diff --git a/superset/data/long_lat.py b/superset/data/long_lat.py
index 40895d540459f..18f477cfa4045 100644
--- a/superset/data/long_lat.py
+++ b/superset/data/long_lat.py
@@ -15,8 +15,6 @@
# specific language governing permissions and limitations
# under the License.
import datetime
-import gzip
-import os
import random
import geohash
@@ -26,7 +24,7 @@
from superset import db
from superset.utils import core as utils
from .helpers import (
- DATA_FOLDER,
+ get_example_data,
get_slice_json,
merge_slice,
misc_dash_slices,
@@ -37,8 +35,8 @@
def load_long_lat_data():
"""Loading lat/long data from a csv file in the repo"""
- with gzip.open(os.path.join(DATA_FOLDER, 'san_francisco.csv.gz')) as f:
- pdf = pd.read_csv(f, encoding='utf-8')
+ data = get_example_data('san_francisco.csv.gz', make_bytes=True)
+ pdf = pd.read_csv(data, encoding='utf-8')
start = datetime.datetime.now().replace(
hour=0, minute=0, second=0, microsecond=0)
pdf['datetime'] = [
diff --git a/superset/data/multiformat_time_series.json.gz b/superset/data/multiformat_time_series.json.gz
deleted file mode 100644
index e0877b707dcd4..0000000000000
Binary files a/superset/data/multiformat_time_series.json.gz and /dev/null differ
diff --git a/superset/data/multiformat_time_series.py b/superset/data/multiformat_time_series.py
index 5dec85ab01a13..58ff7fbb0d32b 100644
--- a/superset/data/multiformat_time_series.py
+++ b/superset/data/multiformat_time_series.py
@@ -14,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import gzip
-import os
import pandas as pd
from sqlalchemy import BigInteger, Date, DateTime, String
@@ -24,7 +22,7 @@
from superset.utils import core as utils
from .helpers import (
config,
- DATA_FOLDER,
+ get_example_data,
get_slice_json,
merge_slice,
misc_dash_slices,
@@ -35,8 +33,9 @@
def load_multiformat_time_series():
"""Loading time series data from a zip file in the repo"""
- with gzip.open(os.path.join(DATA_FOLDER, 'multiformat_time_series.json.gz')) as f:
- pdf = pd.read_json(f)
+ data = get_example_data('multiformat_time_series.json.gz')
+ pdf = pd.read_json(data)
+
pdf.ds = pd.to_datetime(pdf.ds, unit='s')
pdf.ds2 = pd.to_datetime(pdf.ds2, unit='s')
pdf.to_sql(
diff --git a/superset/data/paris.py b/superset/data/paris.py
index e32588da1c740..2ed3f8eaea075 100644
--- a/superset/data/paris.py
+++ b/superset/data/paris.py
@@ -14,24 +14,22 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import gzip
import json
-import os
import pandas as pd
from sqlalchemy import String, Text
from superset import db
from superset.utils import core as utils
-from .helpers import DATA_FOLDER, TBL
+from .helpers import TBL, get_example_data
def load_paris_iris_geojson():
tbl_name = 'paris_iris_mapping'
- with gzip.open(os.path.join(DATA_FOLDER, 'paris_iris.json.gz')) as f:
- df = pd.read_json(f)
- df['features'] = df.features.map(json.dumps)
+ data = get_example_data('paris_iris.json.gz')
+ df = pd.read_json(data)
+ df['features'] = df.features.map(json.dumps)
df.to_sql(
tbl_name,
diff --git a/superset/data/paris_iris.json.gz b/superset/data/paris_iris.json.gz
deleted file mode 100644
index 4a964c94f74dd..0000000000000
Binary files a/superset/data/paris_iris.json.gz and /dev/null differ
diff --git a/superset/data/random_time_series.json.gz b/superset/data/random_time_series.json.gz
deleted file mode 100644
index 5275d5571d5f4..0000000000000
Binary files a/superset/data/random_time_series.json.gz and /dev/null differ
diff --git a/superset/data/random_time_series.py b/superset/data/random_time_series.py
index cfc13e131ef03..ee7450a634050 100644
--- a/superset/data/random_time_series.py
+++ b/superset/data/random_time_series.py
@@ -14,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import gzip
-import os
import pandas as pd
from sqlalchemy import DateTime
@@ -24,7 +22,7 @@
from superset.utils import core as utils
from .helpers import (
config,
- DATA_FOLDER,
+ get_example_data,
get_slice_json,
merge_slice,
Slice,
@@ -34,8 +32,8 @@
def load_random_time_series_data():
"""Loading random time series data from a zip file in the repo"""
- with gzip.open(os.path.join(DATA_FOLDER, 'random_time_series.json.gz')) as f:
- pdf = pd.read_json(f)
+ data = get_example_data('random_time_series.json.gz')
+ pdf = pd.read_json(data)
pdf.ds = pd.to_datetime(pdf.ds, unit='s')
pdf.to_sql(
'random_time_series',
diff --git a/superset/data/san_francisco.csv.gz b/superset/data/san_francisco.csv.gz
deleted file mode 100644
index 1d977a4a1a803..0000000000000
Binary files a/superset/data/san_francisco.csv.gz and /dev/null differ
diff --git a/superset/data/sf_population.json.gz b/superset/data/sf_population.json.gz
deleted file mode 100644
index 53ba13acd7802..0000000000000
Binary files a/superset/data/sf_population.json.gz and /dev/null differ
diff --git a/superset/data/sf_population_polygons.py b/superset/data/sf_population_polygons.py
index 6da85f728bb73..2248a48dafece 100644
--- a/superset/data/sf_population_polygons.py
+++ b/superset/data/sf_population_polygons.py
@@ -14,24 +14,22 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-import gzip
import json
-import os
import pandas as pd
from sqlalchemy import BigInteger, Text
from superset import db
from superset.utils import core as utils
-from .helpers import DATA_FOLDER, TBL
+from .helpers import TBL, get_example_data
def load_sf_population_polygons():
tbl_name = 'sf_population_polygons'
- with gzip.open(os.path.join(DATA_FOLDER, 'sf_population.json.gz')) as f:
- df = pd.read_json(f)
- df['contour'] = df.contour.map(json.dumps)
+ data = get_example_data('sf_population.json.gz')
+ df = pd.read_json(data)
+ df['contour'] = df.contour.map(json.dumps)
df.to_sql(
tbl_name,
diff --git a/superset/data/unicode_test_data.py b/superset/data/unicode_test_data.py
index 42e6bdb1e3699..03c00a7b07fce 100644
--- a/superset/data/unicode_test_data.py
+++ b/superset/data/unicode_test_data.py
@@ -16,7 +16,6 @@
# under the License.
import datetime
import json
-import os
import random
import pandas as pd
@@ -27,7 +26,7 @@
from .helpers import (
config,
Dash,
- DATA_FOLDER,
+ get_example_data,
get_slice_json,
merge_slice,
Slice,
@@ -38,8 +37,9 @@
def load_unicode_test_data():
"""Loading unicode test dataset from a csv file in the repo"""
- df = pd.read_csv(os.path.join(DATA_FOLDER, 'unicode_utf8_unixnl_test.csv'),
- encoding='utf-8')
+ data = get_example_data(
+ 'unicode_utf8_unixnl_test.csv', is_gzip=False, make_bytes=True)
+ df = pd.read_csv(data, encoding='utf-8')
# generate date/numeric data
df['dttm'] = datetime.datetime.now().date()
df['value'] = [random.randint(1, 100) for _ in range(len(df))]
diff --git a/superset/data/unicode_utf8_unixnl_test.csv b/superset/data/unicode_utf8_unixnl_test.csv
deleted file mode 100644
index 9b0235b0ddd0b..0000000000000
--- a/superset/data/unicode_utf8_unixnl_test.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-phrase,short_phrase,with_missing
-"Под южно дърво, цъфтящо в синьо, бягаше малко пухкаво зайче.",Под южно д,Fam hx-cardiovas dis NEC
-Příliš žluťoučký kůň úpěl ďábelské ódy.,Příliš žlu,
-視野無限廣，窗外有藍天,視野無限廣，窗外有藍,Sparganosis
-微風迎客，軟語伴茶,微風迎客，軟語伴茶,Var mgr NEC wo ntc mgr
-中国智造，慧及全球,中国智造，慧及全球,Mech prob w internal org
-"Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon.",Quizdeltag,Corneal dystrophy NOS
-Pa’s wijze lynx bezag vroom het fikse aquaduct.,Pa’s wijze,Edema in preg-unspec
-Eĥoŝanĝo ĉiuĵaŭde.,Eĥoŝanĝo ĉ,
-See väike mölder jõuab rongile hüpata,See väike ,Twin NOS-nonhosp
-Viekas kettu punaturkki laiskan koiran takaa kurkki.,Viekas ket,Postgastric surgery synd
-Voix ambiguë d’un cœur qui au zéphyr préfère les jattes de kiwis.,Voix ambig,Loose body-mult joints
-Portez ce vieux whisky au juge blond qui fume.,Portez ce ,Late eff acc poisoning
-Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich,Zwölf Boxk,Opn brain inj w/o coma
-Franz jagt im komplett verwahrlosten Taxi quer durch Bayern.,Franz jagt,TB of ear-unspec
-Θέλει αρετή και τόλμη η ελευθερία. (Ανδρέας Κάλβος),Θέλει αρετ,Chr peptic ulcer w perf
-Ο καλύμνιος σφουγγαράς ψιθύρισε πως θα βουτήξει χωρίς να διστάζει.,Ο καλύμνιο,Cns TB NEC-cult dx
-דג סקרן שט לו בים זך אך לפתע פגש חבורה נחמדה שצצה כך.,דג סקרן שט,Polyhydramnios-delivered
-Árvíztűrő tükörfúrógép,Árvíztűrő ,Malign neopl scrotum
-"Egy hűtlen vejét fülöncsípő, dühös mexikói úr Wesselényinél mázol Quitóban.",Egy hűtlen,Tubal/broad lig anom NOS
-Saya lihat foto Hamengkubuwono XV bersama enam zebra purba cantik yang jatuh dari Al Quranmu.,Saya lihat,Ben carcinoid duodenum
-"Ma la volpe, col suo balzo, ha raggiunto il quieto Fido.",Ma la volp,Ch leu un cl wo ach rmsn
-いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす,いろはにほへと ちり,Mycotic arthritis-pelvis
-다람쥐 헌 쳇바퀴에 타고파,다람쥐 헌 쳇바퀴에,Paral polio NEC-type 1
-Sarkanās jūrascūciņas peld pa jūru.,Sarkanās j,Fx larynx/trachea-open
-En god stil må først og fremst være klar. Den må være passende. Aristoteles.,En god sti,Dermatophytosis site NOS
-Pchnąć w tę łódź jeża lub ośm skrzyń fig,Pchnąć w t,Anxiety disorder oth dis
-A rápida raposa castanha salta por cima do cão lento.,A rápida r,Adenoid vegetations
-A ligeira raposa marrom ataca o cão preguiçoso.,A ligeira ,Consanguinity
-Zebras caolhas de Java querem passar fax para moças gigantes de New York,Zebras cao,"Hypotony NOS, eye"
-Agera vulpe maronie sare peste câinele cel leneş.,Agera vulp,Urethral syndrome NOS
-Съешь ещё этих мягких французских булок да выпей же чаю,Съешь ещё ,Coccidioidomycosis NOS
-Чешће цeђење мрeжастим џаком побољшава фертилизацију генских хибрида.,Чешће цeђе,
-Češće ceđenje mrežastim džakom poboljšava fertilizaciju genskih hibrida.,Češće ceđe,Scrn-hemoglobinopath NEC
-Kŕdeľ šťastných ďatľov učí pri ústí Váhu mĺkveho koňa obhrýzať kôru a žrať čerstvé mäso.,Kŕdeľ šťas,
-V kožuščku hudobnega fanta stopiclja mizar in kliče 0619872345.,V kožuščku,
-El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el saxofón detrás del palenque de paja.,El veloz m,Cervical syndrome NEC
-Flygande bäckasiner söka hwila på mjuka tuvor,Flygande b,Letterer-siwe dis abdom
-เป็นมนุษย์สุดประเสริฐเลิศคุณค่า กว่าบรรดาฝูงสัตว์เดรัจฉาน จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า หัดอภัยเหมือนกีฬาอัชฌาสัย ปฏิบัติประพฤติกฎกำหนดใจ พูดจาให้จ๊ะ ๆ จ๋า ๆ น่าฟังเอยฯ,เป็นมนุษย์,Balantidiasis
-"Pijamalı hasta, yağız şoföre çabucak güvendi",Pijamalı h,Epilepsy-delivered w p/p
-زۆھرەگۈل ئابدۇۋاجىت فرانسىيەنىڭ پارىژدىكى خېلى بىشەم ئوقۇغۇچى.,زۆھرەگۈل ئ,Fit/adj non-vsc cath NEC
-ئاۋۇ بىر جۈپ خوراز فرانسىيەنىڭ پارىژ شەھرىگە يېقىن تاغقا كۆچەلمىدى.,ئاۋۇ بىر ج,Sat cerv smr-no trnsfrm
diff --git a/superset/data/world_bank.py b/superset/data/world_bank.py
index 910b3389e575c..16aa0cb24c656 100644
--- a/superset/data/world_bank.py
+++ b/superset/data/world_bank.py
@@ -16,7 +16,6 @@
# under the License.
"""Loads datasets, dashboards and slices in a new superset instance"""
# pylint: disable=C,R,W
-import gzip
import json
import os
import textwrap
@@ -31,6 +30,7 @@
config,
Dash,
DATA_FOLDER,
+ get_example_data,
get_slice_json,
merge_slice,
misc_dash_slices,
@@ -43,8 +43,8 @@
def load_world_bank_health_n_pop():
"""Loads the world bank health dataset, slices and a dashboard"""
tbl_name = 'wb_health_population'
- with gzip.open(os.path.join(DATA_FOLDER, 'countries.json.gz')) as f:
- pdf = pd.read_json(f)
+ data = get_example_data('countries.json.gz')
+ pdf = pd.read_json(data)
pdf.columns = [col.replace('.', '_') for col in pdf.columns]
pdf.year = pd.to_datetime(pdf.year)
pdf.to_sql(
diff --git a/superset/legacy.py b/superset/legacy.py
index c066cb6da0949..955a486a185dd 100644
--- a/superset/legacy.py
+++ b/superset/legacy.py
@@ -16,82 +16,6 @@
# under the License.
# pylint: disable=C,R,W
"""Code related with dealing with legacy / change management"""
-import re
-
-from superset import frontend_config
-
-FORM_DATA_KEY_WHITELIST = list(frontend_config.get('controls').keys()) + ['slice_id']
-
-
-def cast_filter_data(form_data):
- """Used by cast_form_data to parse the filters"""
- flts = []
- having_flts = []
- fd = form_data
- filter_pattern = re.compile(r"""((?:[^,"']|"[^"]*"|'[^']*')+)""")
- for i in range(0, 10):
- for prefix in ['flt', 'having']:
- col_str = '{}_col_{}'.format(prefix, i)
- op_str = '{}_op_{}'.format(prefix, i)
- val_str = '{}_eq_{}'.format(prefix, i)
- if col_str in fd and op_str in fd and val_str in fd \
- and len(fd[val_str]) > 0:
- f = {}
- f['col'] = fd[col_str]
- f['op'] = fd[op_str]
- if prefix == 'flt':
- # transfer old strings in filter value to list
- splitted = filter_pattern.split(fd[val_str])[1::2]
- values = [types.replace("'", '').strip() for types in splitted]
- f['val'] = values
- flts.append(f)
- if prefix == 'having':
- f['val'] = fd[val_str]
- having_flts.append(f)
- if col_str in fd:
- del fd[col_str]
- if op_str in fd:
- del fd[op_str]
- if val_str in fd:
- del fd[val_str]
- fd['filters'] = flts
- fd['having_filters'] = having_flts
- return fd
-
-
-def cast_form_data(form_data):
- """Translates old to new form_data"""
- d = {}
- fields = frontend_config.get('controls', {})
- for k, v in form_data.items():
- field_config = fields.get(k, {})
- ft = field_config.get('type')
- if ft == 'CheckboxControl':
- # bug in some urls with dups on bools
- if isinstance(v, list):
- v = 'y' in v
- else:
- v = True if v in ('true', 'y') or v is True else False
- elif v and ft == 'TextControl' and field_config.get('isInt'):
- v = int(v) if v != '' else None
- elif v and ft == 'TextControl' and field_config.get('isFloat'):
- v = float(v) if v != '' else None
- elif v and ft == 'SelectControl':
- if field_config.get('multi'):
- if type(form_data).__name__ == 'ImmutableMultiDict':
- v = form_data.getlist(k)
- elif not isinstance(v, list):
- v = [v]
- if d.get('slice_id'):
- d['slice_id'] = int(d['slice_id'])
-
- d[k] = v
- if 'filters' not in d:
- d = cast_filter_data(d)
- for k in list(d.keys()):
- if k not in FORM_DATA_KEY_WHITELIST:
- del d[k]
- return d
def update_time_range(form_data):
diff --git a/superset/migrations/versions/7f2635b51f5d_update_base_columns.py b/superset/migrations/versions/7f2635b51f5d_update_base_columns.py
new file mode 100644
index 0000000000000..7087c6a5ab19e
--- /dev/null
+++ b/superset/migrations/versions/7f2635b51f5d_update_base_columns.py
@@ -0,0 +1,137 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""update base columns
+
+Note that the columns table was previously partially modifed by revision
+f231d82b9b26.
+
+Revision ID: 7f2635b51f5d
+Revises: 937d04c16b64
+Create Date: 2018-07-20 15:31:05.058050
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '7f2635b51f5d'
+down_revision = '937d04c16b64'
+
+from alembic import op
+from sqlalchemy import Column, engine, Integer, String
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+from superset.utils.core import generic_find_uq_constraint_name
+
+Base = declarative_base()
+
+conv = {
+ 'uq': 'uq_%(table_name)s_%(column_0_name)s',
+}
+
+
+class BaseColumnMixin:
+ id = Column(Integer, primary_key=True)
+
+
+class DruidColumn(BaseColumnMixin, Base):
+ __tablename__ = 'columns'
+
+ datasource_id = Column(Integer)
+
+
+class TableColumn(BaseColumnMixin, Base):
+ __tablename__ = 'table_columns'
+
+ table_id = Column(Integer)
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ # Delete the orphaned columns records.
+ for record in session.query(DruidColumn).all():
+ if record.datasource_id is None:
+ session.delete(record)
+
+ session.commit()
+
+ # Enforce that the columns.column_name column be non-nullable.
+ with op.batch_alter_table('columns') as batch_op:
+ batch_op.alter_column(
+ 'column_name',
+ existing_type=String(255),
+ nullable=False,
+ )
+
+ # Delete the orphaned table_columns records.
+ for record in session.query(TableColumn).all():
+ if record.table_id is None:
+ session.delete(record)
+
+ session.commit()
+
+ # Reduce the size of the table_columns.column_name column for constraint
+ # viability and enforce that it be non-nullable.
+ with op.batch_alter_table('table_columns') as batch_op:
+ batch_op.alter_column(
+ 'column_name',
+ existing_type=String(256),
+ nullable=False,
+ type_=String(255),
+ )
+
+ # Add the missing uniqueness constraint to the table_columns table.
+ with op.batch_alter_table('table_columns', naming_convention=conv) as batch_op:
+ batch_op.create_unique_constraint(
+ 'uq_table_columns_column_name',
+ ['column_name', 'table_id'],
+ )
+
+
+def downgrade():
+ bind = op.get_bind()
+ insp = engine.reflection.Inspector.from_engine(bind)
+
+ # Remove the missing uniqueness constraint from the table_columns table.
+ with op.batch_alter_table('table_columns', naming_convention=conv) as batch_op:
+ batch_op.drop_constraint(
+ generic_find_uq_constraint_name(
+ 'table_columns',
+ {'column_name', 'table_id'},
+ insp,
+ ) or 'uq_table_columns_column_name',
+ type_='unique',
+ )
+
+ # Restore the size of the table_columns.column_name column and forego that
+ # it be non-nullable.
+ with op.batch_alter_table('table_columns') as batch_op:
+ batch_op.alter_column(
+ 'column_name',
+ existing_type=String(255),
+ nullable=True,
+ type_=String(256),
+ )
+
+ # Forego that the columns.column_name be non-nullable.
+ with op.batch_alter_table('columns') as batch_op:
+ batch_op.alter_column(
+ 'column_name',
+ existing_type=String(255),
+ nullable=True,
+ )
diff --git a/superset/migrations/versions/80aa3f04bc82_add_parent_ids_in_dashboard_layout.py b/superset/migrations/versions/80aa3f04bc82_add_parent_ids_in_dashboard_layout.py
new file mode 100644
index 0000000000000..dd975386d3537
--- /dev/null
+++ b/superset/migrations/versions/80aa3f04bc82_add_parent_ids_in_dashboard_layout.py
@@ -0,0 +1,120 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Add Parent ids in dashboard layout metadata
+
+Revision ID: 80aa3f04bc82
+Revises: 45e7da7cfeba
+Create Date: 2019-04-09 16:27:03.392872
+
+"""
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import (
+ Column,
+ Integer,
+ Text,
+)
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+from alembic import op
+import sqlalchemy as sa
+
+from superset import db
+
+# revision identifiers, used by Alembic.
+revision = '80aa3f04bc82'
+down_revision = '45e7da7cfeba'
+
+Base = declarative_base()
+
+
+class Dashboard(Base):
+ """Declarative class to do query in upgrade"""
+ __tablename__ = 'dashboards'
+ id = Column(Integer, primary_key=True)
+ position_json = Column(Text)
+
+
+def add_parent_ids(node, layout):
+ if node:
+ current_id = node.get('id')
+ parents = list(node.get('parents') or [])
+ child_ids = node.get('children')
+
+ if child_ids and len(child_ids) > 0:
+ parents.append(current_id)
+ for child_id in child_ids:
+ child_node = layout.get(child_id)
+ child_node['parents'] = parents
+ add_parent_ids(child_node, layout)
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print('adding parents for dashboard layout, id = {} ({}/{}) >>>>'.format(
+ dashboard.id,
+ i + 1,
+ len(dashboards),
+ ))
+ try:
+ layout = json.loads(dashboard.position_json or '{}')
+ if layout and layout['ROOT_ID']:
+ add_parent_ids(layout['ROOT_ID'], layout)
+
+ dashboard.position_json = json.dumps(
+ layout, indent=None, separators=(',', ':'), sort_keys=True)
+ session.merge(dashboard)
+ except Exception as e:
+ logging.exception(e)
+
+ session.commit()
+ session.close()
+
+
+def downgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print('remove parents from dashboard layout, id = {} ({}/{}) >>>>'.format(
+ dashboard.id,
+ i + 1,
+ len(dashboards),
+ ))
+ try:
+ layout = json.loads(dashboard.position_json or '{}')
+ for key, item in layout.items():
+ if not isinstance(item, dict):
+ continue
+ item.pop('parents', None)
+ layout[key] = item
+
+ dashboard.position_json = json.dumps(
+ layout, indent=None, separators=(',', ':'), sort_keys=True)
+ session.merge(dashboard)
+ except Exception as e:
+ logging.exception(e)
+
+ session.commit()
+ session.close()
diff --git a/superset/migrations/versions/937d04c16b64_update_datasources.py b/superset/migrations/versions/937d04c16b64_update_datasources.py
new file mode 100644
index 0000000000000..a233a442eb4e8
--- /dev/null
+++ b/superset/migrations/versions/937d04c16b64_update_datasources.py
@@ -0,0 +1,52 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""update datasources
+
+Revision ID: 937d04c16b64
+Revises: d94d33dbe938
+Create Date: 2018-07-20 16:08:10.195843
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '937d04c16b64'
+down_revision = 'd94d33dbe938'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+
+ # Enforce that the datasource_name column be non-nullable.
+ with op.batch_alter_table('datasources') as batch_op:
+ batch_op.alter_column(
+ 'datasource_name',
+ existing_type=sa.String(255),
+ nullable=False,
+ )
+
+
+def downgrade():
+
+ # Forego that the datasource_name column be non-nullable.
+ with op.batch_alter_table('datasources') as batch_op:
+ batch_op.alter_column(
+ 'datasource_name',
+ existing_type=sa.String(255),
+ nullable=True,
+ )
diff --git a/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py b/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py
index 4cc432fb1b000..05e7de8ce55be 100644
--- a/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py
+++ b/superset/migrations/versions/a99f2f7c195a_rewriting_url_from_shortner_with_new_.py
@@ -30,7 +30,6 @@
import json
import sqlalchemy as sa
from superset import db
-from superset.legacy import cast_form_data
from sqlalchemy.ext.declarative import declarative_base
from urllib import parse
@@ -72,7 +71,6 @@ def upgrade():
d = parse_querystring(url.url.split('?')[1])
split = url.url.split('/')
d['datasource'] = split[5] + '__' + split[4]
- d = cast_form_data(d)
newurl = '/'.join(split[:-1]) + '/?form_data=' + parse.quote_plus(json.dumps(d))
url.url = newurl
session.merge(url)
diff --git a/superset/migrations/versions/d94d33dbe938_form_strip.py b/superset/migrations/versions/d94d33dbe938_form_strip.py
new file mode 100644
index 0000000000000..b34bbaacb85ca
--- /dev/null
+++ b/superset/migrations/versions/d94d33dbe938_form_strip.py
@@ -0,0 +1,193 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""form strip
+
+Revision ID: d94d33dbe938
+Revises: 80aa3f04bc82
+Create Date: 2019-03-21 10:22:01.610217
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'd94d33dbe938'
+down_revision = '80aa3f04bc82'
+
+from alembic import op
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Column, Integer, String, Text
+
+from superset import db
+from superset.utils.core import MediumText
+
+Base = declarative_base()
+
+
+class BaseColumnMixin(object):
+ id = Column(Integer, primary_key=True)
+ column_name = Column(String(255))
+ description = Column(Text)
+ type = Column(String(32))
+ verbose_name = Column(String(1024))
+
+
+class BaseDatasourceMixin(object):
+ id = Column(Integer, primary_key=True)
+ description = Column(Text)
+
+
+class BaseMetricMixin(object):
+ id = Column(Integer, primary_key=True)
+ d3format = Column(String(128))
+ description = Column(Text)
+ metric_name = Column(String(512))
+ metric_type = Column(String(32))
+ verbose_name = Column(String(1024))
+ warning_text = Column(Text)
+
+
+class Annotation(Base):
+ __tablename__ = 'annotation'
+
+ id = Column(Integer, primary_key=True)
+ long_descr = Column(Text)
+ json_metadata = Column(Text)
+ short_descr = Column(String(500))
+
+
+class Dashboard(Base):
+ __tablename__ = 'dashboards'
+
+ id = Column(Integer, primary_key=True)
+ css = Column(Text)
+ dashboard_title = Column(String(500))
+ description = Column(Text)
+ json_metadata = Column(Text)
+ position_json = Column(MediumText())
+ slug = Column(String(255))
+
+
+class Database(Base):
+ __tablename__ = 'dbs'
+
+ id = Column(Integer, primary_key=True)
+ database_name = Column(String(250))
+ extra = Column(Text)
+ force_ctas_schema = Column(String(250))
+ sqlalchemy_uri = Column(String(1024))
+ verbose_name = Column(String(250))
+
+
+class DruidCluster(Base):
+ __tablename__ = 'clusters'
+
+ id = Column(Integer, primary_key=True)
+ broker_host = Column(String(255))
+ broker_endpoint = Column(String(255))
+ cluster_name = Column(String(250))
+ verbose_name = Column(String(250))
+
+
+class DruidColumn(BaseColumnMixin, Base):
+ __tablename__ = 'columns'
+
+ dimension_spec_json = Column(Text)
+
+
+class DruidDatasource(BaseDatasourceMixin, Base):
+ __tablename__ = 'datasources'
+
+ datasource_name = Column(String(255))
+ default_endpoint = Column(Text)
+ fetch_values_from = Column(String(100))
+
+
+class DruidMetric(BaseMetricMixin, Base):
+ __tablename__ = 'metrics'
+
+ json = Column(Text)
+
+
+class Slice(Base):
+ __tablename__ = 'slices'
+
+ id = Column(Integer, primary_key=True)
+ description = Column(Text)
+ params = Column(Text)
+ slice_name = Column(String(250))
+ viz_type = Column(String(250))
+
+
+class SqlaTable(BaseDatasourceMixin, Base):
+ __tablename__ = 'tables'
+
+ default_endpoint = Column(MediumText())
+ fetch_values_predicate = Column(String(1000))
+ main_dttm_col = Column(String(250))
+ schema = Column(String(255))
+ sql = Column(Text)
+ table_name = Column(String(250))
+ template_params = Column(Text)
+
+
+class SqlMetric(BaseMetricMixin, Base):
+ __tablename__ = 'sql_metrics'
+
+ expression = Column(Text)
+
+
+class TableColumn(BaseColumnMixin, Base):
+ __tablename__ = 'table_columns'
+
+ database_expression = Column(String(255))
+ expression = Column(Text)
+ python_date_format = Column(String(255))
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ tables = [
+ Annotation,
+ Dashboard,
+ Database,
+ DruidCluster,
+ DruidColumn,
+ DruidDatasource,
+ DruidMetric,
+ Slice,
+ SqlaTable,
+ SqlMetric,
+ TableColumn,
+ ]
+
+ for table in tables:
+ for record in session.query(table).all():
+ for col in record.__table__.columns.values():
+ if not col.primary_key:
+ value = getattr(record, col.name)
+
+ if value is not None and value.strip() == '':
+ setattr(record, col.name, None)
+
+ session.commit()
+
+ session.close()
+
+
+def downgrade():
+ pass
diff --git a/superset/migrations/versions/db0c65b146bd_update_slice_model_json.py b/superset/migrations/versions/db0c65b146bd_update_slice_model_json.py
index 642f5b5aefb21..760945f0f6074 100644
--- a/superset/migrations/versions/db0c65b146bd_update_slice_model_json.py
+++ b/superset/migrations/versions/db0c65b146bd_update_slice_model_json.py
@@ -32,7 +32,6 @@
from sqlalchemy import Column, Integer, String, Text
from superset import db
-from superset.legacy import cast_form_data
Base = declarative_base()
@@ -55,7 +54,6 @@ def upgrade():
for i, slc in enumerate(slices):
try:
d = json.loads(slc.params or '{}')
- d = cast_form_data(d)
slc.params = json.dumps(d, indent=2, sort_keys=True)
session.merge(slc)
session.commit()
diff --git a/superset/migrations/versions/e9df189e5c7e_update_base_metrics.py b/superset/migrations/versions/e9df189e5c7e_update_base_metrics.py
new file mode 100644
index 0000000000000..07a6c4d571767
--- /dev/null
+++ b/superset/migrations/versions/e9df189e5c7e_update_base_metrics.py
@@ -0,0 +1,169 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""update base metrics
+
+Note that the metrics table was previously partially modifed by revision
+f231d82b9b26.
+
+Revision ID: e9df189e5c7e
+Revises: 7f2635b51f5d
+Create Date: 2018-07-20 15:57:48.118304
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'e9df189e5c7e'
+down_revision = '7f2635b51f5d'
+
+from alembic import op
+from sqlalchemy import Column, engine, Integer, String, Text
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+from superset.utils.core import generic_find_uq_constraint_name
+
+Base = declarative_base()
+
+conv = {
+ 'uq': 'uq_%(table_name)s_%(column_0_name)s',
+}
+
+
+class BaseMetricMixin:
+ id = Column(Integer, primary_key=True)
+
+
+class DruidMetric(BaseMetricMixin, Base):
+ __tablename__ = 'metrics'
+
+ datasource_id = Column(Integer)
+
+
+class SqlMetric(BaseMetricMixin, Base):
+ __tablename__ = 'sql_metrics'
+
+ table_id = Column(Integer)
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ # Delete the orphaned metrics records.
+ for record in session.query(DruidMetric).all():
+ if record.datasource_id is None:
+ session.delete(record)
+
+ session.commit()
+
+ # Enforce that metrics.metric_name column be non-nullable.
+ with op.batch_alter_table('metrics') as batch_op:
+ batch_op.alter_column(
+ 'metric_name',
+ existing_type=String(255),
+ nullable=False,
+ )
+
+ # Enforce that metrics.json column be non-nullable.
+ with op.batch_alter_table('metrics') as batch_op:
+ batch_op.alter_column(
+ 'json',
+ existing_type=Text,
+ nullable=False,
+ )
+
+ # Delete the orphaned sql_metrics records.
+ for record in session.query(SqlMetric).all():
+ if record.table_id is None:
+ session.delete(record)
+
+ session.commit()
+
+ # Reduce the size of the sql_metrics.metric_name column for constraint
+ # viability and enforce that it to be non-nullable.
+ with op.batch_alter_table('sql_metrics') as batch_op:
+ batch_op.alter_column(
+ 'metric_name',
+ existing_type=String(512),
+ nullable=False,
+ type_=String(255),
+ )
+
+ # Enforce that sql_metrics.expression column be non-nullable.
+ with op.batch_alter_table('sql_metrics') as batch_op:
+ batch_op.alter_column(
+ 'expression',
+ existing_type=Text,
+ nullable=False,
+ )
+
+ # Add the missing uniqueness constraint to the sql_metrics table.
+ with op.batch_alter_table('sql_metrics', naming_convention=conv) as batch_op:
+ batch_op.create_unique_constraint(
+ 'uq_sql_metrics_metric_name',
+ ['metric_name', 'table_id'],
+ )
+
+
+def downgrade():
+ bind = op.get_bind()
+ insp = engine.reflection.Inspector.from_engine(bind)
+
+ # Remove the missing uniqueness constraint from the sql_metrics table.
+ with op.batch_alter_table('sql_metrics', naming_convention=conv) as batch_op:
+ batch_op.drop_constraint(
+ generic_find_uq_constraint_name(
+ 'sql_metrics',
+ {'metric_name', 'table_id'},
+ insp,
+ ) or 'uq_sql_metrics_table_id',
+ type_='unique',
+ )
+
+ # Restore the size of the sql_metrics.metric_name column and forego that it
+ # be non-nullable.
+ with op.batch_alter_table('sql_metrics') as batch_op:
+ batch_op.alter_column(
+ 'metric_name',
+ existing_type=String(255),
+ nullable=True,
+ type_=String(512),
+ )
+
+ # Forego that the sql_metrics.expression column be non-nullable.
+ with op.batch_alter_table('sql_metrics') as batch_op:
+ batch_op.alter_column(
+ 'expression',
+ existing_type=Text,
+ nullable=True,
+ )
+
+ # Forego that the metrics.metric_name column be non-nullable.
+ with op.batch_alter_table('metrics') as batch_op:
+ batch_op.alter_column(
+ 'metric_name',
+ existing_type=String(255),
+ nullable=True,
+ )
+
+ # Forego that the metrics.json column be non-nullable.
+ with op.batch_alter_table('metrics') as batch_op:
+ batch_op.alter_column(
+ 'json',
+ existing_type=Text,
+ nullable=True,
+ )
diff --git a/superset/models/core.py b/superset/models/core.py
index 0486245a9f0df..fb5850c0fa1b0 100644
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -243,6 +243,7 @@ def data(self):
'slice_name': self.slice_name,
'slice_url': self.slice_url,
'modified': self.modified(),
+ 'changed_on_humanized': self.changed_on_humanized,
'changed_on': self.changed_on.isoformat(),
}
diff --git a/superset/models/helpers.py b/superset/models/helpers.py
index a1e9b3c61aadb..78b438d9f8f17 100644
--- a/superset/models/helpers.py
+++ b/superset/models/helpers.py
@@ -288,10 +288,13 @@ def changed_by_(self):
def changed_on_(self):
return Markup(f'{self.changed_on}')
+ @property
+ def changed_on_humanized(self):
+ return humanize.naturaltime(datetime.now() - self.changed_on)
+
@renders('changed_on')
def modified(self):
- time_str = humanize.naturaltime(datetime.now() - self.changed_on)
- return Markup(f'{time_str}')
+ return Markup(f'{self.changed_on_humanized}')
class QueryResult(object):
diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py
index 93eae2fcfce53..2d23a6400536e 100644
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@ -138,6 +138,14 @@ def name(self):
tab = re.sub(r'\W+', '', tab)
return f'sqllab_{tab}_{ts}'
+ @property
+ def database_name(self):
+ return self.database.name
+
+ @property
+ def username(self):
+ return self.user.username
+
class SavedQuery(Model, AuditMixinNullable, ExtraJSONMixin):
"""ORM model for SQL query"""
diff --git a/superset/security.py b/superset/security.py
index 35545f22e0447..b30b2e516cbaa 100644
--- a/superset/security.py
+++ b/superset/security.py
@@ -68,7 +68,6 @@ class SupersetSecurityManager(SecurityManager):
}
ADMIN_ONLY_PERMISSIONS = {
- 'all_database_access',
'can_sql_json', # TODO: move can_sql_json to sql_lab role
'can_override_role_permissions',
'can_sync_druid_source',
@@ -82,17 +81,23 @@ class SupersetSecurityManager(SecurityManager):
'can_list',
}
- ALPHA_ONLY_PERMISSIONS = set([
+ ALPHA_ONLY_PERMISSIONS = {
'muldelete',
+ 'all_database_access',
'all_datasource_access',
- ])
+ }
- OBJECT_SPEC_PERMISSIONS = set([
+ OBJECT_SPEC_PERMISSIONS = {
'database_access',
'schema_access',
'datasource_access',
'metric_access',
- ])
+ 'can_only_access_owned_queries',
+ }
+
+ ACCESSIBLE_PERMS = {
+ 'can_userinfo',
+ }
def get_schema_perm(self, database, schema):
if schema:
@@ -105,6 +110,17 @@ def can_access(self, permission_name, view_name):
return self.is_item_public(permission_name, view_name)
return self._has_view_access(user, permission_name, view_name)
+ def can_only_access_owned_queries(self) -> bool:
+ """
+ can_access check for custom can_only_access_owned_queries permissions.
+
+ :returns: True if current user can access custom permissions
+ """
+ return self.can_access(
+ 'can_only_access_owned_queries',
+ 'can_only_access_owned_queries',
+ )
+
def all_datasource_access(self):
return self.can_access(
'all_datasource_access', 'all_datasource_access')
@@ -266,6 +282,7 @@ def create_custom_permissions(self):
# Global perms
self.merge_perm('all_datasource_access', 'all_datasource_access')
self.merge_perm('all_database_access', 'all_database_access')
+ self.merge_perm('can_only_access_owned_queries', 'can_only_access_owned_queries')
def create_missing_perms(self):
"""Creates missing perms for datasources, schemas and metrics"""
@@ -373,15 +390,21 @@ def is_alpha_only(self, pvm):
pvm.permission.name in self.ALPHA_ONLY_PERMISSIONS
)
+ def is_accessible_to_all(self, pvm):
+ return pvm.permission.name in self.ACCESSIBLE_PERMS
+
def is_admin_pvm(self, pvm):
return not self.is_user_defined_permission(pvm)
def is_alpha_pvm(self, pvm):
- return not (self.is_user_defined_permission(pvm) or self.is_admin_only(pvm))
+ return (
+ not (self.is_user_defined_permission(pvm) or self.is_admin_only(pvm)) or
+ self.is_accessible_to_all(pvm)
+ )
def is_gamma_pvm(self, pvm):
return not (self.is_user_defined_permission(pvm) or self.is_admin_only(pvm) or
- self.is_alpha_only(pvm))
+ self.is_alpha_only(pvm)) or self.is_accessible_to_all(pvm)
def is_sql_lab_pvm(self, pvm):
return (
diff --git a/superset/translations/es/LC_MESSAGES/messages.mo b/superset/translations/es/LC_MESSAGES/messages.mo
index f180b282c93d2..854495d3a6a9b 100644
Binary files a/superset/translations/es/LC_MESSAGES/messages.mo and b/superset/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/superset/translations/es/LC_MESSAGES/messages.po b/superset/translations/es/LC_MESSAGES/messages.po
index 8277a9e005673..3c40e93569d31 100644
--- a/superset/translations/es/LC_MESSAGES/messages.po
+++ b/superset/translations/es/LC_MESSAGES/messages.po
@@ -767,7 +767,7 @@ msgstr "Claves de la tabla"
#: superset/assets/javascripts/SqlLab/components/TableElement.jsx:119
#, python-format
msgid "View keys & indexes (%s)"
-msgstr "Ver claves e índices ($s)"
+msgstr "Ver claves e índices (%s)"
#: superset/assets/javascripts/SqlLab/components/TableElement.jsx:135
msgid "Sort columns alphabetically"
diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.json b/superset/translations/pt_BR/LC_MESSAGES/messages.json
index f2c675df55299..db0878e998d73 100644
--- a/superset/translations/pt_BR/LC_MESSAGES/messages.json
+++ b/superset/translations/pt_BR/LC_MESSAGES/messages.json
@@ -289,7 +289,7 @@
"Consulta sem título"
],
"Copy of %s": [
- "Cópia de% s"
+ "Cópia de %s"
],
"share query": [
"compartilhar consulta"
@@ -592,7 +592,7 @@
"Erro"
],
"Sorry, there was an error adding slices to this dashboard: %s": [
- "Desculpe, houve um erro ao adicionar fatias a este painel:% s"
+ "Desculpe, houve um erro ao adicionar fatias a este painel: %s"
],
"Active Dashboard Filters": [
"Filtros Active Dashboard"
@@ -709,7 +709,7 @@
"não pode estar vazio"
],
"%s - untitled": [
- "% s - sem título"
+ "%s - sem título"
],
"Edit slice properties": [
"Editar propriedades da fatia"
@@ -823,7 +823,7 @@
"Erro ao buscar dados"
],
"Select %s": [
- "Selecione% s"
+ "Selecione %s"
],
"textarea": [
"textarea"
@@ -841,7 +841,7 @@
"O mapa de atualização foi interrompido"
],
"An error occurred while rendering the visualization: %s": [
- "Ocorreu um erro ao renderizar a visualização:% s"
+ "Ocorreu um erro ao renderizar a visualização: %s"
],
"Perhaps your data has grown, your database is under unusual load, or you are simply querying a data source that is to large to be processed within the timeout range. If that is the case, we recommend that you summarize your data further.": [
"Talvez seus dados tenham crescido, seu banco de dados está sob carga incomum, ou você está simplesmente consultando uma fonte de dados que seja grande para ser processada dentro do intervalo de tempo limite. Se for esse o caso, recomendamos que você sintetize seus dados ainda mais."
@@ -1966,7 +1966,7 @@
"O servidor não pôde ser alcançado. Você pode querer verificar sua conexão e tentar novamente."
],
"An unknown error occurred. (Status: %s )": [
- "Ocorreu um erro desconhecido. (Status:% s)"
+ "Ocorreu um erro desconhecido. (Status: %s)"
],
"Favorites": [
""
@@ -2020,7 +2020,7 @@
""
],
"Select [%s]": [
- "Selecione [% s]"
+ "Selecione [%s]"
],
"No data was returned.": [
"Nenhum dado foi retornado."
@@ -2630,4 +2630,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.mo b/superset/translations/pt_BR/LC_MESSAGES/messages.mo
index fb982333c6980..81fed17561b5f 100644
Binary files a/superset/translations/pt_BR/LC_MESSAGES/messages.mo and b/superset/translations/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/superset/translations/pt_BR/LC_MESSAGES/messages.po b/superset/translations/pt_BR/LC_MESSAGES/messages.po
index ca91b9640b9d1..fab78c6080829 100644
--- a/superset/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/superset/translations/pt_BR/LC_MESSAGES/messages.po
@@ -497,7 +497,7 @@ msgstr "Consulta sem título"
#: superset/assets/javascripts/SqlLab/reducers.js:44
#, python-format
msgid "Copy of %s"
-msgstr "Cópia de% s"
+msgstr "Cópia de %s"
#: superset/assets/javascripts/SqlLab/components/CopyQueryTabUrl.jsx:30
msgid "share query"
@@ -937,7 +937,7 @@ msgstr "Erro"
#: superset/assets/javascripts/dashboard/Dashboard.jsx:359
#, python-format
msgid "Sorry, there was an error adding slices to this dashboard: %s"
-msgstr "Desculpe, houve um erro ao adicionar fatias a este painel:% s"
+msgstr "Desculpe, houve um erro ao adicionar fatias a este painel: %s"
#: superset/assets/javascripts/dashboard/components/CodeModal.jsx:35
msgid "Active Dashboard Filters"
@@ -1101,7 +1101,7 @@ msgstr "não pode estar vazio"
#: superset/assets/javascripts/explore/components/ChartContainer.jsx:180
#, python-format
msgid "%s - untitled"
-msgstr "% s - sem título"
+msgstr "%s - sem título"
#: superset/assets/javascripts/explore/components/ChartContainer.jsx:287
msgid "Edit slice properties"
@@ -1283,7 +1283,7 @@ msgstr "Erro ao buscar dados"
#: superset/assets/javascripts/explore/components/controls/SelectControl.jsx:155
#, python-format
msgid "Select %s"
-msgstr "Selecione% s"
+msgstr "Selecione %s"
#: superset/assets/javascripts/explore/components/controls/TextAreaControl.jsx:63
msgid "textarea"
@@ -1309,7 +1309,7 @@ msgstr "O mapa de atualização foi interrompido"
#: superset/assets/javascripts/modules/superset.js:226
#, python-format
msgid "An error occurred while rendering the visualization: %s"
-msgstr "Ocorreu um erro ao renderizar a visualização:% s"
+msgstr "Ocorreu um erro ao renderizar a visualização: %s"
#: superset/assets/javascripts/explore/reducers/chartReducer.js:47
msgid ""
@@ -3071,7 +3071,7 @@ msgstr ""
#: superset/assets/javascripts/modules/superset.js:135
#, python-format
msgid "An unknown error occurred. (Status: %s )"
-msgstr "Ocorreu um erro desconhecido. (Status:% s)"
+msgstr "Ocorreu um erro desconhecido. (Status: %s)"
#: superset/assets/javascripts/profile/components/App.jsx:24
msgid "Favorites"
@@ -3150,7 +3150,7 @@ msgstr ""
#: superset/assets/visualizations/filter_box.jsx:181
#, python-format
msgid "Select [%s]"
-msgstr "Selecione [% s]"
+msgstr "Selecione [%s]"
#: superset/connectors/druid/models.py:1073
msgid "No data was returned."
diff --git a/superset/utils/cache.py b/superset/utils/cache.py
index 569e39728c2b5..4c44d421f0613 100644
--- a/superset/utils/cache.py
+++ b/superset/utils/cache.py
@@ -20,7 +20,7 @@
from superset import tables_cache
-def view_cache_key(*unused_args, **unused_kwargs):
+def view_cache_key(*unused_args, **unused_kwargs) -> str:
args_hash = hash(frozenset(request.args.items()))
return 'view/{}/{}'.format(request.path, args_hash)
diff --git a/superset/utils/core.py b/superset/utils/core.py
index be8bc08b3e7b0..122998e2fea0e 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -31,7 +31,8 @@
import signal
import smtplib
import sys
-from typing import Optional, Tuple
+from time import struct_time
+from typing import List, Optional, Tuple
import uuid
import zlib
@@ -39,7 +40,8 @@
import celery
from dateutil.parser import parse
from dateutil.relativedelta import relativedelta
-from flask import flash, g, Markup, render_template
+from flask import flash, Flask, g, Markup, render_template
+from flask_appbuilder.security.sqla.models import User
from flask_babel import gettext as __
from flask_babel import lazy_gettext as _
from flask_caching import Cache
@@ -51,6 +53,7 @@
import sqlalchemy as sa
from sqlalchemy import event, exc, select, Text
from sqlalchemy.dialects.mysql import MEDIUMTEXT
+from sqlalchemy.sql.type_api import Variant
from sqlalchemy.types import TEXT, TypeDecorator
from superset.exceptions import SupersetException, SupersetTimeoutException
@@ -138,11 +141,11 @@ def wrapper(f):
return wrapper
-def js_string_to_python(item):
+def js_string_to_python(item: str) -> Optional[str]:
return None if item in ('null', 'undefined') else item
-def string_to_num(s):
+def string_to_num(s: str):
"""Converts a string to an int/float
Returns ``None`` if it can't be converted
@@ -182,7 +185,7 @@ def __init__(self, **args):
}
-def list_minus(l, minus):
+def list_minus(l: List, minus: List) -> List:
"""Returns l without what is in minus
>>> list_minus([1, 2, 3], [2])
@@ -230,7 +233,7 @@ def parse_human_datetime(s):
return dttm
-def dttm_from_timtuple(d):
+def dttm_from_timtuple(d: struct_time) -> datetime:
return datetime(
d.tm_year, d.tm_mon, d.tm_mday, d.tm_hour, d.tm_min, d.tm_sec)
@@ -284,7 +287,7 @@ def default(self, o):
return json.JSONEncoder.default(self, o)
-def parse_human_timedelta(s):
+def parse_human_timedelta(s: str):
"""
Returns ``datetime.datetime`` from natural language time deltas
@@ -349,7 +352,7 @@ def base_json_conv(obj):
return '[bytes]'
-def json_iso_dttm_ser(obj, pessimistic=False):
+def json_iso_dttm_ser(obj, pessimistic: Optional[bool] = False):
"""
json serializer that deals with dates
@@ -420,7 +423,7 @@ def error_msg_from_exception(e):
return msg or '{}'.format(e)
-def markdown(s, markup_wrap=False):
+def markdown(s: str, markup_wrap: Optional[bool] = False) -> str:
safe_markdown_tags = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'b', 'i',
'strong', 'em', 'tt', 'p', 'br', 'span',
'div', 'blockquote', 'code', 'hr', 'ul', 'ol',
@@ -438,7 +441,7 @@ def markdown(s, markup_wrap=False):
return s
-def readfile(file_path):
+def readfile(file_path: str) -> Optional[str]:
with open(file_path) as f:
content = f.read()
return content
@@ -677,17 +680,18 @@ def send_MIME_email(e_from, e_to, mime_msg, config, dryrun=False):
logging.info(mime_msg.as_string())
-def get_email_address_list(address_string):
+def get_email_address_list(address_string: str) -> List[str]:
+ address_string_list: List[str] = []
if isinstance(address_string, str):
if ',' in address_string:
- address_string = address_string.split(',')
+ address_string_list = address_string.split(',')
elif '\n' in address_string:
- address_string = address_string.split('\n')
+ address_string_list = address_string.split('\n')
elif ';' in address_string:
- address_string = address_string.split(';')
+ address_string_list = address_string.split(';')
else:
- address_string = [address_string]
- return [x.strip() for x in address_string if x.strip()]
+ address_string_list = [address_string]
+ return [x.strip() for x in address_string_list if x.strip()]
def choicify(values):
@@ -695,11 +699,13 @@ def choicify(values):
return [(v, v) for v in values]
-def setup_cache(app, cache_config):
+def setup_cache(app: Flask, cache_config) -> Optional[Cache]:
"""Setup the flask-cache on a flask app"""
if cache_config and cache_config.get('CACHE_TYPE') != 'null':
return Cache(app, config=cache_config)
+ return None
+
def zlib_compress(data):
"""
@@ -766,7 +772,7 @@ def to_adhoc(filt, expressionType='SIMPLE', clause='where'):
return result
-def merge_extra_filters(form_data):
+def merge_extra_filters(form_data: dict):
# extra_filters are temporary/contextual filters (using the legacy constructs)
# that are external to the slice definition. We use those for dynamic
# interactive filters like the ones emitted by the "Filter Box" visualization.
@@ -837,7 +843,7 @@ def get_filter_key(f):
del form_data['extra_filters']
-def merge_request_params(form_data, params):
+def merge_request_params(form_data: dict, params: dict):
url_params = {}
for key, value in params.items():
if key in ('form_data', 'r'):
@@ -846,12 +852,12 @@ def merge_request_params(form_data, params):
form_data['url_params'] = url_params
-def get_update_perms_flag():
+def get_update_perms_flag() -> bool:
val = os.environ.get('SUPERSET_UPDATE_PERMS')
return val.lower() not in ('0', 'false', 'no') if val else True
-def user_label(user):
+def user_label(user: User) -> Optional[str]:
"""Given a user ORM FAB object, returns a label"""
if user:
if user.first_name and user.last_name:
@@ -859,6 +865,8 @@ def user_label(user):
else:
return user.username
+ return None
+
def get_or_create_main_db():
from superset import conf, db
@@ -887,7 +895,7 @@ def get_main_database(session):
)
-def is_adhoc_metric(metric):
+def is_adhoc_metric(metric) -> bool:
return (
isinstance(metric, dict) and
(
@@ -913,7 +921,7 @@ def get_metric_names(metrics):
return [get_metric_name(metric) for metric in metrics]
-def ensure_path_exists(path):
+def ensure_path_exists(path: str):
try:
os.makedirs(path)
except OSError as exc:
@@ -997,7 +1005,7 @@ def get_since_until(time_range: Optional[str] = None,
return since, until # noqa: T400
-def add_ago_to_since(since):
+def add_ago_to_since(since: str) -> str:
"""
Backwards compatibility hack. Without this slices with since: 7 days will
be treated as 7 days in the future.
@@ -1072,17 +1080,17 @@ def split_adhoc_filters_into_base_filters(fd):
fd['filters'] = simple_where_filters
-def get_username():
+def get_username() -> Optional[str]:
"""Get username if within the flask context, otherwise return noffin'"""
try:
return g.user.username
except Exception:
- pass
+ return None
-def MediumText():
+def MediumText() -> Variant:
return Text().with_variant(MEDIUMTEXT(), 'mysql')
-def shortid():
+def shortid() -> str:
return '{}'.format(uuid.uuid4())[-12:]
diff --git a/superset/views/base.py b/superset/views/base.py
index 071f2b335b658..113b9c68e3975 100644
--- a/superset/views/base.py
+++ b/superset/views/base.py
@@ -19,16 +19,20 @@
import functools
import logging
import traceback
+from typing import Any, Dict
from flask import abort, flash, g, get_flashed_messages, redirect, Response
from flask_appbuilder import BaseView, ModelView
from flask_appbuilder.actions import action
+from flask_appbuilder.forms import DynamicForm
from flask_appbuilder.models.sqla.filters import BaseFilter
from flask_appbuilder.widgets import ListWidget
from flask_babel import get_locale
from flask_babel import gettext as __
from flask_babel import lazy_gettext as _
+from flask_wtf.form import FlaskForm
import simplejson as json
+from wtforms.fields.core import Field, UnboundField
import yaml
from superset import conf, db, get_feature_flags, security_manager
@@ -368,3 +372,26 @@ def check_ownership(obj, raise_if_false=True):
raise security_exception
else:
return False
+
+
+def bind_field(
+ self,
+ form: DynamicForm,
+ unbound_field: UnboundField,
+ options: Dict[Any, Any],
+ ) -> Field:
+ """
+ Customize how fields are bound by stripping all whitespace.
+
+ :param form: The form
+ :param unbound_field: The unbound field
+ :param options: The field options
+ :returns: The bound field
+ """
+
+ filters = unbound_field.kwargs.get('filters', [])
+ filters.append(lambda x: x.strip() if isinstance(x, str) else x)
+ return unbound_field.bind(form=form, filters=filters, **options)
+
+
+FlaskForm.Meta.bind_field = bind_field
diff --git a/superset/views/core.py b/superset/views/core.py
index 2e3980f894e7c..f5de14673df2c 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -22,6 +22,7 @@
import re
import time
import traceback
+from typing import List # noqa: F401
from urllib import parse
from flask import (
@@ -50,6 +51,7 @@
from superset.exceptions import SupersetException
from superset.forms import CsvToDatabaseForm
from superset.jinja_context import get_template_processor
+from superset.legacy import update_time_range
import superset.models.core as models
from superset.models.sql_lab import Query
from superset.models.user_attributes import UserAttribute
@@ -82,7 +84,7 @@
'The access requests seem to have been deleted')
USER_MISSING_ERR = __('The user seems to have been deleted')
-FORM_DATA_KEY_BLACKLIST = []
+FORM_DATA_KEY_BLACKLIST: List[str] = []
if not config.get('ENABLE_JAVASCRIPT_CONTROLS'):
FORM_DATA_KEY_BLACKLIST = [
'js_tooltip',
@@ -498,9 +500,6 @@ class SliceModelView(SupersetModelView, DeleteMixin): # noqa
edit_title = _('Edit Chart')
can_add = False
- label_columns = {
- 'datasource_link': _('Datasource'),
- }
search_columns = (
'slice_name', 'description', 'viz_type', 'datasource_name', 'owners',
)
@@ -582,7 +581,8 @@ class SliceAsync(SliceModelView): # noqa
route_base = '/sliceasync'
list_columns = [
'id', 'slice_link', 'viz_type', 'slice_name',
- 'creator', 'modified', 'icons']
+ 'creator', 'modified', 'icons', 'changed_on_humanized',
+ ]
label_columns = {
'icons': ' ',
'slice_link': _('Chart'),
@@ -598,7 +598,8 @@ class SliceAddView(SliceModelView): # noqa
'id', 'slice_name', 'slice_url', 'edit_url', 'viz_type', 'params',
'description', 'description_markeddown', 'datasource_id', 'datasource_type',
'datasource_name_text', 'datasource_link',
- 'owners', 'modified', 'changed_on']
+ 'owners', 'modified', 'changed_on', 'changed_on_humanized',
+ ]
appbuilder.add_view_no_menu(SliceAddView)
@@ -1049,6 +1050,81 @@ def clean_fulfilled_requests(session):
session.commit()
return redirect('/accessrequestsmodelview/list/')
+ def get_form_data(self, slice_id=None, use_slice_data=False):
+ form_data = {}
+ post_data = request.form.get('form_data')
+ request_args_data = request.args.get('form_data')
+ # Supporting POST
+ if post_data:
+ form_data.update(json.loads(post_data))
+ # request params can overwrite post body
+ if request_args_data:
+ form_data.update(json.loads(request_args_data))
+
+ url_id = request.args.get('r')
+ if url_id:
+ saved_url = db.session.query(models.Url).filter_by(id=url_id).first()
+ if saved_url:
+ url_str = parse.unquote_plus(
+ saved_url.url.split('?')[1][10:], encoding='utf-8', errors=None)
+ url_form_data = json.loads(url_str)
+ # allow form_date in request override saved url
+ url_form_data.update(form_data)
+ form_data = url_form_data
+
+ form_data = {
+ k: v
+ for k, v in form_data.items()
+ if k not in FORM_DATA_KEY_BLACKLIST
+ }
+
+ # When a slice_id is present, load from DB and override
+ # the form_data from the DB with the other form_data provided
+ slice_id = form_data.get('slice_id') or slice_id
+ slc = None
+
+ # Check if form data only contains slice_id
+ contains_only_slc_id = not any(key != 'slice_id' for key in form_data)
+
+ # Include the slice_form_data if request from explore or slice calls
+ # or if form_data only contains slice_id
+ if slice_id and (use_slice_data or contains_only_slc_id):
+ slc = db.session.query(models.Slice).filter_by(id=slice_id).one_or_none()
+ if slc:
+ slice_form_data = slc.form_data.copy()
+ slice_form_data.update(form_data)
+ form_data = slice_form_data
+
+ update_time_range(form_data)
+
+ return form_data, slc
+
+ def get_viz(
+ self,
+ slice_id=None,
+ form_data=None,
+ datasource_type=None,
+ datasource_id=None,
+ force=False,
+ ):
+ if slice_id:
+ slc = (
+ db.session.query(models.Slice)
+ .filter_by(id=slice_id)
+ .one()
+ )
+ return slc.get_viz()
+ else:
+ viz_type = form_data.get('viz_type', 'table')
+ datasource = ConnectorRegistry.get_datasource(
+ datasource_type, datasource_id, db.session)
+ viz_obj = viz.viz_types[viz_type](
+ datasource,
+ form_data=form_data,
+ force=force,
+ )
+ return viz_obj
+
@has_access
@expose('/slice//')
def slice(self, slice_id):
@@ -1418,6 +1494,7 @@ def save_or_overwrite_slice(
'can_overwrite': is_owner(slc, g.user),
'form_data': slc.form_data,
'slice': slc.data,
+ 'dashboard_id': dash.id if dash else None,
}
if request.args.get('goto_dash') == 'true':
@@ -2705,10 +2782,21 @@ def queries_call(self, last_updated_ms):
@has_access
@expose('/search_queries')
@log_this
- def search_queries(self):
- """Search for queries."""
+ def search_queries(self) -> Response:
+ """
+ Search for previously run sqllab queries. Used for Sqllab Query Search
+ page /superset/sqllab#search.
+
+ Custom permission can_only_search_queries_owned restricts queries
+ to only queries run by current user.
+
+ :returns: Response with list of sql query dicts
+ """
query = db.session.query(Query)
- search_user_id = request.args.get('user_id')
+ if security_manager.can_only_access_owned_queries():
+ search_user_id = g.user.get_user_id()
+ else:
+ search_user_id = request.args.get('user_id')
database_id = request.args.get('database_id')
search_text = request.args.get('search_text')
status = request.args.get('status')
@@ -2717,7 +2805,7 @@ def search_queries(self):
to_time = request.args.get('to')
if search_user_id:
- # Filter on db Id
+ # Filter on user_id
query = query.filter(Query.user_id == search_user_id)
if database_id:
diff --git a/superset/views/schedules.py b/superset/views/schedules.py
index 4dae3cbfb7292..6fdae77265219 100644
--- a/superset/views/schedules.py
+++ b/superset/views/schedules.py
@@ -90,9 +90,12 @@ class EmailScheduleView(SupersetModelView, DeleteMixin):
edit_form_extra_fields = add_form_extra_fields
def process_form(self, form, is_created):
- recipients = form.test_email_recipients.data.strip() or None
+ if form.test_email_recipients.data:
+ test_email_recipients = form.test_email_recipients.data.strip()
+ else:
+ test_email_recipients = None
self._extra_data['test_email'] = form.test_email.data
- self._extra_data['test_email_recipients'] = recipients
+ self._extra_data['test_email_recipients'] = test_email_recipients
def pre_add(self, obj):
try:
@@ -111,7 +114,7 @@ def pre_update(self, obj):
def post_add(self, obj):
# Schedule a test mail if the user requested for it.
if self._extra_data['test_email']:
- recipients = self._extra_data['test_email_recipients']
+ recipients = self._extra_data['test_email_recipients'] or obj.recipients
args = (self.schedule_type, obj.id)
kwargs = dict(recipients=recipients)
schedule_email_report.apply_async(args=args, kwargs=kwargs)
diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py
index 0c8e87f168e7c..adbdd46c6dfde 100644
--- a/superset/views/sql_lab.py
+++ b/superset/views/sql_lab.py
@@ -15,16 +15,38 @@
# specific language governing permissions and limitations
# under the License.
# pylint: disable=C,R,W
+from typing import Callable
+
from flask import g, redirect
from flask_appbuilder import expose
from flask_appbuilder.models.sqla.interface import SQLAInterface
from flask_appbuilder.security.decorators import has_access
from flask_babel import gettext as __
from flask_babel import lazy_gettext as _
+from flask_sqlalchemy import BaseQuery
-from superset import appbuilder
+from superset import appbuilder, security_manager
from superset.models.sql_lab import Query, SavedQuery
-from .base import BaseSupersetView, DeleteMixin, SupersetModelView
+from .base import BaseSupersetView, DeleteMixin, SupersetFilter, SupersetModelView
+
+
+class QueryFilter(SupersetFilter):
+ def apply(
+ self,
+ query: BaseQuery,
+ func: Callable) -> BaseQuery:
+ """
+ Filter queries to only those owned by current user if
+ can_only_access_owned_queries permission is set.
+
+ :returns: query
+ """
+ if security_manager.can_only_access_owned_queries():
+ query = (
+ query
+ .filter(Query.user_id == g.user.get_user_id())
+ )
+ return query
class QueryView(SupersetModelView):
@@ -35,10 +57,12 @@ class QueryView(SupersetModelView):
add_title = _('Add Query')
edit_title = _('Edit Query')
- list_columns = ['user', 'database', 'status', 'start_time', 'end_time']
+ list_columns = ['username', 'database_name', 'status', 'start_time', 'end_time']
+ base_filters = [['id', QueryFilter, lambda: []]]
label_columns = {
'user': _('User'),
- 'database': _('Database'),
+ 'username': _('User'),
+ 'database_name': _('Database'),
'status': _('Status'),
'start_time': _('Start Time'),
'end_time': _('End Time'),
diff --git a/superset/views/utils.py b/superset/views/utils.py
index 74171d1e48a98..bb934a11260ba 100644
--- a/superset/views/utils.py
+++ b/superset/views/utils.py
@@ -24,7 +24,7 @@
from superset import app, db, viz
from superset.connectors.connector_registry import ConnectorRegistry
-from superset.legacy import cast_form_data, update_time_range
+from superset.legacy import update_time_range
import superset.models.core as models
@@ -138,10 +138,6 @@ def get_form_data(slice_id=None, use_slice_data=False):
url_form_data.update(form_data)
form_data = url_form_data
- if request.args.get('viz_type'):
- # Converting old URLs
- form_data = cast_form_data(form_data)
-
form_data = {
k: v
for k, v in form_data.items()
diff --git a/superset/viz.py b/superset/viz.py
index ce8c720342f3b..3e2e838c58321 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -518,7 +518,7 @@ def should_be_timeseries(self):
return fd.get('include_time')
def query_obj(self):
- d = super(TableViz, self).query_obj()
+ d = super().query_obj()
fd = self.form_data
if fd.get('all_columns') and (fd.get('groupby') or fd.get('metrics')):
@@ -610,7 +610,7 @@ class TimeTableViz(BaseViz):
is_timeseries = True
def query_obj(self):
- d = super(TimeTableViz, self).query_obj()
+ d = super().query_obj()
fd = self.form_data
if not fd.get('metrics'):
@@ -653,7 +653,7 @@ class PivotTableViz(BaseViz):
is_timeseries = False
def query_obj(self):
- d = super(PivotTableViz, self).query_obj()
+ d = super().query_obj()
groupby = self.form_data.get('groupby')
columns = self.form_data.get('columns')
metrics = self.form_data.get('metrics')
@@ -747,7 +747,7 @@ class WordCloudViz(BaseViz):
is_timeseries = False
def query_obj(self):
- d = super(WordCloudViz, self).query_obj()
+ d = super().query_obj()
d['groupby'] = [self.form_data.get('series')]
return d
@@ -832,7 +832,7 @@ def get_data(self, df):
}
def query_obj(self):
- d = super(CalHeatmapViz, self).query_obj()
+ d = super().query_obj()
fd = self.form_data
d['metrics'] = fd.get('metrics')
return d
@@ -943,7 +943,7 @@ class BubbleViz(NVD3Viz):
def query_obj(self):
form_data = self.form_data
- d = super(BubbleViz, self).query_obj()
+ d = super().query_obj()
d['groupby'] = [
form_data.get('entity'),
]
@@ -956,11 +956,11 @@ def query_obj(self):
self.series = form_data.get('series') or self.entity
d['row_limit'] = form_data.get('limit')
- d['metrics'] = [
+ d['metrics'] = list(set([
self.z_metric,
self.x_metric,
self.y_metric,
- ]
+ ]))
if not all(d['metrics'] + [self.entity]):
raise Exception(_('Pick a metric for x, y and size'))
return d
@@ -993,7 +993,7 @@ class BulletViz(NVD3Viz):
def query_obj(self):
form_data = self.form_data
- d = super(BulletViz, self).query_obj()
+ d = super().query_obj()
self.metric = form_data.get('metric')
def as_strings(field):
@@ -1041,7 +1041,7 @@ class BigNumberViz(BaseViz):
is_timeseries = True
def query_obj(self):
- d = super(BigNumberViz, self).query_obj()
+ d = super().query_obj()
metric = self.form_data.get('metric')
if not metric:
raise Exception(_('Pick a metric!'))
@@ -1060,7 +1060,7 @@ class BigNumberTotalViz(BaseViz):
is_timeseries = False
def query_obj(self):
- d = super(BigNumberTotalViz, self).query_obj()
+ d = super().query_obj()
metric = self.form_data.get('metric')
if not metric:
raise Exception(_('Pick a metric!'))
@@ -1309,7 +1309,7 @@ class NVD3DualLineViz(NVD3Viz):
is_timeseries = True
def query_obj(self):
- d = super(NVD3DualLineViz, self).query_obj()
+ d = super().query_obj()
m1 = self.form_data.get('metric')
m2 = self.form_data.get('metric_2')
d['metrics'] = [m1, m2]
@@ -1393,7 +1393,7 @@ class NVD3TimePivotViz(NVD3TimeSeriesViz):
verbose_name = _('Time Series - Period Pivot')
def query_obj(self):
- d = super(NVD3TimePivotViz, self).query_obj()
+ d = super().query_obj()
d['metrics'] = [self.form_data.get('metric')]
return d
@@ -1475,7 +1475,7 @@ class HistogramViz(BaseViz):
def query_obj(self):
"""Returns the query object for this visualization"""
- d = super(HistogramViz, self).query_obj()
+ d = super().query_obj()
d['row_limit'] = self.form_data.get(
'row_limit', int(config.get('VIZ_ROW_LIMIT')))
numeric_columns = self.form_data.get('all_columns_x')
@@ -1521,7 +1521,7 @@ class DistributionBarViz(DistributionPieViz):
is_timeseries = False
def query_obj(self):
- d = super(DistributionBarViz, self).query_obj() # noqa
+ d = super().query_obj() # noqa
fd = self.form_data
if (
len(d['groupby']) <
@@ -1602,7 +1602,7 @@ def get_data(self, df):
return json.loads(df.to_json(orient='values'))
def query_obj(self):
- qry = super(SunburstViz, self).query_obj()
+ qry = super().query_obj()
fd = self.form_data
qry['metrics'] = [fd['metric']]
secondary_metric = fd.get('secondary_metric')
@@ -1621,7 +1621,7 @@ class SankeyViz(BaseViz):
credits = 'd3-sankey on npm'
def query_obj(self):
- qry = super(SankeyViz, self).query_obj()
+ qry = super().query_obj()
if len(qry['groupby']) != 2:
raise Exception(_('Pick exactly 2 columns as [Source / Target]'))
qry['metrics'] = [
@@ -1672,7 +1672,7 @@ class DirectedForceViz(BaseViz):
is_timeseries = False
def query_obj(self):
- qry = super(DirectedForceViz, self).query_obj()
+ qry = super().query_obj()
if len(self.form_data['groupby']) != 2:
raise Exception(_("Pick exactly 2 columns to 'Group By'"))
qry['metrics'] = [self.form_data['metric']]
@@ -1693,7 +1693,7 @@ class ChordViz(BaseViz):
is_timeseries = False
def query_obj(self):
- qry = super(ChordViz, self).query_obj()
+ qry = super().query_obj()
fd = self.form_data
qry['groupby'] = [fd.get('groupby'), fd.get('columns')]
qry['metrics'] = [utils.get_metric_name(fd.get('metric'))]
@@ -1726,7 +1726,7 @@ class CountryMapViz(BaseViz):
credits = 'From bl.ocks.org By john-guerra'
def query_obj(self):
- qry = super(CountryMapViz, self).query_obj()
+ qry = super().query_obj()
qry['metrics'] = [
self.form_data['metric']]
qry['groupby'] = [self.form_data['entity']]
@@ -1754,7 +1754,7 @@ class WorldMapViz(BaseViz):
credits = 'datamaps on npm'
def query_obj(self):
- qry = super(WorldMapViz, self).query_obj()
+ qry = super().query_obj()
qry['groupby'] = [self.form_data['entity']]
return qry
@@ -1812,7 +1812,7 @@ def query_obj(self):
return None
def run_extra_queries(self):
- qry = super(FilterBoxViz, self).query_obj()
+ qry = super().query_obj()
filters = self.form_data.get('filter_configs') or []
qry['row_limit'] = self.filter_row_limit
self.dataframes = {}
@@ -1890,7 +1890,7 @@ class ParallelCoordinatesViz(BaseViz):
is_timeseries = False
def query_obj(self):
- d = super(ParallelCoordinatesViz, self).query_obj()
+ d = super().query_obj()
fd = self.form_data
d['groupby'] = [fd.get('series')]
return d
@@ -1911,7 +1911,7 @@ class HeatmapViz(BaseViz):
'bl.ocks.org')
def query_obj(self):
- d = super(HeatmapViz, self).query_obj()
+ d = super().query_obj()
fd = self.form_data
d['metrics'] = [fd.get('metric')]
d['groupby'] = [fd.get('all_columns_x'), fd.get('all_columns_y')]
@@ -1977,7 +1977,7 @@ class MapboxViz(BaseViz):
'Mapbox GL JS')
def query_obj(self):
- d = super(MapboxViz, self).query_obj()
+ d = super().query_obj()
fd = self.form_data
label_col = fd.get('mapbox_label')
@@ -2235,7 +2235,7 @@ def query_obj(self):
if fd.get('filter_nulls', True):
self.add_null_filters()
- d = super(BaseDeckGLViz, self).query_obj()
+ d = super().query_obj()
gb = []
for key in self.spatial_control_keys:
@@ -2301,7 +2301,7 @@ def query_obj(self):
fd.get('time_grain_sqla') or fd.get('granularity'))
self.point_radius_fixed = (
fd.get('point_radius_fixed') or {'type': 'fix', 'value': 500})
- return super(DeckScatterViz, self).query_obj()
+ return super().query_obj()
def get_metrics(self):
self.metric = None
@@ -2328,7 +2328,7 @@ def get_data(self, df):
self.dim = self.form_data.get('dimension')
if self.point_radius_fixed.get('type') != 'metric':
self.fixed_value = self.point_radius_fixed.get('value')
- return super(DeckScatterViz, self).get_data(df)
+ return super().get_data(df)
class DeckScreengrid(BaseDeckGLViz):
@@ -2343,7 +2343,7 @@ class DeckScreengrid(BaseDeckGLViz):
def query_obj(self):
fd = self.form_data
self.is_timeseries = fd.get('time_grain_sqla') or fd.get('granularity')
- return super(DeckScreengrid, self).query_obj()
+ return super().query_obj()
def get_properties(self, d):
return {
@@ -2354,7 +2354,7 @@ def get_properties(self, d):
def get_data(self, df):
self.metric_label = utils.get_metric_name(self.metric)
- return super(DeckScreengrid, self).get_data(df)
+ return super().get_data(df)
class DeckGrid(BaseDeckGLViz):
@@ -2373,7 +2373,7 @@ def get_properties(self, d):
def get_data(self, df):
self.metric_label = utils.get_metric_name(self.metric)
- return super(DeckGrid, self).get_data(df)
+ return super().get_data(df)
def geohash_to_json(geohash_code):
@@ -2504,7 +2504,7 @@ class DeckPathViz(BaseDeckGLViz):
def query_obj(self):
fd = self.form_data
self.is_timeseries = fd.get('time_grain_sqla') or fd.get('granularity')
- d = super(DeckPathViz, self).query_obj()
+ d = super().query_obj()
self.metric = fd.get('metric')
line_col = fd.get('line_column')
if d['metrics']:
@@ -2555,7 +2555,7 @@ def query_obj(self):
fd = self.form_data
self.elevation = (
fd.get('point_radius_fixed') or {'type': 'fix', 'value': 500})
- return super(DeckPolygon, self).query_obj()
+ return super().query_obj()
def get_metrics(self):
metrics = [self.form_data.get('metric')]
@@ -2564,7 +2564,7 @@ def get_metrics(self):
return [metric for metric in metrics if metric]
def get_properties(self, d):
- super(DeckPolygon, self).get_properties(d)
+ super().get_properties(d)
fd = self.form_data
elevation = fd['point_radius_fixed']['value']
type_ = fd['point_radius_fixed']['type']
@@ -2599,7 +2599,7 @@ class DeckGeoJson(BaseDeckGLViz):
verbose_name = _('Deck.gl - GeoJSON')
def query_obj(self):
- d = super(DeckGeoJson, self).query_obj()
+ d = super().query_obj()
d['columns'] += [self.form_data.get('geojson')]
d['metrics'] = []
d['groupby'] = []
@@ -2623,7 +2623,7 @@ def query_obj(self):
fd = self.form_data
self.is_timeseries = bool(
fd.get('time_grain_sqla') or fd.get('granularity'))
- return super(DeckArc, self).query_obj()
+ return super().query_obj()
def get_properties(self, d):
dim = self.form_data.get('dimension')
@@ -2635,7 +2635,7 @@ def get_properties(self, d):
}
def get_data(self, df):
- d = super(DeckArc, self).get_data(df)
+ d = super().get_data(df)
return {
'features': d['features'],
@@ -2653,7 +2653,7 @@ class EventFlowViz(BaseViz):
is_timeseries = True
def query_obj(self):
- query = super(EventFlowViz, self).query_obj()
+ query = super().query_obj()
form_data = self.form_data
event_key = form_data.get('all_columns_x')
@@ -2723,7 +2723,7 @@ def get_data(self, df):
"""
fd = self.form_data
groups = fd.get('groupby')
- metrics = fd.get('metrics')
+ metrics = self.metric_labels
df = df.pivot_table(
index=DTTM_ALIAS,
columns=groups,
@@ -2768,7 +2768,7 @@ class RoseViz(NVD3TimeSeriesViz):
is_timeseries = True
def get_data(self, df):
- data = super(RoseViz, self).get_data(df)
+ data = super().get_data(df)
result = {}
for datum in data:
key = datum['key']
@@ -2796,7 +2796,7 @@ class PartitionViz(NVD3TimeSeriesViz):
verbose_name = _('Partition Diagram')
def query_obj(self):
- query_obj = super(PartitionViz, self).query_obj()
+ query_obj = super().query_obj()
time_op = self.form_data.get('time_series_option', 'not_time')
# Return time series data if the user specifies so
query_obj['is_timeseries'] = time_op != 'not_time'
diff --git a/tests/core_tests.py b/tests/core_tests.py
index 00e83ace58fae..f021e9267a1e4 100644
--- a/tests/core_tests.py
+++ b/tests/core_tests.py
@@ -189,7 +189,6 @@ def assert_admin_view_menus_in(role_name, assert_func):
assert_func('ResetPasswordView', view_menus)
assert_func('RoleModelView', view_menus)
assert_func('Security', view_menus)
- assert_func('UserDBModelView', view_menus)
assert_func('SQL Lab',
view_menus)
diff --git a/tests/dict_import_export_tests.py b/tests/dict_import_export_tests.py
index 50cb0f7cbdc8d..f1f93fa64f89e 100644
--- a/tests/dict_import_export_tests.py
+++ b/tests/dict_import_export_tests.py
@@ -72,7 +72,7 @@ def create_table(
'params': json.dumps(params),
'columns': [{'column_name': c}
for c in cols_names],
- 'metrics': [{'metric_name': c} for c in metric_names],
+ 'metrics': [{'metric_name': c, 'expression': ''} for c in metric_names],
}
table = SqlaTable(
@@ -84,7 +84,7 @@ def create_table(
for col_name in cols_names:
table.columns.append(TableColumn(column_name=col_name))
for metric_name in metric_names:
- table.metrics.append(SqlMetric(metric_name=metric_name))
+ table.metrics.append(SqlMetric(metric_name=metric_name, expression=''))
return table, dict_rep
def create_druid_datasource(
@@ -98,7 +98,7 @@ def create_druid_datasource(
'id': id,
'params': json.dumps(params),
'columns': [{'column_name': c} for c in cols_names],
- 'metrics': [{'metric_name': c} for c in metric_names],
+ 'metrics': [{'metric_name': c, 'json': '{}'} for c in metric_names],
}
datasource = DruidDatasource(
diff --git a/tests/import_export_tests.py b/tests/import_export_tests.py
index ad1aa908682f0..f6d04426d73ff 100644
--- a/tests/import_export_tests.py
+++ b/tests/import_export_tests.py
@@ -113,7 +113,7 @@ def create_table(
table.columns.append(
TableColumn(column_name=col_name))
for metric_name in metric_names:
- table.metrics.append(SqlMetric(metric_name=metric_name))
+ table.metrics.append(SqlMetric(metric_name=metric_name, expression=''))
return table
def create_druid_datasource(
@@ -130,7 +130,7 @@ def create_druid_datasource(
DruidColumn(column_name=col_name))
for metric_name in metric_names:
datasource.metrics.append(DruidMetric(
- metric_name=metric_name))
+ metric_name=metric_name, json='{}'))
return datasource
def get_slice(self, slc_id):
diff --git a/tests/security_tests.py b/tests/security_tests.py
index 3530cf86e4ee4..868a8b53ae66d 100644
--- a/tests/security_tests.py
+++ b/tests/security_tests.py
@@ -76,6 +76,7 @@ def assert_can_gamma(self, perm_set):
self.assertIn(('can_slice', 'Superset'), perm_set)
self.assertIn(('can_explore', 'Superset'), perm_set)
self.assertIn(('can_explore_json', 'Superset'), perm_set)
+ self.assertIn(('can_userinfo', 'UserDBModelView'), perm_set)
def assert_can_alpha(self, perm_set):
self.assert_can_all('SqlMetricInlineView', perm_set)
@@ -129,9 +130,6 @@ def test_is_admin_only(self):
self.assertTrue(security_manager.is_admin_only(
security_manager.find_permission_view_menu(
'can_approve', 'Superset')))
- self.assertTrue(security_manager.is_admin_only(
- security_manager.find_permission_view_menu(
- 'all_database_access', 'all_database_access')))
def test_is_alpha_only(self):
self.assertFalse(security_manager.is_alpha_only(
@@ -148,6 +146,9 @@ def test_is_alpha_only(self):
self.assertTrue(security_manager.is_alpha_only(
security_manager.find_permission_view_menu(
'can_delete', 'DruidMetricInlineView')))
+ self.assertTrue(security_manager.is_alpha_only(
+ security_manager.find_permission_view_menu(
+ 'all_database_access', 'all_database_access')))
def test_is_gamma_pvm(self):
self.assertTrue(security_manager.is_gamma_pvm(
@@ -231,6 +232,7 @@ def assert_can_all(view_menu):
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)
+ self.assertIn(('can_userinfo', 'UserDBModelView'), gamma_perm_set)
def test_views_are_secured(self):
"""Preventing the addition of unsecured views without has_access decorator"""
diff --git a/tests/sqllab_tests.py b/tests/sqllab_tests.py
index d54601ce0d599..dc86866a9960a 100644
--- a/tests/sqllab_tests.py
+++ b/tests/sqllab_tests.py
@@ -53,9 +53,10 @@ def run_some_queries(self):
self.logout()
def tearDown(self):
+ self.logout()
db.session.query(Query).delete()
db.session.commit()
- self.logout()
+ db.session.close()
def test_sql_json(self):
self.login('admin')
@@ -223,6 +224,46 @@ def test_search_query_on_time(self):
data = json.loads(resp)
self.assertEquals(2, len(data))
+ def test_search_query_with_owner_only_perms(self) -> None:
+ """
+ Test a search query with can_only_access_owned_queries perm added to
+ Admin and make sure only Admin queries show up.
+ """
+ session = db.session
+
+ # Add can_only_access_owned_queries perm to Admin user
+ owned_queries_view = security_manager.find_permission_view_menu(
+ 'can_only_access_owned_queries',
+ 'can_only_access_owned_queries',
+ )
+ security_manager.add_permission_role(
+ security_manager.find_role('Admin'),
+ owned_queries_view,
+ )
+ session.commit()
+
+ # Test search_queries for Admin user
+ self.run_some_queries()
+ self.login('admin')
+
+ user_id = security_manager.find_user('admin').id
+ data = self.get_json_resp('/superset/search_queries')
+ self.assertEquals(2, len(data))
+ user_ids = {k['userId'] for k in data}
+ self.assertEquals(set([user_id]), user_ids)
+
+ # Remove can_only_access_owned_queries from Admin
+ owned_queries_view = security_manager.find_permission_view_menu(
+ 'can_only_access_owned_queries',
+ 'can_only_access_owned_queries',
+ )
+ security_manager.del_permission_role(
+ security_manager.find_role('Admin'),
+ owned_queries_view,
+ )
+
+ session.commit()
+
def test_alias_duplicate(self):
self.run_sql(
'SELECT username as col, id as col, username FROM ab_user',
@@ -266,7 +307,7 @@ def test_sqllab_viz(self):
'columns': [{
'is_date': False,
'type': 'STRING',
- 'nam:qe': 'viz_type',
+ 'name': 'viz_type',
'is_dim': True,
}, {
'is_date': False,
@@ -309,6 +350,68 @@ def test_sql_limit(self):
query_limit=test_limit)
self.assertEquals(len(data['data']), test_limit)
+ def test_queryview_filter(self) -> None:
+ """
+ Test queryview api without can_only_access_owned_queries perm added to
+ Admin and make sure all queries show up.
+ """
+ self.run_some_queries()
+ self.login(username='admin')
+
+ url = '/queryview/api/read'
+ data = self.get_json_resp(url)
+ admin = security_manager.find_user('admin')
+ gamma_sqllab = security_manager.find_user('gamma_sqllab')
+ self.assertEquals(3, len(data['result']))
+ user_queries = [
+ result.get('username') for result in data['result']
+ ]
+ assert admin.username in user_queries
+ assert gamma_sqllab.username in user_queries
+
+ def test_queryview_filter_owner_only(self) -> None:
+ """
+ Test queryview api with can_only_access_owned_queries perm added to
+ Admin and make sure only Admin queries show up.
+ """
+ session = db.session
+
+ # Add can_only_access_owned_queries perm to Admin user
+ owned_queries_view = security_manager.find_permission_view_menu(
+ 'can_only_access_owned_queries',
+ 'can_only_access_owned_queries',
+ )
+ security_manager.add_permission_role(
+ security_manager.find_role('Admin'),
+ owned_queries_view,
+ )
+ session.commit()
+
+ # Test search_queries for Admin user
+ self.run_some_queries()
+ self.login('admin')
+
+ url = '/queryview/api/read'
+ data = self.get_json_resp(url)
+ admin = security_manager.find_user('admin')
+ self.assertEquals(2, len(data['result']))
+ all_admin_user_queries = all([
+ result.get('username') == admin.username for result in data['result']
+ ])
+ assert all_admin_user_queries is True
+
+ # Remove can_only_access_owned_queries from Admin
+ owned_queries_view = security_manager.find_permission_view_menu(
+ 'can_only_access_owned_queries',
+ 'can_only_access_owned_queries',
+ )
+ security_manager.del_permission_role(
+ security_manager.find_role('Admin'),
+ owned_queries_view,
+ )
+
+ session.commit()
+
if __name__ == '__main__':
unittest.main()
diff --git a/tox.ini b/tox.ini
index 5eb9db5df7624..dbe2baaca3aff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,8 @@ exclude =
superset/templates
venv
ignore =
+ E121
+ E125
FI12
FI15
FI16