bugfix(fe): Search page freezing on loading state for tabs with 0 ent…

…ities (#1587)
opendatadiscovery · Jan 18, 2024 · 8ea9d90 · 8ea9d90
1 parent 528e018
commit 8ea9d90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/odd-platform-ui/src/components/Search/Results/Results.tsx b/odd-platform-ui/src/components/Search/Results/Results.tsx
@@ -51,7 +51,7 @@ const Results: React.FC = () => {
   const searchResults = useAppSelector(getSearchResults);
   const searchResultsError = useAppSelector(getSearchResultsError);
   const searchFiltersSynced = useAppSelector(getSearchFacetsSynced);
-  const { total, page, hasNext } = useAppSelector(getSearchResultsPageInfo);
+  const { page, hasNext } = useAppSelector(getSearchResultsPageInfo);
 
   const isSearchFetching = useAppSelector(getSearchIsFetching);
   const isSearchCreatingAndFetching = useAppSelector(getSearchIsCreatingAndFetching);
@@ -160,7 +160,7 @@ const Results: React.FC = () => {
           </InfiniteScroll>
           <EmptyContentPlaceholder
             isContentLoaded={!isSearchFetching}
-            isContentEmpty={!total}
+            isContentEmpty={!searchResults.length}
             text={t('No matches found')}
           />
         </S.ListContainer>

diff --git a/odd-platform-ui/src/redux/selectors/dataentitySearch.selectors.ts b/odd-platform-ui/src/redux/selectors/dataentitySearch.selectors.ts
@@ -68,23 +68,19 @@ export const getSearchIsFetching = createSelector(
   getSearchUpdateStatuses,
   getSearchResultsFetchStatuses,
   getSearchFacetsSynced,
-  searchState,
   (
     { isLoading: isSearchCreating },
     { isLoading: isSearchFetching },
     { isLoading: isSearchUpdating },
     { isLoading: isSearchResultsFetching },
-    isSynced,
-    search
+    isSynced
   ) =>
     compact([
       isSearchCreating,
       isSearchFetching,
       isSearchUpdating,
       isSearchResultsFetching,
-    ]).length > 0 ||
-    !isSynced ||
-    (!!search.results.pageInfo.total && !search.results.items.length)
+    ]).length > 0 || !isSynced
 );
 
 export const getSearchIsCreatingAndFetching = createSelector(