From 03265c05cacba50ba2ad2c8eb7107adc76064a70 Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Thu, 6 May 2021 15:36:35 -0400
Subject: [PATCH] fixes setstate, and double tooltip

---
 .../JobCancelButton/JobCancelButton.jsx       |  6 +++---
 .../InventorySourceListItem.jsx               | 18 +++++++++--------
 .../Project/ProjectList/ProjectListItem.jsx   | 20 +++++++++++--------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx
index b3ab1e9fa7..177f217fd3 100644
--- a/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx
+++ b/awx/ui_next/src/components/JobCancelButton/JobCancelButton.jsx
@@ -33,7 +33,7 @@ function JobCancelButton({
           <Button
             aria-label={title}
             ouiaId="cancel job"
-            onClick={setIsOpen}
+            onClick={() => setIsOpen(true)}
             variant="plain"
           >
             <MinusCircleIcon />
@@ -43,7 +43,7 @@ function JobCancelButton({
             aria-label={title}
             variant="secondary"
             ouiaId="cancel job"
-            onClick={setIsOpen}
+            onClick={() => setIsOpen(true)}
           >{t`Cancel Sync`}</Button>
         )}
       </Tooltip>
@@ -77,7 +77,7 @@ function JobCancelButton({
             </Button>,
           ]}
         >
-          {t`Are you sure you want to submit the request to cancel this job?`}
+          {t`Are you sure you want to cancel this job?`}
         </AlertModal>
       )}
       {error && (
diff --git a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx
index a5b4603bfc..dce8c861fe 100644
--- a/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventorySources/InventorySourceListItem.jsx
@@ -92,11 +92,8 @@ function InventorySourceListItem({
         </Td>
         <Td dataLabel={t`Type`}>{label}</Td>
         <ActionsTd dataLabel={t`Actions`}>
-          <ActionItem
-            visible={source.summary_fields.user_capabilities.start}
-            tooltip={t`Sync`}
-          >
-            {['running', 'pending', 'waiting'].includes(source?.status) ? (
+          {['running', 'pending', 'waiting'].includes(source?.status) ? (
+            <ActionItem visible={source.summary_fields.user_capabilities.start}>
               <JobCancelButton
                 job={{
                   type: 'inventory_update',
@@ -107,10 +104,15 @@ function InventorySourceListItem({
                 title={t`Cancel Inventory Source Sync`}
                 showIconButton
               />
-            ) : (
+            </ActionItem>
+          ) : (
+            <ActionItem
+              visible={source.summary_fields.user_capabilities.start}
+              tooltip={t`Sync`}
+            >
               <InventorySourceSyncButton source={source} />
-            )}
-          </ActionItem>
+            </ActionItem>
+          )}
           <ActionItem
             visible={source.summary_fields.user_capabilities.edit}
             tooltip={t`Edit`}
diff --git a/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx b/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx
index 750ed9f0fd..7fcf5ec5c9 100644
--- a/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx
+++ b/awx/ui_next/src/screens/Project/ProjectList/ProjectListItem.jsx
@@ -169,11 +169,10 @@ function ProjectListItem({
           />
         </Td>
         <ActionsTd dataLabel={t`Actions`}>
-          <ActionItem
-            visible={project.summary_fields.user_capabilities.start}
-            tooltip={t`Sync Project`}
-          >
-            {['running', 'pending', 'waiting'].includes(job?.status) ? (
+          {['running', 'pending', 'waiting'].includes(job?.status) ? (
+            <ActionItem
+              visible={project.summary_fields.user_capabilities.start}
+            >
               <JobCancelButton
                 job={{ id: job.id, type: 'project_update' }}
                 errorTitle={t`Project Sync Error`}
@@ -181,13 +180,18 @@ function ProjectListItem({
                 showIconButton
                 errorMessage={t`Failed to cancel Project Sync`}
               />
-            ) : (
+            </ActionItem>
+          ) : (
+            <ActionItem
+              visible={project.summary_fields.user_capabilities.start}
+              tooltip={t`Sync Project`}
+            >
               <ProjectSyncButton
                 projectId={project.id}
                 lastJobStatus={job && job.status}
               />
-            )}
-          </ActionItem>
+            </ActionItem>
+          )}
           <ActionItem
             visible={project.summary_fields.user_capabilities.edit}
             tooltip={t`Edit Project`}