From 8cd4d06903399672f2a60bf3592da63ced878142 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 17 Nov 2020 08:41:02 -0500
Subject: [PATCH] Hide the delete button on workflow approval details when job
 is pending

---
 .../WorkflowApprovalDetail.jsx                |  3 +-
 .../WorkflowApprovalDetail.test.jsx           | 38 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx
index fb20460a2d..eb9e8f6677 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.jsx
@@ -204,7 +204,8 @@ function WorkflowApprovalDetail({ i18n, workflowApproval }) {
             </Button>
           </>
         )}
-        {workflowApproval.summary_fields.user_capabilities &&
+        {workflowApproval.status !== 'pending' &&
+          workflowApproval.summary_fields.user_capabilities &&
           workflowApproval.summary_fields.user_capabilities.delete && (
             <DeleteButton
               name={workflowApproval.name}
diff --git a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.test.jsx b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.test.jsx
index ff59b6ad01..4b7c153049 100644
--- a/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.test.jsx
+++ b/awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.test.jsx
@@ -52,7 +52,6 @@ describe('<WorkflowApprovalDetail />', () => {
     assertDetail('Elapsed', '00:00:22');
     expect(wrapper.find('Button[aria-label="Approve"]').length).toBe(1);
     expect(wrapper.find('Button[aria-label="Deny"]').length).toBe(1);
-    expect(wrapper.find('DeleteButton').length).toBe(1);
   });
 
   test('should show expiration date/time', () => {
@@ -227,12 +226,35 @@ describe('<WorkflowApprovalDetail />', () => {
       <WorkflowApprovalDetail
         workflowApproval={{
           ...workflowApproval,
+          status: 'successful',
           summary_fields: {
             ...workflowApproval.summary_fields,
             user_capabilities: {
               delete: false,
               start: false,
             },
+            approved_or_denied_by: {
+              id: 1,
+              username: 'Foobar',
+            },
+          },
+        }}
+      />
+    );
+    expect(wrapper.find('DeleteButton').length).toBe(0);
+  });
+
+  test('delete button should be hidden when job is pending', () => {
+    const wrapper = mountWithContexts(
+      <WorkflowApprovalDetail
+        workflowApproval={{
+          ...workflowApproval,
+          summary_fields: {
+            ...workflowApproval.summary_fields,
+            user_capabilities: {
+              delete: true,
+              start: false,
+            },
           },
         }}
       />
@@ -245,7 +267,19 @@ describe('<WorkflowApprovalDetail />', () => {
       Promise.reject(new Error())
     );
     const wrapper = mountWithContexts(
-      <WorkflowApprovalDetail workflowApproval={workflowApproval} />
+      <WorkflowApprovalDetail
+        workflowApproval={{
+          ...workflowApproval,
+          status: 'successful',
+          summary_fields: {
+            ...workflowApproval.summary_fields,
+            approved_or_denied_by: {
+              id: 1,
+              username: 'Foobar',
+            },
+          },
+        }}
+      />
     );
     await waitForElement(
       wrapper,