diff --git a/portal-ui/src/screens/Console/Users/DeleteUser.tsx b/portal-ui/src/screens/Console/Users/DeleteUser.tsx index de1aeb299..a1ee46d0d 100644 --- a/portal-ui/src/screens/Console/Users/DeleteUser.tsx +++ b/portal-ui/src/screens/Console/Users/DeleteUser.tsx @@ -84,6 +84,7 @@ const DeleteUser = ({ history.push( `${IAM_PAGES.USERS}/${encodeURLString(selectionElement.userName)}` ); + onClose(); }; const tableActions = [ { @@ -102,6 +103,8 @@ const DeleteUser = ({ closeDeleteModalAndRefresh(true); } else { invokeDeleteApi("DELETE", `/api/v1/user/${encodeURLString(user)}`); + closeDeleteModalAndRefresh(true); + history.push(`${IAM_PAGES.USERS}`) } } }; diff --git a/portal-ui/src/screens/Console/Users/UserDetails.tsx b/portal-ui/src/screens/Console/Users/UserDetails.tsx index ae7d8d2ec..643bd6455 100644 --- a/portal-ui/src/screens/Console/Users/UserDetails.tsx +++ b/portal-ui/src/screens/Console/Users/UserDetails.tsx @@ -44,7 +44,7 @@ import SetUserPolicies from "./SetUserPolicies"; import history from "../../../history"; import UserServiceAccountsPanel from "./UserServiceAccountsPanel"; import ChangeUserPasswordModal from "../Account/ChangeUserPasswordModal"; -import DeleteUserModal from "./DeleteUserModal"; +import DeleteUser from "./DeleteUser"; import ScreenTitle from "../Common/ScreenTitle/ScreenTitle"; import PanelTitle from "../Common/PanelTitle/PanelTitle"; import PageLayout from "../Common/Layout/PageLayout"; @@ -182,7 +182,7 @@ const UserDetails = ({ classes, match }: IUserDetailsProps) => { - + } actions={} @@ -209,12 +209,13 @@ const UserDetails = ({ classes, match }: IUserDetailsProps) => { /> )} {deleteOpen && ( - { closeDeleteModalAndRefresh(refresh); }} + history={history} /> )} {changeUserPasswordModalOpen && (