From b6141f5fffa9357f38899ccd956496914a8b294d Mon Sep 17 00:00:00 2001
From: Chris Collins <chriscollins3456@gmail.com>
Date: Thu, 24 Aug 2023 18:02:22 -0400
Subject: [PATCH] feat(java/ui) Add search suggestions to our search experience
 (#8710)

---
 .../mappers/SearchFlagsInputMapper.java       |  3 +
 .../graphql/types/mappers/MapperUtils.java    |  5 ++
 .../types/mappers/UrnSearchResultsMapper.java |  1 +
 .../src/main/resources/search.graphql         | 35 ++++++++
 datahub-web-react/src/Mocks.tsx               | 22 +++++
 .../src/app/search/EmptySearchResults.tsx     | 90 +++++++++++++++++++
 .../src/app/search/SearchPage.tsx             |  2 +
 .../src/app/search/SearchResultList.tsx       | 39 ++------
 .../src/app/search/SearchResults.tsx          | 33 ++++---
 .../suggestions/SearchQuerySugggester.tsx     | 39 ++++++++
 datahub-web-react/src/graphql/search.graphql  |  5 ++
 .../query/request/SearchRequestHandler.java   | 29 ++++++
 .../metadata/search/utils/ESUtils.java        | 17 ++++
 .../linkedin/metadata/query/SearchFlags.pdl   |  5 ++
 .../metadata/search/SearchResultMetadata.pdl  |  5 ++
 .../metadata/search/SearchSuggestion.pdl      | 24 +++++
 ...com.linkedin.entity.entities.snapshot.json | 33 ++++++-
 17 files changed, 341 insertions(+), 46 deletions(-)
 create mode 100644 datahub-web-react/src/app/search/EmptySearchResults.tsx
 create mode 100644 datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx
 create mode 100644 metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchSuggestion.pdl

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java
index 6435d6ee4c8e5..f3ac008734339 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SearchFlagsInputMapper.java
@@ -39,6 +39,9 @@ public com.linkedin.metadata.query.SearchFlags apply(@Nonnull final SearchFlags
     if (searchFlags.getSkipAggregates() != null) {
       result.setSkipAggregates(searchFlags.getSkipAggregates());
     }
+    if (searchFlags.getGetSuggestions() != null) {
+      result.setGetSuggestions(searchFlags.getGetSuggestions());
+    }
     return result;
   }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
index 2c9aa13934afc..5ba32b0c2a77c 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/MapperUtils.java
@@ -5,6 +5,7 @@
 import com.linkedin.datahub.graphql.generated.FacetMetadata;
 import com.linkedin.datahub.graphql.generated.MatchedField;
 import com.linkedin.datahub.graphql.generated.SearchResult;
+import com.linkedin.datahub.graphql.generated.SearchSuggestion;
 import com.linkedin.datahub.graphql.resolvers.EntityTypeMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.UrnToEntityMapper;
 import com.linkedin.metadata.search.SearchEntity;
@@ -76,4 +77,8 @@ public static List<MatchedField> getMatchedFieldEntry(List<com.linkedin.metadata
         })
         .collect(Collectors.toList());
   }
