Skip to content

Commit 1c35269

Browse files
committed
update ut
Signed-off-by: Jackie Han <jkhanjob@gmail.com>
1 parent d066841 commit 1c35269

File tree

6 files changed

+38
-6
lines changed

6 files changed

+38
-6
lines changed

public/pages/ConfigureModel/containers/__tests__/ConfigureModel.test.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ import { CoreServicesContext } from '../../../../components/CoreServices/CoreSer
2525
import { INITIAL_DETECTOR_DEFINITION_VALUES } from '../../../DefineDetector/utils/constants';
2626
import { INITIAL_MODEL_CONFIGURATION_VALUES } from '../../utils/constants';
2727

28+
jest.mock('../../../../services', () => ({
29+
...jest.requireActual('../../../../services'),
30+
31+
getDataSourcePlugin: () => {
32+
return false;
33+
}
34+
}));
35+
2836
const renderWithRouter = (isEdit: boolean = false) => ({
2937
...render(
3038
<Provider store={configureStore(httpClientMock)}>
@@ -34,6 +42,7 @@ const renderWithRouter = (isEdit: boolean = false) => ({
3442
render={(props: RouteComponentProps) => (
3543
<CoreServicesContext.Provider value={coreServicesMock}>
3644
<ConfigureModel
45+
setActionMenu={jest.fn()}
3746
isEdit={isEdit}
3847
detectorDefinitionValues={INITIAL_DETECTOR_DEFINITION_VALUES}
3948
initialValues={INITIAL_MODEL_CONFIGURATION_VALUES}

public/pages/DefineDetector/containers/__tests__/DefineDetector.test.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ import {
2727
testDetectorDefinitionValues,
2828
} from '../../utils/constants';
2929

30+
jest.mock('../../../../services', () => ({
31+
...jest.requireActual('../../../../services'),
32+
33+
getDataSourcePlugin: () => {
34+
return false;
35+
}
36+
}));
37+
3038
const renderWithRouterEmpty = (isEdit: boolean = false) => ({
3139
...render(
3240
<Provider store={configureStore(httpClientMock)}>
@@ -36,6 +44,7 @@ const renderWithRouterEmpty = (isEdit: boolean = false) => ({
3644
render={(props: RouteComponentProps) => (
3745
<CoreServicesContext.Provider value={coreServicesMock}>
3846
<DefineDetector
47+
setActionMenu={jest.fn()}
3948
isEdit={isEdit}
4049
initialValues={INITIAL_DETECTOR_DEFINITION_VALUES}
4150
{...props}

public/pages/DetectorsList/containers/List/__tests__/List.test.tsx

+8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ import { DetectorList, ListRouterParams } from '../List';
3131
import { DETECTOR_STATE } from '../../../../../../server/utils/constants';
3232
import { CoreServicesContext } from '../../../../../components/CoreServices/CoreServices';
3333

34+
jest.mock('../../../../../services', () => ({
35+
...jest.requireActual('../../../../../services'),
36+
37+
getDataSourcePlugin: () => {
38+
return false;
39+
}
40+
}));
41+
3442
const renderWithRouter = (
3543
initialAdState: Detectors = initialDetectorsState
3644
) => ({

public/pages/utils/helpers.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { DETECTORS_QUERY_PARAMS, SORT_DIRECTION } from '../../../server/utils/co
2020
import { ALL_INDICES, ALL_DETECTOR_STATES, MAX_DETECTORS, DEFAULT_QUERY_PARAMS } from './constants';
2121
import { DETECTOR_STATE } from '../../../server/utils/constants';
2222
import { timeFormatter } from '@elastic/charts';
23-
import { getDataSourcePlugin } from '../../services';
23+
import { getDataSourceEnabled, getDataSourcePlugin } from '../../services';
2424

2525
export function sanitizeSearchText(searchValue: string): string {
2626
if (!searchValue || searchValue == '*') {
@@ -155,7 +155,7 @@ export const constructHrefWithDataSourceId = (
155155
dataSourceId: string,
156156
withHash: Boolean
157157
): string => {
158-
const dataSourceEnabled = getDataSourcePlugin()?.dataSourceEnabled || false;
158+
const dataSourceEnabled = getDataSourceEnabled().enabled;
159159
const url = new URLSearchParams();
160160

161161
// Set up base parameters for '/detectors'

public/plugin.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {
3737
setQueryService,
3838
setSavedObjectsClient,
3939
setDataSourceManagementPlugin,
40-
setDataSourcePlugin,
40+
setDataSourceEnabled,
4141
} from './services';
4242
import { AnomalyDetectionOpenSearchDashboardsPluginStart } from 'public';
4343
import {
@@ -100,7 +100,9 @@ export class AnomalyDetectionOpenSearchDashboardsPlugin
100100

101101
setDataSourceManagementPlugin(plugins.dataSourceManagement);
102102

103-
setDataSourcePlugin(plugins.dataSource);
103+
const enabled = !!plugins.dataSource;
104+
105+
setDataSourceEnabled({ enabled });
104106

105107
// Create context menu actions
106108
const actions = getActions();

public/services.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
1717
import { SavedAugmentVisLoader } from '../../../src/plugins/vis_augmenter/public';
1818
import { DataSourcePluginSetup } from '../../../src/plugins/data_source/public';
1919

20+
export interface DataSourceEnabled {
21+
enabled: boolean;
22+
}
23+
2024
export const [getSavedFeatureAnywhereLoader, setSavedFeatureAnywhereLoader] =
2125
createGetterSetter<SavedAugmentVisLoader>('savedFeatureAnywhereLoader');
2226

@@ -47,8 +51,8 @@ export const [getSavedObjectsClient, setSavedObjectsClient] =
4751
export const [getDataSourceManagementPlugin, setDataSourceManagementPlugin] =
4852
createGetterSetter<DataSourceManagementPluginSetup>('DataSourceManagement');
4953

50-
export const [getDataSourcePlugin, setDataSourcePlugin] =
51-
createGetterSetter<DataSourcePluginSetup>('DataSource');
54+
export const [getDataSourceEnabled, setDataSourceEnabled] =
55+
createGetterSetter<DataSourceEnabled>('DataSourceEnabled');
5256

5357
// This is primarily used for mocking this module and each of its fns in tests.
5458
export default {

0 commit comments

Comments
 (0)