supported display name in description (#14105)

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

View File

@ -52,6 +52,7 @@ import {
getClassificationExtraDropdownContent, getClassificationExtraDropdownContent,
getTagsTableColumn, getTagsTableColumn,
} from '../../utils/ClassificationUtils'; } from '../../utils/ClassificationUtils';
import { getEntityName } from '../../utils/EntityUtils';
import { import {
getEntityVersionByField, getEntityVersionByField,
getMutuallyExclusiveDiff, getMutuallyExclusiveDiff,
@ -501,10 +502,7 @@ function ClassificationDetails({
'opacity-60': isClassificationDisabled, 'opacity-60': isClassificationDisabled,
})} })}
description={description} description={description}
entityName={ entityName={getEntityName(currentClassification)}
currentClassification?.displayName ??
currentClassification?.fullyQualifiedName
}
hasEditAccess={editDescriptionPermission} hasEditAccess={editDescriptionPermission}
isEdit={isEditClassification} isEdit={isEditClassification}
onCancel={handleCancelEditDescription} onCancel={handleCancelEditDescription}

View File

@ -253,7 +253,7 @@ const ContainerDataModel: FC<ContainerDataModelProps> = ({
<ModalWithMarkdownEditor <ModalWithMarkdownEditor
header={`${t('label.edit-entity', { header={`${t('label.edit-entity', {
entity: t('label.column'), entity: t('label.column'),
})}: "${editContainerColumnDescription.name}"`} })}: "${getEntityName(editContainerColumnDescription)}"`}
placeholder={t('label.enter-field-description', { placeholder={t('label.enter-field-description', {
field: t('label.column'), field: t('label.column'),
})} })}

View File

@ -766,7 +766,7 @@ const DashboardDetails = ({
{editChart && ( {editChart && (
<ModalWithMarkdownEditor <ModalWithMarkdownEditor
header={t('label.edit-chart-name', { header={t('label.edit-chart-name', {
name: editChart.chart.displayName, name: getEntityName(editChart.chart),
})} })}
placeholder={t('label.enter-field-description', { placeholder={t('label.enter-field-description', {
field: t('label.chart'), field: t('label.chart'),

View File

@ -188,7 +188,7 @@ const ModelTab = ({
<ModalWithMarkdownEditor <ModalWithMarkdownEditor
header={`${t('label.edit-entity', { header={`${t('label.edit-entity', {
entity: t('label.column'), entity: t('label.column'),
})}: "${editColumnDescription.name}"`} })}: "${getEntityName(editColumnDescription)}"`}
placeholder={t('label.enter-field-description', { placeholder={t('label.enter-field-description', {
field: t('label.column'), field: t('label.column'),
})} })}

View File

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

View File

@ -741,7 +741,7 @@ const AssetsTabs = forwardRef(
<ConfirmationModal <ConfirmationModal
bodyText={t('message.are-you-sure-action-property', { bodyText={t('message.are-you-sure-action-property', {
propertyName: getEntityName(assetToDelete), propertyName: getEntityName(assetToDelete),
action: t('label.remove-lowecase'), action: t('label.remove-lowercase'),
})} })}
cancelText={t('label.cancel')} cancelText={t('label.cancel')}
confirmText={t('label.delete')} confirmText={t('label.delete')}

View File

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

View File

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

View File

@ -767,9 +767,9 @@ const PipelineDetails = ({
{editTask && ( {editTask && (
<ModalWithMarkdownEditor <ModalWithMarkdownEditor
header={`${t('label.edit-entity', { entity: t('label.task') })}: "${ header={`${t('label.edit-entity', {
editTask.task.displayName ?? editTask.task.name entity: t('label.task'),
}"`} })}: "${getEntityName(editTask.task)}"`}
placeholder={t('label.enter-field-description', { placeholder={t('label.enter-field-description', {
field: t('label.task-lowercase'), field: t('label.task-lowercase'),
})} })}

View File

@ -473,7 +473,7 @@ const SchemaTable = ({
<ModalWithMarkdownEditor <ModalWithMarkdownEditor
header={`${t('label.edit-entity', { header={`${t('label.edit-entity', {
entity: t('label.column'), entity: t('label.column'),
})}: "${editColumn.name}"`} })}: "${getEntityName(editColumn)}"`}
placeholder={t('message.enter-column-description')} placeholder={t('message.enter-column-description')}
value={editColumn.description as string} value={editColumn.description as string}
visible={Boolean(editColumn)} visible={Boolean(editColumn)}

View File

@ -1141,7 +1141,7 @@ const TeamDetailsV1 = ({
}> }>
<Description <Description
description={currentTeam.description ?? ''} description={currentTeam.description ?? ''}
entityName={currentTeam.displayName ?? currentTeam.name} entityName={getEntityName(currentTeam)}
isEdit={isDescriptionEditable} isEdit={isDescriptionEditable}
onCancel={() => descriptionHandler(false)} onCancel={() => descriptionHandler(false)}
onDescriptionUpdate={onDescriptionUpdate} onDescriptionUpdate={onDescriptionUpdate}

View File

@ -361,7 +361,7 @@ const TopicSchemaFields: FC<TopicSchemaFieldsProps> = ({
<ModalWithMarkdownEditor <ModalWithMarkdownEditor
header={`${t('label.edit-entity', { header={`${t('label.edit-entity', {
entity: t('label.schema-field'), entity: t('label.schema-field'),
})}: "${editFieldDescription.name}"`} })}: "${getEntityName(editFieldDescription)}"`}
placeholder={t('label.enter-field-description', { placeholder={t('label.enter-field-description', {
field: t('label.schema-field'), field: t('label.schema-field'),
})} })}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -186,7 +186,7 @@ const DatabaseDetails: FunctionComponent = () => {
setSchemaInstanceCount(paging.total); setSchemaInstanceCount(paging.total);
} catch (error) { } catch (error) {
showErrorToast(error); showErrorToast(error as AxiosError);
} finally { } finally {
setIsLoading(false); setIsLoading(false);
} }
@ -515,7 +515,7 @@ const DatabaseDetails: FunctionComponent = () => {
<DescriptionV1 <DescriptionV1
description={description} description={description}
entityFqn={decodedDatabaseFQN} entityFqn={decodedDatabaseFQN}
entityName={databaseName} entityName={getEntityName(database)}
entityType={EntityType.DATABASE} entityType={EntityType.DATABASE}
hasEditAccess={editDescriptionPermission} hasEditAccess={editDescriptionPermission}
isEdit={isEdit} isEdit={isEdit}

View File

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

View File

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

View File

@ -273,7 +273,7 @@ const SearchIndexFieldsTable = ({
<ModalWithMarkdownEditor <ModalWithMarkdownEditor
header={`${t('label.edit-entity', { header={`${t('label.edit-entity', {
entity: t('label.field'), entity: t('label.field'),
})}: "${editField.field.name}"`} })}: "${getEntityName(editField.field)}"`}
placeholder={t('label.enter-field-description', { placeholder={t('label.enter-field-description', {
field: t('label.field'), field: t('label.field'),
})} })}

View File

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

View File

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