From 34d50f7057625992c5d36f406a2ca8813b969040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <stuermer@weltenwort.de>
Date: Wed, 13 May 2020 17:15:48 +0200
Subject: [PATCH] Take dataset validation request state into account

---
 .../log_analysis/log_analysis_setup_state.ts     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts
index ddab76714604d..9f757497aff81 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts
@@ -212,25 +212,29 @@ export const useAnalysisSetupState = <JobType extends string>({
     }
 
     return [
-      // index count
-      ...(selectedIndexNames.length === 0 ? [{ error: 'TOO_FEW_SELECTED_INDICES' as const }] : []),
-      // time range
-      ...(!isTimeRangeValid ? [{ error: 'INVALID_TIME_RANGE' as const }] : []),
       // validate request status
-      ...(validateIndicesRequest.state === 'rejected' ? [{ error: 'NETWORK_ERROR' as const }] : []),
+      ...(validateIndicesRequest.state === 'rejected' ||
+      validateDatasetsRequest.state === 'rejected'
+        ? [{ error: 'NETWORK_ERROR' as const }]
+        : []),
       // validation request results
       ...validatedIndices.reduce<ValidationUIError[]>((errors, index) => {
         return index.validity === 'invalid' && selectedIndexNames.includes(index.name)
           ? [...errors, ...index.errors]
           : errors;
       }, []),
+      // index count
+      ...(selectedIndexNames.length === 0 ? [{ error: 'TOO_FEW_SELECTED_INDICES' as const }] : []),
+      // time range
+      ...(!isTimeRangeValid ? [{ error: 'INVALID_TIME_RANGE' as const }] : []),
     ];
   }, [
     isValidating,
     validateIndicesRequest.state,
+    validateDatasetsRequest.state,
+    validatedIndices,
     selectedIndexNames,
     isTimeRangeValid,
-    validatedIndices,
   ]);
 
   const prevStartTime = usePrevious(startTime);