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

Jump to bottom

[Ingest Node Pipelines] More lenient treatment of on-failure value #64411

Merged
merged 1 commit into from
Apr 25, 2020
Merged

[Ingest Node Pipelines] More lenient treatment of on-failure value #64411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 17 additions & 26 deletions x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/schema.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,7 @@

import { i18n } from '@kbn/i18n';

import {
FormSchema,
FIELD_TYPES,
fieldValidators,
fieldFormatters,
isJSON,
isEmptyString,
ValidationFuncArg,
} from '../../../shared_imports';
import { FormSchema, FIELD_TYPES, fieldValidators, fieldFormatters } from '../../../shared_imports';

const { emptyField, isJsonField } = fieldValidators;
const { toInt } = fieldFormatters;
Expand Down Expand Up @@ -97,27 +89,26 @@ export const pipelineFormSchema: FormSchema = {
label: i18n.translate('xpack.ingestPipelines.form.onFailureFieldLabel', {
defaultMessage: 'On-failure processors (optional)',
}),
serializer: parseJson,
serializer: value => {
const result = parseJson(value);
// If an empty array was passed, strip out this value entirely.
if (!result.length) {
return undefined;
}
return result;
},
deserializer: stringifyJson,
validations: [
{
validator: ({ value }: ValidationFuncArg<any, any>) => {
if (isJSON(value)) {
const parsedJSON = JSON.parse(value);
if (!parsedJSON.length) {
return {
message: 'At least one on-failure processor must be defined.',
};
}
} else {
if (!isEmptyString(value)) {
return {
message: i18n.translate('xpack.ingestPipelines.form.onFailureProcessorsJsonError', {
defaultMessage: 'The on-failure processors JSON is not valid.',
}),
};
}
validator: validationArg => {
if (!validationArg.value) {
return;
}
return isJsonField(
i18n.translate('xpack.ingestPipelines.form.onFailureProcessorsJsonError', {
defaultMessage: 'The on-failure processors JSON is not valid.',
})
)(validationArg);
},
},
],
Expand Down