Merge pull request #12191 from kialam/fix-12188-undefined-wf-approval…

…-list Fix deleted wf approval node name.
ansible · May 9, 2022 · 1da57a4 · 1da57a4
2 parents b73078e + b17f22c
commit 1da57a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.js b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.js
@@ -45,12 +45,8 @@ function WorkflowApprovalsList() {
         WorkflowApprovalsAPI.read(params),
         WorkflowApprovalsAPI.readOptions(),
       ]);
-      const dataWithModifiedName = response.data.results.map((i) => {
-        i.name = `${i.summary_fields.source_workflow_job.id} - ${i.name}`;
-        return i;
-      });
       return {
-        results: dataWithModifiedName,
+        results: response.data.results,
         count: response.data.count,
         relatedSearchableKeys: (
           actionsResponse?.data?.related_search_fields || []

diff --git a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalListItem.js
@@ -21,7 +21,6 @@ function WorkflowApprovalListItem({
 }) {
   const labelId = `check-action-${workflowApproval.id}`;
   const workflowJob = workflowApproval?.summary_fields?.source_workflow_job;
-
   return (
     <Tr id={`workflow-approval-row-${workflowApproval.id}`}>
       <Td
@@ -34,7 +33,13 @@ function WorkflowApprovalListItem({
       />
       <Td id={labelId} dataLabel={t`Name`}>
         <Link to={`${detailUrl}`}>
-          <b>{workflowApproval.name}</b>
+          {workflowJob && workflowJob?.id ? (
+            <b>{`${workflowJob?.id} - ${workflowApproval?.name}`}</b>
+          ) : (
+            <b>
+              {t`Deleted`} {`- ${workflowApproval?.name}`}
+            </b>
+          )}
         </Link>
       </Td>
       <Td>