[Ingest Node Pipelines] Remove default value for error_distance param (…

…#102222)
elastic · Jun 21, 2021 · 863e709 · 863e709
1 parent 7765fc7
commit 863e709
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/...pelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx b/...pelines/public/application/components/pipeline_editor/__jest__/processors/circle.test.tsx
@@ -54,9 +54,10 @@ describe('Processor: Circle', () => {
     // Click submit button with only the type defined
     await saveNewProcessor();
 
-    // Expect form error as "field" and "shape_type" are required parameters
+    // Expect form error as "field", "shape_type" and "error_distance" are required parameters
     expect(form.getErrorsMessages()).toEqual([
       'A field value is required.',
+      'An error distance value is required.',
       'A shape type value is required.',
     ]);
   });
@@ -91,15 +92,15 @@ describe('Processor: Circle', () => {
       form,
     } = testBed;
 
-    // Add "field" value (required)
+    // Set required parameters
     form.setInputValue('fieldNameField.input', 'field_1');
-    // Select the shape
     form.setSelectValue('shapeSelectorField', 'geo_shape');
-    // Add "target_field" value
-    form.setInputValue('targetField.input', 'target_field');
-
     form.setInputValue('errorDistanceField.input', '10');
 
+    // Set optional parameters
+    form.setInputValue('targetField.input', 'target_field');
+    form.toggleEuiSwitch('ignoreMissingSwitch.input');
+
     // Save the field with new changes
     await saveNewProcessor();
 
@@ -109,6 +110,7 @@ describe('Processor: Circle', () => {
       error_distance: 10,
       shape_type: 'geo_shape',
       target_field: 'target_field',
+      ignore_missing: true,
     });
   });
 });
diff --git a/...ic/application/components/pipeline_editor/components/processor_form/processors/circle.tsx b/...ic/application/components/pipeline_editor/components/processor_form/processors/circle.tsx
@@ -13,6 +13,7 @@ import { EuiCode } from '@elastic/eui';
 import {
   FIELD_TYPES,
   fieldValidators,
+  fieldFormatters,
   UseField,
   SelectField,
   NumericField,
@@ -24,13 +25,13 @@ import { FieldNameField } from './common_fields/field_name_field';
 import { TargetField } from './common_fields/target_field';
 
 const { emptyField } = fieldValidators;
+const { toInt } = fieldFormatters;
 
 const fieldsConfig: FieldsConfig = {
   /* Required fields config */
   error_distance: {
     type: FIELD_TYPES.NUMBER,
-    deserializer: (v) => (typeof v === 'number' && !isNaN(v) ? v : 1.0),
-    serializer: Number,
+    formatters: [toInt],
     label: i18n.translate(
       'xpack.ingestPipelines.pipelineEditor.circleForm.errorDistanceFieldLabel',
       {
@@ -49,18 +50,11 @@ const fieldsConfig: FieldsConfig = {
     ),
     validations: [
       {
-        validator: ({ value }) => {
-          return isNaN(Number(value))
-            ? {
-                message: i18n.translate(
-                  'xpack.ingestPipelines.pipelineEditor.circleForm.errorDistanceError',
-                  {
-                    defaultMessage: 'An error distance value is required.',
-                  }
-                ),
-              }
-            : undefined;
-        },
+        validator: emptyField(
+          i18n.translate('xpack.ingestPipelines.pipelineEditor.circleForm.errorDistanceError', {
+            defaultMessage: 'An error distance value is required.',
+          })
+        ),
       },
     ],
   },
@@ -110,14 +104,14 @@ export const Circle: FunctionComponent = () => {
             options: [
               {
                 value: 'shape',
-                label: i18n.translate(
+                text: i18n.translate(
                   'xpack.ingestPipelines.pipelineEditor.circleForm.shapeTypeShape',
                   { defaultMessage: 'Shape' }
                 ),
               },
               {
                 value: 'geo_shape',
-                label: i18n.translate(
+                text: i18n.translate(
                   'xpack.ingestPipelines.pipelineEditor.circleForm.shapeTypeGeoShape',
                   { defaultMessage: 'Geo-shape' }
                 ),