diff --git a/src/components/Ecosystem/Dashboard.tsx b/src/components/Ecosystem/Dashboard.tsx index 5857ce2d2..5a451d411 100644 --- a/src/components/Ecosystem/Dashboard.tsx +++ b/src/components/Ecosystem/Dashboard.tsx @@ -19,7 +19,7 @@ import SendInvitationModal from '../organization/invitations/SendInvitationModal import { Dropdown } from 'flowbite-react'; import EditPopupModal from '../EditEcosystemOrgModal'; import { getFromLocalStorage, setToLocalStorage } from '../../api/Auth'; -import { getEcosytemReceivedInvitations } from '../../api/invitations'; +import { getUserEcosystemInvitations } from '../../api/invitations'; import { pathRoutes } from '../../config/pathRoutes'; import type { EcosystemDashboard } from '../organization/interfaces'; @@ -66,28 +66,25 @@ const Dashboard = () => { fetchEcosystemDetails() }; - const getAllEcosystemInvitations = async () => { - setLoading(true); - const response = await getEcosytemReceivedInvitations( - currentPage.pageNumber, - currentPage.pageSize, - '' - ); - const { data } = response as AxiosResponse; - + const getAllEcosystemInvitations = async () => { + + setLoading(true); + const response = await getUserEcosystemInvitations( + currentPage.pageNumber, + currentPage.pageSize, + '', + ); + const { data } = response as AxiosResponse; + 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 && data?.data?.invitations?.filter((invitation: { status: string; }) => { + const totalPages = data?.data?.totalPages; + + const invitationPendingList = data?.data?.invitations.filter((invitation: { status: string; }) => { return invitation.status === 'pending' }) - if (invitationPendingList && invitationPendingList.length > 0) { - setMessage(`You have received invitation to join ${ecoSystemName} ecosystem `) + if (invitationPendingList.length > 0) { + setMessage(`You have received invitation to join ecosystem `) setViewButton(true); } setCurrentPage({ @@ -147,10 +144,17 @@ const Dashboard = () => { } + const checkOrgId = async () => { + const orgId = await getFromLocalStorage(storageKeys.ORG_ID); + if (orgId) { + await getAllEcosystemInvitations(); + } + }; + const getDashboardData = async () => { + await checkOrgId(); await fetchEcosystemDetails(); await fetchEcosystemDashboard(); - getAllEcosystemInvitations(); }; useEffect(() => { @@ -188,9 +192,9 @@ const Dashboard = () => { <>
{ { setMessage(null); @@ -209,8 +213,6 @@ const Dashboard = () => { }} /> )} - - } @@ -414,4 +416,4 @@ const Dashboard = () => { ); }; -export default Dashboard; \ No newline at end of file +export default Dashboard; diff --git a/src/components/EcosystemInvite/EcoInvitationList.tsx b/src/components/EcosystemInvite/EcoInvitationList.tsx index fbd2ddd54..c53d46b1f 100644 --- a/src/components/EcosystemInvite/EcoInvitationList.tsx +++ b/src/components/EcosystemInvite/EcoInvitationList.tsx @@ -56,7 +56,7 @@ const EcoInvitationList = (props: InvitationProps) => {
  • - Roles: + Role:{' '} { if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) { setMessage(data?.message); setLoading(false); - window.location.href = pathRoutes.ecosystem.root + getAllInvitations() } else { setError(response as string); setLoading(false); @@ -201,20 +201,33 @@ stroke-linejoin="round" return (
    -
    - +
    +
    + + +

    - Received Invitations + Received Ecosystem Invitations

    - setMessage(data)} - setOpenModal={props.setOpenModal} - /> - diff --git a/src/components/EcosystemInvite/SentInvitations.tsx b/src/components/EcosystemInvite/SentInvitations.tsx index ae0ad4c7d..09b3bdbcf 100644 --- a/src/components/EcosystemInvite/SentInvitations.tsx +++ b/src/components/EcosystemInvite/SentInvitations.tsx @@ -65,7 +65,7 @@ const SentInvitations = () => { if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) { setLoading(true); await getAllSentInvitations(); - setMessage('Invitation deleted successfully') + setMessage('Invitation deleted successfully'); } else { setError(response as string); } @@ -110,8 +110,8 @@ const SentInvitations = () => {
      {invitationsList.map((invitation) => ( -
    • -
      +
    • +
      { -

      {invitation.email} @@ -164,9 +163,11 @@ const SentInvitations = () => {

    • - Roles:{' '} + Role:{' '} + key={invitation.id} + className="m-1 bg-blue-100 text-blue-800 text-sm font-medium mr-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300" + > Ecosystem Member
      @@ -176,43 +177,52 @@ const SentInvitations = () => {
    +
    -
    - + {invitation.status} +
    -
    - -
    - Status: - - {invitation.status} - + {invitation.status === 'pending' && ( +
    + +
    + )}
  • diff --git a/src/components/organization/invitations/SendInvitationModal.tsx b/src/components/organization/invitations/SendInvitationModal.tsx index 1d63f0c82..507ab949c 100644 --- a/src/components/organization/invitations/SendInvitationModal.tsx +++ b/src/components/organization/invitations/SendInvitationModal.tsx @@ -149,7 +149,7 @@ const SendInvitationModal = (props: { props.setOpenModal(false); }} > - Send Invitations + Send Invitation(s) {formikHandlers?.errors?.email && formikHandlers?.touched?.email ? ( @@ -266,7 +265,7 @@ const SendInvitationModal = (props: {
  • - Roles: Member + Role: Member