diff --git a/portal-ui/src/screens/Console/Policies/DeletePolicy.tsx b/portal-ui/src/screens/Console/Policies/DeletePolicy.tsx index b475e372f..488cfc865 100644 --- a/portal-ui/src/screens/Console/Policies/DeletePolicy.tsx +++ b/portal-ui/src/screens/Console/Policies/DeletePolicy.tsx @@ -74,7 +74,7 @@ const DeletePolicy = ({ {deleteLoading && } - Are you sure you want to delete policy {selectedPolicy}?. + Are you sure you want to delete policy {selectedPolicy}? diff --git a/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx b/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx index 26e212e7c..5fa928c99 100644 --- a/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx +++ b/portal-ui/src/screens/Console/Policies/PolicyDetails.tsx @@ -29,6 +29,7 @@ import { Button, IconButton, LinearProgress, Tooltip } from "@material-ui/core"; import TableWrapper from "../Common/TableWrapper/TableWrapper"; import api from "../../../common/api"; import PageHeader from "../Common/PageHeader/PageHeader"; +import DeletePolicy from "./DeletePolicy"; import { Link } from "react-router-dom"; import { setErrorSnackMessage, setSnackBarMessage } from "../../../actions"; import { ErrorResponseHandler } from "../../../common/types"; @@ -199,6 +200,7 @@ const PolicyDetails = ({ const [loadingUsers, setLoadingUsers] = useState(true); const [filterGroups, setFilterGroups] = useState(""); const [loadingGroups, setLoadingGroups] = useState(true); + const [deleteOpen, setDeleteOpen] = useState(false); const saveRecord = (event: React.FormEvent) => { event.preventDefault(); @@ -307,6 +309,15 @@ const PolicyDetails = ({ const validSave = policyName.trim() !== ""; + const deletePolicy = () => { + setDeleteOpen(true); + }; + + const closeDeleteModalAndRefresh = (refresh: boolean) => { + setDeleteOpen(false); + history.push(`/policies`); + }; + const userViewAction = (user: any) => { history.push(`/users/${user}`); }; @@ -322,6 +333,13 @@ const PolicyDetails = ({ return ( + {deleteOpen && ( + + )} @@ -343,18 +361,17 @@ const PolicyDetails = ({ subTitle={IAM Policy} actions={ - + { - // setDeleteOpen(true); - }} + onClick={deletePolicy} > +