Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: do not render favorite favStars and filters for anonymous user #14120

Merged
merged 4 commits into from May 14, 2021
Merged

fix: do not render favorite favStars and filters for anonymous user #14120

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1691b9c
fix: do not render favorite favStar and filter for anonymous user
trepmag May 11, 2021
1a488c8
fix: prevent anonymous user to trigger the favstar view route
trepmag May 11, 2021
8dd7062
fix: lint over previous commit
trepmag May 11, 2021
07e6e6c
fix: linter follow-up
trepmag May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions superset-frontend/src/explore/components/ExploreChartHeader.jsx
View file
Open in desktop
Expand Up @@ -148,13 +148,15 @@ export class ExploreChartHeader extends React.PureComponent {

{this.props.slice && (
<StyledButtons>
<FaveStar
itemId={this.props.slice.slice_id}
fetchFaveStar={this.props.actions.fetchFaveStar}
saveFaveStar={this.props.actions.saveFaveStar}
isStarred={this.props.isStarred}
showTooltip
/>
{this.props.userId && (
<FaveStar
itemId={this.props.slice.slice_id}
fetchFaveStar={this.props.actions.fetchFaveStar}
saveFaveStar={this.props.actions.saveFaveStar}
isStarred={this.props.isStarred}
showTooltip
/>
)}
<PropertiesModal
show={this.state.isPropertiesModalOpen}
onHide={this.closePropertiesModal}
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/explore/components/ExploreChartPanel.jsx
View file
Open in desktop
Expand Up @@ -250,6 +250,7 @@ const ExploreChartPanel = props => {
form_data={props.form_data}
timeout={props.timeout}
chart={props.chart}
userId={props.userId}
/>
);

Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/explore/components/ExploreViewContainer.jsx
View file
Open in desktop
Expand Up @@ -592,6 +592,7 @@ function mapStateToProps(state) {
timeout: explore.common.conf.SUPERSET_WEBSERVER_TIMEOUT,
ownState: dataMask[form_data.slice_id]?.ownState,
impressionId,
userId: explore.user_id,
};
}

Expand Down
74 changes: 44 additions & 30 deletions superset-frontend/src/views/CRUD/chart/ChartList.tsx
View file
Open in desktop
Expand Up @@ -42,6 +42,7 @@ import SubMenu, { SubMenuProps } from 'src/components/Menu/SubMenu';
import FaveStar from 'src/components/FaveStar';
import ListView, {
ListViewProps,
Filter,
Filters,
SelectOption,
FilterOperator,
Expand Down Expand Up @@ -195,23 +196,27 @@ function ChartList(props: ChartListProps) {

const columns = useMemo(
() => [
{
Cell: ({
row: {
original: { id },
},
}: any) => (
<FaveStar
itemId={id}
saveFaveStar={saveFavoriteStatus}
isStarred={favoriteStatus[id]}
/>
),
Header: '',
id: 'id',
disableSortBy: true,
size: 'xs',
},
...(props.user.userId
? [
{
Cell: ({
row: {
original: { id },
},
}: any) => (
<FaveStar
itemId={id}
saveFaveStar={saveFavoriteStatus}
isStarred={favoriteStatus[id]}
/>
),
Header: '',
id: 'id',
disableSortBy: true,
size: 'xs',
},
]
: []),
{
Cell: ({
row: {
Expand Down Expand Up @@ -377,7 +382,12 @@ function ChartList(props: ChartListProps) {
hidden: !canEdit && !canDelete,
},
],
[canEdit, canDelete, canExport, favoriteStatus],
[
canEdit,
canDelete,
canExport,
...(props.user.userId ? [favoriteStatus] : []),
],
);

const filters: Filters = [
Expand Down Expand Up @@ -465,18 +475,22 @@ function ChartList(props: ChartListProps) {
),
paginate: false,
},
{
Header: t('Favorite'),
id: 'id',
urlDisplay: 'favorite',
input: 'select',
operator: FilterOperator.chartIsFav,
unfilteredLabel: t('Any'),
selects: [
{ label: t('Yes'), value: true },
{ label: t('No'), value: false },
],
},
...(props.user.userId
? [
{
Header: t('Favorite'),
id: 'id',
urlDisplay: 'favorite',
input: 'select',
operator: FilterOperator.chartIsFav,
unfilteredLabel: t('Any'),
selects: [
{ label: t('Yes'), value: true },
{ label: t('No'), value: false },
],
} as Filter,
]
: []),
{
Header: t('Search'),
id: 'slice_name',
Expand Down
74 changes: 44 additions & 30 deletions superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@ import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
import SubMenu, { SubMenuProps } from 'src/components/Menu/SubMenu';
import ListView, {
ListViewProps,
Filter,
Filters,
FilterOperator,
} from 'src/components/ListView';
Expand Down Expand Up @@ -189,23 +190,27 @@ function DashboardList(props: DashboardListProps) {

const columns = useMemo(
() => [
{
Cell: ({
row: {
original: { id },
},
}: any) => (
<FaveStar
itemId={id}
saveFaveStar={saveFavoriteStatus}
isStarred={favoriteStatus[id]}
/>
),
Header: '',
id: 'id',
disableSortBy: true,
size: 'xs',
},
...(props.user.userId
? [
{
Cell: ({
row: {
original: { id },
},
}: any) => (
<FaveStar
itemId={id}
saveFaveStar={saveFavoriteStatus}
isStarred={favoriteStatus[id]}
/>
),
Header: '',
id: 'id',
disableSortBy: true,
size: 'xs',
},
]
: []),
{
Cell: ({
row: {
Expand Down Expand Up @@ -357,7 +362,12 @@ function DashboardList(props: DashboardListProps) {
disableSortBy: true,
},
],
[canEdit, canDelete, canExport, favoriteStatus],
[
canEdit,
canDelete,
canExport,
...(props.user.userId ? [favoriteStatus] : []),
],
);

const filters: Filters = [
Expand Down Expand Up @@ -414,18 +424,22 @@ function DashboardList(props: DashboardListProps) {
{ label: t('Draft'), value: false },
],
},
{
Header: t('Favorite'),
id: 'id',
urlDisplay: 'favorite',
input: 'select',
operator: FilterOperator.dashboardIsFav,
unfilteredLabel: t('Any'),
selects: [
{ label: t('Yes'), value: true },
{ label: t('No'), value: false },
],
},
...(props.user.userId
? [
{
Header: t('Favorite'),
id: 'id',
urlDisplay: 'favorite',
input: 'select',
operator: FilterOperator.dashboardIsFav,
unfilteredLabel: t('Any'),
selects: [
{ label: t('Yes'), value: true },
{ label: t('No'), value: false },
],
} as Filter,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any way we can cleanly avoid using as Filter here? Ideally the type system would know that this object is compatible without a type assertion.

]
: []),
{
Header: t('Search'),
id: 'dashboard_title',
Expand Down
2 changes: 2 additions & 0 deletions superset/views/core.py
View file
Open in desktop
Expand Up @@ -1747,6 +1747,8 @@ def favstar( # pylint: disable=no-self-use
self, class_name: str, obj_id: int, action: str
) -> FlaskResponse:
"""Toggle favorite stars on Slices and Dashboard"""
if not g.user.get_id():
return json_error_response(f"ERROR: Favstar toggling denied", status=403)
suddjian marked this conversation as resolved.
Show resolved Hide resolved
session = db.session()
count = 0
favs = (
Expand Down