Merge pull request #768 from AI4Bharat/reinvite

changes for reinvite user
AI4Bharat · Jul 30, 2024 · 53dc4b4 · 53dc4b4
2 parents 01bd378 + 616b92b
commit 53dc4b4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/src/containers/Organization/UserList.jsx b/src/containers/Organization/UserList.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { useSelector } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { Link } from "react-router-dom";
 import { getColumns, getOptions } from "utils";
 import { usersColumns } from "config";
@@ -9,14 +9,23 @@ import { tableTheme } from "theme";
 
 //Icons
 import PreviewIcon from "@mui/icons-material/Preview";
+import MailIcon from "@mui/icons-material/Mail";
 
 //Components
 import { ThemeProvider, Tooltip, IconButton } from "@mui/material";
 import MUIDataTable from "mui-datatables";
+import { APITransport, ResendUserInviteAPI } from "redux/actions";
 
 const UserList = ({ data }) => {
+  const dispatch = useDispatch();
   const apiStatus = useSelector((state) => state.apiStatus);
 
+  const handleReinvite = (email) => {
+    let apiObj;
+    apiObj = new ResendUserInviteAPI([email]);
+    dispatch(APITransport(apiObj));
+  };
+
   const actionColumn = {
     name: "Action",
     label: "Actions",
@@ -29,6 +38,7 @@ const UserList = ({ data }) => {
         const selectedRow = tableData[rowIndex];
 
         return (
+          <>
           <Link
             to={`/profile/${selectedRow.id}`}
             style={{ textDecoration: "none" }}
@@ -39,6 +49,14 @@ const UserList = ({ data }) => {
               </IconButton>
             </Tooltip>
           </Link>
+          {selectedRow.has_accepted_invite === false &&
+            <Tooltip title="Reinvite">
+              <IconButton onClick={() => {handleReinvite(selectedRow.email)}}>
+                <MailIcon color="primary" />
+              </IconButton>
+            </Tooltip>
+          }
+          </>
         );
       },
     },

diff --git a/src/containers/UserManagement/EditProfile.jsx b/src/containers/UserManagement/EditProfile.jsx
@@ -38,7 +38,6 @@ import {
   setSnackBar,
   UpdateUserRoleAPI,
   FetchUserRolesAPI,
-  ResendUserInviteAPI,
 } from "redux/actions";
 
 const EditProfile = () => {
@@ -218,12 +217,6 @@ const EditProfile = () => {
     );
   };
 
-  const handleReinvite = () => {
-    let apiObj;
-    apiObj = new ResendUserInviteAPI([userData.email]);
-    dispatch(APITransport(apiObj));
-  };
-
   const handleSubmit = () => {
     let updateProfileReqBody = {
       username: userDetails.username,
@@ -459,20 +452,8 @@ const EditProfile = () => {
             direction="row"
             justifyContent="flex-end"
             alignItems="center"
-            gap={4}
             sx={{ my: 5, px: "9.75%" }}
           >
-            {userData.has_accepted_invite === false &&
-            <Button
-              variant="contained"
-              color="error"
-              onClick={() => handleReinvite()}
-              sx={{ borderRadius: "8px", width: "180px" }}
-              className={classes.editProfileBtn}
-            >
-              Reinvite
-            </Button>
-            }
             <Button
               variant="contained"
               color="primary"