+
+  public static SearchSuggestion mapSearchSuggestion(com.linkedin.metadata.search.SearchSuggestion suggestion) {
+    return new SearchSuggestion(suggestion.getText(), suggestion.getScore(), Math.toIntExact(suggestion.getFrequency()));
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/UrnSearchResultsMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/UrnSearchResultsMapper.java
index 9f750820e3093..b16e2f10d1df7 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/UrnSearchResultsMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mappers/UrnSearchResultsMapper.java
@@ -27,6 +27,7 @@ public SearchResults apply(com.linkedin.metadata.search.SearchResult input) {
     final SearchResultMetadata searchResultMetadata = input.getMetadata();
     result.setSearchResults(input.getEntities().stream().map(MapperUtils::mapResult).collect(Collectors.toList()));
     result.setFacets(searchResultMetadata.getAggregations().stream().map(MapperUtils::mapFacet).collect(Collectors.toList()));
+    result.setSuggestions(searchResultMetadata.getSuggestions().stream().map(MapperUtils::mapSearchSuggestion).collect(Collectors.toList()));
 
     return result;
   }
diff --git a/datahub-graphql-core/src/main/resources/search.graphql b/datahub-graphql-core/src/main/resources/search.graphql
index 85f33756ae744..4cabdb04afe77 100644
--- a/datahub-graphql-core/src/main/resources/search.graphql
+++ b/datahub-graphql-core/src/main/resources/search.graphql
@@ -138,6 +138,11 @@ input  SearchFlags {
   Whether to skip aggregates/facets
   """
   skipAggregates: Boolean
+
+  """
+  Whether to request for search suggestions on the _entityName virtualized field
+  """
+  getSuggestions: Boolean
 }
 
 """
@@ -483,6 +488,11 @@ type SearchResults {
   Candidate facet aggregations used for search filtering
   """
   facets: [FacetMetadata!]
+
+  """
+  Search suggestions based on the query provided for alternate query texts
+  """
+  suggestions: [SearchSuggestion!]
 }
 
 """
@@ -727,6 +737,31 @@ type AggregationMetadata {
   entity: Entity
 }
 
+"""
+A suggestion for an alternate search query given an original query compared to all
+of the entity names in our search index.
+"""
+type SearchSuggestion {
+  """
+  The suggested text based on the provided query text compared to
+  the entity name field in the search index.
+  """
+  text: String!
+
+  """
+  The "edit distance" for this suggestion. The closer this number is to 1, the
+  closer the suggested text is to the original text. The closer it is to 0, the
+  further from the original text it is.
+  """
+  score: Float
+
+  """
+  The number of entities that would match on the name field given the suggested text
+  """
+  frequency: Int
+}
+
+
 """
 Input for performing an auto completion query against a single Metadata Entity
 """
diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index b772341370050..a2e14308e8cee 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -1973,6 +1973,7 @@ export const mocks = [
                     count: 10,
                     filters: [],
                     orFilters: [],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -2033,6 +2034,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    suggestions: [],
                 },
             } as GetSearchResultsQuery,
         },
@@ -2059,6 +2061,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -2112,6 +2115,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    suggestions: [],
                 },
             } as GetSearchResultsQuery,
         },
@@ -2230,6 +2234,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -2251,6 +2256,7 @@ export const mocks = [
                             insights: [],
                         },
                     ],
+                    suggestions: [],
                     facets: [
                         {
                             field: 'origin',
@@ -2772,6 +2778,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -2794,6 +2801,7 @@ export const mocks = [
                             insights: [],
                         },
                     ],
+                    suggestions: [],
                     facets: [
                         {
                             __typename: 'FacetMetadata',
@@ -2886,6 +2894,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -2908,6 +2917,7 @@ export const mocks = [
                         },
                     ],
                     facets: [],
+                    suggestions: [],
                 },
             } as GetSearchResultsForMultipleQuery,
         },
@@ -2934,6 +2944,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -2955,6 +2966,7 @@ export const mocks = [
                             insights: [],
                         },
                     ],
+                    suggestions: [],
                     facets: [
                         {
                             field: 'origin',
@@ -3007,6 +3019,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -3028,6 +3041,7 @@ export const mocks = [
                             insights: [],
                         },
                     ],
+                    suggestions: [],
                     facets: [
                         {
                             field: 'origin',
@@ -3084,6 +3098,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -3113,6 +3128,7 @@ export const mocks = [
                             insights: [],
                         },
                     ],
+                    suggestions: [],
                     facets: [
                         {
                             field: 'origin',
@@ -3175,6 +3191,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -3196,6 +3213,7 @@ export const mocks = [
                             insights: [],
                         },
                     ],
+                    suggestions: [],
                     facets: [
                         {
                             field: 'origin',
@@ -3258,6 +3276,7 @@ export const mocks = [
                             ],
                         },
                     ],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -3279,6 +3298,7 @@ export const mocks = [
                             insights: [],
                         },
                     ],
+                    suggestions: [],
                     facets: [
                         {
                             field: 'origin',
@@ -3451,6 +3471,7 @@ export const mocks = [
                     count: 10,
                     filters: [],
                     orFilters: [],
+                    searchFlags: { getSuggestions: true },
                 },
             },
         },
@@ -3462,6 +3483,7 @@ export const mocks = [
                     total: 0,
                     searchResults: [],
                     facets: [],
+                    suggestions: [],
                 },
             },
         },
