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 tooltip issue with status icon #1002

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Fix tooltip issue with status icon #1002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d92c7a
Fix tooltip issue with status icon
jernestmyers Apr 12, 2024
96e128c
Merge branch 'main' into dataset-status-tooltip
jernestmyers Apr 23, 2024
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
35 changes: 23 additions & 12 deletions packages/libs/user-datasets/src/lib/Components/UserDatasetStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,27 @@ export default function UserDatasetStatus(props: Props) {

const link = `${baseUrl}/${userDataset.id}`;
const children = <Icon className="StatusIcon" fa={faIcon} />;
const visibleContent = props.useTooltip ? (
<Tooltip title={content ?? ''}>{children}</Tooltip>
) : (
<React.Fragment>
{children} {content}
</React.Fragment>
);
return props.linkToDataset ? (
<Link to={link}>{visibleContent}</Link>
) : (
visibleContent
);
if (props.useTooltip && props.linkToDataset) {
return (
<Tooltip title={content ?? ''}>
<Link to={link}>{children}</Link>
</Tooltip>
);
} else if (props.useTooltip && !props.linkToDataset) {
return <Tooltip title={content ?? ''}>{children}</Tooltip>;
} else if (!props.useTooltip && props.linkToDataset) {
return (
<Link to={link}>
<React.Fragment>
{children} {content}
</React.Fragment>
</Link>
);
} else {
return (
<React.Fragment>
{children} {content}
</React.Fragment>
);
}
}
Loading