fixed: added alert component

Signed-off-by: bhavanakarwade <[email protected]>
credebl · Aug 2, 2023 · 7f80c48 · 7f80c48
1 parent a96272b
commit 7f80c48
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/organization/OrganizationsList.tsx b/src/components/organization/OrganizationsList.tsx
@@ -61,16 +61,16 @@ const OrganizationsList = () => {
         return userOrg;
       })
 
-      if (orgList.length === 0) {
-        setError('No Data Found')
-      }
-
       setOrganizationList(orgList)
       setCurrentPage({
         ...currentPage,
         total: totalPages
       })
     }
+    else{
+      setError(response as string)
+
+    }
     setLoading(false)
   }
 
@@ -151,6 +151,16 @@ const OrganizationsList = () => {
             setOpenModal={
               props.setOpenModal
             } />
+
+          <AlertComponent
+            message={message ? message : error}
+            type={message ? 'success' : 'failure'}
+            onAlertClose={() => {
+              setMessage(null)
+              setError(null)
+            }}
+          />
+
           {loading
             ? <div className="flex items-center justify-center mb-4">
               <Spinner

diff --git a/src/components/organization/invitations/Invitations.tsx b/src/components/organization/invitations/Invitations.tsx
@@ -56,15 +56,16 @@ const Invitations = () => {
 
             const invitationList = data?.data?.invitations
 
-            if (invitationList.length === 0) {
-                setError('No Data Found')
-            }
             setInvitationsList(invitationList)
             setCurrentPage({
                 ...currentPage,
                 total: totalPages
             })
         }
+        else {
+            setError(response as string)
+
+        }
     }
 
     //This useEffect is called when the searchText changes 
@@ -123,6 +124,15 @@ const Invitations = () => {
                         props.setOpenModal
                     } />
 
+                <AlertComponent
+                    message={message ? message : error}
+                    type={message ? 'success' : 'failure'}
+                    onAlertClose={() => {
+                        setMessage(null)
+                        setError(null)
+                    }}
+                />
+
                 {loading
                     ? <div className="flex items-center justify-center mb-4">
                         <Spinner

diff --git a/src/components/organization/invitations/ReceivedInvitations.tsx b/src/components/organization/invitations/ReceivedInvitations.tsx
@@ -55,15 +55,16 @@ const ReceivedInvitations = () => {
             const totalPages = data?.data?.totalPages;
 
             const invitationList = data?.data?.invitations
-            if (invitationList.length === 0) {
-                setError('No Data Found')
-            }
+
             setInvitationsList(invitationList)
             setCurrentPage({
                 ...currentPage,
                 total: totalPages
             })
         }
+        else {
+            setError(response as string)
+        }
 
         setLoading(false)
     }
@@ -135,6 +136,16 @@ const ReceivedInvitations = () => {
                             props.setOpenModal
                         } />
 
+                    <AlertComponent
+                        message={message ? message : error}
+                        type={message ? 'success' : 'failure'}
+                        onAlertClose={() => {
+                            setMessage(null)
+                            setError(null)
+                        }}
+                    />
+
+
                     {loading
                         ? <div className="flex items-center justify-center mb-4">
                             <Spinner