Skip to content

Commit 35ca0bc

Browse files
authored
Merge pull request #112 from cloudera/DSE-47182
2 parents 6404a1c + 48b96af commit 35ca0bc

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

app/client/src/pages/DataGenerator/Finish.tsx

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ const Finish = () => {
255255
title: 'Review Dataset',
256256
description: 'Review your dataset to ensure it properly fits your usecase.',
257257
icon: <GradingIcon/>,
258-
href: getFilesURL(genDatasetResp?.export_path?.local || "")
258+
href: getFilesURL(genDatasetResp?.export_path?.local || ""),
259+
external: true
259260
},
260261
{
261262
avatar: '',
@@ -278,7 +279,8 @@ const Finish = () => {
278279
title: 'Review Dataset',
279280
description: 'Once your dataset finishes generating, you can review your dataset in the workbench files',
280281
icon: <GradingIcon/>,
281-
href: getFilesURL('')
282+
href: getFilesURL(''),
283+
external: true
282284
},
283285
{
284286
avatar: '',
@@ -361,7 +363,18 @@ const Finish = () => {
361363
<List
362364
itemLayout="horizontal"
363365
dataSource={isDemo ? nextStepsListPreview : nextStepsListNonPreview}
364-
renderItem={({ title, href, icon, description}, i) => (
366+
renderItem={({ title, href, icon, description, external }, i) => (
367+
external ?
368+
<Link to={href} target="_blank" rel="noopener noreferrer">
369+
<List.Item key={`${title}-${i}`}>
370+
<List.Item.Meta
371+
avatar={<Avatar style={{ backgroundColor: '#1677ff'}} icon={icon} />}
372+
title={title}
373+
description={description}
374+
/>
375+
</List.Item>
376+
</Link> :
377+
365378
<Link to={href}>
366379
<List.Item key={`${title}-${i}`}>
367380
<List.Item.Meta

app/client/src/pages/Home/TemplateCard.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ const TagsContainer = styled.div`
132132
}
133133
`;
134134

135-
const StyledTag = styled(Tag)`
136-
color: ${props => props.theme.color};
137-
background-color: ${props => props.theme.backgroundColor};
138-
border: 1px solid ${props => props.theme.borderColor};
135+
const StyledTag = styled(Tag)<{ $theme: { color: string; backgroundColor: string; borderColor: string } }>`
136+
color: ${props => props.$theme.color} !important;
137+
background-color: ${props => props.$theme.backgroundColor} !important;
138+
border: 1px solid ${props => props.$theme.borderColor} !important;
139139
`;
140140

141141

@@ -150,7 +150,7 @@ const TemplateCard: React.FC<Props> = ({ template }) => {
150150
const { color, backgroundColor, borderColor } = getTemplateTagColors(theme as string);
151151

152152
return (
153-
<StyledTag key={tag} theme={{ color, backgroundColor, borderColor }}>
153+
<StyledTag key={tag} $theme={{ color, backgroundColor, borderColor }}>
154154
<div className="tag-title" title={tag} style={{ maxWidth: '150px', color }}>
155155
{tag}
156156
</div>

0 commit comments

Comments
 (0)