You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2022/04/04 07:51:20 UTC
[superset] branch 1.5 updated (ff44cb077f -> 1a2c56159e)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a change to branch 1.5
in repository https://gitbox.apache.org/repos/asf/superset.git
from ff44cb077f update changelog, updating and version
new 454a5a321d Revert "fix: Remove`time_range_endpoints` from query context object (#19423)"
new c60cf13117 fix(dashboard list): do not show favorite star for anonymous users #18210 (#19409)
new 1a2c56159e update changelog
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 2 +-
.../src/components/ListViewCard/index.tsx | 2 +-
.../src/views/CRUD/dashboard/DashboardCard.tsx | 14 ++--
.../views/CRUD/dashboard/DashboardList.test.jsx | 68 +++++++++++++++++--
.../src/views/CRUD/dashboard/DashboardList.tsx | 79 ++++++++++++++--------
superset-frontend/src/views/CRUD/utils.tsx | 2 +-
...2ed890b36b94_rm_time_range_endpoints_from_qc.py | 66 ------------------
7 files changed, 121 insertions(+), 112 deletions(-)
delete mode 100644 superset/migrations/versions/2ed890b36b94_rm_time_range_endpoints_from_qc.py
[superset] 03/03: update changelog
Posted by vi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 1a2c56159ef2009d1119be204440496b1f14fc61
Author: Ville Brofeldt <vi...@gmail.com>
AuthorDate: Mon Apr 4 10:50:25 2022 +0300
update changelog
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ba0c9b4e1..977136b005 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,6 @@ under the License.
### 1.5.0 (Fri Apr 1 13:05:03 2022 +0300)
**Database Migrations**
-- [#19423](https://github.com/apache/superset/pull/19423) fix: Remove`time_range_endpoints` from query context object (@hughhhh)
- [#19416](https://github.com/apache/superset/pull/19416) perf: improve perf in SIP-68 migration (@betodealmeida)
- [#19410](https://github.com/apache/superset/pull/19410) chore: upgrade black (@villebro)
- [#19225](https://github.com/apache/superset/pull/19225) fix(sql lab): deleting the last saved query or the last executed from history (@diegomedina248)
@@ -173,6 +172,7 @@ under the License.
- [#17001](https://github.com/apache/superset/pull/17001) feat(linting): restrict direct use of supersetTheme in favor of ThemeProvider (@rusackas)
**Fixes**
+- [#19409](https://github.com/apache/superset/pull/19409) fix(dashboard list): do not show favorite star for anonymous users (@dudasaron)
- [#19483](https://github.com/apache/superset/pull/19483) fix: flaky test for charts changed on (@zhaoyongjie)
- [#19366](https://github.com/apache/superset/pull/19366) fix: can't sync temporal flag on virtual table (@zhaoyongjie)
- [#19456](https://github.com/apache/superset/pull/19456) fix: request samples with default row limit (@villebro)
[superset] 02/03: fix(dashboard list): do not show favorite star for anonymous users #18210 (#19409)
Posted by vi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/superset.git
commit c60cf13117067ea12c6025b4a952b272ca7f8808
Author: dudasaron <68...@users.noreply.github.com>
AuthorDate: Mon Apr 4 09:38:44 2022 +0200
fix(dashboard list): do not show favorite star for anonymous users #18210 (#19409)
* fix: Only show favorite star on dashboard list if user is logged in #18210
* Fix linter errors
---
.../src/components/ListViewCard/index.tsx | 2 +-
.../src/views/CRUD/dashboard/DashboardCard.tsx | 14 ++--
.../views/CRUD/dashboard/DashboardList.test.jsx | 68 +++++++++++++++++--
.../src/views/CRUD/dashboard/DashboardList.tsx | 79 ++++++++++++++--------
superset-frontend/src/views/CRUD/utils.tsx | 2 +-
5 files changed, 120 insertions(+), 45 deletions(-)
diff --git a/superset-frontend/src/components/ListViewCard/index.tsx b/superset-frontend/src/components/ListViewCard/index.tsx
index 79616c86ac..153b06489b 100644
--- a/superset-frontend/src/components/ListViewCard/index.tsx
+++ b/superset-frontend/src/components/ListViewCard/index.tsx
@@ -26,7 +26,7 @@ import CertifiedBadge from '../CertifiedBadge';
const ActionsWrapper = styled.div`
width: 64px;
display: flex;
- justify-content: space-between;
+ justify-content: flex-end;
`;
const StyledCard = styled(AntdCard)`
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
index 25a012f86b..2da9f45515 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
@@ -44,7 +44,7 @@ interface DashboardCardProps {
saveFavoriteStatus: (id: number, isStarred: boolean) => void;
favoriteStatus: boolean;
dashboardFilter?: string;
- userId?: number;
+ userId?: string | number;
showThumbnails?: boolean;
handleBulkDashboardExport: (dashboardsToExport: Dashboard[]) => void;
}
@@ -171,11 +171,13 @@ function DashboardCard({
e.preventDefault();
}}
>
- <FaveStar
- itemId={dashboard.id}
- saveFaveStar={saveFavoriteStatus}
- isStarred={favoriteStatus}
- />
+ {userId && (
+ <FaveStar
+ itemId={dashboard.id}
+ saveFaveStar={saveFavoriteStatus}
+ isStarred={favoriteStatus}
+ />
+ )}
<AntdDropdown overlay={menu}>
<Icons.MoreVert iconColor={theme.colors.grayscale.base} />
</AntdDropdown>
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx
index 3561cafdbc..e42ba92ff2 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.test.jsx
@@ -36,6 +36,9 @@ import DashboardList from 'src/views/CRUD/dashboard/DashboardList';
import ListView from 'src/components/ListView';
import ListViewCard from 'src/components/ListViewCard';
import PropertiesModal from 'src/dashboard/components/PropertiesModal';
+import FaveStar from 'src/components/FaveStar';
+import TableCollection from 'src/components/TableCollection';
+import CardCollection from 'src/components/ListView/CardCollection';
// store needed for withToasts(DashboardTable)
const mockStore = configureStore([thunk]);
@@ -104,15 +107,18 @@ describe('DashboardList', () => {
});
const mockedProps = {};
- const wrapper = mount(
- <MemoryRouter>
- <Provider store={store}>
- <DashboardList {...mockedProps} user={mockUser} />
- </Provider>
- </MemoryRouter>,
- );
+ let wrapper;
beforeAll(async () => {
+ fetchMock.resetHistory();
+ wrapper = mount(
+ <MemoryRouter>
+ <Provider store={store}>
+ <DashboardList {...mockedProps} user={mockUser} />
+ </Provider>
+ </MemoryRouter>,
+ );
+
await waitForComponentToPaint(wrapper);
});
@@ -178,6 +184,18 @@ describe('DashboardList', () => {
await waitForComponentToPaint(wrapper);
expect(wrapper.find(ConfirmStatusChange)).toExist();
});
+
+ it('renders the Favorite Star column in list view for logged in user', async () => {
+ wrapper.find('[aria-label="list-view"]').first().simulate('click');
+ await waitForComponentToPaint(wrapper);
+ expect(wrapper.find(TableCollection).find(FaveStar)).toExist();
+ });
+
+ it('renders the Favorite Star in card view for logged in user', async () => {
+ wrapper.find('[aria-label="card-view"]').first().simulate('click');
+ await waitForComponentToPaint(wrapper);
+ expect(wrapper.find(CardCollection).find(FaveStar)).toExist();
+ });
});
describe('RTL', () => {
@@ -222,3 +240,39 @@ describe('RTL', () => {
expect(importTooltip).toBeInTheDocument();
});
});
+
+describe('DashboardList - anonymous view', () => {
+ const mockedProps = {};
+ const mockUserLoggedOut = {};
+ let wrapper;
+
+ beforeAll(async () => {
+ fetchMock.resetHistory();
+ wrapper = mount(
+ <MemoryRouter>
+ <Provider store={store}>
+ <DashboardList {...mockedProps} user={mockUserLoggedOut} />
+ </Provider>
+ </MemoryRouter>,
+ );
+
+ await waitForComponentToPaint(wrapper);
+ });
+
+ afterAll(() => {
+ cleanup();
+ fetch.resetMocks();
+ });
+
+ it('does not render the Favorite Star column in list view for anonymous user', async () => {
+ wrapper.find('[aria-label="list-view"]').first().simulate('click');
+ await waitForComponentToPaint(wrapper);
+ expect(wrapper.find(TableCollection).find(FaveStar)).not.toExist();
+ });
+
+ it('does not render the Favorite Star in card view for anonymous user', async () => {
+ wrapper.find('[aria-label="card-view"]').first().simulate('click');
+ await waitForComponentToPaint(wrapper);
+ expect(wrapper.find(CardCollection).find(FaveStar)).not.toExist();
+ });
+});
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
index aa1b9fc7b7..6b4bb04b1c 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
@@ -17,7 +17,7 @@
* under the License.
*/
import { styled, SupersetClient, t } from '@superset-ui/core';
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, useCallback } from 'react';
import { Link } from 'react-router-dom';
import rison from 'rison';
import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
@@ -96,7 +96,11 @@ const Actions = styled.div`
`;
function DashboardList(props: DashboardListProps) {
- const { addDangerToast, addSuccessToast } = props;
+ const {
+ addDangerToast,
+ addSuccessToast,
+ user: { userId },
+ } = props;
const {
state: {
@@ -144,7 +148,6 @@ function DashboardList(props: DashboardListProps) {
addSuccessToast(t('Dashboard imported'));
};
- const { userId } = props.user;
// TODO: Fix usage of localStorage keying on the user id
const userKey = dangerouslyGetItemDoNotUse(userId?.toString(), null);
@@ -233,27 +236,25 @@ function DashboardList(props: DashboardListProps) {
const columns = useMemo(
() => [
- ...(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: {
+ original: { id },
+ },
+ }: any) =>
+ userId && (
+ <FaveStar
+ itemId={id}
+ saveFaveStar={saveFavoriteStatus}
+ isStarred={favoriteStatus[id]}
+ />
+ ),
+ Header: '',
+ id: 'id',
+ disableSortBy: true,
+ size: 'xs',
+ hidden: !userId,
+ },
{
Cell: ({
row: {
@@ -423,10 +424,15 @@ function DashboardList(props: DashboardListProps) {
},
],
[
+ userId,
canEdit,
canDelete,
canExport,
- ...(props.user.userId ? [favoriteStatus] : []),
+ saveFavoriteStatus,
+ favoriteStatus,
+ refreshData,
+ addSuccessToast,
+ addDangerToast,
],
);
@@ -501,7 +507,7 @@ function DashboardList(props: DashboardListProps) {
{ label: t('Draft'), value: false },
],
},
- ...(props.user.userId ? [favoritesFilter] : []),
+ ...(userId ? [favoritesFilter] : []),
{
Header: t('Certified'),
id: 'id',
@@ -545,8 +551,8 @@ function DashboardList(props: DashboardListProps) {
},
];
- function renderCard(dashboard: Dashboard) {
- return (
+ const renderCard = useCallback(
+ (dashboard: Dashboard) => (
<DashboardCard
dashboard={dashboard}
hasPerm={hasPerm}
@@ -557,6 +563,7 @@ function DashboardList(props: DashboardListProps) {
? userKey.thumbnails
: isFeatureEnabled(FeatureFlag.THUMBNAILS)
}
+ userId={userId}
loading={loading}
addDangerToast={addDangerToast}
addSuccessToast={addSuccessToast}
@@ -565,8 +572,20 @@ function DashboardList(props: DashboardListProps) {
favoriteStatus={favoriteStatus[dashboard.id]}
handleBulkDashboardExport={handleBulkDashboardExport}
/>
- );
- }
+ ),
+ [
+ addDangerToast,
+ addSuccessToast,
+ bulkSelectEnabled,
+ favoriteStatus,
+ hasPerm,
+ loading,
+ userId,
+ refreshData,
+ saveFavoriteStatus,
+ userKey,
+ ],
+ );
const subMenuButtons: SubMenuProps['buttons'] = [];
if (canDelete || canExport) {
diff --git a/superset-frontend/src/views/CRUD/utils.tsx b/superset-frontend/src/views/CRUD/utils.tsx
index 3449d764ab..7f069a3e7c 100644
--- a/superset-frontend/src/views/CRUD/utils.tsx
+++ b/superset-frontend/src/views/CRUD/utils.tsx
@@ -285,7 +285,7 @@ export function handleDashboardDelete(
addSuccessToast: (arg0: string) => void,
addDangerToast: (arg0: string) => void,
dashboardFilter?: string,
- userId?: number,
+ userId?: string | number,
) {
return SupersetClient.delete({
endpoint: `/api/v1/dashboard/${id}`,
[superset] 01/03: Revert "fix: Remove`time_range_endpoints` from query context object (#19423)"
Posted by vi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 454a5a321d3f4cae9befcdc09836627284c88a4a
Author: Ville Brofeldt <vi...@gmail.com>
AuthorDate: Mon Apr 4 10:47:50 2022 +0300
Revert "fix: Remove`time_range_endpoints` from query context object (#19423)"
This reverts commit 4caba8c464885eab5e83b642e6d22a8f215b0309.
---
...2ed890b36b94_rm_time_range_endpoints_from_qc.py | 66 ----------------------
1 file changed, 66 deletions(-)
diff --git a/superset/migrations/versions/2ed890b36b94_rm_time_range_endpoints_from_qc.py b/superset/migrations/versions/2ed890b36b94_rm_time_range_endpoints_from_qc.py
deleted file mode 100644
index 34b833dabd..0000000000
--- a/superset/migrations/versions/2ed890b36b94_rm_time_range_endpoints_from_qc.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.
-"""rm_time_range_endpoints_from_qc
-
-Revision ID: 2ed890b36b94
-Revises: 58df9d617f14
-Create Date: 2022-03-29 18:03:48.977741
-
-"""
-
-# revision identifiers, used by Alembic.
-revision = "2ed890b36b94"
-down_revision = "58df9d617f14"
-
-import json
-
-import sqlalchemy as sa
-from alembic import op
-from sqlalchemy.dialects import postgresql
-from sqlalchemy.ext.declarative import declarative_base
-
-from superset import db
-
-Base = declarative_base()
-
-
-class Slice(Base):
- __tablename__ = "slices"
- id = sa.Column(sa.Integer, primary_key=True)
- query_context = sa.Column(sa.Text)
-
-
-def upgrade():
- bind = op.get_bind()
- session = db.Session(bind=bind)
- for slc in session.query(Slice):
- if slc.query_context:
- try:
- query_context = json.loads(slc.query_context)
- except json.decoder.JSONDecodeError:
- continue
- queries = query_context.get("queries")
- for query in queries:
- query.get("extras", {}).pop("time_range_endpoints", None)
- slc.queries = json.dumps(queries)
-
- session.commit()
- session.close()
-
-
-def downgrade():
- pass