Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ describe('Chart', () => {
editMode: false,
isExpanded: false,
supersetCanExplore: false,
supersetCanCSV: false,
sliceCanEdit: false,
};

Expand Down
4 changes: 4 additions & 0 deletions superset/assets/src/dashboard/components/SliceHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const propTypes = {
annotationError: PropTypes.object,
sliceName: PropTypes.string,
supersetCanExplore: PropTypes.bool,
supersetCanCSV: PropTypes.bool,
sliceCanEdit: PropTypes.bool,
};

Expand All @@ -61,6 +62,7 @@ const defaultProps = {
isExpanded: false,
sliceName: '',
supersetCanExplore: false,
supersetCanCSV: false,
sliceCanEdit: false,
};

Expand All @@ -82,6 +84,7 @@ class SliceHeader extends React.PureComponent {
innerRef,
sliceName,
supersetCanExplore,
supersetCanCSV,
sliceCanEdit,
editMode,
updateSliceName,
Expand Down Expand Up @@ -133,6 +136,7 @@ class SliceHeader extends React.PureComponent {
exploreChart={exploreChart}
exportCSV={exportCSV}
supersetCanExplore={supersetCanExplore}
supersetCanCSV={supersetCanCSV}
sliceCanEdit={sliceCanEdit}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const propTypes = {
cachedDttm: PropTypes.string,
updatedDttm: PropTypes.number,
supersetCanExplore: PropTypes.bool,
supersetCanCSV: PropTypes.bool,
sliceCanEdit: PropTypes.bool,
toggleExpandSlice: PropTypes.func,
forceRefresh: PropTypes.func,
Expand All @@ -53,6 +54,7 @@ const defaultProps = {
isCached: false,
isExpanded: false,
supersetCanExplore: false,
supersetCanCSV: false,
sliceCanEdit: false,
};

Expand Down Expand Up @@ -161,7 +163,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}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const propTypes = {
editMode: PropTypes.bool.isRequired,
isExpanded: PropTypes.bool.isRequired,
supersetCanExplore: PropTypes.bool.isRequired,
supersetCanCSV: PropTypes.bool.isRequired,
sliceCanEdit: PropTypes.bool.isRequired,
};

Expand Down Expand Up @@ -164,6 +165,7 @@ class Chart extends React.Component {
toggleExpandSlice,
timeout,
supersetCanExplore,
supersetCanCSV,
sliceCanEdit,
} = this.props;

Expand Down Expand Up @@ -198,6 +200,7 @@ class Chart extends React.Component {
updateSliceName={updateSliceName}
sliceName={sliceName}
supersetCanExplore={supersetCanExplore}
supersetCanCSV={supersetCanCSV}
sliceCanEdit={sliceCanEdit}
/>

Expand Down
1 change: 1 addition & 0 deletions superset/assets/src/dashboard/containers/Chart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,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,
};
}
Expand Down
1 change: 1 addition & 0 deletions superset/assets/src/dashboard/reducers/getInitialState.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions superset/views/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2146,6 +2146,7 @@ def dashboard(self, dashboard_id):
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'
Expand All @@ -2167,6 +2168,7 @@ def dashboard(**kwargs): # noqa
'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,
})

Expand Down