diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts index 9966d0b0b1e..9543fa48b16 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts @@ -18,6 +18,7 @@ export const PRIMERY_COLOR = '#7147E8'; export const LITE_GRAY_COLOR = '#DBE0EB'; export const FOLLOWERS_VIEW_CAP = 20; +export const INITIAL_PAGIN_VALUE = 1; export const JSON_TAB_SIZE = 2; export const PAGE_SIZE = 10; export const PAGE_SIZE_MEDIUM = 16; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsAndUsersPage/TeamsAndUsersPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsAndUsersPage/TeamsAndUsersPage.component.tsx index f53e4fd9d17..28db2e22aa1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsAndUsersPage/TeamsAndUsersPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsAndUsersPage/TeamsAndUsersPage.component.tsx @@ -37,6 +37,7 @@ import Loader from '../../components/Loader/Loader'; import TeamsAndUsers from '../../components/TeamsAndUsers/TeamsAndUsers.component'; import { getTeamAndUserDetailsPath, + INITIAL_PAGIN_VALUE, PAGE_SIZE_MEDIUM, ROUTES, } from '../../constants/constants'; @@ -69,7 +70,8 @@ const TeamsAndUsersPage = () => { const [currentTeam, setCurrentTeam] = useState(); const [currentTeamUsers, setCurrentTeamUsers] = useState([]); const [teamUserPagin, setTeamUserPagin] = useState({} as Paging); - const [currentTeamUserPage, setCurrentTeamUserPage] = useState(1); + const [currentTeamUserPage, setCurrentTeamUserPage] = + useState(INITIAL_PAGIN_VALUE); const [teamUsersSearchText, setTeamUsersSearchText] = useState(''); const [isDescriptionEditable, setIsDescriptionEditable] = useState(false); const [isAddingTeam, setIsAddingTeam] = useState(false); @@ -311,11 +313,15 @@ const TeamsAndUsersPage = () => { .finally(() => setIsTeamMemberLoading(false)); }; - const teamUserPaginHandler = (cursorValue: string | number) => { + const teamUserPaginHandler = ( + cursorValue: string | number, + activePage?: number + ) => { if (teamUsersSearchText) { setCurrentTeamUserPage(cursorValue as number); searchUsers(teamUsersSearchText, cursorValue as number); } else { + setCurrentTeamUserPage(activePage as number); getCurrentTeamUsers(currentTeam?.name || '', { [cursorValue]: teamUserPagin[cursorValue as keyof Paging] as string, }); @@ -324,8 +330,9 @@ const TeamsAndUsersPage = () => { const handleTeamUsersSearchAction = (text: string) => { setTeamUsersSearchText(text); + setCurrentTeamUserPage(INITIAL_PAGIN_VALUE); if (text) { - searchUsers(text, currentTeamUserPage); + searchUsers(text, INITIAL_PAGIN_VALUE); } else { getCurrentTeamUsers(currentTeam?.name as string); } @@ -371,6 +378,7 @@ const TeamsAndUsersPage = () => { .then((res: AxiosResponse) => { if (res.data) { fetchCurrentTeam(res.data.name, true); + setTeamUsersSearchText(''); } else { throw jsonData['api-error-messages']['unexpected-server-response']; }