From ab6e650e9c0e3b1d50739b852c469957aabaa40b Mon Sep 17 00:00:00 2001
From: nixocio <nixocio@gmail.com>
Date: Mon, 20 Dec 2021 16:28:36 -0500
Subject: [PATCH] Fix relaunch of jobs

Events were passed to `handleRelaunch` and those events structure were
not parseable to JSON - breaking the relaunch of jobs. React 17 changes
made this bug visible.

Also, remove withRouter from LaunchButton.

See: https://github.com/ansible/awx/issues/11452
---
 awx/ui/src/components/JobList/JobListItem.js             | 2 +-
 awx/ui/src/components/LaunchButton/LaunchButton.js       | 7 ++++---
 awx/ui/src/screens/Job/JobDetail/JobDetail.js            | 2 +-
 awx/ui/src/screens/Job/JobOutput/shared/OutputToolbar.js | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/awx/ui/src/components/JobList/JobListItem.js b/awx/ui/src/components/JobList/JobListItem.js
index 8dbbc0b911..4cdb215790 100644
--- a/awx/ui/src/components/JobList/JobListItem.js
+++ b/awx/ui/src/components/JobList/JobListItem.js
@@ -135,7 +135,7 @@ function JobListItem({
                   <Button
                     ouiaId={`${job.id}-relaunch-button`}
                     variant="plain"
-                    onClick={handleRelaunch}
+                    onClick={() => handleRelaunch()}
                     aria-label={t`Relaunch`}
                     isDisabled={isLaunching}
                   >
diff --git a/awx/ui/src/components/LaunchButton/LaunchButton.js b/awx/ui/src/components/LaunchButton/LaunchButton.js
index 49af6c5833..675538f90c 100644
--- a/awx/ui/src/components/LaunchButton/LaunchButton.js
+++ b/awx/ui/src/components/LaunchButton/LaunchButton.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { withRouter } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { number, shape } from 'prop-types';
 
 import { t } from '@lingui/macro';
@@ -32,7 +32,8 @@ function canLaunchWithoutPrompt(launchData) {
   );
 }
 
-function LaunchButton({ resource, children, history }) {
+function LaunchButton({ resource, children }) {
+  const history = useHistory();
   const [showLaunchPrompt, setShowLaunchPrompt] = useState(false);
   const [launchConfig, setLaunchConfig] = useState(null);
   const [surveyConfig, setSurveyConfig] = useState(null);
@@ -184,4 +185,4 @@ LaunchButton.propTypes = {
   }).isRequired,
 };
 
-export default withRouter(LaunchButton);
+export default LaunchButton;
diff --git a/awx/ui/src/screens/Job/JobDetail/JobDetail.js b/awx/ui/src/screens/Job/JobDetail/JobDetail.js
index 535ed3936f..2b241f1589 100644
--- a/awx/ui/src/screens/Job/JobDetail/JobDetail.js
+++ b/awx/ui/src/screens/Job/JobDetail/JobDetail.js
@@ -452,7 +452,7 @@ function JobDetail({ job, inventorySourceLabels }) {
                 <Button
                   ouiaId="job-detail-relaunch-button"
                   type="submit"
-                  onClick={handleRelaunch}
+                  onClick={() => handleRelaunch()}
                   isDisabled={isLaunching}
                 >
                   {t`Relaunch`}
diff --git a/awx/ui/src/screens/Job/JobOutput/shared/OutputToolbar.js b/awx/ui/src/screens/Job/JobOutput/shared/OutputToolbar.js
index ab69c15256..a4040f5725 100644
--- a/awx/ui/src/screens/Job/JobOutput/shared/OutputToolbar.js
+++ b/awx/ui/src/screens/Job/JobOutput/shared/OutputToolbar.js
@@ -161,7 +161,7 @@ const OutputToolbar = ({ job, onDelete, isDeleteDisabled, jobStatus }) => {
                 <Button
                   ouiaId="job-output-relaunch-button"
                   variant="plain"
-                  onClick={handleRelaunch}
+                  onClick={() => handleRelaunch()}
                   aria-label={t`Relaunch`}
                   isDisabled={isLaunching}
                 >