yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-26 01:15:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

supported display name in description (#14105)

Browse Source
This commit is contained in:
Ashish Gupta 2023-11-24 15:30:02 +05:30 committed by GitHub
parent 1540329e1e
commit b25b5376cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx
View File

@ -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}

2
openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx
View File

@ -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'),
})}

2
openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
View File

@ -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'),

2
openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx
View File

@ -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'),
})}

3
openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx
View File

@ -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}

2
openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
View File

@ -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')}

12
openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx
View File

@ -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,

3
openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx
View File

@ -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'),

6
openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
View File

@ -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'),
})}

2
openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx
View File

@ -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)}

2
openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx
View File

@ -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}

2
openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx
View File

@ -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'),
})}

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json
View File

@ -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",

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
View File

@ -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",

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/es-es.json
View File

@ -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",

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/fr-fr.json
View File

@ -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",

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/ja-jp.json
View File

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

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/pt-br.json
View File

@ -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",

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/ru-ru.json
View File

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

2
openmetadata-ui/src/main/resources/ui/src/locale/languages/zh-cn.json
View File

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

4
openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx
View File

@ -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}

14
openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx
View File

@ -83,6 +83,8 @@ const PoliciesDetailPage = () => {
GlobalSettingOptions.POLICIES
);
const policyName = useMemo(() => getEntityName(policy), [policy]);
const breadcrumb = useMemo(
() => [
{
@ -90,11 +92,11 @@ const PoliciesDetailPage = () => {
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>

14
openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx
View File

@ -68,6 +68,8 @@ const RolesDetailPage = () => {
GlobalSettingOptions.ROLES
);
const roleName = useMemo(() => getEntityName(role), [role]);
const breadcrumb = useMemo(
() => [
{
@ -75,11 +77,11 @@ const RolesDetailPage = () => {
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>

2
openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx
View File

@ -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'),
})}

13
openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx
View File

@ -277,7 +277,7 @@ const TableDetailsPageV1 = () => {
setLoading(false);
}
},
[getEntityPermissionByFqn, setTablePermissions]
[tableFqn, getEntityPermissionByFqn, setTablePermissions]
);
useEffect(() => {
@ -560,6 +560,7 @@ const TableDetailsPageV1 = () => {
[
isEdit,
tableDetails,
entityName,
onDescriptionEdit,
onDescriptionUpdate,
editTagsPermission,
@ -808,11 +809,11 @@ const TableDetailsPageV1 = () => {
showErrorToast(
error as AxiosError,
t('server.entity-follow-error', {
entity: getEntityName(tableDetails),
entity: entityName,
})
);
}
}, [USERId, tableId, setTableDetails, getEntityFeedCount]);
}, [USERId, tableId, entityName, setTableDetails, getEntityFeedCount]);
const unFollowTable = useCallback(async () => {
try {
@ -835,11 +836,11 @@ const TableDetailsPageV1 = () => {
showErrorToast(
error as AxiosError,
t('server.entity-unfollow-error', {
entity: getEntityName(tableDetails),
entity: entityName,
})
);
}
}, [USERId, tableId, getEntityFeedCount, setTableDetails]);
}, [USERId, tableId, entityName, getEntityFeedCount, setTableDetails]);
const { isFollowing } = useMemo(() => {
return {
@ -854,7 +855,7 @@ const TableDetailsPageV1 = () => {
const versionHandler = useCallback(() => {
version &&
history.push(getVersionPath(EntityType.TABLE, tableFqn, version + ''));
}, [version]);
}, [version, tableFqn]);
const afterDeleteAction = useCallback(
(isSoftDelete?: boolean) =>

16
openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx
View File

@ -97,8 +97,8 @@ const TestSuiteDetailsPage = () => {
const { testSuiteDescription, testSuiteId, testOwner } = useMemo(() => {
return {
testOwner: testSuite?.owner,
testSuiteId: testSuite?.id,
testSuiteDescription: testSuite?.description,
testSuiteId: testSuite?.id ?? '',
testSuiteDescription: testSuite?.description ?? '',
};
}, [testSuite]);
@ -132,7 +132,7 @@ const TestSuiteDetailsPage = () => {
try {
const response = await getListTestCase({
fields: 'testCaseResult,testDefinition,testSuite',
testSuiteId: testSuiteId,
testSuiteId,
orderByLastExecutionDate: true,
...param,
limit: pageSize,
@ -156,7 +156,7 @@ const TestSuiteDetailsPage = () => {
try {
await addTestCaseToLogicalTestSuite({
testCaseIds,
testSuiteId: testSuite?.id ?? '',
testSuiteId,
});
setIsTestCaseModalOpen(false);
fetchTestCases();
@ -289,8 +289,8 @@ const TestSuiteDetailsPage = () => {
}, [testSuiteFQN]);
useEffect(() => {
if (testSuite?.id) {
fetchTestCases({ testSuiteId: testSuite.id });
if (testSuiteId) {
fetchTestCases({ testSuiteId });
}
}, [testSuite, pageSize]);
@ -360,8 +360,8 @@ const TestSuiteDetailsPage = () => {
<Description
className="test-suite-description"
description={testSuiteDescription || ''}
entityName={testSuite?.displayName ?? testSuite?.name}
description={testSuiteDescription}
entityName={getEntityName(testSuite)}
hasEditAccess={hasAccess}
isEdit={isDescriptionEditable}
onCancel={() => descriptionHandler(false)}