From 634d67ee0db39dbd7c7af4066cf805fefaee4e92 Mon Sep 17 00:00:00 2001
From: Aseem Bansal <asmbansal2@gmail.com>
Date: Wed, 14 Jun 2023 14:01:45 +0530
Subject: [PATCH] fix(search): tag/term should filter for both entity and field
 level (#7881)

---
 .../renderer/component/GlossaryTermSearchList.tsx           | 6 ++++++
 .../recommendations/renderer/component/TagSearchList.tsx    | 6 ++++++
 .../src/app/search/SearchResultsRecommendations.tsx         | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx
index 4ccb2fc8eb0234..7c3c6604ebe180 100644
--- a/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx
+++ b/datahub-web-react/src/app/recommendations/renderer/component/GlossaryTermSearchList.tsx
@@ -6,6 +6,7 @@ import { useHistory } from 'react-router-dom';
 import { RecommendationContent, GlossaryTerm } from '../../../../types.generated';
 import { navigateToSearchUrl } from '../../../search/utils/navigateToSearchUrl';
 import { useEntityRegistry } from '../../../useEntityRegistry';
+import { UnionType } from '../../../search/utils/constants';
 
 const TermSearchListContainer = styled.div`
     display: flex;
@@ -55,8 +56,13 @@ export const GlossaryTermSearchList = ({ content, onClick }: Props) => {
                     field: 'glossaryTerms',
                     values: [term.urn],
                 },
+                {
+                    field: 'fieldGlossaryTerms',
+                    values: [term.urn],
+                },
             ],
             history,
+            unionType: UnionType.OR,
         });
     };
 
diff --git a/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx b/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx
index c6f0c401d0af8b..62dff176834277 100644
--- a/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx
+++ b/datahub-web-react/src/app/recommendations/renderer/component/TagSearchList.tsx
@@ -4,6 +4,7 @@ import { useHistory } from 'react-router-dom';
 import styled from 'styled-components';
 import { EntityType, RecommendationContent, Tag } from '../../../../types.generated';
 import { StyledTag } from '../../../entity/shared/components/styled/StyledTag';
+import { UnionType } from '../../../search/utils/constants';
 import { navigateToSearchUrl } from '../../../search/utils/navigateToSearchUrl';
 import { useEntityRegistry } from '../../../useEntityRegistry';
 
@@ -46,8 +47,13 @@ export const TagSearchList = ({ content, onClick }: Props) => {
                     field: 'tags',
                     values: [tag.urn],
                 },
+                {
+                    field: 'fieldTags',
+                    values: [tag.urn],
+                },
             ],
             history,
+            unionType: UnionType.OR,
         });
     };
 
diff --git a/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx b/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx
index ea16a864832476..92e5817b076851 100644
--- a/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx
+++ b/datahub-web-react/src/app/search/SearchResultsRecommendations.tsx
@@ -55,7 +55,7 @@ export const SearchResultsRecommendations = ({ userUrn, query, filters }: Props)
     return (
         <>
             {recommendationModules && !!recommendationModules.length && (
-                <RecommendationsContainer>
+                <RecommendationsContainer data-testid="recommendation-container-id">
                     <RecommendationTitle level={3}>More you may be interested in</RecommendationTitle>
                     {recommendationModules &&
                         recommendationModules.map((module) => (