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

[GSoC2024] Add tooltip to long project card name #7550

Merged
merged 15 commits into from
Mar 14, 2024
+19 −12
Merged

[GSoC2024] Add tooltip to long project card name #7550

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bcf236e
Add tooltip to long project card name
Mar 4, 2024
1309d88
Add tooltip to long task card name
Mar 4, 2024
066b887
Update project-item.tsx
syedbarimanjan Mar 11, 2024
860156c
Update project card name tooltip
Mar 11, 2024
0dc03d0
Update task card name tooltip
Mar 11, 2024
a93386b
Add tooltip to long cloud storage card name
Mar 12, 2024
e24a86f
Add tooltip to long model card name
Mar 13, 2024
b55c481
Add Changelog
Mar 13, 2024
6970a3c
Update changelog.d/20240313_200940_syedbarimnajan_long_cardname_toolt…
bsekachev Mar 13, 2024
80f0711
Merge branch 'develop' into feature/long-cardname-tooltip
bsekachev Mar 13, 2024
b981a55
Update task-item.tsx
syedbarimanjan Mar 14, 2024
4bb880d
Remove styles
syedbarimanjan Mar 14, 2024
5ae6504
Update task-item.tsx
syedbarimanjan Mar 14, 2024
f4612db
Update task-item.tsx
syedbarimanjan Mar 14, 2024
7370214
Cleanup task-item.tsx
syedbarimanjan Mar 14, 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
9 changes: 8 additions & 1 deletion cvat-ui/src/components/projects-page/project-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Meta from 'antd/lib/card/Meta';
import Dropdown from 'antd/lib/dropdown';
import Button from 'antd/lib/button';
import Badge from 'antd/lib/badge';
import Tooltip from 'antd/lib/tooltip';
import { MoreOutlined } from '@ant-design/icons';

import { CombinedState, Project } from 'reducers';
Expand Down Expand Up @@ -85,7 +86,13 @@ export default function ProjectItemComponent(props: Props): JSX.Element {
className='cvat-projects-project-item-card'
>
<Meta
title={(
title={instance.name.length >= 21 ? (
<Tooltip title={instance.name} placement='topLeft'>
<span onClick={onOpenProject} className='cvat-projects-project-item-title' aria-hidden>
{instance.name}
</span>
</Tooltip>
) : (
<span onClick={onOpenProject} className='cvat-projects-project-item-title' aria-hidden>
{instance.name}
</span>
Expand Down
20 changes: 16 additions & 4 deletions cvat-ui/src/components/tasks-page/task-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { LoadingOutlined, MoreOutlined } from '@ant-design/icons';
import Dropdown from 'antd/lib/dropdown';
import Progress from 'antd/lib/progress';
import Badge from 'antd/lib/badge';
import Tooltip from 'antd/lib/tooltip';
import moment from 'moment';

import { Task, RQStatus } from 'cvat-core-wrapper';
Expand Down Expand Up @@ -121,10 +122,21 @@ class TaskItemComponent extends React.PureComponent<TaskItemProps & RouteCompone

return (
<Col span={10} className='cvat-task-item-description'>
<Text strong type='secondary' className='cvat-item-task-id'>{`#${id}: `}</Text>
<Text strong className='cvat-item-task-name'>
{name}
</Text>
{taskInstance.name.length > 70 ? (
<Tooltip title={taskInstance.name} placement='topLeft'>
<Text strong type='secondary' className='cvat-item-task-id'>{`#${id}: `}</Text>
<Text strong className='cvat-item-task-name'>
{name}
</Text>
</Tooltip>
) : (
<>
<Text strong type='secondary' className='cvat-item-task-id'>{`#${id}: `}</Text>
<Text strong className='cvat-item-task-name'>
{name}
</Text>
</>
)}
<br />
{owner && (
<>
Expand Down