fix types and i18n

elastic · Aug 12, 2020 · 5ff03ea · 5ff03ea
1 parent 106701f
commit 5ff03ea
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 28 deletions.
diff --git a/...mponents/pipeline_processors_editor/components/manage_processor_form/processors/bytes.tsx b/...mponents/pipeline_processors_editor/components/manage_processor_form/processors/bytes.tsx
@@ -30,7 +30,7 @@ export const Bytes: FunctionComponent = () => {
  <>
  <FieldNameField
  helpText={i18n.translate(
- 'xpack.ingestPipelines.pipelineEditor.bytesForm.targetFieldHelpText',
+ 'xpack.ingestPipelines.pipelineEditor.bytesForm.fieldNameHelpText',
  { defaultMessage: 'The field to convert.' }
  )}
  />

diff --git a/...editor/components/manage_processor_form/processors/common_fields/processor_type_field.tsx b/...editor/components/manage_processor_form/processors/common_fields/processor_type_field.tsx
@@ -46,20 +46,12 @@ interface Props {
 
 const { emptyField } = fieldValidators;
 
-const typeConfig: FieldConfig = {
+const typeConfig: FieldConfig<any, string> = {
  type: FIELD_TYPES.COMBO_BOX,
  label: i18n.translate('xpack.ingestPipelines.pipelineEditor.typeField.typeFieldLabel', {
  defaultMessage: 'Processor',
  }),
- deserializer: (value: string | undefined) => {
- if (value) {
- return [value];
- }
- return [];
- },
- serializer: (value: string[]) => {
- return value[0];
- },
+ deserializer: String,
  validations: [
  {
  validator: emptyField(
@@ -73,11 +65,11 @@ const typeConfig: FieldConfig = {
 
 export const ProcessorTypeField: FunctionComponent<Props> = ({ initialType }) => {
  return (
- <UseField<string[]> config={typeConfig} defaultValue={initialType} path="type">
+ <UseField<string> config={typeConfig} defaultValue={initialType} path="type">
  {(typeField) => {
  let selectedOptions: ProcessorTypeAndLabel[];
  if (typeField.value?.length) {
- const [type] = typeField.value;
+ const type = typeField.value;
  const descriptor = getProcessorDescriptor(type);
  selectedOptions = descriptor
  ? [{ label: descriptor.label, value: type }]
@@ -103,9 +95,7 @@ export const ProcessorTypeField: FunctionComponent<Props> = ({ initialType }) =>
  return false;
  }
 
- const newValue = [...(typeField.value as string[]), value];
-
- typeField.setValue(newValue);
+ typeField.setValue(value);
  };
 
  return (
@@ -131,8 +121,9 @@ export const ProcessorTypeField: FunctionComponent<Props> = ({ initialType }) =>
  options={processorTypesAndLabels}
  selectedOptions={selectedOptions}
  onCreateOption={onCreateComboOption}
- onChange={(options: EuiComboBoxOptionOption[]) => {
- typeField.setValue(options.map(({ value }) => value));
+ onChange={(options: Array<EuiComboBoxOptionOption<string>>) => {
+ const [selection] = options;
+ typeField.setValue(selection?.value! ?? '');
  }}
  noSuggestions={false}
  singleSelection={{

diff --git a/...onents/pipeline_processors_editor/components/manage_processor_form/processors/convert.tsx b/...onents/pipeline_processors_editor/components/manage_processor_form/processors/convert.tsx
@@ -48,9 +48,12 @@ const fieldsConfig: FieldsConfig = {
  label: i18n.translate('xpack.ingestPipelines.pipelineEditor.convertForm.targetFieldLabel', {
  defaultMessage: 'Target field (optional)',
  }),
- helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.convertForm.targetFieldLabel', {
- defaultMessage: 'The field to assign the converted value to.',
- }),
+ helpText: i18n.translate(
+ 'xpack.ingestPipelines.pipelineEditor.convertForm.targetFieldHelpText',
+ {
+ defaultMessage: 'The field to assign the converted value to.',
+ }
+ ),
  },
 };
 
@@ -59,7 +62,7 @@ export const Convert: FunctionComponent = () => {
  <>
  <FieldNameField
  helpText={i18n.translate(
- 'xpack.ingestPipelines.pipelineEditor.convertForm.targetFieldHelpText',
+ 'xpack.ingestPipelines.pipelineEditor.convertForm.fieldNameHelpText',
  { defaultMessage: 'The field whose value is to be converted.' }
  )}
  />

diff --git a/...components/pipeline_processors_editor/components/manage_processor_form/processors/csv.tsx b/...components/pipeline_processors_editor/components/manage_processor_form/processors/csv.tsx
@@ -139,10 +139,9 @@ export const CSV: FunctionComponent = () => {
  return (
  <>
  <FieldNameField
- helpText={i18n.translate(
- 'xpack.ingestPipelines.pipelineEditor.convertForm.fieldNameHelpText',
- { defaultMessage: 'The field to extract data from.' }
- )}
+ helpText={i18n.translate('xpack.ingestPipelines.pipelineEditor.csvForm.fieldNameHelpText', {
+ defaultMessage: 'The field to extract data from.',
+ })}
  />
 
  <UseField

diff --git a/...ipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx b/...ipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
@@ -117,7 +117,7 @@ const fieldsConfig: FieldsConfig = {
  ),
  helpText: (
  <FormattedMessage
- id="xpack.ingestPipelines.pipelineEditor.dateForm.timezoneHelpText"
+ id="xpack.ingestPipelines.pipelineEditor.dateIndexNameForm.timezoneHelpText"
  defaultMessage="The timezone to use when parsing the date and when date math index supports resolves expressions into concrete index names. Default value is {timezone}."
  values={{ timezone: <EuiCode inline>{'UTC'}</EuiCode> }}
  />
@@ -134,7 +134,7 @@ const fieldsConfig: FieldsConfig = {
  ),
  helpText: (
  <FormattedMessage
- id="xpack.ingestPipelines.pipelineEditor.dateForm.localeHelpText"
+ id="xpack.ingestPipelines.pipelineEditor.dateIndexForm.localeHelpText"
  defaultMessage="The locale to use when parsing the date from the document being preprocessed, relevant when parsing month names or week days. Default value is {locale}"
  values={{ locale: <EuiCode inline>{'ENGLISH'}</EuiCode> }}
  />