From a2a3a0ebdea4528c159e1265be2fcebb154f03b3 Mon Sep 17 00:00:00 2001
From: darth-coder00 <86726556+darth-coder00@users.noreply.github.com>
Date: Thu, 17 Mar 2022 04:05:01 +0530
Subject: [PATCH] Fixed: #3455 Able to select same term name in related terms
 (#3470)

---
 .../GlossaryTerms/GlossaryTermsV1.component.tsx        |  1 +
 .../Modals/RelatedTermsModal/RelatedTermsModal.tsx     | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx
index 2a401d95957..45f152bb24a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx
@@ -629,6 +629,7 @@ const GlossaryTermsV1 = ({
 
         {showRelatedTermsModal && (
           <RelatedTermsModal
+            glossaryTermFQN={glossaryTerm.fullyQualifiedName}
             header="Add Related Terms"
             relatedTerms={relatedTerms}
             onCancel={onRelatedTermsModalCancel}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx
index 49cbc4044b5..a0eac03661d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/RelatedTermsModal/RelatedTermsModal.tsx
@@ -24,6 +24,7 @@ import Searchbar from '../../common/searchbar/Searchbar';
 import Loader from '../../Loader/Loader';
 
 type RelatedTermsModalProp = {
+  glossaryTermFQN?: string;
   relatedTerms?: Array<FormattedGlossaryTermData>;
   onCancel: () => void;
   onSave: (terms: Array<FormattedGlossaryTermData>) => void;
@@ -31,6 +32,7 @@ type RelatedTermsModalProp = {
 };
 
 const RelatedTermsModal = ({
+  glossaryTermFQN = '',
   relatedTerms,
   onCancel,
   onSave,
@@ -56,9 +58,11 @@ const RelatedTermsModal = ({
     setIsLoading(true);
     searchData(searchText, 1, PAGE_SIZE, '', '', '', SearchIndex.GLOSSARY)
       .then((res: SearchResponse) => {
-        const termResult = formatSearchGlossaryTermResponse(
-          res?.data?.hits?.hits || []
-        );
+        const termResult = (
+          formatSearchGlossaryTermResponse(
+            res?.data?.hits?.hits || []
+          ) as FormattedGlossaryTermData[]
+        ).filter((item) => item.fqdn !== glossaryTermFQN);
         const data = !searchText ? getSearchedTerms(termResult) : termResult;
         setOptions(data);
       })