Merge pull request #13064 from kialam/fix-pending-health-check-button-setState

Fix pending state for health check button.
This commit is contained in:
Sarah Akus
2022-10-14 08:54:39 -04:00
committed by GitHub
3 changed files with 9 additions and 6 deletions

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>
); );

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,

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,