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: Use SPA Dataset link in Chart and Dashboard #20941

Merged
merged 4 commits into from
Aug 3, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3e1376
Use SPA Dataset link in Chart and Dashboard
EugeneTorap Aug 2, 2022
5cf0ee6
Validate datasourceUrl
EugeneTorap Aug 2, 2022
be78590
Show datasourceName when datasourceUrl is undefined
EugeneTorap Aug 2, 2022
f38a740
Merge branch 'master' into fix/dataset-link-in-spa-for-chart-and-dash…
EugeneTorap Aug 3, 2022
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
11 changes: 10 additions & 1 deletion superset-frontend/src/dashboard/components/AddSliceCard/AddSliceCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion superset-frontend/src/views/CRUD/chart/ChartList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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,
Expand Down