yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-30 01:59:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: fixed re-render issue in glossary term page (#14051)

Browse Source
This commit is contained in:
Shailesh Parmar 2023-11-22 11:33:17 +05:30 committed by GitHub
parent dc1d465b7e
commit 06d9ca3f49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import { Glossary } from '../../../../generated/entity/data/glossary';
import { GlossaryTerm } from '../../../../generated/entity/data/glossaryTerm'; import { GlossaryTerm } from '../../../../generated/entity/data/glossaryTerm';
import { ChangeDescription } from '../../../../generated/entity/type'; import { ChangeDescription } from '../../../../generated/entity/type';
import { TagLabel } from '../../../../generated/type/tagLabel'; import { TagLabel } from '../../../../generated/type/tagLabel';
import { getEntityName } from '../../../../utils/EntityUtils';
import { import {
getEntityVersionByField, getEntityVersionByField,
getEntityVersionTags, getEntityVersionTags,
@ -109,7 +110,7 @@ const GlossaryOverviewTab = ({
<Col span={24}> <Col span={24}>
<DescriptionV1 <DescriptionV1
description={glossaryDescription} description={glossaryDescription}
entityName={selectedData?.displayName ?? selectedData?.name} entityName={getEntityName(selectedData)}
entityType={EntityType.GLOSSARY} entityType={EntityType.GLOSSARY}
hasEditAccess={permissions.EditDescription || permissions.EditAll} hasEditAccess={permissions.EditDescription || permissions.EditAll}
isEdit={isDescriptionEditable} isEdit={isDescriptionEditable}

45
openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx
View File

@ -13,7 +13,7 @@
import { AxiosError } from 'axios'; import { AxiosError } from 'axios';
import { compare } from 'fast-json-patch'; import { compare } from 'fast-json-patch';
import React, { useEffect, useMemo, useState } from 'react'; import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useHistory, useParams } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder';
@ -248,28 +248,31 @@ const GlossaryPage = () => {
.finally(() => setDeleteStatus(LOADING_STATE.INITIAL)); .finally(() => setDeleteStatus(LOADING_STATE.INITIAL));
}; };
const handleGlossaryTermUpdate = async (updatedData: GlossaryTerm) => { const handleGlossaryTermUpdate = useCallback(
const jsonPatch = compare(selectedData as GlossaryTerm, updatedData); async (updatedData: GlossaryTerm) => {
try { const jsonPatch = compare(selectedData as GlossaryTerm, updatedData);
const response = await patchGlossaryTerm( try {
selectedData?.id as string, const response = await patchGlossaryTerm(
jsonPatch selectedData?.id as string,
); jsonPatch
if (response) { );
setSelectedData(response); if (response) {
if (selectedData?.name !== updatedData.name) { setSelectedData(response);
history.push(getGlossaryPath(response.fullyQualifiedName)); if (selectedData?.name !== updatedData.name) {
fetchGlossaryList(); history.push(getGlossaryPath(response.fullyQualifiedName));
fetchGlossaryList();
}
} else {
throw t('server.entity-updating-error', {
entity: t('label.glossary-term'),
});
} }
} else { } catch (error) {
throw t('server.entity-updating-error', { showErrorToast(error as AxiosError);
entity: t('label.glossary-term'),
});
} }
} catch (error) { },
showErrorToast(error as AxiosError); [selectedData]
} );
};
const handleGlossaryTermDelete = (id: string) => { const handleGlossaryTermDelete = (id: string) => {
setDeleteStatus(LOADING_STATE.WAITING); setDeleteStatus(LOADING_STATE.WAITING);