From a49aa396f2997ff45eb691edb982e06837bd66e0 Mon Sep 17 00:00:00 2001
From: karan <karan.tompe@ayanworks.com>
Date: Tue, 10 Oct 2023 19:00:29 +0530
Subject: [PATCH 1/2] fix: invitation issues

Signed-off-by: karan <karan.tompe@ayanworks.com>
---
 src/app/SideBar.astro                         |  2 +-
 .../EcosystemInvite/SentInvitations.tsx       |  1 +
 src/components/User/UserDashBoard.tsx         | 39 +++++++------------
 src/config/pathRoutes.ts                      |  1 +
 .../{ecosystems => ecosystem}/index.astro     |  2 +-
 src/pages/ecosystem/profile.astro             |  8 ----
 6 files changed, 18 insertions(+), 35 deletions(-)
 rename src/pages/{ecosystems => ecosystem}/index.astro (96%)
 delete mode 100644 src/pages/ecosystem/profile.astro

diff --git a/src/app/SideBar.astro b/src/app/SideBar.astro
index e633df0db..1ef88fdcb 100644
--- a/src/app/SideBar.astro
+++ b/src/app/SideBar.astro
@@ -115,7 +115,7 @@ import { pathRoutes } from '../config/pathRoutes';
 						<ul id="dropdown-ecosystems" class="py-2 space-y-2">
 							<li>
 								<a
-									href={pathRoutes.ecosystem.profile}
+									href={pathRoutes.ecosystem.root}
 									class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
 								>
 									<svg
diff --git a/src/components/EcosystemInvite/SentInvitations.tsx b/src/components/EcosystemInvite/SentInvitations.tsx
index 17e3d2a89..ae0ad4c7d 100644
--- a/src/components/EcosystemInvite/SentInvitations.tsx
+++ b/src/components/EcosystemInvite/SentInvitations.tsx
@@ -65,6 +65,7 @@ const SentInvitations = () => {
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 			setLoading(true);
 			await getAllSentInvitations();
+			setMessage('Invitation deleted successfully')
 		} else {
 			setError(response as string);
 		}
diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
index 1f838e049..075daa27f 100644
--- a/src/components/User/UserDashBoard.tsx
+++ b/src/components/User/UserDashBoard.tsx
@@ -10,11 +10,11 @@ import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
 import { getOrganizations } from '../../api/organization';
 import { getUserActivity } from '../../api/users';
 import {
-	getEcosytemReceivedInvitations,
+	getUserEcosystemInvitations,
 	getUserInvitations,
 } from '../../api/invitations';
 import { pathRoutes } from '../../config/pathRoutes';
-import { setToLocalStorage } from '../../api/Auth';
+import { getFromLocalStorage, setToLocalStorage } from '../../api/Auth';
 import { dateConversion } from '../../utils/DateConversion';
 import DateTooltip from '../Tooltip';
 
