supported display name in description (#14105)

open-metadata · Nov 24, 2023 · b25b537 · b25b537
1 parent 1540329
commit b25b537
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 56 deletions.
diff --git a/...a-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx b/...a-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx
@@ -52,6 +52,7 @@ import {
   getClassificationExtraDropdownContent,
   getTagsTableColumn,
 } from '../../utils/ClassificationUtils';
+import { getEntityName } from '../../utils/EntityUtils';
 import {
   getEntityVersionByField,
   getMutuallyExclusiveDiff,
@@ -501,10 +502,7 @@ function ClassificationDetails({
             'opacity-60': isClassificationDisabled,
           })}
           description={description}
-          entityName={
-            currentClassification?.displayName ??
-            currentClassification?.fullyQualifiedName
-          }
+          entityName={getEntityName(currentClassification)}
           hasEditAccess={editDescriptionPermission}
           isEdit={isEditClassification}
           onCancel={handleCancelEditDescription}

diff --git a/...ain/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx b/...ain/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx
@@ -253,7 +253,7 @@ const ContainerDataModel: FC<ContainerDataModelProps> = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.column'),
-          })}: "${editContainerColumnDescription.name}"`}
+          })}: "${getEntityName(editContainerColumnDescription)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.column'),
           })}

diff --git a/...a-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/...a-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
@@ -766,7 +766,7 @@ const DashboardDetails = ({
       {editChart && (
         <ModalWithMarkdownEditor
           header={t('label.edit-chart-name', {
-            name: editChart.chart.displayName,
+            name: getEntityName(editChart.chart),
           })}
           placeholder={t('label.enter-field-description', {
             field: t('label.chart'),

diff --git a/...tadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx b/...tadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx
@@ -188,7 +188,7 @@ const ModelTab = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.column'),
-          })}: "${editColumnDescription.name}"`}
+          })}: "${getEntityName(editColumnDescription)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.column'),
           })}

diff --git a/...c/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx b/...c/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
@@ -21,6 +21,7 @@ import { EntityField } from '../../../constants/Feeds.constants';
 import { EntityType } from '../../../enums/entity.enum';
 import { ChangeDescription } from '../../../generated/entity/type';
 import { getFeedCounts } from '../../../utils/CommonUtils';
+import { getEntityName } from '../../../utils/EntityUtils';
 import { getEntityVersionByField } from '../../../utils/EntityVersionUtils';
 import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component';
 import DescriptionV1 from '../../common/EntityDescription/DescriptionV1';
