External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 18:21:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8035 from nixocio/ui_update_instance_groups

Browse Source 
Update instance groups

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-08-28 20:37:34 +00:00
committed by GitHub
parent bebd882688 21330a54cb
commit bd4b009bea
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui_next/src/screens/InstanceGroup/InstanceGroupDetails/InstanceGroupDetails.jsx
View File

@@ -39,13 +39,6 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
const { error, dismissError } = useDismissableError(deleteError); const { error, dismissError } = useDismissableError(deleteError);
const isAvailable = item => {
return (
(item.policy_instance_minimum || item.policy_instance_percentage) &&
item.capacity
);
};
const verifyIsIsolated = item => { const verifyIsIsolated = item => {
if (item.is_isolated) { if (item.is_isolated) {
return ( return (
@@ -89,10 +82,12 @@ function InstanceGroupDetails({ instanceGroup, i18n }) {
dataCy="instance-group-policy-instance-percentage" dataCy="instance-group-policy-instance-percentage"
content={`${instanceGroup.policy_instance_percentage} %`} content={`${instanceGroup.policy_instance_percentage} %`}
/> />
{isAvailable(instanceGroup) ? ( {instanceGroup.capacity ? (
<DetailBadge <DetailBadge
label={i18n._(t`Used capacity`)} label={i18n._(t`Used capacity`)}
content={`${100 - instanceGroup.percent_capacity_remaining} %`} content={`${Math.round(
100 - instanceGroup.percent_capacity_remaining
)} %`}
dataCy="instance-group-used-capacity" dataCy="instance-group-used-capacity"
/> />
) : ( ) : (

11
awx/ui_next/src/screens/InstanceGroup/InstanceGroupList/InstanceGroupListItem.jsx
View File

@@ -60,23 +60,16 @@ function InstanceGroupListItem({
}) { }) {
const labelId = `check-action-${instanceGroup.id}`; const labelId = `check-action-${instanceGroup.id}`;
const isAvailable = item => {
return (
(item.policy_instance_minimum || item.policy_instance_percentage) &&
item.capacity
);
};
const isContainerGroup = item => { const isContainerGroup = item => {
return item.is_containerized; return item.is_containerized;
}; };
function usedCapacity(item) { function usedCapacity(item) {
if (!isContainerGroup(item)) { if (!isContainerGroup(item)) {
if (isAvailable(item)) { if (item.capacity) {
return ( return (
<Progress <Progress
value={100 - item.percent_capacity_remaining} value={Math.round(100 - item.percent_capacity_remaining)}
measureLocation={ProgressMeasureLocation.top} measureLocation={ProgressMeasureLocation.top}
size={ProgressSize.sm} size={ProgressSize.sm}
title={i18n._(t`Used capacity`)} title={i18n._(t`Used capacity`)}

2
awx/ui_next/src/screens/InstanceGroup/Instances/InstanceListItem.jsx
View File

@@ -53,7 +53,7 @@ function InstanceListItem({
if (item.enabled) { if (item.enabled) {
return ( return (
<Progress <Progress
value={100 - item.percent_capacity_remaining} value={Math.round(100 - item.percent_capacity_remaining)}
measureLocation={ProgressMeasureLocation.top} measureLocation={ProgressMeasureLocation.top}
size={ProgressSize.sm} size={ProgressSize.sm}
title={i18n._(t`Used capacity`)} title={i18n._(t`Used capacity`)}