Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(search) Fixes a UI issue so results and filters are always separated #4811

Merged
merged 1 commit into from
May 3, 2022
Merged

fix(search) Fixes a UI issue so results and filters are always separated #4811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 85 additions & 78 deletions datahub-web-react/src/app/search/SearchResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,88 +174,95 @@ export const SearchResults = ({
return (
<>
{loading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
<SearchBody>
<FiltersContainer>
<FiltersHeader>Filter</FiltersHeader>
<SearchFilterContainer>
<SearchFilters
loading={loading}
facets={filters || []}
selectedFilters={selectedFilters}
onFilterSelect={onFilterSelect}
/>
</SearchFilterContainer>
</FiltersContainer>
<ResultContainer>
<PaginationInfoContainer>
<Typography.Paragraph>
Showing{' '}
<b>
{lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
</b>{' '}
of <b>{totalResults}</b> results
</Typography.Paragraph>
<SearchMenuContainer>
<SearchExtendedMenu
callSearchOnVariables={callSearchOnVariables}
entityFilters={entityFilters}
filters={filtersWithoutEntities}
query={query}
<div>
<SearchBody>
<FiltersContainer>
<FiltersHeader>Filter</FiltersHeader>
<SearchFilterContainer>
<SearchFilters
loading={loading}
facets={filters || []}
selectedFilters={selectedFilters}
onFilterSelect={onFilterSelect}
/>
</SearchMenuContainer>
</PaginationInfoContainer>
{!loading && (
<>
<ResultList<React.FC<ListProps<SearchResult>>>
dataSource={searchResponse?.searchResults}
split={false}
locale={{
emptyText: (
<NoDataContainer>
<Empty
style={{ fontSize: 18, color: ANTD_GRAY[8] }}
description={`No results found for "${query}"`}
/>
<Button
onClick={() => navigateToSearchUrl({ query: '*', page: 0, history })}
</SearchFilterContainer>
</FiltersContainer>
<ResultContainer>
<PaginationInfoContainer>
<Typography.Paragraph>
Showing{' '}
<b>
{lastResultIndex > 0 ? (page - 1) * pageSize + 1 : 0} - {lastResultIndex}
</b>{' '}
of <b>{totalResults}</b> results
</Typography.Paragraph>
<SearchMenuContainer>
<SearchExtendedMenu
callSearchOnVariables={callSearchOnVariables}
entityFilters={entityFilters}
filters={filtersWithoutEntities}
query={query}
/>
</SearchMenuContainer>
</PaginationInfoContainer>
{!loading && (
<>
<ResultList<React.FC<ListProps<SearchResult>>>
dataSource={searchResponse?.searchResults}
split={false}
locale={{
emptyText: (
<NoDataContainer>
<Empty
style={{ fontSize: 18, color: ANTD_GRAY[8] }}
description={`No results found for "${query}"`}
/>
<Button
onClick={() =>
navigateToSearchUrl({ query: '*', page: 0, history })
}
>
<RocketOutlined /> Explore your metadata
</Button>
</NoDataContainer>
),
}}
renderItem={(item, index) => (
<>
<List.Item
style={{ padding: 0 }}
onClick={() => onResultClick(item, index)}
>
<RocketOutlined /> Explore your metadata
</Button>
</NoDataContainer>
),
}}
renderItem={(item, index) => (
<>
<List.Item style={{ padding: 0 }} onClick={() => onResultClick(item, index)}>
{entityRegistry.renderSearchResult(item.entity.type, item)}
</List.Item>
<ThinDivider />
</>
)}
/>
<PaginationControlContainer>
<Pagination
current={page}
pageSize={SearchCfg.RESULTS_PER_PAGE}
total={totalResults}
showLessItems
onChange={onChangePage}
showSizeChanger={false}
{entityRegistry.renderSearchResult(item.entity.type, item)}
</List.Item>
<ThinDivider />
</>
)}
/>
</PaginationControlContainer>
{authenticatedUserUrn && (
<SearchResultsRecommendationsContainer>
<SearchResultsRecommendations
userUrn={authenticatedUserUrn}
query={query}
filters={selectedFilters}
<PaginationControlContainer>
<Pagination
current={page}
pageSize={SearchCfg.RESULTS_PER_PAGE}
total={totalResults}
showLessItems
onChange={onChangePage}
showSizeChanger={false}
/>
</SearchResultsRecommendationsContainer>
)}
</>
)}
</ResultContainer>
</SearchBody>
</PaginationControlContainer>
{authenticatedUserUrn && (
<SearchResultsRecommendationsContainer>
<SearchResultsRecommendations
userUrn={authenticatedUserUrn}
query={query}
filters={selectedFilters}
/>
</SearchResultsRecommendationsContainer>
)}
</>
)}
</ResultContainer>
</SearchBody>
</div>
</>
);
};