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

User can turn off download - export csv from a dashboard (#6821) 

* User can turn off download - export csv from a dashboard

* Revert changes in the backendSync

* Fix space error in the MenuItem Export CSV
This commit is contained in:
Enrique Macip 2019-03-16 17:33:45 +00:00 committed by Grace Guo
parent f760ba8d4c
commit 4a3009406a
7 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
superset/assets/spec/javascripts/dashboard/components/gridComponents/Chart_spec.jsx
View File

@ -58,6 +58,7 @@ describe('Chart', () => {
editMode: false,
isExpanded: false,
supersetCanExplore: false,
supersetCanCSV: false,
sliceCanEdit: false,
};

4
superset/assets/src/dashboard/components/SliceHeader.jsx
View File

@ -41,6 +41,7 @@ const propTypes = {
annotationError: PropTypes.object,
sliceName: PropTypes.string,
supersetCanExplore: PropTypes.bool,
supersetCanCSV: PropTypes.bool,
sliceCanEdit: PropTypes.bool,
};
@ -61,6 +62,7 @@ const defaultProps = {
isExpanded: false,
sliceName: '',
supersetCanExplore: false,
supersetCanCSV: false,
sliceCanEdit: false,
};
@ -82,6 +84,7 @@ class SliceHeader extends React.PureComponent {
innerRef,
sliceName,
supersetCanExplore,
supersetCanCSV,
sliceCanEdit,
editMode,
updateSliceName,
@ -133,6 +136,7 @@ class SliceHeader extends React.PureComponent {
exploreChart={exploreChart}
exportCSV={exportCSV}
supersetCanExplore={supersetCanExplore}
supersetCanCSV={supersetCanCSV}
sliceCanEdit={sliceCanEdit}
/>
)}

6
superset/assets/src/dashboard/components/SliceHeaderControls.jsx
View File

@ -29,6 +29,7 @@ const propTypes = {
cachedDttm: PropTypes.string,
updatedDttm: PropTypes.number,
supersetCanExplore: PropTypes.bool,
supersetCanCSV: PropTypes.bool,
sliceCanEdit: PropTypes.bool,
toggleExpandSlice: PropTypes.func,
forceRefresh: PropTypes.func,
@ -46,6 +47,7 @@ const defaultProps = {
isCached: false,
isExpanded: false,
supersetCanExplore: false,
supersetCanCSV: false,
sliceCanEdit: false,
};
@ -134,7 +136,9 @@ class SliceHeaderControls extends React.PureComponent {
</MenuItem>
)}
<MenuItem onClick={this.exportCSV}>{t('Export CSV')}</MenuItem>
{this.props.supersetCanCSV && (
<MenuItem onClick={this.exportCSV}>{t('Export CSV')}</MenuItem>
)}
{this.props.supersetCanExplore && (
<MenuItem onClick={this.exploreChart}>

3
superset/assets/src/dashboard/components/gridComponents/Chart.jsx
View File

@ -53,6 +53,7 @@ const propTypes = {
isExpanded: PropTypes.bool.isRequired,
isCached: PropTypes.bool,
supersetCanExplore: PropTypes.bool.isRequired,
supersetCanCSV: PropTypes.bool.isRequired,
sliceCanEdit: PropTypes.bool.isRequired,
};
@ -195,6 +196,7 @@ class Chart extends React.Component {
toggleExpandSlice,
timeout,
supersetCanExplore,
supersetCanCSV,
sliceCanEdit,
} = this.props;
@ -229,6 +231,7 @@ class Chart extends React.Component {
updateSliceName={updateSliceName}
sliceName={sliceName}
supersetCanExplore={supersetCanExplore}
supersetCanCSV={supersetCanCSV}
sliceCanEdit={sliceCanEdit}
/>

1
superset/assets/src/dashboard/containers/Chart.jsx
View File

@ -63,6 +63,7 @@ function mapStateToProps(
editMode: dashboardState.editMode,
isExpanded: !!dashboardState.expandedSlices[id],
supersetCanExplore: !!dashboardInfo.superset_can_explore,
supersetCanCSV: !!dashboardInfo.superset_can_csv,
sliceCanEdit: !!dashboardInfo.slice_can_edit,
};
}

1
superset/assets/src/dashboard/reducers/getInitialState.js
View File

@ -174,6 +174,7 @@ export default function(bootstrapData) {
dash_edit_perm: dashboard.dash_edit_perm,
dash_save_perm: dashboard.dash_save_perm,
superset_can_explore: dashboard.superset_can_explore,
superset_can_csv: dashboard.superset_can_csv,
slice_can_edit: dashboard.slice_can_edit,
common: {
flash_messages: common.flash_messages,

2
superset/views/core.py
View File

@ -2175,6 +2175,7 @@ class Superset(BaseSupersetView):
security_manager.can_access('can_save_dash', 'Superset')
dash_save_perm = security_manager.can_access('can_save_dash', 'Superset')
superset_can_explore = security_manager.can_access('can_explore', 'Superset')
superset_can_csv = security_manager.can_access('can_csv', 'Superset')
slice_can_edit = security_manager.can_access('can_edit', 'SliceModelView')
standalone_mode = request.args.get('standalone') == 'true'
@ -2196,6 +2197,7 @@ class Superset(BaseSupersetView):
'dash_save_perm': dash_save_perm,
'dash_edit_perm': dash_edit_perm,
'superset_can_explore': superset_can_explore,
'superset_can_csv': superset_can_csv,
'slice_can_edit': slice_can_edit,
})