github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Index Management] Fix bug when editing a template with no mappings (#78653)

Browse source
This commit is contained in:
Alison Goryachev 2020-09-29 09:19:31 -04:00 • committed by GitHub
parent 488344a642
commit 0b3c39e64f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

54
x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.test.tsx
View file

@ -98,6 +98,60 @@ describe('<TemplateEdit />', () => {
expect(find('fieldsListItem').length).toBe(1);
});
it('allows you to save an unmodified template', async () => {
const { actions } = testBed;
// Logistics
await actions.completeStepOne();
// Component templates
await actions.completeStepTwo();
// Index settings
await actions.completeStepThree();
// Mappings
await actions.completeStepFour();
// Aliases
await actions.completeStepFive();
// Submit the form
await act(async () => {
actions.clickNextButton();
});
const latestRequest = server.requests[server.requests.length - 1];
const { version } = templateToEdit;
const expected = {
name: 'index_template_without_mappings',
indexPatterns: ['indexPattern1'],
version,
_kbnMeta: {
type: 'default',
isLegacy: templateToEdit._kbnMeta.isLegacy,
hasDatastream: false,
},
};
expect(JSON.parse(JSON.parse(latestRequest.requestBody).body)).toEqual(expected);
});
it('allows you to view the "Request" tab of an unmodified template', async () => {
const { actions, exists } = testBed;
// Logistics
await actions.completeStepOne();
// Component templates
await actions.completeStepTwo();
// Index settings
await actions.completeStepThree();
// Mappings
await actions.completeStepFour();
// Aliases
await actions.completeStepFive();
await actions.review.selectTab('request');
expect(exists('requestTab')).toBe(true);
});
});
describe('with mappings', () => {

2
x-pack/plugins/index_management/public/application/components/template_form/steps/step_review.tsx
View file

@ -278,7 +278,7 @@ export const StepReview: React.FunctionComponent<Props> = React.memo(
);
const RequestTab = () => {
const includeTypeName = doMappingsHaveType(template!.template.mappings);
const includeTypeName = doMappingsHaveType(template!.template?.mappings);
const esApiEndpoint = isLegacy ? '_template' : '_index_template';
const endpoint = `PUT ${esApiEndpoint}/${name || '<templateName>'}${
includeTypeName ? '?include_type_name' : ''

2
x-pack/plugins/index_management/public/application/services/api.ts
View file

@ -284,7 +284,7 @@ export async function saveTemplate(template: TemplateDeserialized, isClone?: boo
}
export async function updateTemplate(template: TemplateDeserialized) {
const includeTypeName = doMappingsHaveType(template.template.mappings);
const includeTypeName = doMappingsHaveType(template.template?.mappings);
const { name } = template;
const result = await sendRequest({
path: `${API_BASE_PATH}/index_templates/${encodeURIComponent(name)}`,