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 a6f18ae8970..a71ada9f8a0 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 24cb26266d3..3889f3d3237 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/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx index b744129fa9e..aeca16ad0b9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx @@ -87,12 +87,12 @@ const FeedCardHeader: FC = ({ data-testid="tasklink" to={getTaskDetailPath(task)} onClick={(e) => e.stopPropagation()}> - + {`#${taskDetails?.id} `} {taskDetails?.type} - {t('label.for-lowercase')} + {t('label.for-lowercase')} {isEntityFeed ? ( {getEntityFieldDisplay(entityField)} @@ -114,17 +114,7 @@ const FeedCardHeader: FC = ({ ); const getAnnouncementLinkElement = entityCheck && ( - - {t('message.made-announcement-for-entity', { entity: entityType })}{' '} - - - {entityDisplayName(entityType, entityFQN)} - - - + {t('message.made-announcement')} ); return ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/AnnouncementThreads.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/AnnouncementThreads.tsx index cedc9791b95..ca5cb12f1e5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/AnnouncementThreads.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/AnnouncementThreads.tsx @@ -158,10 +158,12 @@ const AnnouncementThreads: FC = ({ {getAnnouncements(activeAnnouncements)} {Boolean(inActiveAnnouncements.length) && ( <> - + {t('label.inactive-announcement-plural')} - + )} 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 ca41d8036c6..a8d82b84366 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 @@ -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 }) => { - - {t('label.task')} - + {t('label.task')} ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less index 6a1ccb3133b..c56b55f93fd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less @@ -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 { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx index 04a024f56a5..fb3954ace35 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx @@ -495,7 +495,6 @@ export const DataAssetsHeader = ({ void; createPermission?: boolean; } @@ -45,7 +44,6 @@ const AnnouncementDrawer: FC = ({ onClose, entityFQN, entityType, - entityName, createPermission, }) => { const { t } = useTranslation(); @@ -59,7 +57,7 @@ const AnnouncementDrawer: FC = ({ data-testid="title" style={{ width: '100%' }}> - {t('label.announcement-on-entity', { entity: entityName })} + {t('label.announcement-plural')} diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json index dda4c1e822e..ee417d59f97 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json @@ -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.", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index dfd2b2cbe95..f04baf352bb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json index ee9735fb150..c6815bad1dd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json index 6ca815a7c4d..43f9989afc9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json index 5e4c2c003ca..6ddda73f836 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/he-he.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json index 1c67777e8fb..ba37b47a829 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json index cdf555c9db6..14736b004d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/nl-nl.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json index 46c11b3ba52..7ddaef9228f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json index a620bb6ed5f..89ead052c38 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json index 7dac8886803..0c8bcbb20cf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json @@ -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", diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less index 4e4261be55a..0446feec272 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less @@ -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;