From caa282f003159fddca9504e9f8c8217725eaab03 Mon Sep 17 00:00:00 2001
From: jinapurapu <65002498+jinapurapu@users.noreply.github.com>
Date: Thu, 21 Oct 2021 17:11:46 -0700
Subject: [PATCH] Added functionality to delete icon on Policy Details screen
 (#1137)

* Added functionality to delete icon on Policy Details screen, typo fix in delete policy modal

* Removed unneeded text

* Updated field names
---
 .../screens/Console/Policies/DeletePolicy.tsx |  2 +-
 .../Console/Policies/PolicyDetails.tsx        | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

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 = ({
       <DialogContent>
         {deleteLoading && <LinearProgress />}
         <DialogContentText id="alert-dialog-description">
-          Are you sure you want to delete policy <b>{selectedPolicy}</b>?.
+          Are you sure you want to delete policy <b>{selectedPolicy}</b>?
         </DialogContentText>
       </DialogContent>
       <DialogActions>
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<boolean>(true);
   const [filterGroups, setFilterGroups] = useState<string>("");
   const [loadingGroups, setLoadingGroups] = useState<boolean>(true);
+  const [deleteOpen, setDeleteOpen] = useState<boolean>(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 (
     <Fragment>
+      {deleteOpen && (
+        <DeletePolicy
+          deleteOpen={deleteOpen}
+          selectedPolicy={policyName}
+          closeDeleteModalAndRefresh={closeDeleteModalAndRefresh}
+        />
+      )}
       <PageHeader
         label={
           <Fragment>
@@ -343,18 +361,17 @@ const PolicyDetails = ({
             subTitle={<Fragment>IAM Policy</Fragment>}
             actions={
               <Fragment>
-                <Tooltip title={"Delete"}>
+                <Tooltip title="Delete Policy">
                   <IconButton
                     color="primary"
-                    aria-label="Delete"
+                    aria-label="Delete Policy"
                     component="span"
-                    onClick={() => {
-                      // setDeleteOpen(true);
-                    }}
+                    onClick={deletePolicy}
                   >
                     <TrashIcon />
                   </IconButton>
                 </Tooltip>
+
                 <Tooltip title={"Refresh"}>
                   <IconButton
                     color="primary"