[Fleet] Fix add fleet server host from advanced tab (elastic#145622)

spalger · Nov 18, 2022 · 904fc21 · 904fc21
1 parent beeea7d
commit 904fc21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/...ic/applications/fleet/components/fleet_server_instructions/hooks/use_fleet_server_host.ts b/...ic/applications/fleet/components/fleet_server_instructions/hooks/use_fleet_server_host.ts
@@ -12,6 +12,7 @@ import {
   useComboInput,
   useInput,
   useSwitchInput,
+  validateInputs,
 } from '../../../hooks';
 import type { FleetServerHost } from '../../../types';
 
@@ -44,11 +45,17 @@ export const useFleetServerHost = (): FleetServerHostForm => {
   const isDefaultInput = useSwitchInput(false, isPreconfigured || fleetServerHost?.is_default);
   const hostUrlsInput = useComboInput('hostUrls', [], validateFleetServerHosts, isPreconfigured);
 
-  const validate = useCallback(
-    () => hostUrlsInput.validate() && nameInput.validate(),
-    [hostUrlsInput, nameInput]
+  const inputs = useMemo(
+    () => ({
+      nameInput,
+      isDefaultInput,
+      hostUrlsInput,
+    }),
+    [nameInput, isDefaultInput, hostUrlsInput]
   );
 
+  const validate = useCallback(() => validateInputs(inputs), [inputs]);
+
   const { data, resendRequest: refreshGetFleetServerHosts } = useGetFleetServerHosts();
 
   const fleetServerHosts = useMemo(() => data?.items ?? [], [data?.items]);
@@ -97,10 +104,6 @@ export const useFleetServerHost = (): FleetServerHostForm => {
     isFleetServerHostSubmitted,
     setFleetServerHost,
     validate,
-    inputs: {
-      hostUrlsInput,
-      nameInput,
-      isDefaultInput,
-    },
+    inputs,
   };
 };
diff --git a/...c/applications/fleet/components/fleet_server_instructions/steps/add_fleet_server_host.tsx b/...c/applications/fleet/components/fleet_server_instructions/steps/add_fleet_server_host.tsx
@@ -79,10 +79,10 @@ export const AddFleetServerHostStepContent = ({
         id: 'fleet-server-host',
         is_preconfigured: false,
       };
-      setFleetServerHost(newFleetServerHost);
+
       if (validate()) {
-        setSubmittedFleetServerHost(newFleetServerHost);
         setFleetServerHost(await saveFleetServerHost(newFleetServerHost));
+        setSubmittedFleetServerHost(newFleetServerHost);
       }
     } catch (err) {
       notifications.toasts.addError(err, {