diff --git a/awx/ui/src/components/HealthCheckButton/HealthCheckButton.js b/awx/ui/src/components/HealthCheckButton/HealthCheckButton.js index e13cb45277..034f94d83b 100644 --- a/awx/ui/src/components/HealthCheckButton/HealthCheckButton.js +++ b/awx/ui/src/components/HealthCheckButton/HealthCheckButton.js @@ -29,7 +29,7 @@ function HealthCheckButton({ isDisabled, onClick, selectedItems }) { onClick={onClick} ouiaId="health-check" > - {t`Health Check`} + {t`Run health check`} ); @@ -42,7 +42,7 @@ function HealthCheckButton({ isDisabled, onClick, selectedItems }) { variant="secondary" ouiaId="health-check" onClick={onClick} - >{t`Health Check`} + >{t`Run health check`} ); diff --git a/awx/ui/src/screens/InstanceGroup/InstanceDetails/InstanceDetails.js b/awx/ui/src/screens/InstanceGroup/InstanceDetails/InstanceDetails.js index 5232e6de2d..f2449a1556 100644 --- a/awx/ui/src/screens/InstanceGroup/InstanceDetails/InstanceDetails.js +++ b/awx/ui/src/screens/InstanceGroup/InstanceDetails/InstanceDetails.js @@ -116,7 +116,11 @@ function InstanceDetails({ setBreadcrumb, instanceGroup }) { fetchDetails(); }, [fetchDetails]); - const { error: healthCheckError, request: fetchHealthCheck } = useRequest( + const { + error: healthCheckError, + isLoading: isRunningHealthCheck, + request: fetchHealthCheck, + } = useRequest( useCallback(async () => { const { data } = await InstancesAPI.healthCheck(instanceId); setHealthCheck(data); @@ -265,12 +269,14 @@ function InstanceDetails({ setBreadcrumb, instanceGroup }) { {me.is_superuser && instance.node_type !== 'control' && ( diff --git a/awx/ui/src/screens/Instances/InstanceDetail/InstanceDetail.js b/awx/ui/src/screens/Instances/InstanceDetail/InstanceDetail.js index ddfd8845f8..9338b7c8d2 100644 --- a/awx/ui/src/screens/Instances/InstanceDetail/InstanceDetail.js +++ b/awx/ui/src/screens/Instances/InstanceDetail/InstanceDetail.js @@ -97,7 +97,11 @@ function InstanceDetail({ setBreadcrumb }) { } }, [instance, setBreadcrumb]); - const { error: healthCheckError, request: fetchHealthCheck } = useRequest( + const { + error: healthCheckError, + isLoading: isRunningHealthCheck, + request: fetchHealthCheck, + } = useRequest( useCallback(async () => { const { data } = await InstancesAPI.healthCheck(id); setHealthCheck(data); @@ -220,12 +224,14 @@ function InstanceDetail({ setBreadcrumb }) {