From 63eb9a95f571feb340a1c398ed3b514dd1fa0adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=CC=81bastien?= <sebastien.loix@elastic.co>
Date: Wed, 29 Jan 2020 15:26:44 +0530
Subject: [PATCH] Revert merge conflict resolution

---
 .../app/components/mappings_editor/mappings_state.tsx      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx b/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx
index 634fde393c2cd..2204f4c90c0a9 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/mappings_editor/mappings_state.tsx
@@ -157,11 +157,8 @@ export const MappingsState = React.memo(
               : Promise.resolve(true);
 
           const templatesFormValidator =
-            state.templates.submitForm !== undefined
-              ? new Promise(async resolve => {
-                  const { isValid } = await state.templates.submitForm!();
-                  resolve(isValid);
-                })
+            state.templates.form !== undefined
+              ? (await state.templates.form!.submit()).isValid
               : Promise.resolve(true);
 
           const promisesToValidate = [configurationFormValidator, templatesFormValidator];