-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Mappings editor] Add support for version field type (#78206)
- Loading branch information
1 parent
cba458e
commit 4fe7625
Showing
5 changed files
with
155 additions
and
0 deletions.
There are no files selected for viewing
95 changes: 95 additions & 0 deletions
95
...omponents/mappings_editor/__jest__/client_integration/datatypes/version_datatype.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
import { act } from 'react-dom/test-utils'; | ||
|
||
import { componentHelpers, MappingsEditorTestBed } from '../helpers'; | ||
|
||
const { setup, getMappingsEditorDataFactory } = componentHelpers.mappingsEditor; | ||
|
||
// Parameters automatically added to the version datatype when saved (with the default values) | ||
export const defaultVersionParameters = { | ||
type: 'version', | ||
}; | ||
|
||
describe('Mappings editor: version datatype', () => { | ||
/** | ||
* Variable to store the mappings data forwarded to the consumer component | ||
*/ | ||
let data: any; | ||
let onChangeHandler: jest.Mock = jest.fn(); | ||
let getMappingsEditorData = getMappingsEditorDataFactory(onChangeHandler); | ||
let testBed: MappingsEditorTestBed; | ||
|
||
beforeAll(() => { | ||
jest.useFakeTimers(); | ||
}); | ||
|
||
afterAll(() => { | ||
jest.useRealTimers(); | ||
}); | ||
|
||
beforeEach(() => { | ||
onChangeHandler = jest.fn(); | ||
getMappingsEditorData = getMappingsEditorDataFactory(onChangeHandler); | ||
}); | ||
|
||
test('supports meta parameter', async () => { | ||
const defaultMappings = { | ||
properties: { | ||
myField: { | ||
type: 'version', | ||
}, | ||
}, | ||
}; | ||
|
||
const updatedMappings = { ...defaultMappings }; | ||
|
||
const metaParameter = { | ||
meta: { | ||
my_metadata: 'foobar', | ||
}, | ||
}; | ||
|
||
await act(async () => { | ||
testBed = setup({ value: defaultMappings, onChange: onChangeHandler }); | ||
}); | ||
testBed.component.update(); | ||
|
||
const { | ||
component, | ||
actions: { | ||
startEditField, | ||
updateFieldAndCloseFlyout, | ||
showAdvancedSettings, | ||
toggleFormRow, | ||
updateJsonEditor, | ||
}, | ||
} = testBed; | ||
|
||
// Open the flyout to edit the field | ||
await startEditField('myField'); | ||
await showAdvancedSettings(); | ||
|
||
// Enable the meta parameter and provide a valid object | ||
toggleFormRow('metaParameter'); | ||
await act(async () => { | ||
updateJsonEditor('metaParameterEditor', metaParameter.meta); | ||
}); | ||
component.update(); | ||
|
||
// Save the field and close the flyout | ||
await updateFieldAndCloseFlyout(); | ||
|
||
// It should have the default parameters values added, plus metadata | ||
updatedMappings.properties.myField = { | ||
...defaultVersionParameters, | ||
...metaParameter, | ||
}; | ||
|
||
({ data } = await getMappingsEditorData(component)); | ||
expect(data).toEqual(updatedMappings); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...components/mappings_editor/components/document_fields/fields/field_types/version_type.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
import React from 'react'; | ||
|
||
import { NormalizedField, Field as FieldType, ParameterName } from '../../../../types'; | ||
import { getFieldConfig } from '../../../../lib'; | ||
import { MetaParameter } from '../../field_parameters'; | ||
import { AdvancedParametersSection } from '../edit_field'; | ||
|
||
interface Props { | ||
field: NormalizedField; | ||
} | ||
|
||
const getDefaultToggleValue = (param: ParameterName, field: FieldType) => { | ||
return field[param] !== undefined && field[param] !== getFieldConfig(param).defaultValue; | ||
}; | ||
|
||
export const VersionType = ({ field }: Props) => { | ||
return ( | ||
<AdvancedParametersSection> | ||
<MetaParameter defaultToggleValue={getDefaultToggleValue('meta', field.source)} /> | ||
</AdvancedParametersSection> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters