Merge pull request #348 from credebl/fix-minor-issues

fix: pagination issues in invitation and member list
credebl · Oct 16, 2023 · 53383df · 53383df
2 parents b7d5302 + fd8de7d
commit 53383df
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 32 deletions.
diff --git a/src/api/invitations.ts b/src/api/invitations.ts
@@ -208,7 +208,7 @@ export const getEcosystemInvitations = async (pageNumber: number, pageSize: numb
 	const ecosystemId = await getFromLocalStorage(storageKeys.ECOSYSTEM_ID);
 
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.Ecosystem.root}/${ecosystemId}/${orgId}${apiRoutes.Ecosystem.invitations}`
+	const url = `${apiRoutes.Ecosystem.root}/${ecosystemId}/${orgId}${apiRoutes.Ecosystem.invitations}?pageNumber=${pageNumber}&pageSize=${pageSize}&search=${search}`
 
 	const token = await getFromLocalStorage(storageKeys.TOKEN)
 

diff --git a/src/components/Ecosystem/MemberList.tsx b/src/components/Ecosystem/MemberList.tsx
@@ -30,22 +30,23 @@ const MemberList = () => {
 		const { data } = response as AxiosResponse;
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 			const totalPages = data?.data?.totalPages;
-
-			const compareMembers=(
-				firstMember: { ecosystemRole: { name: string; }; },
+			
+			const compareMembers = (
+					firstMember: { ecosystemRole: { name: string; }; },
 				secondMember: { ecosystemRole: { name: string; }; }
-			)=> {
+			) => {
 				const firstName = firstMember?.ecosystemRole?.name;
 				const secondName = secondMember?.ecosystemRole?.name;
 
-				if (firstName > secondName) {
-					return 1;
-				} else if (secondName > firstName) {
-					return -1;
-				} else {
-					return 0;
+				switch (true) {
+					case firstName > secondName:
+						return 1;
+					case secondName > firstName:
+						return -1;
+					default:
+						return 0;
 				}
-			}
+			};
 			const sortedMemberList = data?.data?.members?.sort(compareMembers)
 			const membersData = sortedMemberList?.map(
 				(member: {
@@ -58,7 +59,7 @@ const MemberList = () => {
 					return {
 						data: [
 							{
-								data: member.orgName || 'Not avilable',
+								data: member.orgName || 'Not available',
 							},
 							{
 								data: <DateTooltip date={member?.createDateTime}>
@@ -176,7 +177,7 @@ const MemberList = () => {
 				loading={loading}
 			></DataTable>
 
-			{currentPage.pageNumber > 1 && (
+			{currentPage.total > 1 && (
 				<div className="flex items-center justify-end mb-4">
 					<Pagination
 						currentPage={currentPage.pageNumber}

diff --git a/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx b/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
@@ -319,7 +319,7 @@ const ReceivedInvitations = () => {
 						)
 					)}
 
-				{currentPage.pageNumber > 1 &&	<div className="flex items-center justify-end mb-4">
+				{currentPage.total > 1 &&	<div className="flex items-center justify-end mb-4">
 						<Pagination
 							currentPage={currentPage.pageNumber}
 							onPageChange={onPageChange}

diff --git a/src/components/EcosystemInvite/SentInvitations.tsx b/src/components/EcosystemInvite/SentInvitations.tsx
@@ -249,7 +249,7 @@ const SentInvitations = () => {
 						</div>
 					)}
 
-					{currentPage.pageNumber >1 && (
+					{currentPage.total > 1 && (
 						<div className="flex items-center justify-end mb-4">
 							<Pagination
 								currentPage={currentPage.pageNumber}

diff --git a/src/components/Resources/Schema/SchemasList.tsx b/src/components/Resources/Schema/SchemasList.tsx
@@ -271,9 +271,7 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD
 										</div>)
 										:
 										(
-											<div>
-												{walletStatus ?
-													<EmptyListMessage
+												<EmptyListMessage
 														message={emptyListTitle}
 														description={emptyListDesc}
 														buttonContent={emptyListBtn}
@@ -284,19 +282,6 @@ const SchemaList = (props: { schemaSelectionCallback: (schemaId: string, schemaD
 															window.location.href = `${pathRoutes.organizations.createSchema}?OrgId=${orgId}`
 														}}
 													/>
-													:
-													<EmptyListMessage
-														message={'No Wallet'}
-														description={'Get started by creating a Wallet'}
-														buttonContent={'Create Wallet'}
-														svgComponent={<svg className='pr-2 mr-1' xmlns="http://www.w3.org/2000/svg" width="24" height="15" fill="none" viewBox="0 0 24 24">
-															<path fill="#fff" d="M21.89 9.89h-7.78V2.11a2.11 2.11 0 1 0-4.22 0v7.78H2.11a2.11 2.11 0 1 0 0 4.22h7.78v7.78a2.11 2.11 0 1 0 4.22 0v-7.78h7.78a2.11 2.11 0 1 0 0-4.22Z" />
-														</svg>}
-														onClick={() => {
-															window.location.href = `${pathRoutes.organizations.dashboard}?OrgId=${orgId}`
-														}}
-													/>}
-											</div>
 										)
 								}
 							</div>