External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 06:29:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix pending state for health check button.

Browse Source
This commit is contained in:
Kia Lam
2022-10-13 19:09:03 -07:00
parent e5c834383c
commit 7127d18072
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/src/components/HealthCheckButton/HealthCheckButton.js
View File

@@ -33,8 +33,10 @@ function HealthCheckButton({
component="button" component="button"
onClick={onClick} onClick={onClick}
ouiaId="health-check" ouiaId="health-check"
isLoading={healthCheckPending}
spinnerAriaLabel={t`Running health check`}
> >
{t`Run health check`} {healthCheckPending ? t`Running health check` : t`Run health check`}
</DropdownItem> </DropdownItem>
</Tooltip> </Tooltip>
); );

6
awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
View File

@@ -58,10 +58,10 @@ function InstanceList({ instanceGroup }) {
InstanceGroupsAPI.readInstances(instanceGroupId, params), InstanceGroupsAPI.readInstances(instanceGroupId, params),
InstanceGroupsAPI.readInstanceOptions(instanceGroupId), InstanceGroupsAPI.readInstanceOptions(instanceGroupId),
]); ]);
setPendingHealthCheck( const isPending = response.data.results.some(
response?.data?.result?.some((i) => i.health_check_pending === true) (i) => i.health_check_pending === true
); );
setPendingHealthCheck(isPending);
return { return {
instances: response.data.results, instances: response.data.results,
count: response.data.count, count: response.data.count,

5
awx/ui/src/screens/Instances/InstanceList/InstanceList.js
View File

@@ -53,9 +53,10 @@ function InstanceList() {
InstancesAPI.readOptions(), InstancesAPI.readOptions(),
SettingsAPI.readCategory('system'), SettingsAPI.readCategory('system'),
]); ]);
setPendingHealthCheck( const isPending = response.data.results.some(
response?.data?.result?.some((i) => i.health_check_pending === true) (i) => i.health_check_pending === true
); );
setPendingHealthCheck(isPending);
return { return {
instances: response.data.results, instances: response.data.results,
isK8s: sysSettings.data.IS_K8S, isK8s: sysSettings.data.IS_K8S,