[Index Management] Fix errors with validation (elastic#56072)

alisonelizabeth · Jan 28, 2020 · ef2d66f · ef2d66f
1 parent 2f2cd9a
commit ef2d66f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...public/app/sections/home/index_list/detail_panel/edit_settings_json/edit_settings_json.js b/...public/app/sections/home/index_list/detail_panel/edit_settings_json/edit_settings_json.js
@@ -67,7 +67,8 @@ export class EditSettingsJson extends React.PureComponent {
       const editor = (this.editor = createAceEditor(this.aceDiv, prettyJson, false, settingsKeys));
       const session = editor.getSession();
       session.on('changeAnnotation', () => {
-        this.setState({ valid: session.getAnnotations().length === 0 });
+        const isEmptyString = session.getValue() === '';
+        this.setState({ valid: !isEmptyString && session.getAnnotations().length === 0 });
       });
     }
   }

diff --git a/...lic/app/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js b/...lic/app/sections/home/index_list/index_actions_context_menu/index_actions_context_menu.js
@@ -13,7 +13,7 @@ import {
   EuiButton,
   EuiCallOut,
   EuiContextMenu,
-  EuiFieldText,
+  EuiFieldNumber,
   EuiForm,
   EuiFormRow,
   EuiPopover,
@@ -367,7 +367,7 @@ export class IndexActionsContextMenu extends Component {
           <EuiSpacer size="m" />
 
           <EuiForm
-            isInvalid={this.forcemergeSegmentsError()}
+            isInvalid={!!this.forcemergeSegmentsError()}
             error={this.forcemergeSegmentsError()}
           >
             <EuiFormRow
@@ -379,10 +379,11 @@ export class IndexActionsContextMenu extends Component {
               )}
               helpText={helpText}
             >
-              <EuiFieldText
+              <EuiFieldNumber
                 onChange={event => {
                   this.setState({ forcemergeSegments: event.target.value });
                 }}
+                min={1}
                 name="maxNumberSegments"
               />
             </EuiFormRow>