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

Fix includeFields function to return root saved object properties (#33847) (#33945)

Browse source
This commit is contained in:
Mike Côté 2019-03-27 11:11:03 -04:00 • committed by GitHub
parent 1a25a22466
commit 530553d344
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 64 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/legacy/server/saved_objects/service/lib/included_fields.js
View file

@ -34,5 +34,8 @@ export function includedFields(type, fields) {
return sourceFields.map(f => `${sourceType}.${f}`)
.concat('namespace')
.concat('type')
.concat('references')
.concat('migrationVersion')
.concat('updated_at')
.concat(fields); // v5 compatibility
}

30
src/legacy/server/saved_objects/service/lib/included_fields.test.js
View file

@ -26,33 +26,51 @@ describe('includedFields', () => {
it('includes type', () => {
const fields = includedFields('config', 'foo');
expect(fields).toHaveLength(4);
expect(fields).toHaveLength(7);
expect(fields).toContain('type');
});
it('includes namespace', () => {
const fields = includedFields('config', 'foo');
expect(fields).toHaveLength(4);
expect(fields).toHaveLength(7);
expect(fields).toContain('namespace');
});
it('includes references', () => {
const fields = includedFields('config', 'foo');
expect(fields).toHaveLength(7);
expect(fields).toContain('references');
});
it('includes migrationVersion', () => {
const fields = includedFields('config', 'foo');
expect(fields).toHaveLength(7);
expect(fields).toContain('migrationVersion');
});
it('includes updated_at', () => {
const fields = includedFields('config', 'foo');
expect(fields).toHaveLength(7);
expect(fields).toContain('updated_at');
});
it('accepts field as string', () => {
const fields = includedFields('config', 'foo');
expect(fields).toHaveLength(4);
expect(fields).toHaveLength(7);
expect(fields).toContain('config.foo');
});
it('accepts fields as an array', () => {
const fields = includedFields('config', ['foo', 'bar']);
expect(fields).toHaveLength(6);
expect(fields).toHaveLength(9);
expect(fields).toContain('config.foo');
expect(fields).toContain('config.bar');
});
it('uses wildcard when type is not provided', () => {
const fields = includedFields(undefined, 'foo');
expect(fields).toHaveLength(4);
expect(fields).toHaveLength(7);
expect(fields).toContain('*.foo');
});
@ -60,7 +78,7 @@ describe('includedFields', () => {
it('includes legacy field path', () => {
const fields = includedFields('config', ['foo', 'bar']);
expect(fields).toHaveLength(6);
expect(fields).toHaveLength(9);
expect(fields).toContain('foo');
expect(fields).toContain('bar');
});

19
src/legacy/server/saved_objects/service/lib/repository.test.js
View file

@ -1073,11 +1073,20 @@ describe('SavedObjectsRepository', () => {
await savedObjectsRepository.find({ type: 'foo', fields: ['title'] });
expect(callAdminCluster).toHaveBeenCalledTimes(1);
expect(callAdminCluster).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({
_source: [
'foo.title', 'namespace', 'type', 'title'
]
}));
expect(callAdminCluster).toHaveBeenCalledWith(
expect.any(String),
expect.objectContaining({
_source: [
'foo.title',
'namespace',
'type',
'references',
'migrationVersion',
'updated_at',
'title',
],
})
);
expect(onBeforeWrite).not.toHaveBeenCalled();
});

12
test/api_integration/apis/saved_objects/find.js
View file

@ -46,7 +46,17 @@ export default function ({ getService }) {
attributes: {
'title': 'Count of requests'
},
references: [],
migrationVersion: {
visualization: '7.0.0',
},
references: [
{
id: '91200a00-9efd-11e7-acb3-3dab96693fab',
name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
type: 'index-pattern',
},
],
updated_at: '2017-09-21T18:51:23.794Z',
}
]
});

13
x-pack/test/saved_object_api_integration/common/suites/find.ts
View file

@ -68,6 +68,7 @@ export function findTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>)
name: 'My favorite global object',
},
references: [],
updated_at: '2017-09-21T18:59:16.270Z',
},
],
});
@ -100,7 +101,17 @@ export function findTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>)
attributes: {
title: 'Count of requests',
},
references: [],
migrationVersion: {
visualization: '7.0.0',
},
references: [
{
id: `${getIdPrefix(spaceId)}91200a00-9efd-11e7-acb3-3dab96693fab`,
name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
type: 'index-pattern',
},
],
updated_at: '2017-09-21T18:51:23.794Z',
},
],
});