Skip to content

Make discover tabs schema changes bwc (v2) #233807

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

Merged
lukasolson merged 2 commits into from
Sep 3, 2025
Merged

Make discover tabs schema changes bwc (v2) #233807

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
78e8093
Read search source from tabs
lukasolson Sep 2, 2025
c8aaf1b
Merge branch 'main' into discover_tabs_schema_bwc_fix_v2
lukasolson Sep 3, 2025
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
66 changes: 66 additions & 0 deletions src/platform/plugins/shared/saved_search/common/service/get_saved_searches.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,72 @@ describe('getSavedSearch', () => {
`);
});

test('should initialize searchSource from tab if kibanaSavedObjectMeta only exists in tab', async () => {
getSavedSrch = jest.fn().mockReturnValue({
item: {
attributes: {
title: 'test3',
sort: [['order_date', 'desc']],
columns: ['_source'],
description: 'description',
grid: {},
hideChart: false,
sampleSize: 100,
tabs: [
{
id: 'tab_with_meta',
label: 'Tab With Meta',
attributes: {
kibanaSavedObjectMeta: {
searchSourceJSON:
'{"query":{"query":"tab-query","language":"kuery"},"filter":[],"indexRefName":"kibanaSavedObjectMeta.searchSourceJSON.index"}',
},
sort: [['order_date', 'desc']],
columns: ['_source'],
grid: {},
hideChart: false,
sampleSize: 100,
},
},
],
},
id: 'ccf1af80-2297-11ec-86e0-1155ffb9c7a7',
type: 'search',
references: [
{
name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
id: 'ff959d40-b880-11e8-a6d9-e546fe2bba5f',
type: 'index-pattern',
},
],
namespaces: ['default'],
},
meta: {
outcome: 'exactMatch',
},
});

const savedSearch = await getSavedSearch(
'ccf1af80-2297-11ec-86e0-1155ffb9c7a7',
{
getSavedSrch,
searchSourceCreate,
},
true
);

expect(savedSearch.serializedSearchSource).toMatchInlineSnapshot(`
Object {
"filter": Array [],
"index": "ff959d40-b880-11e8-a6d9-e546fe2bba5f",
"query": Object {
"language": "kuery",
"query": "tab-query",
},
}
`);
});

it('should call savedObjectsTagging.ui.getTagIdsFromReferences', async () => {
getSavedSrch = jest.fn().mockReturnValue({
item: {
Expand Down
3 changes: 2 additions & 1 deletion src/platform/plugins/shared/saved_search/common/service/get_saved_searches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ export const convertToSavedSearch = async <
{ searchSourceCreate, savedObjectsTagging }: GetSavedSearchDependencies,
serialized?: Serialized
): Promise<ReturnType> => {
const [tab] = attributes.tabs;
const parsedSearchSourceJSON = parseSearchSourceJSON(
attributes.kibanaSavedObjectMeta?.searchSourceJSON ?? '{}'
tab.attributes.kibanaSavedObjectMeta?.searchSourceJSON ?? '{}'
);

const searchSourceValues = injectReferences(
Expand Down