Skip to content

Commit 8ea9d90

Browse files
bugfix(fe): Search page freezing on loading state for tabs with 0 entities (#1587)
1 parent 528e018 commit 8ea9d90

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

odd-platform-ui/src/components/Search/Results/Results.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const Results: React.FC = () => {
5151
const searchResults = useAppSelector(getSearchResults);
5252
const searchResultsError = useAppSelector(getSearchResultsError);
5353
const searchFiltersSynced = useAppSelector(getSearchFacetsSynced);
54-
const { total, page, hasNext } = useAppSelector(getSearchResultsPageInfo);
54+
const { page, hasNext } = useAppSelector(getSearchResultsPageInfo);
5555

5656
const isSearchFetching = useAppSelector(getSearchIsFetching);
5757
const isSearchCreatingAndFetching = useAppSelector(getSearchIsCreatingAndFetching);
@@ -160,7 +160,7 @@ const Results: React.FC = () => {
160160
</InfiniteScroll>
161161
<EmptyContentPlaceholder
162162
isContentLoaded={!isSearchFetching}
163-
isContentEmpty={!total}
163+
isContentEmpty={!searchResults.length}
164164
text={t('No matches found')}
165165
/>
166166
</S.ListContainer>

odd-platform-ui/src/redux/selectors/dataentitySearch.selectors.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,19 @@ export const getSearchIsFetching = createSelector(
6868
getSearchUpdateStatuses,
6969
getSearchResultsFetchStatuses,
7070
getSearchFacetsSynced,
71-
searchState,
7271
(
7372
{ isLoading: isSearchCreating },
7473
{ isLoading: isSearchFetching },
7574
{ isLoading: isSearchUpdating },
7675
{ isLoading: isSearchResultsFetching },
77-
isSynced,
78-
search
76+
isSynced
7977
) =>
8078
compact([
8179
isSearchCreating,
8280
isSearchFetching,
8381
isSearchUpdating,
8482
isSearchResultsFetching,
85-
]).length > 0 ||
86-
!isSynced ||
87-
(!!search.results.pageInfo.total && !search.results.items.length)
83+
]).length > 0 || !isSynced
8884
);
8985

9086
export const getSearchIsCreatingAndFetching = createSelector(

0 commit comments

Comments
 (0)