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

fix: Use SPA Dataset link in Chart and Dashboard (#20941) 

* Use SPA Dataset link in Chart and Dashboard

* Validate datasourceUrl

* Show datasourceName when datasourceUrl is undefined
This commit is contained in:
EugeneTorap 2022-08-03 10:09:33 +03:00 committed by GitHub
parent bce32af19b
commit 96a63bcbfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx
View File

@ -29,6 +29,7 @@ import { t, isFeatureEnabled, FeatureFlag, css } from '@superset-ui/core';
import ImageLoader from 'src/components/ListViewCard/ImageLoader';
import { usePluginContext } from 'src/components/DynamicPlugins';
import { Tooltip } from 'src/components/Tooltip';
import { GenericLink } from 'src/components/GenericLink/GenericLink';
import { Theme } from '@emotion/react';
const FALLBACK_THUMBNAIL_URL = '/static/assets/images/chart-card-fallback.svg';
@ -264,7 +265,15 @@ const AddSliceCard: React.FC<{
<MetadataItem label={t('Viz type')} value={vizName} />
<MetadataItem
label={t('Dataset')}
value={<a href={datasourceUrl}>{datasourceName}</a>}
value={
datasourceUrl ? (
<GenericLink to={datasourceUrl}>
{datasourceName}
</GenericLink>
) : (
datasourceName
)
}
/>
<MetadataItem label={t('Modified')} value={lastModified} />
</div>

3
superset-frontend/src/views/CRUD/chart/ChartList.tsx
View File

@ -61,6 +61,7 @@ import { nativeFilterGate } from 'src/dashboard/components/nativeFilters/utils';
import setupPlugins from 'src/setup/setupPlugins';
import InfoTooltip from 'src/components/InfoTooltip';
import CertifiedBadge from 'src/components/CertifiedBadge';
import { GenericLink } from 'src/components/GenericLink/GenericLink';
import ChartCard from './ChartCard';
const FlexRowContainer = styled.div`
@ -310,7 +311,7 @@ function ChartList(props: ChartListProps) {
datasource_url: dsUrl,
},
},
}: any) => <a href={dsUrl}>{dsNameTxt}</a>,
}: any) => <GenericLink to={dsUrl}>{dsNameTxt}</GenericLink>,
Header: t('Dataset'),
accessor: 'datasource_id',
disableSortBy: true,