From 1712540c8e6e9d1877e04b13e2bc158086cf1d0e Mon Sep 17 00:00:00 2001 From: David O Neill Date: Fri, 19 Jan 2024 11:06:44 +0000 Subject: [PATCH] Updates for receptor reaslese to ui for protocol and is_managed --- .../Instances/InstanceEndPointList/InstanceEndPointList.js | 2 +- .../InstanceEndPointList/InstanceEndPointListItem.js | 4 ++++ .../src/screens/Instances/InstancePeers/InstancePeerList.js | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js b/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js index dace4d42fc..bdcf31af42 100644 --- a/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js +++ b/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointList.js @@ -61,7 +61,6 @@ function InstanceEndPointList({ setBreadcrumb }) { if (id.toString() === receptor.instance.toString()) { receptor.name = detail.hostname; endpoint_list.push(receptor); - console.log(receptor); } } @@ -137,6 +136,7 @@ function InstanceEndPointList({ setBreadcrumb }) { {t`Address`} {t`Port`} + {t`Protocol`} {t`Canonical`} } diff --git a/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointListItem.js b/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointListItem.js index 920b7aeef9..961e16843e 100644 --- a/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointListItem.js +++ b/awx/ui/src/screens/Instances/InstanceEndPointList/InstanceEndPointListItem.js @@ -42,6 +42,10 @@ function InstanceEndPointListItem({ {peerEndpoint.port} + + {peerEndpoint.protocol} + + {peerEndpoint.canonical.toString()} diff --git a/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js b/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js index 3a7d40d0b1..ca36e725ef 100644 --- a/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js +++ b/awx/ui/src/screens/Instances/InstancePeers/InstancePeerList.js @@ -153,6 +153,10 @@ function InstancePeerList({ setBreadcrumb }) { continue; } + if(receptor.is_internal) { + continue; + } + const copy = receptor; copy.hostname = host.hostname; copy.node_type = host.node_type; @@ -318,7 +322,7 @@ function InstancePeerList({ setBreadcrumb }) { { key: 'address', name: t`Address` }, { key: 'port', name: t`Port` }, { key: 'node_type', name: t`Node Type` }, - { key: 'canonical', name: t`Canonical` }, + { key: 'protocol', name: t`Protocol` }, ]} /> )}