Skip to content

Commit b0f9812

Browse files
committed
[visualizations] get index pattern via service instead of saved object (#84458)
* embeddable - get index pattern via service instead of saved object
1 parent 9d71a8a commit b0f9812

1 file changed

Lines changed: 7 additions & 25 deletions

File tree

src/plugins/visualizations/public/embeddable/get_index_pattern.ts

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,19 @@
1818
*/
1919

2020
import { VisSavedObject } from '../types';
21-
import {
22-
indexPatterns,
23-
IIndexPattern,
24-
IndexPatternAttributes,
25-
} from '../../../../plugins/data/public';
26-
import { getUISettings, getSavedObjects } from '../services';
21+
import type { IndexPattern } from '../../../../plugins/data/public';
22+
import { getIndexPatterns } from '../services';
2723

2824
export async function getIndexPattern(
2925
savedVis: VisSavedObject
30-
): Promise<IIndexPattern | undefined> {
26+
): Promise<IndexPattern | undefined | null> {
3127
if (savedVis.visState.type !== 'metrics') {
3228
return savedVis.searchSource!.getField('index');
3329
}
3430

35-
const savedObjectsClient = getSavedObjects().client;
36-
const defaultIndex = getUISettings().get('defaultIndex');
31+
const indexPatternsClient = getIndexPatterns();
3732

38-
if (savedVis.visState.params.index_pattern) {
39-
const indexPatternObjects = await savedObjectsClient.find<IndexPatternAttributes>({
40-
type: 'index-pattern',
41-
fields: ['title', 'fields'],
42-
search: `"${savedVis.visState.params.index_pattern}"`,
43-
searchFields: ['title'],
44-
});
45-
const [indexPattern] = indexPatternObjects.savedObjects.map(indexPatterns.getFromSavedObject);
46-
return indexPattern;
47-
}
48-
49-
const savedObject = await savedObjectsClient.get<IndexPatternAttributes>(
50-
'index-pattern',
51-
defaultIndex
52-
);
53-
return indexPatterns.getFromSavedObject(savedObject);
33+
return savedVis.visState.params.index_pattern
34+
? (await indexPatternsClient.find(`"${savedVis.visState.params.index_pattern}"`))[0]
35+
: await indexPatternsClient.getDefault();
5436
}

0 commit comments

Comments
 (0)