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 c56c84df46d..34c3e49c4ef 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 @@ -553,7 +553,9 @@ export const DataAssetsHeader = ({ - {t('label.source-url')} + {t('label.view-in-service-type', { + serviceType: (dataAsset as Table).serviceType, + })} @@ -627,7 +629,7 @@ export const DataAssetsHeader = ({ data-testid="header-tier-container"> {tier ? (
-
+
{t('label.tier')} @@ -654,7 +656,7 @@ export const DataAssetsHeader = ({
) : (
-
+
{t('label.tier')} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx index 4bd75424c65..c70cc31b462 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx @@ -17,7 +17,10 @@ import { APIEndpoint, APIRequestMethod, } from '../../../generated/entity/data/apiEndpoint'; -import { Container } from '../../../generated/entity/data/container'; +import { + Container, + StorageServiceType, +} from '../../../generated/entity/data/container'; import { MOCK_TIER_DATA } from '../../../mocks/TableData.mock'; import { getDataQualityLineage } from '../../../rest/lineageAPI'; import { getContainerByName } from '../../../rest/storageAPI'; @@ -42,6 +45,7 @@ const mockProps: DataAssetsHeaderProps = { name: 's3_storage_sample', type: 'storageService', }, + serviceType: 'moc service' as StorageServiceType, } as Container, entityType: EntityType.CONTAINER, permissions: DEFAULT_ENTITY_PERMISSION, @@ -246,7 +250,9 @@ describe('DataAssetsHeader component', () => { expect(sourceUrlButton).toBeInTheDocument(); expect(sourceUrlLink).toHaveAttribute('href', mockSourceUrl); expect(sourceUrlLink).toHaveAttribute('target', '_blank'); - expect(screen.getByText('label.source-url')).toBeInTheDocument(); + expect(screen.getByText('label.view-in-service-type')).toBeInTheDocument(); + + ``; }); it('should not render source URL button when sourceUrl is not present', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less index 0ea3930ad78..552c8340af7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/data-asset-header.less @@ -124,4 +124,9 @@ .extra-info-container { max-width: 148px; } + .tier-heading-container { + svg { + fill: @de-active-color; + } + } } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx index 23bb689fb10..11c882b3b21 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx @@ -112,7 +112,7 @@ const EntityHeaderTitle = ({ wrap={false}> {icon && {icon}} {/* If we do not have displayName name only be shown in the bold from the below code */} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/CertificationTag.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/CertificationTag.tsx index bfa84cee405..9ced62681f4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/CertificationTag.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/CertificationTag.tsx @@ -27,11 +27,11 @@ const CertificationTag = ({ }) => { if (certification.tagLabel.style?.iconURL) { const name = getEntityName(certification.tagLabel); + const actualName = certification.tagLabel.name ?? ''; const tagSrc = getTagImageSrc(certification.tagLabel.style.iconURL); return (
{showName && ( - + {name} )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/certification-tag.less b/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/certification-tag.less index 8d413964b82..9cab16625b6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/certification-tag.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CertificationTag/certification-tag.less @@ -38,7 +38,13 @@ width: 16px; height: 16px; } - span { + span.bronze { + color: @red-16; + } + span.silver { + color: @grey-700; + } + span.gold { color: @yellow-11; } } 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 fbab75779ce..13e1ee26c6d 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 @@ -1497,6 +1497,7 @@ "view-definition": "Ansichtsdefinition", "view-detail-plural": "Details anzeigen", "view-entity": "{{entity}} anzeigen", + "view-in-service-type": "In {{serviceType}} anzeigen", "view-less": "Weniger anzeigen", "view-more": "Mehr anzeigen", "view-new-count": "{{count}} Neu anzeigen", 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 80c0f784895..a325251f8c9 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 @@ -1497,6 +1497,7 @@ "view-definition": "View Definition", "view-detail-plural": "View Details", "view-entity": "View {{entity}}", + "view-in-service-type": "View in {{serviceType}}", "view-less": "View less", "view-more": "View more", "view-new-count": "View {{count}} new", 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 8462b2129f8..4caab09e826 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 @@ -1497,6 +1497,7 @@ "view-definition": "View Definition", "view-detail-plural": "Ver detalles", "view-entity": "Ver {{entity}}", + "view-in-service-type": "Ver en {{serviceType}}", "view-less": "Ver menos", "view-more": "Ver más", "view-new-count": "Ver {{count}} nuevo", 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 8e3a90e37ef..0516c3da90f 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 @@ -1497,6 +1497,7 @@ "view-definition": "Définition de la Vue", "view-detail-plural": "Voir les détails", "view-entity": "Voir la {{entity}}", + "view-in-service-type": "Voir dans {{serviceType}}", "view-less": "Voir moins", "view-more": "Voir Plus", "view-new-count": "Voir {{count}} Nouveau", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json index 9d911ba98ce..f8e0a0cd1c2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/gl-es.json @@ -1497,6 +1497,7 @@ "view-definition": "Ver definición", "view-detail-plural": "Ver detalles", "view-entity": "Ver {{entity}}", + "view-in-service-type": "Ver en {{serviceType}}", "view-less": "Ver menos", "view-more": "Ver máis", "view-new-count": "Ver {{count}} novos", 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 d8fb779a173..61bc3ef1a51 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 @@ -1497,6 +1497,7 @@ "view-definition": "הצג תיאור", "view-detail-plural": "הצג פרטים", "view-entity": "הצג {{entity}}", + "view-in-service-type": "צפה ב-{{serviceType}}", "view-less": "הצג פחות", "view-more": "הצג עוד", "view-new-count": "הצג {{count}} חדש", 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 e05857c23dd..bd0974f1feb 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 @@ -1497,6 +1497,7 @@ "view-definition": "View Definition", "view-detail-plural": "詳細を表示", "view-entity": "{{entity}}を見る", + "view-in-service-type": "{{serviceType}}에서 보기", "view-less": "表示を減らす", "view-more": "もっと見る", "view-new-count": "View {{count}} new", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json index ecdc5de083a..9b534394306 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/ko-kr.json @@ -1497,6 +1497,7 @@ "view-definition": "정의 보기", "view-detail-plural": "View Details", "view-entity": "{{entity}} 보기", + "view-in-service-type": "View in {{serviceType}}", "view-less": "적게 보기", "view-more": "더 보기", "view-new-count": "{{count}}개 새 항목 보기", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json index b244efcf0b6..efb3547023f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/mr-in.json @@ -1497,6 +1497,7 @@ "view-definition": "परिभाषा पहा", "view-detail-plural": "तपशील पहा", "view-entity": "{{entity}} पहा", + "view-in-service-type": "{{serviceType}} मध्ये पहा", "view-less": "कमी पहा", "view-more": "अधिक पहा", "view-new-count": "{{count}} नवीन पहा", 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 f135818a0de..3249117d057 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 @@ -1497,6 +1497,7 @@ "view-definition": "Viewdefinitie", "view-detail-plural": "Details bekijken", "view-entity": "Bekijk {{entity}}", + "view-in-service-type": "Bekijk in {{serviceType}}", "view-less": "Minder weergeven", "view-more": "Bekijk meer", "view-new-count": "Bekijk {{count}} nieuw", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json index bb71001a455..5284f2afbc8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pr-pr.json @@ -1497,6 +1497,7 @@ "view-definition": "مشاهده تعریف", "view-detail-plural": "مشاهده جزئیات", "view-entity": "مشاهده {{entity}}", + "view-in-service-type": "در {{serviceType}} مشاهده کنید", "view-less": "Ver menos", "view-more": "مشاهده بیشتر", "view-new-count": "مشاهده {{count}} جدید", 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 577b908eac3..928fa1d1d0f 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 @@ -1497,6 +1497,7 @@ "view-definition": "Definição de Visualização", "view-detail-plural": "Ver detalhes", "view-entity": "Visualizar {{entity}}", + "view-in-service-type": "Ver no {{serviceType}}", "view-less": "Ver menos", "view-more": "Ver mais", "view-new-count": "Visualizar {{count}} novos", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json index 1d1a1bd0884..c34c2721529 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-pt.json @@ -1497,6 +1497,7 @@ "view-definition": "Definição de Visualização", "view-detail-plural": "Ver detalhes", "view-entity": "Visualizar {{entity}}", + "view-in-service-type": "Ver em {{serviceType}}", "view-less": "Ver menos", "view-more": "Ver mais", "view-new-count": "Visualizar {{count}} novos", 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 784ad11c733..cd05b4521ba 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 @@ -1497,6 +1497,7 @@ "view-definition": "Посмотреть определение", "view-detail-plural": "Просмотр деталей", "view-entity": "Посмотреть {{entity}}", + "view-in-service-type": "Просмотр в {{serviceType}}", "view-less": "Показать меньше", "view-more": "Посмотреть больше", "view-new-count": "Посмотреть {{count}} новых", diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json index deacae4deb1..3ba508d0f46 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/th-th.json @@ -1497,6 +1497,7 @@ "view-definition": "ดูคำจำกัดความ", "view-detail-plural": "ดูรายละเอียด", "view-entity": "ดู {{entity}}", + "view-in-service-type": "ดูใน {{serviceType}}", "view-less": "ดูน้อยลง", "view-more": "ดูเพิ่มเติม", "view-new-count": "ดู {{count}} ใหม่", 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 8d2363115de..6039e4af684 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 @@ -1497,6 +1497,7 @@ "view-definition": "查看定义", "view-detail-plural": "查看详情", "view-entity": "查看{{entity}}", + "view-in-service-type": "在 {{serviceType}} 中查看", "view-less": "查看较少", "view-more": "查看更多", "view-new-count": "查看{{count}}个新的", 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 24dc6131094..b31be91652e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/variables.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/variables.less @@ -65,6 +65,7 @@ @red-13: #fda29b; @red-14: #d92d20; @red-15: #e52315; +@red-16: #7e2410; @orange-1: #fff6ed; @orange-2: #c4320a; @@ -122,6 +123,7 @@ @grey-19: #363f72; @text-grey-muted: @grey-4; +@de-active-color: #6b7280; @font-size-base: 14px; @box-shadow-base: 0px 2px 10px rgba(0, 0, 0, 0.12); @white: #fff;