diff --git a/src/plugins/data_views/common/data_views/data_views.test.ts b/src/plugins/data_views/common/data_views/data_views.test.ts index 9962243e94293d..6f54cac9041a02 100644 --- a/src/plugins/data_views/common/data_views/data_views.test.ts +++ b/src/plugins/data_views/common/data_views/data_views.test.ts @@ -153,6 +153,14 @@ describe('IndexPatterns', () => { SOClientGetDelay = 0; }); + test('force field refresh', async () => { + const id = '1'; + await indexPatterns.get(id); + expect(apiClient.getFieldsForWildcard).toBeCalledTimes(1); + await indexPatterns.get(id, undefined, true); + expect(apiClient.getFieldsForWildcard).toBeCalledTimes(2); + }); + test('does cache ad-hoc data views', async () => { const id = '1'; diff --git a/src/plugins/discover/public/__mocks__/data_views.ts b/src/plugins/discover/public/__mocks__/data_views.ts index 1bc8d791d53fbe..7b599318917a09 100644 --- a/src/plugins/discover/public/__mocks__/data_views.ts +++ b/src/plugins/discover/public/__mocks__/data_views.ts @@ -23,6 +23,7 @@ export function createDiscoverDataViewsMock() { return Promise.reject('Invald'); } }, + getDefaultDataView: jest.fn(() => dataViewMock), updateSavedObject: jest.fn(), getIdsWithTitle: jest.fn(() => { return Promise.resolve([dataViewMock, dataViewComplexMock, dataViewWithTimefieldMock]); diff --git a/src/plugins/discover/public/application/main/utils/resolve_data_view.ts b/src/plugins/discover/public/application/main/utils/resolve_data_view.ts index 675abe584a2351..47dfff4ac4c375 100644 --- a/src/plugins/discover/public/application/main/utils/resolve_data_view.ts +++ b/src/plugins/discover/public/application/main/utils/resolve_data_view.ts @@ -34,43 +34,6 @@ interface DataViewData { stateValFound: boolean; } -export function findDataViewById( - dataViews: DataViewListItem[], - id: string -): DataViewListItem | undefined { - return dataViews.find((o) => o.id === id); -} - -/** - * Checks if the given defaultIndex exists and returns - * the first available data view id if not - */ -export function getFallbackDataViewId( - dataViews: DataViewListItem[], - defaultIndex: string = '' -): string { - if (defaultIndex && findDataViewById(dataViews, defaultIndex)) { - return defaultIndex; - } - return dataViews && dataViews[0]?.id ? dataViews[0].id : ''; -} - -/** - * A given data view id is checked for existence and a fallback is provided if it doesn't exist - * The provided defaultIndex is usually configured in Advanced Settings, if it's also invalid - * the first entry of the given list of dataViews is used - */ -export function getDataViewId( - id: string = '', - dataViews: DataViewListItem[] = [], - defaultIndex: string = '' -): string { - if (!id || !findDataViewById(dataViews, id)) { - return getFallbackDataViewId(dataViews, defaultIndex); - } - return id; -} - /** * Function to load the given data view by id, providing a fallback if it doesn't exist */