commit dfcf175a25cd76c8fe9cd152a1efc409d18c8876
author Prasad Pawar <prasad.pawar@freestoneinfotech.com> Mon Sep 22 12:17:21 2025 +0530
committer Prasad Pawar <prasad.pawar@freestoneinfotech.com> Mon Sep 22 12:17:21 2025 +0530
tree fa6872c03061d0df914e89c9a45a42a1bf8da303
parent 25305c0dde397188866fe2fbf6e634a9dd8d7637

ATLAS-5110: [REACT UI] Incorrect entities are being displayed for Empty entity types

dashboard/src/views/SearchResult/SearchResult.tsx

diff --git a/dashboard/src/views/SearchResult/SearchResult.tsx b/dashboard/src/views/SearchResult/SearchResult.tsx
index aa1cd09..a6574e1 100644
--- a/dashboard/src/views/SearchResult/SearchResult.tsx
+++ b/dashboard/src/views/SearchResult/SearchResult.tsx
@@ -231,11 +231,17 @@
         }
         if (!dataLength) {
           setIsEmptyData(true);
+          setSearchData({ entities: [], referredEntities: {} });
+          setTotalCount(0);
+          setPageCount(0);
           setLoader(false);
         } else {
+          setIsEmptyData(false);
           setSearchData(searchResp.data);
           setTotalCount(totalCount || 0);
-          setPageCount(Math.ceil(totalCount / pagination.pageSize));
+          setPageCount(
+            Math.ceil((totalCount || 0) / ((pagination && pagination.pageSize) || 1))
+          );
           setLoader(false);
         }
       } catch (error: any) {