[Fleet] Fix add fleet server flow from agent policy page (#149507)

elastic · Jan 26, 2023 · da83d96 · da83d96
1 parent 1d5e25a
commit da83d96
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
@@ -42,7 +42,8 @@ export const Instructions = (props: InstructionProps) => {
     refreshAgentPolicies,
   } = props;
   const fleetStatus = useFleetStatus();
-  const { isUnhealthy: isFleetServerUnhealthy } = useFleetServerUnhealthy();
+  const { isUnhealthy: isFleetServerUnhealthy, isLoading: isLoadingFleetServerHealth } =
+    useFleetServerUnhealthy();
 
   useEffect(() => {
     refreshAgentPolicies();
@@ -66,14 +67,17 @@ export const Instructions = (props: InstructionProps) => {
 
   const fleetServers = agents?.items || [];
 
-  if (isLoadingAgents || isLoadingAgentPolicies) return <Loading size="l" />;
+  if (isLoadingAgents || isLoadingAgentPolicies || isLoadingFleetServerHealth)
+    return <Loading size="l" />;
 
   const hasNoFleetServerHost = fleetStatus.isReady && (fleetServerHosts?.length ?? 0) === 0;
 
   const showAgentEnrollment =
-    fleetStatus.isReady &&
-    (isFleetServerPolicySelected ||
-      (!isFleetServerUnhealthy && fleetServers.length > 0 && (fleetServerHosts?.length ?? 0) > 0));
+    isFleetServerPolicySelected ||
+    (fleetStatus.isReady &&
+      !isFleetServerUnhealthy &&
+      fleetServers.length > 0 &&
+      (fleetServerHosts?.length ?? 0) > 0);
 
   const showFleetServerEnrollment =
     !isFleetServerPolicySelected &&