@@ -49,16 +49,8 @@ const UserDashBoard = () => {
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 			const totalPages = data?.data?.totalPages;
 			const invitationList = data?.data?.invitations;
-			const orgName = invitationList.map(
-				(invitations: { organisation: { name: string } }) => {
-					return invitations.organisation.name;
-				},
-			);
-
 			if (invitationList.length > 0) {
-				setMessage(
-					`You have received invitations to join ${orgName} organisation`,
-				);
+				setMessage(`You have received invitations to join organisation`);
 				setViewButton(true);
 			}
 			setCurrentPage({
@@ -73,7 +65,7 @@ const UserDashBoard = () => {
 
 	const getAllEcosystemInvitations = async () => {
 		setLoading(true);
-		const response = await getEcosytemReceivedInvitations(
+		const response = await getUserEcosystemInvitations(
 			currentPage.pageNumber,
 			currentPage.pageSize,
 			'',
@@ -82,21 +74,14 @@ const UserDashBoard = () => {
 
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 			const totalPages = data?.data?.totalPages;
-			const invitationList = data?.data;
-			const ecoSystemName = invitationList.map(
-				(invitations: { name: string }) => {
-					return invitations.name;
-				},
-			);
 			const invitationPendingList = data?.data?.invitations.filter(
 				(invitation: { status: string }) => {
 					return invitation.status === 'pending';
 				},
 			);
+
 			if (invitationPendingList.length > 0) {
-				setEcoMessage(
-					`You have received invitation to join ${ecoSystemName} ecosystem `,
-				);
+				setEcoMessage(`You have received invitation to join ecosystem `);
 				setViewButton(true);
 			}
 			setCurrentPage({
@@ -154,12 +139,17 @@ const UserDashBoard = () => {
 
 		setLoading(false);
 	};
-
+	const checkOrgId = async () => {
+		const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
+		if (orgId) {
+			await getAllEcosystemInvitations();
+		}
+	};
 	useEffect(() => {
 		getAllInvitations();
 		getAllOrganizations();
 		getUserRecentActivity();
-		getAllEcosystemInvitations();
+		checkOrgId();
 	}, []);
 
 	const goToOrgDashboard = async (orgId: number, roles: string[]) => {
@@ -193,7 +183,6 @@ const UserDashBoard = () => {
 						setError(null);
 					}}
 				/>
-				{/* } */}
 			</div>
 
 			<div className="grid w-full grid-cols-1 gap-4 mt-0 mb-4 xl:grid-cols-2 2xl:grid-cols-3">
@@ -202,7 +191,7 @@ const UserDashBoard = () => {
 						<h2 className="text-base font-bold text-gray-500 dark:text-white mb-2">
 							Organizations
 						</h2>
-						
+
 						{organizationsList?.map((org) => {
 							const roles: string[] = org.userOrgRoles.map(
 								(role) => role.orgRole.name,
diff --git a/src/config/pathRoutes.ts b/src/config/pathRoutes.ts
index 91015076a..2af726073 100644
--- a/src/config/pathRoutes.ts
+++ b/src/config/pathRoutes.ts
@@ -34,6 +34,7 @@ export const pathRoutes = {
         },
     },
     ecosystem: {
+			  root:'/ecosystem',
         profile: "/ecosystem/profile",
         endorsements: "/ecosystem/endorsements",
 				invitation:"/ecosystem/invitation"
diff --git a/src/pages/ecosystems/index.astro b/src/pages/ecosystem/index.astro
similarity index 96%
rename from src/pages/ecosystems/index.astro
rename to src/pages/ecosystem/index.astro
index ae15c77de..b555bbece 100644
--- a/src/pages/ecosystems/index.astro
+++ b/src/pages/ecosystem/index.astro
@@ -13,4 +13,4 @@ if (!response) {
 
 <LayoutSidebar>
 	<Dashboard client:visible/>
-</LayoutSidebar>
\ No newline at end of file
+</LayoutSidebar>
diff --git a/src/pages/ecosystem/profile.astro b/src/pages/ecosystem/profile.astro
deleted file mode 100644
index 1437e6e6f..000000000
--- a/src/pages/ecosystem/profile.astro
+++ /dev/null
@@ -1,8 +0,0 @@
----
-import LayoutSidebar from '../../app/LayoutSidebar.astro';
-import Dashboard from '../../components/Ecosystem/Dashboard';
----
-
-<LayoutSidebar>
-	<Dashboard client:visible/>
-</LayoutSidebar>
\ No newline at end of file

From 2f28d11e56aeae137152de55211af1424a1176cd Mon Sep 17 00:00:00 2001
From: karan <karan.tompe@ayanworks.com>
Date: Tue, 10 Oct 2023 20:09:04 +0530
Subject: [PATCH 2/2] fix: handled routes

Signed-off-by: karan <karan.tompe@ayanworks.com>
---
 src/components/EcosystemInvite/EcoInvitationList.tsx         | 4 +++-
 .../EcosystemInvite/EcoSystemReceivedInvitations.tsx         | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/EcosystemInvite/EcoInvitationList.tsx b/src/components/EcosystemInvite/EcoInvitationList.tsx
index 8bf8b0f74..3b982b6dc 100644
--- a/src/components/EcosystemInvite/EcoInvitationList.tsx
+++ b/src/components/EcosystemInvite/EcoInvitationList.tsx
@@ -4,11 +4,13 @@ import React from 'react';
 interface InvitationProps{
 	invitationId:string;
 	invitationEmail:string
+	ecosytem:[]
 }
 
 const EcoInvitationList = (props: InvitationProps ) => {
 
-	const {invitationId, invitationEmail} = props
+	const {invitationId, invitationEmail,ecosytem} = props
+	
 	return (
 		<>
 			<div className="flex space-x-4">
diff --git a/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx b/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
index 3577fdbb1..1a2e0d986 100644
--- a/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
+++ b/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
@@ -26,7 +26,7 @@ const initialPageState = {
 
 
 export interface EcosystemInvitation {
-	ecosystem: any
+	ecosystem: []
 	id: string
 	createDateTime: string
 	createdBy: number
@@ -146,7 +146,7 @@ const ReceivedInvitations = () => {
 		if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) {
 			setMessage(data?.message);
 			setLoading(false);
-			window.location.href = pathRoutes.ecosystem.profile
+			window.location.href = pathRoutes.ecosystem.root
 		} else {
 			setError(response as string);
 			setLoading(false);
@@ -239,6 +239,7 @@ stroke-linejoin="round"
 													<EcoInvitationList 
 													invitationId={invitation.id} 
 													invitationEmail={invitation.email} 
+													ecosytem={invitation.ecosystem}
 													/>
 
 													<div  id={invitation.email} className="flex">