From 13ddc78b7d36a018b09936d58f64778fb6df263a Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Fri, 6 Aug 2021 10:53:18 -0400
Subject: [PATCH] Addresses permission problem on host group list and adds
 convergence data to Prompt Detail

---
 awx/ui/src/api/models/Hosts.js                      |  2 +-
 awx/ui/src/components/PromptDetail/PromptDetail.js  | 13 ++++++++++++-
 .../Modals/NodeModals/NodeViewModal.js              |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/awx/ui/src/api/models/Hosts.js b/awx/ui/src/api/models/Hosts.js
index 7c4b9446a0..ae90bf2826 100644
--- a/awx/ui/src/api/models/Hosts.js
+++ b/awx/ui/src/api/models/Hosts.js
@@ -21,7 +21,7 @@ class Hosts extends Base {
   }
 
   readGroupsOptions(id) {
-    return this.http.options(`${this.baseUrl}${id}/all_groups/`);
+    return this.http.options(`${this.baseUrl}${id}/groups/`);
   }
 
   associateGroup(id, groupId) {
diff --git a/awx/ui/src/components/PromptDetail/PromptDetail.js b/awx/ui/src/components/PromptDetail/PromptDetail.js
index c58a1f99d6..94da1aa91b 100644
--- a/awx/ui/src/components/PromptDetail/PromptDetail.js
+++ b/awx/ui/src/components/PromptDetail/PromptDetail.js
@@ -87,7 +87,12 @@ function omitOverrides(resource, overrides, defaultConfig) {
   return clonedResource;
 }
 
-function PromptDetail({ resource, launchConfig = {}, overrides = {} }) {
+function PromptDetail({
+  resource,
+  launchConfig = {},
+  overrides = {},
+  workflowNode = false,
+}) {
   const VERBOSITY = {
     0: t`0 (Normal)`,
     1: t`1 (Verbose)`,
@@ -109,6 +114,12 @@ function PromptDetail({ resource, launchConfig = {}, overrides = {} }) {
           label={t`Type`}
           value={toTitleCase(details.unified_job_type || details.type)}
         />
+        {workflowNode && (
+          <Detail
+            label={t`Convergence`}
+            value={workflowNode?.all_parents_must_converge ? t`All` : t`Any`}
+          />
+        )}
         <Detail label={t`Timeout`} value={formatTimeout(details?.timeout)} />
         {details?.type === 'project' && (
           <PromptProjectDetail resource={details} />
diff --git a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js
index 4e7c01127e..51fc3eca1d 100644
--- a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js
+++ b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/NodeModals/NodeViewModal.js
@@ -192,6 +192,7 @@ function NodeViewModal({ readOnly }) {
         launchConfig={launchConfig}
         resource={fullUnifiedJobTemplate}
         overrides={overrides}
+        workflowNode={nodeToView.originalNodeObject}
       />
     );
   }