mirror of
https://github.com/open-metadata/OpenMetadata.git
synced 2025-10-17 19:57:56 +00:00
MINOR : fix task card color code as per new ui (#14976)
* fix task card colors code as per new ui * fix card styling and remove enity fqn from announcement card in drawer * minor fix * text change for accouncement card header
This commit is contained in:
parent
7197356101
commit
20401ab1ec
@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 360" fill="none"><path fill="#0968da" d="M259.568 122.885c5.494 5.493 5.494 14.397 0 19.888l-94.339 94.342c-5.493 5.491-14.395 5.491-19.888 0l-44.909-44.912c-5.494-5.49-5.494-14.395 0-19.885 5.49-5.493 14.394-5.493 19.885 0l34.967 34.967 84.396-84.4c5.494-5.491 14.398-5.491 19.888 0ZM360 180c0 99.495-80.519 180-180 180C80.505 360 0 279.481 0 180 0 80.505 80.519 0 180 0c99.495 0 180 80.519 180 180Zm-28.125 0c0-83.95-67.937-151.875-151.875-151.875C96.05 28.125 28.125 96.062 28.125 180c0 83.949 67.937 151.875 151.875 151.875 83.949 0 151.875-67.937 151.875-151.875Z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 360" fill="none"><path fill="currentColor" d="M259.568 122.885c5.494 5.493 5.494 14.397 0 19.888l-94.339 94.342c-5.493 5.491-14.395 5.491-19.888 0l-44.909-44.912c-5.494-5.49-5.494-14.395 0-19.885 5.49-5.493 14.394-5.493 19.885 0l34.967 34.967 84.396-84.4c5.494-5.491 14.398-5.491 19.888 0ZM360 180c0 99.495-80.519 180-180 180C80.505 360 0 279.481 0 180 0 80.505 80.519 0 180 0c99.495 0 180 80.519 180 180Zm-28.125 0c0-83.95-67.937-151.875-151.875-151.875C96.05 28.125 28.125 96.062 28.125 180c0 83.949 67.937 151.875 151.875 151.875 83.949 0 151.875-67.937 151.875-151.875Z"/></svg>
|
Before Width: | Height: | Size: 634 B After Width: | Height: | Size: 639 B |
@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 361 361" fill="none"><path fill="#0968da" fill-rule="evenodd" d="M.134 180.133c0-99.41 80.589-180 180-180 99.412 0 180 80.59 180 180 0 99.413-80.588 180-180 180-99.411 0-180-80.587-180-180Zm180-152.307c-84.117 0-152.308 68.19-152.308 152.307 0 84.118 68.19 152.308 152.308 152.308s152.307-68.19 152.307-152.308c0-84.117-68.189-152.307-152.307-152.307Zm0 193.846c22.941 0 41.539-18.598 41.539-41.539 0-22.941-18.598-41.538-41.539-41.538-22.941 0-41.538 18.597-41.538 41.538 0 22.941 18.597 41.539 41.538 41.539Z" clip-rule="evenodd"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 361 361" fill="none"><path fill="currentColor" fill-rule="evenodd" d="M.134 180.133c0-99.41 80.589-180 180-180 99.412 0 180 80.59 180 180 0 99.413-80.588 180-180 180-99.411 0-180-80.587-180-180Zm180-152.307c-84.117 0-152.308 68.19-152.308 152.307 0 84.118 68.19 152.308 152.308 152.308s152.307-68.19 152.307-152.308c0-84.117-68.189-152.307-152.307-152.307Zm0 193.846c22.941 0 41.539-18.598 41.539-41.539 0-22.941-18.598-41.538-41.539-41.538-22.941 0-41.538 18.597-41.538 41.538 0 22.941 18.597 41.539 41.538 41.539Z" clip-rule="evenodd"/></svg>
|
Before Width: | Height: | Size: 592 B After Width: | Height: | Size: 597 B |
@ -87,12 +87,12 @@ const FeedCardHeader: FC<FeedHeaderProp> = ({
|
||||
data-testid="tasklink"
|
||||
to={getTaskDetailPath(task)}
|
||||
onClick={(e) => e.stopPropagation()}>
|
||||
<span>
|
||||
<span className="m-x-xss">
|
||||
{`#${taskDetails?.id} `}
|
||||
{taskDetails?.type}
|
||||
</span>
|
||||
</Link>
|
||||
<span>{t('label.for-lowercase')}</span>
|
||||
<span className="m-r-xss">{t('label.for-lowercase')}</span>
|
||||
{isEntityFeed ? (
|
||||
<span data-testid="headerText-entityField">
|
||||
{getEntityFieldDisplay(entityField)}
|
||||
@ -114,17 +114,7 @@ const FeedCardHeader: FC<FeedHeaderProp> = ({
|
||||
);
|
||||
|
||||
const getAnnouncementLinkElement = entityCheck && (
|
||||
<span>
|
||||
{t('message.made-announcement-for-entity', { entity: entityType })}{' '}
|
||||
<EntityPopOverCard entityFQN={entityFQN} entityType={entityType}>
|
||||
<Link
|
||||
className="break-all"
|
||||
data-testid="entitylink"
|
||||
to={prepareFeedLink(entityType, entityFQN)}>
|
||||
{entityDisplayName(entityType, entityFQN)}
|
||||
</Link>
|
||||
</EntityPopOverCard>
|
||||
</span>
|
||||
<span>{t('message.made-announcement')} </span>
|
||||
);
|
||||
|
||||
return (
|
||||
|
@ -158,10 +158,12 @@ const AnnouncementThreads: FC<ActivityThreadListProp> = ({
|
||||
{getAnnouncements(activeAnnouncements)}
|
||||
{Boolean(inActiveAnnouncements.length) && (
|
||||
<>
|
||||
<Typography.Text data-testid="inActive-announcements">
|
||||
<Typography.Text
|
||||
className="d-block m-t-lg"
|
||||
data-testid="inActive-announcements">
|
||||
{t('label.inactive-announcement-plural')}
|
||||
</Typography.Text>
|
||||
<Divider />
|
||||
<Divider className="m-t-xs m-b-xlg" />
|
||||
</>
|
||||
)}
|
||||
|
||||
|
@ -18,6 +18,7 @@ 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 { TEXT_BODY_COLOR } from '../../../constants/constants';
|
||||
import { ThreadTaskStatus } from '../../../generated/entity/feed/thread';
|
||||
import './task-badge.less';
|
||||
|
||||
@ -35,11 +36,9 @@ const TaskBadge = ({ status }: { status: ThreadTaskStatus }) => {
|
||||
<Icon
|
||||
alt="task-status"
|
||||
component={isTaskOpen ? IconTaskOpen : IconTaskClose}
|
||||
style={{ fontSize: '12px' }}
|
||||
style={{ fontSize: '12px', color: TEXT_BODY_COLOR }}
|
||||
/>
|
||||
<Typography.Text className="text-primary">
|
||||
{t('label.task')}
|
||||
</Typography.Text>
|
||||
<Typography.Text>{t('label.task')}</Typography.Text>
|
||||
</Space>
|
||||
</Tooltip>
|
||||
);
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
.announcement-badge-container {
|
||||
position: absolute;
|
||||
top: -12px;
|
||||
top: -9px;
|
||||
left: 16px;
|
||||
background: @announcement-background-dark;
|
||||
border-radius: 4px;
|
||||
@ -29,7 +29,7 @@
|
||||
.announcement-badge {
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
color: @announcement-border;
|
||||
color: @primary-color;
|
||||
}
|
||||
|
||||
.task-badge {
|
||||
|
@ -495,7 +495,6 @@ export const DataAssetsHeader = ({
|
||||
<AnnouncementDrawer
|
||||
createPermission={permissions?.EditAll}
|
||||
entityFQN={dataAsset.fullyQualifiedName ?? ''}
|
||||
entityName={entityName ?? ''}
|
||||
entityType={entityType}
|
||||
open={isAnnouncementDrawerOpen}
|
||||
onClose={handleCloseAnnouncementDrawer}
|
||||
|
@ -43,7 +43,6 @@ const mockProps = {
|
||||
open: true,
|
||||
entityType: 'string',
|
||||
entityFQN: 'string',
|
||||
entityName: 'string',
|
||||
onClose: jest.fn(),
|
||||
createPermission: true,
|
||||
};
|
||||
|
@ -35,7 +35,6 @@ interface Props {
|
||||
open: boolean;
|
||||
entityType: string;
|
||||
entityFQN: string;
|
||||
entityName: string;
|
||||
onClose: () => void;
|
||||
createPermission?: boolean;
|
||||
}
|
||||
@ -45,7 +44,6 @@ const AnnouncementDrawer: FC<Props> = ({
|
||||
onClose,
|
||||
entityFQN,
|
||||
entityType,
|
||||
entityName,
|
||||
createPermission,
|
||||
}) => {
|
||||
const { t } = useTranslation();
|
||||
@ -59,7 +57,7 @@ const AnnouncementDrawer: FC<Props> = ({
|
||||
data-testid="title"
|
||||
style={{ width: '100%' }}>
|
||||
<Typography.Text className="font-medium break-all">
|
||||
{t('label.announcement-on-entity', { entity: entityName })}
|
||||
{t('label.announcement-plural')}
|
||||
</Typography.Text>
|
||||
<CloseOutlined onClick={onClose} />
|
||||
</Space>
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Geben Sie eine Liste von Zeichenfolgen/Regex-Mustern als durch Kommas getrennte Werte ein.",
|
||||
"login-fail-attempt-message": "Allowed attampt on consicutive failed login to application.",
|
||||
"logout-confirmation": "Sind Sie sicher, dass Sie sich abmelden möchten?",
|
||||
"made-announcement-for-entity": "hat eine Ankündigung für {{entity}} gemacht.",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "Machen Sie eine Ankündigung!",
|
||||
"manage-airflow-api": "OpenMetadata - Verwaltete Airflow-APIs",
|
||||
"manage-airflow-api-failed": "Konnte OpenMetadata - Verwaltete Airflow-APIs nicht finden.",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Enter a list of strings/regex patterns as a comma separated value",
|
||||
"login-fail-attempt-message": "Allowed attempt on consecutive failed login to application.",
|
||||
"logout-confirmation": "Are you sure you want to logout?",
|
||||
"made-announcement-for-entity": "made an announcement for {{entity}}",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "Make an announcement!",
|
||||
"manage-airflow-api": "OpenMetadata - Managed Airflow APIs",
|
||||
"manage-airflow-api-failed": "Failed to find OpenMetadata - Managed Airflow APIs",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Ingrese una lista de cadenas/patrones regex como un valor separado por comas",
|
||||
"login-fail-attempt-message": "Allowed attampt on consicutive failed login to application.",
|
||||
"logout-confirmation": "Are you sure you want to logout?",
|
||||
"made-announcement-for-entity": "hizo un anuncio para {{entity}}",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "¡Haz un anuncio!",
|
||||
"manage-airflow-api": "OpenMetadata - APIs de Airflow",
|
||||
"manage-airflow-api-failed": "No se pudieron encontrar las APIs de Airflow",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Entrer une liste de chaînes / motifs regex comme une valeur séparée par des virgules",
|
||||
"login-fail-attempt-message": "Allowed attampt on consicutive failed login to application.",
|
||||
"logout-confirmation": "Are you sure you want to logout?",
|
||||
"made-announcement-for-entity": "a fait une annonce pour {{entity}}",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "Faire une annonce",
|
||||
"manage-airflow-api": "OpenMetadata - Managed Airflow APIs",
|
||||
"manage-airflow-api-failed": "Echec de la recherche d'OpenMetadata - API gérées par Airflow",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "הזן רשימה של מחרוזות / דפוסי Regex כערך מופרך בפסיקים",
|
||||
"login-fail-attempt-message": "ניתן עדיין לנסות במקרה של כמה ניסיונות כושלים רצופים להתחבר ליישום.",
|
||||
"logout-confirmation": "האם אתה בטוח שברצונך להתנתק?",
|
||||
"made-announcement-for-entity": "יצר הודעה עבור {{entity}}",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "פרסם הודעה!",
|
||||
"manage-airflow-api": "OpenMetadata - ממונה APIs ל-Airflow",
|
||||
"manage-airflow-api-failed": "נכשל במציאת OpenMetadata - Managed Airflow APIs",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Enter a list of strings/regex patterns as a comma separated value",
|
||||
"login-fail-attempt-message": "Allowed attampt on consicutive failed login to application.",
|
||||
"logout-confirmation": "Are you sure you want to logout?",
|
||||
"made-announcement-for-entity": "{{entity}}に対するお知らせを作成しました。",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "お知らせを作成してください!",
|
||||
"manage-airflow-api": "OpenMetadata - Managed Airflow APIs",
|
||||
"manage-airflow-api-failed": "Failed to find OpenMetadata - Managed Airflow APIs",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Voer een lijst met strings/regex-patronen in als een door komma's gescheiden waarde",
|
||||
"login-fail-attempt-message": "Toegestane poging bij opeenvolgende mislukte aanmelding bij de toepassing.",
|
||||
"logout-confirmation": "Weet je zeker dat je wilt uitloggen?",
|
||||
"made-announcement-for-entity": "heeft een aankondiging gedaan voor {{entity}}",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "Doe een aankondiging!",
|
||||
"manage-airflow-api": "OpenMetadata - Beheerde Airflow API's",
|
||||
"manage-airflow-api-failed": "Kan OpenMetadata - Beheerde Airflow API's niet vinden",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Insira uma lista de strings/padrões regex como um valor separado por vírgulas",
|
||||
"login-fail-attempt-message": "Tentativa permitida após falhas consecutivas de login no aplicativo.",
|
||||
"logout-confirmation": "Você tem certeza de que deseja sair?",
|
||||
"made-announcement-for-entity": "fez um anúncio para {{entity}}",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "Faça um anúncio!",
|
||||
"manage-airflow-api": "OpenMetadata - APIs Gerenciadas de Airflow",
|
||||
"manage-airflow-api-failed": "Falha ao encontrar OpenMetadata - APIs Gerenciadas de Airflow",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "Введите список строк/шаблонов регулярных выражений в виде значения, разделенного запятыми.",
|
||||
"login-fail-attempt-message": "Allowed attampt on consicutive failed login to application.",
|
||||
"logout-confirmation": "Вы уверены, что хотите выйти из системы?",
|
||||
"made-announcement-for-entity": "сделано объявление для {{entity}}",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "Сделайте объявление!",
|
||||
"manage-airflow-api": "OpenMetadata - Managed Airflow APIs",
|
||||
"manage-airflow-api-failed": "Не удалось найти OpenMetadata - Managed Airflow APIs",
|
||||
|
@ -1471,7 +1471,7 @@
|
||||
"list-of-strings-regex-patterns-csv": "以逗号分隔的值的形式输入字符串/正则表达式列表",
|
||||
"login-fail-attempt-message": "Allowed attampt on consicutive failed login to application.",
|
||||
"logout-confirmation": "您确定要注销登录吗?",
|
||||
"made-announcement-for-entity": "为{{entity}}发布了公告",
|
||||
"made-announcement": "made an announcement",
|
||||
"make-an-announcement": "发布公告",
|
||||
"manage-airflow-api": "OpenMetadata 管理的 Airflow APIs",
|
||||
"manage-airflow-api-failed": "未找到 OpenMetadata 管理的 Airflow APIs",
|
||||
|
@ -78,7 +78,7 @@
|
||||
@background-color: #ffffff;
|
||||
@radio-button-checked-bg: @primary-color-hover;
|
||||
@announcement-background: #e3f2fd30;
|
||||
@announcement-background-dark: #9dd6ffd6;
|
||||
@announcement-background-dark: #9dd6ff;
|
||||
@announcement-border: #2196f3;
|
||||
@test-parameter-bg-color: #e7ebf0;
|
||||
@group-title-color: #76746f;
|
||||
|
Loading…
x
Reference in New Issue
Block a user