From 3bd3158bee8d79a98b00fc3a26fbf744de01985c Mon Sep 17 00:00:00 2001
From: Harshit Shah <dinkushah169@gmail.com>
Date: Wed, 20 Aug 2025 05:42:47 +0530
Subject: [PATCH] Fix pagination for Persona listing (#22975)

* Fix pagination for Persona

* fix failing tests
---
 .../PersonaListPage/PersonaPage.test.tsx      |  8 ++
 .../Persona/PersonaListPage/PersonaPage.tsx   | 76 ++++++++++++-------
 2 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx
index f8a95ecca87..949cbbf3a09 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx
@@ -11,6 +11,7 @@
  *  limitations under the License.
  */
 import { act, fireEvent, render, screen } from '@testing-library/react';
+import { CursorType } from '../../../enums/pagination.enum';
 import { getAllPersonas } from '../../../rest/PersonaAPI';
 import { PersonaPage } from './PersonaPage';
 
@@ -82,6 +83,13 @@ jest.mock('../../../hooks/paging/usePaging', () => ({
     currentPage: 1,
     showPagination: true,
     pageSize: 10,
+    paging: {
+      [CursorType.AFTER]: '1',
+    },
+    pagingCursor: {
+      cursorType: CursorType.AFTER,
+      cursorValue: '',
+    },
     handlePageChange: jest.fn(),
     handlePagingChange: jest.fn(),
     handlePageSizeChange: jest.fn(),
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx
index 1c70ba6352b..2e1084adca0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx
@@ -12,6 +12,7 @@
  */
 import { Button, Skeleton } from 'antd';
 import Card from 'antd/lib/card/Card';
+import { AxiosError } from 'axios';
 import { isEmpty } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -28,12 +29,14 @@ import { GlobalSettingsMenuCategory } from '../../../constants/GlobalSettings.co
 import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant';
 import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum';
 import { TabSpecificField } from '../../../enums/entity.enum';
+import { CursorType } from '../../../enums/pagination.enum';
 import { Persona } from '../../../generated/entity/teams/persona';
 import { Paging } from '../../../generated/type/paging';
 import { useAuth } from '../../../hooks/authHooks';
 import { usePaging } from '../../../hooks/paging/usePaging';
 import { getAllPersonas } from '../../../rest/PersonaAPI';
 import { getSettingPageEntityBreadCrumb } from '../../../utils/GlobalSettingsUtils';
+import { showErrorToast } from '../../../utils/ToastUtils';
 import './persona-page.less';
 
 const PERSONA_PAGE_SIZE = 12;
@@ -49,9 +52,10 @@ export const PersonaPage = ({ pageTitle }: { pageTitle: string }) => {
   const {
     currentPage,
     handlePageChange,
+    handlePagingChange,
     pageSize,
     paging,
-    handlePagingChange,
+    pagingCursor,
     showPagination,
   } = usePaging(PERSONA_PAGE_SIZE);
 
@@ -60,28 +64,44 @@ export const PersonaPage = ({ pageTitle }: { pageTitle: string }) => {
     []
   );
 
-  const fetchPersonas = useCallback(async (params?: Partial<Paging>) => {
-    try {
-      setIsLoading(true);
-      const { data, paging } = await getAllPersonas({
-        limit: pageSize,
-        fields: TabSpecificField.USERS,
-        after: params?.after,
-        before: params?.before,
-      });
+  const fetchPersonas = useCallback(
+    async (params?: Partial<Paging>) => {
+      try {
+        setIsLoading(true);
+        const { data, paging } = await getAllPersonas({
+          limit: pageSize,
+          fields: TabSpecificField.USERS,
+          after: params?.after,
+          before: params?.before,
+        });
 
-      setPersona(data);
-      handlePagingChange(paging);
-    } catch {
-      // Error
-    } finally {
-      setIsLoading(false);
-    }
-  }, []);
+        setPersona(data);
+        handlePagingChange(paging);
+      } catch (error) {
+        showErrorToast(error as AxiosError);
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [pageSize, handlePagingChange]
+  );
 
+  // Initial load and when URL params change
   useEffect(() => {
-    fetchPersonas();
-  }, [pageSize]);
+    const cursorValue = pagingCursor.cursorValue;
+    const cursorType = pagingCursor.cursorType as CursorType;
+
+    if (cursorType && cursorValue) {
+      fetchPersonas({ [cursorType]: cursorValue });
+    } else {
+      fetchPersonas();
+    }
+  }, [
+    pagingCursor.cursorType,
+    pagingCursor.cursorValue,
+    pageSize,
+    fetchPersonas,
+  ]);
 
   const handleAddNewPersona = useCallback(() => {
     setAddEditPersona({} as Persona);
@@ -112,14 +132,18 @@ export const PersonaPage = ({ pageTitle }: { pageTitle: string }) => {
 
   const handlePersonaAddEditSave = useCallback(() => {
     handlePersonalAddEditCancel();
-    fetchPersonas();
-  }, [fetchPersonas]);
+    fetchPersonas({ [CursorType.AFTER]: paging[CursorType.AFTER] });
+  }, [fetchPersonas, paging]);
 
   const handlePersonaPageChange = useCallback(
     ({ currentPage, cursorType }: PagingHandlerParams) => {
-      handlePageChange(currentPage);
-      if (cursorType) {
-        fetchPersonas({ [cursorType]: paging[cursorType] });
+      const cursorValue = cursorType ? paging[cursorType] : undefined;
+      handlePageChange(currentPage, {
+        cursorType: cursorType as CursorType,
+        cursorValue,
+      });
+      if (cursorType && cursorValue) {
+        fetchPersonas({ [cursorType]: cursorValue });
       }
     },
     [handlePageChange, fetchPersonas, paging]
@@ -187,7 +211,7 @@ export const PersonaPage = ({ pageTitle }: { pageTitle: string }) => {
 
           {/* Pagination at bottom of page */}
           {showPagination && (
-            <div className="d-flex justify-center align-center m-b-sm">
+            <div className="d-flex justify-center align-center m-b-sm m-t-sm">
               <NextPrevious
                 currentPage={currentPage}
                 isLoading={isLoading}