diff --git a/datahub-web-react/src/app/search/EmptySearchResults.tsx b/datahub-web-react/src/app/search/EmptySearchResults.tsx
new file mode 100644
index 0000000000000..cde61f746d35b
--- /dev/null
+++ b/datahub-web-react/src/app/search/EmptySearchResults.tsx
@@ -0,0 +1,90 @@
+import { RocketOutlined } from '@ant-design/icons';
+import { useHistory } from 'react-router';
+import { Button } from 'antd';
+import React, { useCallback } from 'react';
+import styled from 'styled-components';
+import { ANTD_GRAY_V2 } from '../entity/shared/constants';
+import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
+import analytics, { EventType } from '../analytics';
+import { SuggestedText } from './suggestions/SearchQuerySugggester';
+import useGetSearchQueryInputs from './useGetSearchQueryInputs';
+import { FacetFilterInput, SearchSuggestion } from '../../types.generated';
+import { useUserContext } from '../context/useUserContext';
+
+const NoDataContainer = styled.div`
+    margin: 40px auto;
+    font-size: 16px;
+    color: ${ANTD_GRAY_V2[8]};
+`;
+
+const Section = styled.div`
+    margin-bottom: 16px;
+`;
+
+function getRefineSearchText(filters: FacetFilterInput[], viewUrn?: string | null) {
+    let text = '';
+    if (filters.length && viewUrn) {
+        text = 'clearing all filters and selected view';
+    } else if (filters.length) {
+        text = 'clearing all filters';
+    } else if (viewUrn) {
+        text = 'clearing the selected view';
+    }
+
+    return text;
+}
+
+interface Props {
+    suggestions: SearchSuggestion[];
+}
+
+export default function EmptySearchResults({ suggestions }: Props) {
+    const { query, filters, viewUrn } = useGetSearchQueryInputs();
+    const history = useHistory();
+    const userContext = useUserContext();
+    const suggestText = suggestions.length > 0 ? suggestions[0].text : '';
+    const refineSearchText = getRefineSearchText(filters, viewUrn);
+
+    const onClickExploreAll = useCallback(() => {
+        analytics.event({ type: EventType.SearchResultsExploreAllClickEvent });
+        navigateToSearchUrl({ query: '*', history });
+    }, [history]);
+
+    const searchForSuggestion = () => {
+        navigateToSearchUrl({ query: suggestText, history });
+    };
+
+    const clearFiltersAndView = () => {
+        navigateToSearchUrl({ query, history });
+        userContext.updateLocalState({
+            ...userContext.localState,
+            selectedViewUrn: undefined,
+        });
+    };
+
+    return (
+        <NoDataContainer>
+            <Section>No results found for &quot;{query}&quot;</Section>
+            {refineSearchText && (
+                <>
+                    Try <SuggestedText onClick={clearFiltersAndView}>{refineSearchText}</SuggestedText>{' '}
+                    {suggestText && (
+                        <>
+                            or searching for <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
+                        </>
+                    )}
+                </>
+            )}
+            {!refineSearchText && suggestText && (
+                <>
+                    Did you mean <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
+                </>
+            )}
+            {!refineSearchText && !suggestText && (
+                <Button onClick={onClickExploreAll}>
+                    <RocketOutlined /> Explore all
+                </Button>
+            )}
+        </NoDataContainer>
+    );
+}
diff --git a/datahub-web-react/src/app/search/SearchPage.tsx b/datahub-web-react/src/app/search/SearchPage.tsx
index ce353640d8179..6387f0ef8c05e 100644
--- a/datahub-web-react/src/app/search/SearchPage.tsx
+++ b/datahub-web-react/src/app/search/SearchPage.tsx
@@ -59,6 +59,7 @@ export const SearchPage = () => {
                 orFilters,
                 viewUrn,
                 sortInput,
+                searchFlags: { getSuggestions: true },
             },
         },
     });
