From bf9269fb7b5cfd7a15e17e4fa40f01842b8a04d1 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Fri, 1 Mar 2024 00:02:25 +0530
Subject: [PATCH] fix url malformed issue in entity popover and data insight
 detail page (#15402)

---
 .../common/PopOverCard/EntityPopOverCard.tsx   |  6 ++----
 .../IncidentManagerDetailPage.tsx              | 18 ++++++------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
index 81a12f25783..3702324d7a3 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
@@ -47,7 +47,6 @@ import { getTagByFqn } from '../../../rest/tagAPI';
 import { getTestCaseByFqn } from '../../../rest/testAPI';
 import { getTopicByFqn } from '../../../rest/topicsAPI';
 import { getEntityName } from '../../../utils/EntityUtils';
-import { getDecodedFqn } from '../../../utils/StringsUtils';
 import { EntityUnion } from '../../Explore/ExplorePage.interface';
 import ExploreSearchCard from '../../ExploreV1/ExploreSearchCard/ExploreSearchCard';
 import { SearchedDataProps } from '../../SearchedData/SearchedData.interface';
@@ -65,7 +64,6 @@ export const PopoverContent: React.FC<{
   entityType: string;
   extraInfo?: React.ReactNode;
 }> = ({ entityFQN, entityType, extraInfo }) => {
-  const decodedFqn = getDecodedFqn(entityFQN);
   const { t } = useTranslation();
   const [loading, setLoading] = useState(true);
   const { cachedEntityData, updateCachedEntityData } =
@@ -82,7 +80,7 @@ export const PopoverContent: React.FC<{
             displayName: getEntityName(data),
             id: data.id ?? '',
             description: data.description ?? '',
-            fullyQualifiedName: decodedFqn,
+            fullyQualifiedName: entityFQN,
             tags: (data as Table)?.tags,
             entityType: entityType,
             serviceType: (data as Table)?.serviceType,
@@ -101,7 +99,7 @@ export const PopoverContent: React.FC<{
 
         break;
       case EntityType.TEST_CASE:
-        promise = getTestCaseByFqn(decodedFqn, {
+        promise = getTestCaseByFqn(entityFQN, {
           fields: ['owner'],
         });
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx
index 862d533e8a5..6c4748ac30f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx
@@ -45,7 +45,6 @@ import { getTestCaseByFqn, updateTestCaseById } from '../../../rest/testAPI';
 import { getFeedCounts } from '../../../utils/CommonUtils';
 import { checkPermission } from '../../../utils/PermissionsUtils';
 import { getIncidentManagerDetailPagePath } from '../../../utils/RouterUtils';
-import { getDecodedFqn } from '../../../utils/StringsUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
 import { IncidentManagerTabs } from '../IncidentManager.interface';
 import { TestCaseData } from './IncidentManagerDetailPage.interface';
@@ -61,11 +60,6 @@ const IncidentManagerDetailPage = () => {
 
   const { fqn: testCaseFQN } = useFqn();
 
-  const decodedTestCaseFQN = useMemo(
-    () => getDecodedFqn(testCaseFQN),
-    [testCaseFQN]
-  );
-
   const [testCaseData, setTestCaseData] = useState<TestCaseData>({
     data: undefined,
     isLoading: true,
@@ -132,7 +126,7 @@ const IncidentManagerDetailPage = () => {
   const fetchTestCaseData = async () => {
     setTestCaseData((prev) => ({ ...prev, isLoading: true }));
     try {
-      const response = await getTestCaseByFqn(decodedTestCaseFQN, {
+      const response = await getTestCaseByFqn(testCaseFQN, {
         fields: [
           'testSuite',
           'testCaseResult',
@@ -177,7 +171,7 @@ const IncidentManagerDetailPage = () => {
     if (activeKey !== activeTab) {
       history.push(
         getIncidentManagerDetailPagePath(
-          decodedTestCaseFQN,
+          testCaseFQN,
           activeKey as IncidentManagerTabs
         )
       );
@@ -230,17 +224,17 @@ const IncidentManagerDetailPage = () => {
   }, []);
 
   const getEntityFeedCount = useCallback(() => {
-    getFeedCounts(EntityType.TEST_CASE, decodedTestCaseFQN, handleFeedCount);
-  }, [decodedTestCaseFQN]);
+    getFeedCounts(EntityType.TEST_CASE, testCaseFQN, handleFeedCount);
+  }, [testCaseFQN]);
 
   useEffect(() => {
-    if (hasViewPermission && decodedTestCaseFQN) {
+    if (hasViewPermission && testCaseFQN) {
       fetchTestCaseData();
       getEntityFeedCount();
     } else {
       setTestCaseData((prev) => ({ ...prev, isLoading: false }));
     }
-  }, [decodedTestCaseFQN, hasViewPermission]);
+  }, [testCaseFQN, hasViewPermission]);
 
   if (testCaseData.isLoading) {
     return <Loader />;