From fec0c90faf5d441bf2355f6464ebee76f5aa11bf Mon Sep 17 00:00:00 2001
From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
Date: Mon, 20 Nov 2023 15:59:00 +0530
Subject: [PATCH] fix(ui): #13963 glossary term custom property update

---
 .../GlossaryTerms/GlossaryTermsV1.component.tsx  | 16 ++++++++++------
 .../CustomPropertyTable/CustomPropertyTable.tsx  |  8 +++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx
index 9bd5337a7e3d..dd420b940f5b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx
@@ -109,12 +109,15 @@ const GlossaryTermsV1 = ({
     tab !== 'assets' && activeTabHandler('assets');
   }, [assetTabRef, tab]);
 
-  const onExtensionUpdate = async (updatedTable: GlossaryTerm) => {
-    await handleGlossaryTermUpdate({
-      ...glossaryTerm,
-      extension: updatedTable.extension,
-    });
-  };
+  const onExtensionUpdate = useCallback(
+    async (updatedTable: GlossaryTerm) => {
+      await handleGlossaryTermUpdate({
+        ...glossaryTerm,
+        extension: updatedTable.extension,
+      });
+    },
+    [glossaryTerm, handleGlossaryTermUpdate]
+  );
 
   const tabItems = useMemo(() => {
     const items = [
@@ -241,6 +244,7 @@ const GlossaryTermsV1 = ({
     isVersionView,
     assetPermissions,
     handleAssetSave,
+    onExtensionUpdate,
   ]);
 
   const fetchGlossaryTermAssets = async () => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
index 8ded0a767e5a..cf58d0cae3ea 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx
@@ -34,6 +34,7 @@ import {
   getDiffByFieldName,
   getUpdatedExtensionDiffFields,
 } from '../../../utils/EntityVersionUtils';
+import { getDecodedFqn } from '../../../utils/StringsUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
 import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider';
 import {
@@ -67,11 +68,12 @@ export const CustomPropertyTable = <T extends ExtentionEntitiesKeys>({
   const [entityTypeDetailLoading, setEntityTypeDetailLoading] =
     useState<boolean>(false);
   const { fqn } = useParams<{ fqn: string; tab: string; version: string }>();
+  const decodedeFqn = getDecodedFqn(fqn);
 
   const fetchExtentiondetails = async () => {
     const response = await getEntityExtentionDetailsFromEntityType<T>(
       entityType,
-      fqn
+      decodedeFqn
     );
 
     setExtentionDetails(response as ExtentionEntities[T]);
@@ -79,7 +81,7 @@ export const CustomPropertyTable = <T extends ExtentionEntitiesKeys>({
 
   useEffect(() => {
     fetchExtentiondetails();
-  }, [fqn]);
+  }, [decodedeFqn]);
 
   const [typePermission, setPermission] = useState<OperationPermission>();
   const versionDetails = entityDetails ?? extentionDetails;
@@ -128,7 +130,7 @@ export const CustomPropertyTable = <T extends ExtentionEntitiesKeys>({
         setExtentionDetails(updatedData);
       }
     },
-    [versionDetails]
+    [versionDetails, handleExtensionUpdate]
   );
 
   const extensionObject: {