@@ -235,6 +236,7 @@ export const SearchPage = () => {
                 error={error}
                 searchResponse={data?.searchAcrossEntities}
                 facets={data?.searchAcrossEntities?.facets}
+                suggestions={data?.searchAcrossEntities?.suggestions || []}
                 selectedFilters={filters}
                 loading={loading}
                 onChangeFilters={onChangeFilters}
diff --git a/datahub-web-react/src/app/search/SearchResultList.tsx b/datahub-web-react/src/app/search/SearchResultList.tsx
index 6e2d5c923c6e2..386b22f34602b 100644
--- a/datahub-web-react/src/app/search/SearchResultList.tsx
+++ b/datahub-web-react/src/app/search/SearchResultList.tsx
@@ -1,18 +1,16 @@
-import React, { useCallback } from 'react';
-import { Button, Checkbox, Divider, Empty, List, ListProps } from 'antd';
+import React from 'react';
+import { Checkbox, Divider, List, ListProps } from 'antd';
 import styled from 'styled-components';
-import { useHistory } from 'react-router';
-import { RocketOutlined } from '@ant-design/icons';
-import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
 import { ANTD_GRAY } from '../entity/shared/constants';
 import { SEPARATE_SIBLINGS_URL_PARAM } from '../entity/shared/siblingUtils';
 import { CompactEntityNameList } from '../recommendations/renderer/component/CompactEntityNameList';
 import { useEntityRegistry } from '../useEntityRegistry';
-import { SearchResult } from '../../types.generated';
+import { SearchResult, SearchSuggestion } from '../../types.generated';
 import analytics, { EventType } from '../analytics';
 import { EntityAndType } from '../entity/shared/types';
 import { useIsSearchV2 } from './useSearchAndBrowseVersion';
 import { CombinedSearchResult } from './utils/combineSiblingsInSearchResults';
+import EmptySearchResults from './EmptySearchResults';
 
 const ResultList = styled(List)`
     &&& {
@@ -28,13 +26,6 @@ const StyledCheckbox = styled(Checkbox)`
     margin-right: 12px;
 `;
 
-const NoDataContainer = styled.div`
-    > div {
-        margin-top: 28px;
-        margin-bottom: 28px;
-    }
-`;
-
 const ThinDivider = styled(Divider)`
     margin-top: 16px;
     margin-bottom: 16px;
@@ -70,6 +61,7 @@ type Props = {
     isSelectMode: boolean;
     selectedEntities: EntityAndType[];
     setSelectedEntities: (entities: EntityAndType[]) => any;
+    suggestions: SearchSuggestion[];
 };
 
 export const SearchResultList = ({
@@ -79,17 +71,12 @@ export const SearchResultList = ({
     isSelectMode,
     selectedEntities,
     setSelectedEntities,
+    suggestions,
 }: Props) => {
-    const history = useHistory();
     const entityRegistry = useEntityRegistry();
     const selectedEntityUrns = selectedEntities.map((entity) => entity.urn);
     const showSearchFiltersV2 = useIsSearchV2();
 
-    const onClickExploreAll = useCallback(() => {
-        analytics.event({ type: EventType.SearchResultsExploreAllClickEvent });
-        navigateToSearchUrl({ query: '*', history });
-    }, [history]);
-
     const onClickResult = (result: SearchResult, index: number) => {
         analytics.event({
             type: EventType.SearchResultClickEvent,
@@ -118,19 +105,7 @@ export const SearchResultList = ({
                 id="search-result-list"
                 dataSource={searchResults}
                 split={false}
-                locale={{
-                    emptyText: (
-                        <NoDataContainer>
-                            <Empty
-                                style={{ fontSize: 18, color: ANTD_GRAY[8] }}
-                                description={`No results found for "${query}"`}
-                            />
-                            <Button onClick={onClickExploreAll}>
-                                <RocketOutlined /> Explore all
-                            </Button>
-                        </NoDataContainer>
-                    ),
-                }}
+                locale={{ emptyText: <EmptySearchResults suggestions={suggestions} /> }}
                 renderItem={(item, index) => (
                     <ResultWrapper showUpdatedStyles={showSearchFiltersV2} className={`entityUrn-${item.entity.urn}`}>
                         <ListItem
diff --git a/datahub-web-react/src/app/search/SearchResults.tsx b/datahub-web-react/src/app/search/SearchResults.tsx
index 19f762c1c6cf2..d21213f462f54 100644
--- a/datahub-web-react/src/app/search/SearchResults.tsx
+++ b/datahub-web-react/src/app/search/SearchResults.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Pagination, Typography } from 'antd';
 import styled from 'styled-components/macro';
 import { Message } from '../shared/Message';
-import { Entity, FacetFilterInput, FacetMetadata, MatchedField } from '../../types.generated';
+import { Entity, FacetFilterInput, FacetMetadata, MatchedField, SearchSuggestion } from '../../types.generated';
 import { SearchCfg } from '../../conf';
 import { SearchResultsRecommendations } from './SearchResultsRecommendations';
 import SearchExtendedMenu from '../entity/shared/components/styled/search/SearchExtendedMenu';
@@ -26,6 +26,7 @@ import { useIsBrowseV2, useIsSearchV2 } from './useSearchAndBrowseVersion';
 import useToggleSidebar from './useToggleSidebar';
 import SearchSortSelect from './sorting/SearchSortSelect';
 import { combineSiblingsInSearchResults } from './utils/combineSiblingsInSearchResults';
+import SearchQuerySuggester from './suggestions/SearchQuerySugggester';
 
 const SearchResultsWrapper = styled.div<{ v2Styles: boolean }>`
     display: flex;
@@ -131,6 +132,7 @@ interface Props {
     setNumResultsPerPage: (numResults: number) => void;
     isSelectMode: boolean;
     selectedEntities: EntityAndType[];
+    suggestions: SearchSuggestion[];
     setSelectedEntities: (entities: EntityAndType[]) => void;
     setIsSelectMode: (showSelectMode: boolean) => any;
     onChangeSelectAll: (selected: boolean) => void;
@@ -155,6 +157,7 @@ export const SearchResults = ({
     setNumResultsPerPage,
     isSelectMode,
     selectedEntities,
+    suggestions,
     setIsSelectMode,
     setSelectedEntities,
     onChangeSelectAll,
@@ -238,6 +241,7 @@ export const SearchResults = ({
                         {(error && <ErrorSection />) ||
                             (!loading && (
                                 <SearchResultListContainer v2Styles={showSearchFiltersV2}>
+                                    {totalResults > 0 && <SearchQuerySuggester suggestions={suggestions} />}
                                     <SearchResultList
                                         query={query}
                                         searchResults={combinedSiblingSearchResults}
@@ -245,19 +249,22 @@ export const SearchResults = ({
                                         isSelectMode={isSelectMode}
                                         selectedEntities={selectedEntities}
                                         setSelectedEntities={setSelectedEntities}
+                                        suggestions={suggestions}
                                     />
-                                    <PaginationControlContainer id="search-pagination">
-                                        <Pagination
-                                            current={page}
-                                            pageSize={numResultsPerPage}
-                                            total={totalResults}
-                                            showLessItems
-                                            onChange={onChangePage}
-                                            showSizeChanger={totalResults > SearchCfg.RESULTS_PER_PAGE}
-                                            onShowSizeChange={(_currNum, newNum) => setNumResultsPerPage(newNum)}
-                                            pageSizeOptions={['10', '20', '50', '100']}
-                                        />
-                                    </PaginationControlContainer>
+                                    {totalResults > 0 && (
+                                        <PaginationControlContainer id="search-pagination">
+                                            <Pagination
+                                                current={page}
+                                                pageSize={numResultsPerPage}
+                                                total={totalResults}
+                                                showLessItems
+                                                onChange={onChangePage}
+                                                showSizeChanger={totalResults > SearchCfg.RESULTS_PER_PAGE}
+                                                onShowSizeChange={(_currNum, newNum) => setNumResultsPerPage(newNum)}
+                                                pageSizeOptions={['10', '20', '50', '100']}
+                                            />
+                                        </PaginationControlContainer>
+                                    )}
                                     {authenticatedUserUrn && (
                                         <SearchResultsRecommendationsContainer>
                                             <SearchResultsRecommendations
diff --git a/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx b/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx
new file mode 100644
index 0000000000000..9dbd67883bf64
--- /dev/null
+++ b/datahub-web-react/src/app/search/suggestions/SearchQuerySugggester.tsx
@@ -0,0 +1,39 @@
+import styled from 'styled-components';
+import React from 'react';
+import { useHistory } from 'react-router';
+import { SearchSuggestion } from '../../../types.generated';
+import { navigateToSearchUrl } from '../utils/navigateToSearchUrl';
+import { ANTD_GRAY_V2 } from '../../entity/shared/constants';
+
+const TextWrapper = styled.div`
+    font-size: 14px;
+    color: ${ANTD_GRAY_V2[8]};
+    margin: 16px 0 -8px 32px;
+`;
+
+export const SuggestedText = styled.span`
+    color: ${(props) => props.theme.styles['primary-color']};
+    text-decoration: underline ${(props) => props.theme.styles['primary-color']};
+    cursor: pointer;
+`;
+
+interface Props {
+    suggestions: SearchSuggestion[];
+}
+
+export default function SearchQuerySuggester({ suggestions }: Props) {
+    const history = useHistory();
+
+    if (suggestions.length === 0) return null;
+    const suggestText = suggestions[0].text;
+
+    function searchForSuggestion() {
+        navigateToSearchUrl({ query: suggestText, history });
+    }
+
+    return (
+        <TextWrapper>
+            Did you mean <SuggestedText onClick={searchForSuggestion}>{suggestText}</SuggestedText>
+        </TextWrapper>
+    );
+}
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
index 7d6d7ef109e16..7cd868d7cd2b2 100644
--- a/datahub-web-react/src/graphql/search.graphql
+++ b/datahub-web-react/src/graphql/search.graphql
@@ -846,6 +846,11 @@ fragment searchResults on SearchResults {
     facets {
         ...facetFields
     }
+    suggestions {
+        text
+        frequency
+        score
+    }
 }
 
 fragment schemaFieldEntityFields on SchemaFieldEntity {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
index bd1e6037ec0c5..5973f77da28aa 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchRequestHandler.java
@@ -28,6 +28,8 @@
 import com.linkedin.metadata.search.SearchEntityArray;
 import com.linkedin.metadata.search.SearchResult;
 import com.linkedin.metadata.search.SearchResultMetadata;
+import com.linkedin.metadata.search.SearchSuggestion;
+import com.linkedin.metadata.search.SearchSuggestionArray;
 import com.linkedin.metadata.search.features.Features;
 import com.linkedin.metadata.search.utils.ESUtils;
 import com.linkedin.metadata.utils.SearchUtil;
@@ -68,7 +70,9 @@
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
+import org.elasticsearch.search.suggest.term.TermSuggestion;
 
+import static com.linkedin.metadata.search.utils.ESUtils.NAME_SUGGESTION;
 import static com.linkedin.metadata.search.utils.ESUtils.toFacetField;
 import static com.linkedin.metadata.search.utils.SearchUtils.applyDefaultSearchFlags;
 import static com.linkedin.metadata.utils.SearchUtil.*;
@@ -199,6 +203,11 @@ public SearchRequest getSearchRequest(@Nonnull String input, @Nullable Filter fi
       searchSourceBuilder.highlighter(_highlights);
     }
     ESUtils.buildSortOrder(searchSourceBuilder, sortCriterion);
+
+    if (finalSearchFlags.isGetSuggestions()) {
+      ESUtils.buildNameSuggestions(searchSourceBuilder, input);
+    }
+
     searchRequest.source(searchSourceBuilder);
     log.debug("Search request is: " + searchRequest.toString());
 
@@ -471,6 +480,9 @@ private SearchResultMetadata extractSearchResultMetadata(@Nonnull SearchResponse
     final List<AggregationMetadata> aggregationMetadataList = extractAggregationMetadata(searchResponse, filter);
     searchResultMetadata.setAggregations(new AggregationMetadataArray(aggregationMetadataList));
 
+    final List<SearchSuggestion> searchSuggestions = extractSearchSuggestions(searchResponse);
+    searchResultMetadata.setSuggestions(new SearchSuggestionArray(searchSuggestions));
+
     return searchResultMetadata;
   }
 
@@ -517,6 +529,23 @@ public static Map<String, Long> extractTermAggregations(@Nonnull SearchResponse
     return extractTermAggregations((ParsedTerms) aggregation, aggregationName.equals("_entityType"));
   }
 
+  private List<SearchSuggestion> extractSearchSuggestions(@Nonnull SearchResponse searchResponse) {
+    final List<SearchSuggestion> searchSuggestions = new ArrayList<>();
+    if (searchResponse.getSuggest() != null) {
+      TermSuggestion termSuggestion = searchResponse.getSuggest().getSuggestion(NAME_SUGGESTION);
+      if (termSuggestion != null && termSuggestion.getEntries().size() > 0) {
+        termSuggestion.getEntries().get(0).getOptions().forEach(suggestOption -> {
+          SearchSuggestion searchSuggestion = new SearchSuggestion();
+          searchSuggestion.setText(String.valueOf(suggestOption.getText()));
+          searchSuggestion.setFrequency(suggestOption.getFreq());
+          searchSuggestion.setScore(suggestOption.getScore());
+          searchSuggestions.add(searchSuggestion);
+        });
+      }
+    }
+    return searchSuggestions;
+  }
+
   /**
    * Adds nested sub-aggregation values to the aggregated results
    * @param aggs The aggregations to traverse. Could be null (base case)
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
index 5179f2be6d060..741eb5568d2ea 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -27,6 +27,10 @@
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.ScoreSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
+import org.elasticsearch.search.suggest.SuggestBuilder;
+import org.elasticsearch.search.suggest.SuggestBuilders;
+import org.elasticsearch.search.suggest.SuggestionBuilder;
+import org.elasticsearch.search.suggest.term.TermSuggestionBuilder;
 
 import static com.linkedin.metadata.search.elasticsearch.query.request.SearchFieldConfig.KEYWORD_FIELDS;
 import static com.linkedin.metadata.search.elasticsearch.query.request.SearchFieldConfig.PATH_HIERARCHY_FIELDS;
@@ -46,6 +50,8 @@ public class ESUtils {
   public static final String OPAQUE_ID_HEADER = "X-Opaque-Id";
   public static final String HEADER_VALUE_DELIMITER = "|";
   public static final String KEYWORD_TYPE = "keyword";
+  public static final String ENTITY_NAME_FIELD = "_entityName";
+  public static final String NAME_SUGGESTION = "nameSuggestion";
 
   // we use this to make sure we filter for editable & non-editable fields. Also expands out top-level properties
   // to field level properties
@@ -197,6 +203,17 @@ public static void buildSortOrder(@Nonnull SearchSourceBuilder searchSourceBuild
     }
   }
 
+  /**
+   * Populates source field of search query with the suggestions query so that we get search suggestions back.
+   * Right now we are only supporting suggestions based on the virtual _entityName field alias.
+   */
+  public static void buildNameSuggestions(@Nonnull SearchSourceBuilder searchSourceBuilder, @Nullable String textInput) {
+    SuggestionBuilder<TermSuggestionBuilder> builder = SuggestBuilders.termSuggestion(ENTITY_NAME_FIELD).text(textInput);
+    SuggestBuilder suggestBuilder = new SuggestBuilder();
+    suggestBuilder.addSuggestion(NAME_SUGGESTION, builder);
+    searchSourceBuilder.suggest(suggestBuilder);
+  }
+
   /**
    * Escapes the Elasticsearch reserved characters in the given input string.
    *
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
index 05a94b8fabc4b..be1a30c7f082c 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/query/SearchFlags.pdl
@@ -28,4 +28,9 @@ record SearchFlags {
    * Whether to skip aggregates/facets
    */
   skipAggregates:optional boolean = false
+
+  /**
+   * Whether to request for search suggestions on the _entityName virtualized field
+   */
+  getSuggestions:optional boolean = false
 }
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchResultMetadata.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchResultMetadata.pdl
index 718d80ba4cb36..60f1b568f586a 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchResultMetadata.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchResultMetadata.pdl
@@ -12,4 +12,9 @@ record SearchResultMetadata {
    */
   aggregations: array[AggregationMetadata] = []
 
+  /**
+   * A list of search query suggestions based on the given query
+   */
+  suggestions: array[SearchSuggestion] = []
+
 }
\ No newline at end of file
diff --git a/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchSuggestion.pdl b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchSuggestion.pdl
new file mode 100644
index 0000000000000..7776ec54fe03e
--- /dev/null
+++ b/metadata-models/src/main/pegasus/com/linkedin/metadata/search/SearchSuggestion.pdl
@@ -0,0 +1,24 @@
+namespace com.linkedin.metadata.search
+
+/**
+ * The model for the search result
+ */
+record SearchSuggestion {
+
+  /**
+   * The suggestion text for this search query
+   */
+  text: string
+
+  /**
+   * The score for how close this suggestion is to the original search query.
+   * The closer to 1 means it is closer to the original query and 0 is further away.
+   */
+  score: float
+
+  /**
+   * How many matches there are with the suggested text for the given field
+   */
+  frequency: long
+
+}
\ No newline at end of file
diff --git a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
index e6198435bce6c..0c9b49649bf1e 100644
--- a/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
+++ b/metadata-service/restli-api/src/main/snapshot/com.linkedin.entity.entities.snapshot.json
@@ -5727,6 +5727,12 @@
       "doc" : "Whether to skip aggregates/facets",
       "default" : false,
       "optional" : true
+    }, {
+      "name" : "getSuggestions",
+      "type" : "boolean",
+      "doc" : "Whether to request for search suggestions on the _entityName virtualized field",
+      "default" : false,
+      "optional" : true
     } ]
   }, {
     "type" : "enum",
@@ -6098,6 +6104,31 @@
           },
           "doc" : "A list of search result metadata such as aggregations",
           "default" : [ ]
+        }, {
+          "name" : "suggestions",
+          "type" : {
+            "type" : "array",
+            "items" : {
+              "type" : "record",
+              "name" : "SearchSuggestion",
+              "doc" : "The model for the search result",
+              "fields" : [ {
+                "name" : "text",
+                "type" : "string",
+                "doc" : "The suggestion text for this search query"
+              }, {
+                "name" : "score",
+                "type" : "float",
+                "doc" : "The score for how close this suggestion is to the original search query.\nThe closer to 1 means it is closer to the original query and 0 is further away."
+              }, {
+                "name" : "frequency",
+                "type" : "long",
+                "doc" : "How many matches there are with the suggested text for the given field"
+              } ]
+            }
+          },
+          "doc" : "A list of search query suggestions based on the given query",
+          "default" : [ ]
         } ]
       },
       "doc" : "Metadata specific to the browse result of the queried path"
@@ -6204,7 +6235,7 @@
       "type" : "int",
       "doc" : "The total number of entities directly under searched path"
     } ]
-  }, "com.linkedin.metadata.search.SearchResultMetadata", "com.linkedin.metadata.snapshot.ChartSnapshot", "com.linkedin.metadata.snapshot.CorpGroupSnapshot", "com.linkedin.metadata.snapshot.CorpUserSnapshot", "com.linkedin.metadata.snapshot.DashboardSnapshot", "com.linkedin.metadata.snapshot.DataFlowSnapshot", "com.linkedin.metadata.snapshot.DataHubPolicySnapshot", "com.linkedin.metadata.snapshot.DataHubRetentionSnapshot", "com.linkedin.metadata.snapshot.DataJobSnapshot", "com.linkedin.metadata.snapshot.DataPlatformSnapshot", "com.linkedin.metadata.snapshot.DataProcessSnapshot", "com.linkedin.metadata.snapshot.DatasetSnapshot", "com.linkedin.metadata.snapshot.GlossaryNodeSnapshot", "com.linkedin.metadata.snapshot.GlossaryTermSnapshot", "com.linkedin.metadata.snapshot.MLFeatureSnapshot", "com.linkedin.metadata.snapshot.MLFeatureTableSnapshot", "com.linkedin.metadata.snapshot.MLModelDeploymentSnapshot", "com.linkedin.metadata.snapshot.MLModelGroupSnapshot", "com.linkedin.metadata.snapshot.MLModelSnapshot", "com.linkedin.metadata.snapshot.MLPrimaryKeySnapshot", "com.linkedin.metadata.snapshot.SchemaFieldSnapshot", "com.linkedin.metadata.snapshot.Snapshot", "com.linkedin.metadata.snapshot.TagSnapshot", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.DeploymentStatus", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLFeatureTableProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelDeploymentProperties", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelGroupProperties", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.MLPrimaryKeyProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", {
+  }, "com.linkedin.metadata.search.SearchResultMetadata", "com.linkedin.metadata.search.SearchSuggestion", "com.linkedin.metadata.snapshot.ChartSnapshot", "com.linkedin.metadata.snapshot.CorpGroupSnapshot", "com.linkedin.metadata.snapshot.CorpUserSnapshot", "com.linkedin.metadata.snapshot.DashboardSnapshot", "com.linkedin.metadata.snapshot.DataFlowSnapshot", "com.linkedin.metadata.snapshot.DataHubPolicySnapshot", "com.linkedin.metadata.snapshot.DataHubRetentionSnapshot", "com.linkedin.metadata.snapshot.DataJobSnapshot", "com.linkedin.metadata.snapshot.DataPlatformSnapshot", "com.linkedin.metadata.snapshot.DataProcessSnapshot", "com.linkedin.metadata.snapshot.DatasetSnapshot", "com.linkedin.metadata.snapshot.GlossaryNodeSnapshot", "com.linkedin.metadata.snapshot.GlossaryTermSnapshot", "com.linkedin.metadata.snapshot.MLFeatureSnapshot", "com.linkedin.metadata.snapshot.MLFeatureTableSnapshot", "com.linkedin.metadata.snapshot.MLModelDeploymentSnapshot", "com.linkedin.metadata.snapshot.MLModelGroupSnapshot", "com.linkedin.metadata.snapshot.MLModelSnapshot", "com.linkedin.metadata.snapshot.MLPrimaryKeySnapshot", "com.linkedin.metadata.snapshot.SchemaFieldSnapshot", "com.linkedin.metadata.snapshot.Snapshot", "com.linkedin.metadata.snapshot.TagSnapshot", "com.linkedin.ml.metadata.BaseData", "com.linkedin.ml.metadata.CaveatDetails", "com.linkedin.ml.metadata.CaveatsAndRecommendations", "com.linkedin.ml.metadata.DeploymentStatus", "com.linkedin.ml.metadata.EthicalConsiderations", "com.linkedin.ml.metadata.EvaluationData", "com.linkedin.ml.metadata.HyperParameterValueType", "com.linkedin.ml.metadata.IntendedUse", "com.linkedin.ml.metadata.IntendedUserType", "com.linkedin.ml.metadata.MLFeatureProperties", "com.linkedin.ml.metadata.MLFeatureTableProperties", "com.linkedin.ml.metadata.MLHyperParam", "com.linkedin.ml.metadata.MLMetric", "com.linkedin.ml.metadata.MLModelDeploymentProperties", "com.linkedin.ml.metadata.MLModelFactorPrompts", "com.linkedin.ml.metadata.MLModelFactors", "com.linkedin.ml.metadata.MLModelGroupProperties", "com.linkedin.ml.metadata.MLModelProperties", "com.linkedin.ml.metadata.MLPrimaryKeyProperties", "com.linkedin.ml.metadata.Metrics", "com.linkedin.ml.metadata.QuantitativeAnalyses", "com.linkedin.ml.metadata.ResultsType", "com.linkedin.ml.metadata.SourceCode", "com.linkedin.ml.metadata.SourceCodeUrl", "com.linkedin.ml.metadata.SourceCodeUrlType", "com.linkedin.ml.metadata.TrainingData", {
     "type" : "record",
     "name" : "SystemMetadata",
     "namespace" : "com.linkedin.mxe",