This is an automated email from the ASF dual-hosted git repository. yjc pushed a commit to branch home-screen-mvp in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 20915ae10287fd336f82c9884fa0de7b5d0bb0b8 Author: Phillip Kelley-Dotson <[email protected]> AuthorDate: Mon Oct 19 21:40:37 2020 -0700 fix typescript --- .../src/views/CRUD/chart/ChartCard.tsx | 3 --- superset-frontend/src/views/CRUD/utils.tsx | 2 +- .../src/views/CRUD/welcome/ActivityTable.tsx | 19 ++++++++------- .../src/views/CRUD/welcome/SavedQueries.tsx | 28 ++++++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx index d5cd625..39f94f0 100644 --- a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx +++ b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx @@ -18,7 +18,6 @@ */ import React from 'react'; import { useFavoriteStatus } from 'src/views/CRUD/hooks'; -// import { createFetchRelated, createErrorHandler } from 'src/views/CRUD/utils'; import { SupersetClient, t } from '@superset-ui/core'; import ConfirmStatusChange from 'src/components/ConfirmStatusChange'; import AvatarIcon from 'src/components/AvatarIcon'; @@ -141,8 +140,6 @@ export default function ChartCard({ fetchFaveStar={fetchFaveStar} saveFaveStar={saveFaveStar} isStarred={!!favoriteStatus[chart.id]} - height={20} - width={20} /> <Dropdown overlay={menu}> <Icon name="more-horiz" /> diff --git a/superset-frontend/src/views/CRUD/utils.tsx b/superset-frontend/src/views/CRUD/utils.tsx index 2208cc6..cf4c9ec 100644 --- a/superset-frontend/src/views/CRUD/utils.tsx +++ b/superset-frontend/src/views/CRUD/utils.tsx @@ -54,7 +54,7 @@ const createFetchResourceMethod = (method: string) => ( return []; }; -export const getBatchData = (userId: string, recent: string) => { +export const getBatchData = (userId: string | number, recent: string) => { const getParams = (filters?: Array<any>) => { const params = { order_column: 'changed_on_delta_humanized', diff --git a/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx b/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx index c9f0883..6c423f0 100644 --- a/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx +++ b/superset-frontend/src/views/CRUD/welcome/ActivityTable.tsx @@ -24,7 +24,7 @@ import ListViewCard from 'src/components/ListViewCard'; import { addDangerToast } from 'src/messageToasts/actions'; import SubMenu from 'src/components/Menu/SubMenu'; import { reject } from 'lodash'; -import { getBatchData, createErrorHandler } from '../utils'; +import { getBatchData } from '../utils'; import EmptyState from './EmptyState'; interface MapProps { @@ -44,15 +44,15 @@ interface MapProps { interface ActivityProps { user: { - userId: string; + userId: string | number; }; } interface ActivityData { - Created: Array<object>; - Edited: Array<object>; - Viewed: Array<object>; - Examples: Array<object>; + Created?: Array<object>; + Edited?: Array<object>; + Viewed?: Array<object>; + Examples?: Array<object>; } const ActivityContainer = styled.div` @@ -73,7 +73,7 @@ const ActivityContainer = styled.div` `; export default function ActivityTable({ user }: ActivityProps) { - const [activityData, setActivityData] = useState<ActivityData | {}>({}); + const [activityData, setActivityData] = useState<ActivityData>({}); const [loading, setLoading] = useState(true); const [activeChild, setActiveChild] = useState('Viewed'); // this api uses log for data which in some cases is can be empty @@ -143,7 +143,6 @@ export default function ActivityTable({ user }: ActivityProps) { Created: [...r.createdByChart, ...r.createdByDash], Edited: [...r.editedChart, ...r.editedDash], }; - console.log('r.viewed', r) if (r.viewed) { const filtered = reject(r.viewed, ['item_url', null]).map(r => r); data.Viewed = filtered; @@ -157,7 +156,9 @@ export default function ActivityTable({ user }: ActivityProps) { }) .catch(e => { setLoading(false); - addDangerToast(`e ${e}`); + addDangerToast( + `There was an issue fetching your recent Acitivity: ${e}`, + ); }); }, []); diff --git a/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx b/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx index 5a49ee5..82de6a3 100644 --- a/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx +++ b/superset-frontend/src/views/CRUD/welcome/SavedQueries.tsx @@ -24,7 +24,6 @@ import { useListViewResource, copyQueryLink } from 'src/views/CRUD/hooks'; import ListViewCard from 'src/components/ListViewCard'; import DeleteModal from 'src/components/DeleteModal'; import Icon from 'src/components/Icon'; -import { SavedQueryObject } from 'src/views/CRUD/types'; import SubMenu from 'src/components/Menu/SubMenu'; import EmptyState from './EmptyState'; @@ -33,15 +32,15 @@ import { IconContainer, CardContainer, createErrorHandler } from '../utils'; const PAGE_SIZE = 3; interface Query { - id: number; - sql_tables: Array<any>; - database: { + id?: number; + sql_tables?: Array<any>; + database?: { database_name: string; }; - rows: string; - description: string; - end_time: string; - label: string; + rows?: string; + description?: string; + end_time?: string; + label?: string; } interface SavedQueriesProps { @@ -66,12 +65,12 @@ const SavedQueries = ({ } = useListViewResource<Query>('saved_query', t('query'), addDangerToast); const [queryFilter, setQueryFilter] = useState('Favorite'); const [queryDeleteModal, setQueryDeleteModal] = useState(false); - const [currentlyEdited, setCurrentlyEdited] = useState(null); + const [currentlyEdited, setCurrentlyEdited] = useState<Query>({}); const canEdit = hasPerm('can_edit'); const canDelete = hasPerm('can_delete'); - const handleQueryDelete = ({ id, label }: SavedQueryObject) => { + const handleQueryDelete = ({ id, label }: Query) => { SupersetClient.delete({ endpoint: `/api/v1/saved_query/${id}`, }).then( @@ -132,7 +131,10 @@ const SavedQueries = ({ </Menu.Item> )} <Menu.Item - onClick={() => copyQueryLink(query.id, addDangerToast, addSuccessToast)} + onClick={() => { + if (query.id) + copyQueryLink(query.id, addDangerToast, addSuccessToast); + }} > Share </Menu.Item> @@ -215,8 +217,8 @@ const SavedQueries = ({ imgURL="" title={q.label} rows={q.rows} - tableName={q.sql_tables[0]?.table} - tables={q.sql_tables?.length} + tableName={q?.sql_tables && q.sql_tables[0].table} + tables={q?.sql_tables?.length} loading={loading} description={t('Last run ', q.end_time)} showImg={false}
