Fix tests

elastic · Jun 29, 2021 · dbe30e0 · dbe30e0
1 parent d3a8c1b
commit dbe30e0
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 62 deletions.
diff --git a/.../sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx b/.../sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx
@@ -437,6 +437,7 @@ export const AddFleetServerHostStep = ({
         await addFleetServerHost(fleetServerHost);
       }
       setCalloutHost(fleetServerHost);
+      setFleetServerHost('');
     } finally {
       setIsLoading(false);
     }

diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState, useMemo } from 'react';
+import React, { useState } from 'react';
 import { EuiSteps, EuiLink, EuiText, EuiSpacer } from '@elastic/eui';
 import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
@@ -71,67 +71,53 @@ export const ManagedInstructions = React.memo<Props>(
     const settings = useGetSettings();
     const fleetServerInstructions = useFleetServerInstructions(apiKey?.data?.item?.policy_id);
 
-    const fleetServerSteps = useMemo(() => {
-      const {
-        serviceToken,
-        getServiceToken,
-        isLoadingServiceToken,
-        installCommand,
-        platform,
-        setPlatform,
-        deploymentMode,
-        setDeploymentMode,
-        addFleetServerHost,
-      } = fleetServerInstructions;
-      return [
-        DeploymentModeStep({ deploymentMode, setDeploymentMode }),
-        AddFleetServerHostStep({ addFleetServerHost }),
-        ServiceTokenStep({ serviceToken, getServiceToken, isLoadingServiceToken }),
-        FleetServerCommandStep({ serviceToken, installCommand, platform, setPlatform }),
-      ];
-    }, [fleetServerInstructions]);
-
-    const steps = useMemo(() => {
-      const fleetServerHosts = settings.data?.item?.fleet_server_hosts || [];
-      const baseSteps: EuiContainedStepProps[] = [
-        DownloadStep(),
-        !agentPolicy
-          ? AgentPolicySelectionStep({
-              agentPolicies,
-              selectedApiKeyId,
-              setSelectedAPIKeyId,
-              setIsFleetServerPolicySelected,
-            })
-          : AgentEnrollmentKeySelectionStep({ agentPolicy, selectedApiKeyId, setSelectedAPIKeyId }),
-      ];
-      if (isFleetServerPolicySelected) {
-        baseSteps.push(...fleetServerSteps);
-      } else {
-        baseSteps.push({
-          title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
-            defaultMessage: 'Enroll and start the Elastic Agent',
-          }),
-          children: selectedApiKeyId && apiKey.data && (
-            <ManualInstructions apiKey={apiKey.data.item} fleetServerHosts={fleetServerHosts} />
-          ),
-        });
-      }
-
-      if (viewDataStepContent) {
-        baseSteps.push(ViewDataStep(viewDataStepContent));
-      }
-
-      return baseSteps;
-    }, [
-      agentPolicy,
-      agentPolicies,
-      selectedApiKeyId,
-      apiKey.data,
-      isFleetServerPolicySelected,
-      settings.data?.item?.fleet_server_hosts,
-      viewDataStepContent,
-      fleetServerSteps,
-    ]);
+    const {
+      serviceToken,
+      getServiceToken,
+      isLoadingServiceToken,
+      installCommand,
+      platform,
+      setPlatform,
+      deploymentMode,
+      setDeploymentMode,
+      addFleetServerHost,
+    } = fleetServerInstructions;
+
+    const fleetServerSteps = [
+      DeploymentModeStep({ deploymentMode, setDeploymentMode }),
+      AddFleetServerHostStep({ addFleetServerHost }),
+      ServiceTokenStep({ serviceToken, getServiceToken, isLoadingServiceToken }),
+      FleetServerCommandStep({ serviceToken, installCommand, platform, setPlatform }),
+    ];
+
+    const fleetServerHosts = settings.data?.item?.fleet_server_hosts || [];
+    const steps: EuiContainedStepProps[] = [
+      DownloadStep(),
+      !agentPolicy
+        ? AgentPolicySelectionStep({
+            agentPolicies,
+            selectedApiKeyId,
+            setSelectedAPIKeyId,
+            setIsFleetServerPolicySelected,
+          })
+        : AgentEnrollmentKeySelectionStep({ agentPolicy, selectedApiKeyId, setSelectedAPIKeyId }),
+    ];
+    if (isFleetServerPolicySelected) {
+      steps.push(...fleetServerSteps);
+    } else {
+      steps.push({
+        title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
+          defaultMessage: 'Enroll and start the Elastic Agent',
+        }),
+        children: selectedApiKeyId && apiKey.data && (
+          <ManualInstructions apiKey={apiKey.data.item} fleetServerHosts={fleetServerHosts} />
+        ),
+      });
+    }
+
+    if (viewDataStepContent) {
+      steps.push(ViewDataStep(viewDataStepContent));
+    }
 
     return (
       <>