diff --git a/awx/ui/src/screens/TopologyView/Legend.js b/awx/ui/src/screens/TopologyView/Legend.js index 5fe35beb51..b292786a59 100644 --- a/awx/ui/src/screens/TopologyView/Legend.js +++ b/awx/ui/src/screens/TopologyView/Legend.js @@ -14,8 +14,12 @@ import { } from '@patternfly/react-core'; import { - ExclamationIcon as PFExclamationIcon, - CheckIcon as PFCheckIcon, + ExclamationIcon, + CheckIcon, + OutlinedClockIcon, + PlusIcon, + MinusIcon, + ResourcesEmptyIcon, } from '@patternfly/react-icons'; const Wrapper = styled.div` @@ -27,23 +31,20 @@ const Wrapper = styled.div` background-color: rgba(255, 255, 255, 0.85); `; const Button = styled(PFButton)` - width: 20px; - height: 20px; - border-radius: 10px; - padding: 0; - font-size: 11px; + &&& { + width: 20px; + height: 20px; + border-radius: 10px; + padding: 0; + font-size: 11px; + background-color: white; + border: 1px solid #ccc; + color: black; + } `; const DescriptionListDescription = styled(PFDescriptionListDescription)` font-size: 11px; `; -const ExclamationIcon = styled(PFExclamationIcon)` - fill: white; - margin-left: 2px; -`; -const CheckIcon = styled(PFCheckIcon)` - fill: white; - margin-left: 2px; -`; const DescriptionList = styled(PFDescriptionList)` gap: 7px; `; @@ -70,9 +71,7 @@ function Legend() { - + {t`Control node`} @@ -110,27 +109,133 @@ function Legend() { - - - - {nodeDetail.hostname} - - - - - {t`Type`} - - {nodeDetail.node_type} {t`node`} - - - - {t`Status`} - - - - - + {isLoading && } + {!isLoading && ( + + + + {' '} + + {instanceDetail.hostname} + + + + + {t`Instance status`} + + + + + + {t`Instance type`} + + {instanceDetail.node_type} + + + {instanceDetail.related?.install_bundle && ( + + {t`Download bundle`} + + + + + + + + + )} + {instanceDetail.ip_address && ( + + {t`IP address`} + + {instanceDetail.ip_address} + + + )} + {instanceGroups && ( + + {t`Instance groups`} + + {renderInstanceGroups(instanceGroups.results)} + + + )} + {instanceDetail.node_type !== 'hop' && ( + <> + + {t`Forks`} + + +
{t`CPU ${instanceDetail.cpu_capacity}`}
+ +
+ +
+ +
+
{t`RAM ${instanceDetail.mem_capacity}`}
+
+
+
+ + {t`Capacity`} + + {usedCapacity(instanceDetail)} + + + + + + + + + )} + + + {t`Last modified`} + + {formatDateString(instanceDetail.modified)} + + + + {t`Last seen`} + + {instanceDetail.last_seen + ? formatDateString(instanceDetail.last_seen) + : `not found`} + + +
+ )} )}