Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] [Ingest Pipelines] Processor forms for processors K-S (#75638) #76762

Merged
merged 2 commits into from
Sep 8, 2020
Merged

[7.x] [Ingest Pipelines] Processor forms for processors K-S (#75638) #76762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba4c5f3
[Ingest Pipelines] Processor forms for processors K-S (#75638)
jloleysens Sep 4, 2020
bec39da
Merge branch '7.x' into backport/7.x/pr-75638
elasticmachine Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...line_processors_editor/components/manage_processor_form/field_components/xjson_editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ interface Props {
editorProps: { [key: string]: any };
}

const defaultEditorOptions = {
minimap: { enabled: false },
lineNumbers: 'off',
};

export const XJsonEditor: FunctionComponent<Props> = ({ field, editorProps }) => {
const { value, setValue } = field;
const { xJson, setXJson, convertToJson } = Monaco.useXJsonMode(value);
Expand All @@ -31,7 +36,7 @@ export const XJsonEditor: FunctionComponent<Props> = ({ field, editorProps }) =>
editorProps={{
value: xJson,
languageId: XJsonLang.ID,
options: { minimap: { enabled: false } },
options: defaultEditorOptions,
onChange,
...editorProps,
}}
Expand Down
16 changes: 14 additions & 2 deletions ...pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,22 @@ export const ProcessorSettingsFields: FunctionComponent<Props> = ({ processor })
const formDescriptor = getProcessorDescriptor(type as any);

if (formDescriptor?.FieldsComponent) {
const renderedFields = (
<formDescriptor.FieldsComponent
key={type}
initialFieldValues={processor?.options}
/>
);
return (
<>
<formDescriptor.FieldsComponent key={type} />
<EuiHorizontalRule />
{renderedFields ? (
<>
{renderedFields}
<EuiHorizontalRule />
</>
) : (
renderedFields
)}
<CommonProcessorFields />
</>
);
Expand Down
11 changes: 7 additions & 4 deletions ...tor/components/manage_processor_form/processors/common_fields/common_processor_fields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import {
} from '../../../../../../../shared_imports';

import { TextEditor } from '../../field_components';
import { to, from } from '../shared';
import { to, from, EDITOR_PX_HEIGHT } from '../shared';

const ignoreFailureConfig: FieldConfig = {
defaultValue: false,
deserializer: to.booleanOrUndef,
serializer: from.defaultBoolToUndef(false),
serializer: from.undefinedIfValue(false),
label: i18n.translate(
'xpack.ingestPipelines.pipelineEditor.commonFields.ignoreFailureFieldLabel',
{
Expand Down Expand Up @@ -64,8 +64,11 @@ export const CommonProcessorFields: FunctionComponent = () => {
componentProps={{
editorProps: {
languageId: 'painless',
height: 75,
options: { minimap: { enabled: false } },
height: EDITOR_PX_HEIGHT.extraSmall,
options: {
lineNumbers: 'off',
minimap: { enabled: false },
},
},
}}
path="fields.if"
Expand Down
2 changes: 1 addition & 1 deletion ...editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const fieldsConfig: FieldsConfig = {
type: FIELD_TYPES.TOGGLE,
defaultValue: false,
deserializer: to.booleanOrUndef,
serializer: from.defaultBoolToUndef(false),
serializer: from.undefinedIfValue(false),
label: i18n.translate(
'xpack.ingestPipelines.pipelineEditor.commonFields.ignoreMissingFieldLabel',
{
Expand Down
3 changes: 1 addition & 2 deletions ...cessors_editor/components/manage_processor_form/processors/common_fields/target_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ const fieldsConfig: FieldsConfig = {
helpText: i18n.translate(
'xpack.ingestPipelines.pipelineEditor.commonFields.targetFieldHelpText',
{
defaultMessage:
'The field to assign the joined value to. If empty, the field is updated in-place.',
defaultMessage: 'Field to assign the value to. If empty, the field is updated in-place.',
}
),
},
Expand Down
3 changes: 2 additions & 1 deletion ...ponents/pipeline_processors_editor/components/manage_processor_form/processors/custom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
const { emptyField, isJsonField } = fieldValidators;

import { XJsonEditor } from '../field_components';
import { EDITOR_PX_HEIGHT } from './shared';

const customConfig: FieldConfig = {
type: FIELD_TYPES.TEXT,
Expand Down Expand Up @@ -78,7 +79,7 @@ export const Custom: FunctionComponent<Props> = ({ defaultOptions }) => {
componentProps={{
editorProps: {
'data-test-subj': 'processorOptionsEditor',
height: 300,
height: EDITOR_PX_HEIGHT.large,
'aria-label': i18n.translate(
'xpack.ingestPipelines.pipelineEditor.customForm.optionsFieldAriaLabel',
{
Expand Down
3 changes: 2 additions & 1 deletion ...onents/pipeline_processors_editor/components/manage_processor_form/processors/dissect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {

import { FieldNameField } from './common_fields/field_name_field';
import { IgnoreMissingField } from './common_fields/ignore_missing_field';
import { EDITOR_PX_HEIGHT } from './shared';

const { emptyField } = fieldValidators;

Expand Down Expand Up @@ -80,7 +81,7 @@ export const Dissect: FunctionComponent = () => {
component={TextEditor}
componentProps={{
editorProps: {
height: 75,
height: EDITOR_PX_HEIGHT.extraSmall,
options: { minimap: { enabled: false } },
},
}}
Expand Down
2 changes: 1 addition & 1 deletion ...ponents/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const fieldsConfig: FieldsConfig = {
type: FIELD_TYPES.TOGGLE,
defaultValue: true,
deserializer: to.booleanOrUndef,
serializer: from.defaultBoolToUndef,
serializer: from.undefinedIfValue,
label: i18n.translate('xpack.ingestPipelines.pipelineEditor.enrichForm.overrideFieldLabel', {
defaultMessage: 'Override',
}),
Expand Down
17 changes: 10 additions & 7 deletions ...onents/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { FIELD_TYPES, fieldValidators, UseField } from '../../../../../../shared
import { XJsonEditor } from '../field_components';

import { FieldNameField } from './common_fields/field_name_field';
import { FieldsConfig, to } from './shared';
import { FieldsConfig, to, EDITOR_PX_HEIGHT } from './shared';

const { emptyField, isJsonField } = fieldValidators;

Expand All @@ -31,15 +31,18 @@ const fieldsConfig: FieldsConfig = {
validations: [
{
validator: emptyField(
i18n.translate('xpack.ingestPipelines.pipelineEditor.failForm.processorRequiredError', {
defaultMessage: 'A processor is required.',
})
i18n.translate(
'xpack.ingestPipelines.pipelineEditor.foreachForm.processorRequiredError',
{
defaultMessage: 'A processor is required.',
}
)
),
},
{
validator: isJsonField(
i18n.translate(
'xpack.ingestPipelines.pipelineEditor.failForm.processorInvalidJsonError',
'xpack.ingestPipelines.pipelineEditor.foreachForm.processorInvalidJsonError',
{
defaultMessage: 'Invalid JSON',
}
Expand All @@ -64,9 +67,9 @@ export const Foreach: FunctionComponent = () => {
component={XJsonEditor}
componentProps={{
editorProps: {
height: 200,
height: EDITOR_PX_HEIGHT.medium,
'aria-label': i18n.translate(
'xpack.ingestPipelines.pipelineEditor.customForm.optionsFieldAriaLabel',
'xpack.ingestPipelines.pipelineEditor.foreachForm.optionsFieldAriaLabel',
{
defaultMessage: 'Configuration JSON editor',
}
Expand Down
2 changes: 1 addition & 1 deletion ...mponents/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const fieldsConfig: FieldsConfig = {
type: FIELD_TYPES.TOGGLE,
defaultValue: true,
deserializer: to.booleanOrUndef,
serializer: from.defaultBoolToUndef(true),
serializer: from.undefinedIfValue(true),
label: i18n.translate('xpack.ingestPipelines.pipelineEditor.geoIPForm.firstOnlyFieldLabel', {
defaultMessage: 'First only',
}),
Expand Down
6 changes: 3 additions & 3 deletions ...omponents/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { XJsonEditor } from '../field_components';

import { FieldNameField } from './common_fields/field_name_field';
import { IgnoreMissingField } from './common_fields/ignore_missing_field';
import { FieldsConfig, to, from } from './shared';
import { FieldsConfig, to, from, EDITOR_PX_HEIGHT } from './shared';

const { emptyField, isJsonField } = fieldValidators;

Expand Down Expand Up @@ -80,7 +80,7 @@ const fieldsConfig: FieldsConfig = {
type: FIELD_TYPES.TOGGLE,
defaultValue: false,
deserializer: to.booleanOrUndef,
serializer: from.defaultBoolToUndef(false),
serializer: from.undefinedIfValue(false),
label: i18n.translate('xpack.ingestPipelines.pipelineEditor.grokForm.traceMatchFieldLabel', {
defaultMessage: 'Trace match',
}),
Expand Down Expand Up @@ -110,7 +110,7 @@ export const Grok: FunctionComponent = () => {
config={fieldsConfig.pattern_definitions}
componentProps={{
editorProps: {
height: 200,
height: EDITOR_PX_HEIGHT.medium,
'aria-label': i18n.translate(
'xpack.ingestPipelines.pipelineEditor.grokForm.patternDefinitionsAriaLabel',
{
Expand Down
4 changes: 2 additions & 2 deletions ...omponents/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { FIELD_TYPES, fieldValidators, UseField, Field } from '../../../../../..

import { TextEditor } from '../field_components';

import { FieldsConfig } from './shared';
import { EDITOR_PX_HEIGHT, FieldsConfig } from './shared';
import { FieldNameField } from './common_fields/field_name_field';
import { IgnoreMissingField } from './common_fields/ignore_missing_field';
import { TargetField } from './common_fields/target_field';
Expand Down Expand Up @@ -78,7 +78,7 @@ export const Gsub: FunctionComponent = () => {
component={TextEditor}
componentProps={{
editorProps: {
height: 75,
height: EDITOR_PX_HEIGHT.extraSmall,
options: { minimap: { enabled: false } },
},
}}
Expand Down
12 changes: 12 additions & 0 deletions ...omponents/pipeline_processors_editor/components/manage_processor_form/processors/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,15 @@ export { HtmlStrip } from './html_strip';
export { Inference } from './inference';
export { Join } from './join';
export { Json } from './json';
export { Kv } from './kv';
export { Lowercase } from './lowercase';
export { Pipeline } from './pipeline';
export { Remove } from './remove';
export { Rename } from './rename';
export { Script } from './script';
export { SetProcessor } from './set';
export { SetSecurityUser } from './set_security_user';
export { Split } from './split';
export { Sort } from './sort';

export { FormFieldsComponent } from './shared';
6 changes: 3 additions & 3 deletions ...ents/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { XJsonEditor } from '../field_components';

import { TargetField } from './common_fields/target_field';

import { FieldsConfig, to, from } from './shared';
import { FieldsConfig, to, from, EDITOR_PX_HEIGHT } from './shared';

const { emptyField, isJsonField } = fieldValidators;

Expand Down Expand Up @@ -177,7 +177,7 @@ export const Inference: FunctionComponent = () => {
component={XJsonEditor}
componentProps={{
editorProps: {
height: 200,
height: EDITOR_PX_HEIGHT.medium,
options: { minimap: { enabled: false } },
},
}}
Expand All @@ -192,7 +192,7 @@ export const Inference: FunctionComponent = () => {
component={XJsonEditor}
componentProps={{
editorProps: {
height: 200,
height: EDITOR_PX_HEIGHT.medium,
options: { minimap: { enabled: false } },
},
}}
Expand Down
2 changes: 1 addition & 1 deletion ...omponents/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const fieldsConfig: FieldsConfig = {
{
validator: emptyField(
i18n.translate('xpack.ingestPipelines.pipelineEditor.joinForm.separatorRequiredError', {
defaultMessage: 'A separator value is required.',
defaultMessage: 'A value is required.',
})
),
},
Expand Down
2 changes: 1 addition & 1 deletion ...omponents/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const fieldsConfig: FieldsConfig = {
defaultMessage: 'Add to root',
}),
deserializer: to.booleanOrUndef,
serializer: from.defaultBoolToUndef(false),
serializer: from.undefinedIfValue(false),
helpText: i18n.translate(
'xpack.ingestPipelines.pipelineEditor.jsonForm.addToRootFieldHelpText',
{
Expand Down
Loading