@@ -133,7 +134,7 @@ const GlossaryDetails = ({
             <DescriptionV1
               description={description}
               entityFqn={glossary.fullyQualifiedName}
-              entityName={glossary.displayName ?? glossary.name}
+              entityName={getEntityName(glossary)}
               entityType={EntityType.GLOSSARY}
               hasEditAccess={permissions.EditDescription || permissions.EditAll}
               isEdit={isDescriptionEditable}

diff --git a/...src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx b/...src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
@@ -741,7 +741,7 @@ const AssetsTabs = forwardRef(
         <ConfirmationModal
           bodyText={t('message.are-you-sure-action-property', {
             propertyName: getEntityName(assetToDelete),
-            action: t('label.remove-lowecase'),
+            action: t('label.remove-lowercase'),
           })}
           cancelText={t('label.cancel')}
           confirmText={t('label.delete')}

diff --git a/...etadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx b/...etadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
@@ -97,6 +97,11 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
     [mlModelFqn]
   );
 
+  const mlModelName = useMemo(
+    () => getEntityName(mlModelDetail),
+    [mlModelDetail]
+  );
+
   const fetchResourcePermission = useCallback(async () => {
     try {
       const entityPermission = await getEntityPermission(
@@ -124,12 +129,12 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
       ...mlModelDetail,
       tier: getTierTags(mlModelDetail.tags ?? []),
       mlModelTags: getTagsWithoutTier(mlModelDetail.tags ?? []),
-      entityName: getEntityName(mlModelDetail),
+      entityName: mlModelName,
       isFollowing: mlModelDetail.followers?.some(
         ({ id }: { id: string }) => id === currentUser?.id
       ),
     };
-  }, [mlModelDetail]);
+  }, [mlModelDetail, mlModelName]);
 
   const fetchEntityFeedCount = () => {
     getFeedCounts(EntityType.MLMODEL, decodedMlModelFqn, setFeedCount);
@@ -392,7 +397,7 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
                 <DescriptionV1
                   description={mlModelDetail.description}
                   entityFqn={decodedMlModelFqn}
-                  entityName={mlModelDetail.name}
+                  entityName={mlModelName}
                   entityType={EntityType.MLMODEL}
                   hasEditAccess={editDescriptionPermission}
                   isEdit={isEdit}
@@ -514,6 +519,7 @@ const MlModelDetail: FC<MlModelDetailProp> = ({
       feedCount,
       activeTab,
       mlModelDetail,
+      mlModelName,
       mlModelPermissions,
       isEdit,
       getMlHyperParameters,

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx
@@ -21,6 +21,7 @@ import TableTags from '../../components/TableTags/TableTags.component';
 import { EntityType } from '../../enums/entity.enum';
 import { MlFeature } from '../../generated/entity/data/mlmodel';
 import { TagSource } from '../../generated/type/schema';
+import { getEntityName } from '../../utils/EntityUtils';
 import { createTagObject } from '../../utils/TagsUtils';
 import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder';
 import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor';
@@ -228,7 +229,7 @@ const MlModelFeaturesList = ({
           <ModalWithMarkdownEditor
             header={t('label.edit-entity-name', {
               entityType: t('label.feature'),
-              entityName: selectedFeature.name,
+              entityName: getEntityName(selectedFeature),
             })}
             placeholder={t('label.enter-field-description', {
               field: t('label.feature-lowercase'),

diff --git a/...ata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx b/...ata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
@@ -767,9 +767,9 @@ const PipelineDetails = ({
 
       {editTask && (
         <ModalWithMarkdownEditor
-          header={`${t('label.edit-entity', { entity: t('label.task') })}: "${
-            editTask.task.displayName ?? editTask.task.name
-          }"`}
+          header={`${t('label.edit-entity', {
+            entity: t('label.task'),
+          })}: "${getEntityName(editTask.task)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.task-lowercase'),
           })}

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx
@@ -473,7 +473,7 @@ const SchemaTable = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.column'),
-          })}: "${editColumn.name}"`}
+          })}: "${getEntityName(editColumn)}"`}
           placeholder={t('message.enter-column-description')}
           value={editColumn.description as string}
           visible={Boolean(editColumn)}

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx
@@ -1141,7 +1141,7 @@ const TeamDetailsV1 = ({
                     }>
                     <Description
                       description={currentTeam.description ?? ''}
-                      entityName={currentTeam.displayName ?? currentTeam.name}
+                      entityName={getEntityName(currentTeam)}
                       isEdit={isDescriptionEditable}
                       onCancel={() => descriptionHandler(false)}
                       onDescriptionUpdate={onDescriptionUpdate}

diff --git a/...metadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx b/...metadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx
@@ -361,7 +361,7 @@ const TopicSchemaFields: FC<TopicSchemaFieldsProps> = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.schema-field'),
-          })}: "${editFieldDescription.name}"`}
+          })}: "${getEntityName(editFieldDescription)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.schema-field'),
           })}

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
@@ -818,7 +818,7 @@
     "relevance": "Relevanz",
     "remove": "Entfernen",
     "remove-entity": "{{entity}} entfernen",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Entfernt",
     "removing-user": "Benutzer entfernen",
     "rename": "Umbenennen",

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
@@ -818,7 +818,7 @@
     "relevance": "Relevance",
     "remove": "Remove",
     "remove-entity": "Remove {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Removed",
     "removing-user": "Removing User",
     "rename": "Rename",

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
@@ -818,7 +818,7 @@
     "relevance": "Relevancia",
     "remove": "Eliminar",
     "remove-entity": "Eliminar {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Eliminado",
     "removing-user": "Eliminando usuario",
     "rename": "Rename",

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
@@ -818,7 +818,7 @@
     "relevance": "Pertinence",
     "remove": "Retirer",
     "remove-entity": "Retirer un·e {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Retiré",
     "removing-user": "Retirer un Utilisateur",
     "rename": "Renommer",

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
@@ -818,7 +818,7 @@
     "relevance": "Relevance",
     "remove": "除外",
     "remove-entity": "{{entity}}を除外",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "除外",
     "removing-user": "ユーザを除外する",
     "rename": "Rename",

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
@@ -818,7 +818,7 @@
     "relevance": "Relevância",
     "remove": "Remover",
     "remove-entity": "Remover {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Removido",
     "removing-user": "Removendo usuário",
     "rename": "Rename",

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
@@ -818,7 +818,7 @@
     "relevance": "Актуальность",
     "remove": "Удалить",
     "remove-entity": "Удалить {{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "Удаленный",
     "removing-user": "Удаление пользователя",
     "rename": "Переименовать",

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
@@ -818,7 +818,7 @@
     "relevance": "相关性",
     "remove": "删除",
     "remove-entity": "删除{{entity}}",
-    "remove-lowecase": "remove",
+    "remove-lowercase": "remove",
     "removed": "已删除",
     "removing-user": "正在删除用户",
     "rename": "重命名",

diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx
@@ -186,7 +186,7 @@ const DatabaseDetails: FunctionComponent = () => {
 
       setSchemaInstanceCount(paging.total);
     } catch (error) {
-      showErrorToast(error);
+      showErrorToast(error as AxiosError);
     } finally {
       setIsLoading(false);
     }
@@ -515,7 +515,7 @@ const DatabaseDetails: FunctionComponent = () => {
                   <DescriptionV1
                     description={description}
                     entityFqn={decodedDatabaseFQN}
-                    entityName={databaseName}
+                    entityName={getEntityName(database)}
                     entityType={EntityType.DATABASE}
                     hasEditAccess={editDescriptionPermission}
                     isEdit={isEdit}

diff --git a/...ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx b/...ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
@@ -83,18 +83,20 @@ const PoliciesDetailPage = () => {
     GlobalSettingOptions.POLICIES
   );
 
+  const policyName = useMemo(() => getEntityName(policy), [policy]);
+
   const breadcrumb = useMemo(
     () => [
       {
         name: t('label.policy-plural'),
         url: policiesPath,
       },
       {
-        name: getEntityName(policy),
+        name: policyName,
         url: '',
       },
     ],
-    [policy]
+    [policyName, policiesPath]
   );
 
   const fetchPolicy = async () => {
@@ -329,14 +331,14 @@ const PoliciesDetailPage = () => {
               className="m-b-0 m-t-xs"
               data-testid="heading"
               level={5}>
-              {getEntityName(policy)}
+              {policyName}
             </Typography.Title>
             <Description
               hasEditAccess
               className="m-b-md"
               description={policy.description || ''}
               entityFqn={policy.fullyQualifiedName}
-              entityName={getEntityName(policy)}
+              entityName={policyName}
               entityType={EntityType.POLICY}
               isEdit={editDescription}
               onCancel={() => setEditDescription(false)}
@@ -486,7 +488,7 @@ const PoliciesDetailPage = () => {
           open={!isUndefined(selectedEntity.record)}
           title={`${t('label.remove-entity', {
             entity: getEntityName(selectedEntity.record),
-          })} ${t('label.from-lowercase')} ${getEntityName(policy)}`}
+          })} ${t('label.from-lowercase')} ${policyName}`}
           onCancel={() => setEntity(undefined)}
           onOk={async () => {
             await handleDelete(selectedEntity.record, selectedEntity.attribute);
@@ -495,7 +497,7 @@ const PoliciesDetailPage = () => {
           <Typography.Text>
             {t('message.are-you-sure-you-want-to-remove-child-from-parent', {
               child: getEntityName(selectedEntity.record),
-              parent: getEntityName(policy),
+              parent: policyName,
             })}
           </Typography.Text>
         </Modal>

diff --git a/...metadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx b/...metadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
@@ -68,18 +68,20 @@ const RolesDetailPage = () => {
     GlobalSettingOptions.ROLES
   );
 
+  const roleName = useMemo(() => getEntityName(role), [role]);
+
   const breadcrumb = useMemo(
     () => [
       {
         name: t('label.role-plural'),
         url: rolesPath,
       },
       {
-        name: getEntityName(role),
+        name: roleName,
         url: '',
       },
     ],
-    [role]
+    [rolesPath, roleName]
   );
 
   const fetchRole = async () => {
@@ -251,14 +253,14 @@ const RolesDetailPage = () => {
               className="m-b-0 m-t-xs"
               data-testid="heading"
               level={5}>
-              {getEntityName(role)}
+              {roleName}
             </Typography.Title>
             <Description
               hasEditAccess
               className="m-b-md"
               description={role.description || ''}
               entityFqn={role.fullyQualifiedName}
-              entityName={getEntityName(role)}
+              entityName={roleName}
               entityType={EntityType.ROLE}
               isEdit={editDescription}
               onCancel={() => setEditDescription(false)}
@@ -328,7 +330,7 @@ const RolesDetailPage = () => {
           open={!isUndefined(selectedEntity.record)}
           title={`${t('label.remove-entity', {
             entity: getEntityName(selectedEntity.record),
-          })} ${t('label.from-lowercase')} ${getEntityName(role)}`}
+          })} ${t('label.from-lowercase')} ${roleName}`}
           onCancel={() => setEntity(undefined)}
           onOk={async () => {
             await handleDelete(selectedEntity.record, selectedEntity.attribute);
@@ -337,7 +339,7 @@ const RolesDetailPage = () => {
           <Typography.Text>
             {t('message.are-you-sure-you-want-to-remove-child-from-parent', {
               child: getEntityName(selectedEntity.record),
-              parent: getEntityName(role),
+              parent: roleName,
             })}
           </Typography.Text>
         </Modal>

diff --git a/...ces/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx b/...ces/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx
@@ -273,7 +273,7 @@ const SearchIndexFieldsTable = ({
         <ModalWithMarkdownEditor
           header={`${t('label.edit-entity', {
             entity: t('label.field'),
-          })}: "${editField.field.name}"`}
+          })}: "${getEntityName(editField.field)}"`}
           placeholder={t('label.enter-field-description', {
             field: t('label.field'),
           })}