diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/complete.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/complete.svg index a24d92e0a7e..8dfd82f8a23 100644 --- a/openmetadata-ui/src/main/resources/ui/src/assets/svg/complete.svg +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/complete.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/in-progress.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/in-progress.svg index 280070de001..3725c9c7af3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/assets/svg/in-progress.svg +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/in-progress.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less index c2d27c8e75c..0a29aa46466 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less @@ -42,6 +42,10 @@ } .task-badge { + position: absolute; + left: 16px; + top: -12px; + padding: 0 8px; background: #f1edfd; border: 1px solid #c6b5f6; box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.06); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx index d695094199a..fc704da77d0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx @@ -11,12 +11,14 @@ * limitations under the License. */ -import { Popover } from 'antd'; +import Icon from '@ant-design/icons'; +import { Popover, Space, Typography } from 'antd'; import { isEqual } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; +import { ReactComponent as IconTaskClose } from '../../../assets/svg/complete.svg'; +import { ReactComponent as IconTaskOpen } from '../../../assets/svg/in-progress.svg'; import { ThreadTaskStatus } from '../../../generated/entity/feed/thread'; -import SVGIcons, { Icons } from '../../../utils/SvgUtils'; import './Badge.less'; const TaskBadge = ({ status }: { status: ThreadTaskStatus }) => { @@ -34,14 +36,16 @@ const TaskBadge = ({ status }: { status: ThreadTaskStatus }) => { overlayClassName="ant-popover-task-status" trigger="hover" zIndex={9999}> - - + - {t('label.task')} - + + {t('label.task')} + + ); };