Skip to content

Commit 6d8bd5b

Browse files
committed
create getter and setter for dataSourceManagement plugin
Signed-off-by: Jackie Han <jkhanjob@gmail.com>
1 parent 6aab2f4 commit 6d8bd5b

File tree

6 files changed

+13
-17
lines changed

6 files changed

+13
-17
lines changed

public/anomaly_detection_app.tsx

-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ import { Main } from './pages/main';
1717
import { Provider } from 'react-redux';
1818
import configureStore from './redux/configureStore';
1919
import { CoreServicesContext } from './components/CoreServices/CoreServices';
20-
import { DataSourceManagementPluginSetup } from '../../../src/plugins/data_source_management/public';
2120
import { DataSourcePluginSetup } from '../../../src/plugins/data_source/public';
2221

2322
export function renderApp(
2423
coreStart: CoreStart,
2524
params: AppMountParameters,
26-
dataSourceManagement: DataSourceManagementPluginSetup,
2725
dataSource: DataSourcePluginSetup
2826
) {
2927
const http = coreStart.http;
@@ -45,7 +43,6 @@ export function renderApp(
4543
<CoreServicesContext.Provider value={coreStart}>
4644
<Main
4745
dataSourceEnabled={dataSource.dataSourceEnabled}
48-
dataSourceManagement={dataSourceManagement}
4946
setHeaderActionMenu={params.setHeaderActionMenu}
5047
{...props}
5148
/>

public/pages/DetectorDetail/containers/DetectorDetail.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,14 @@ import {
5858
import { DETECTOR_STATE } from '../../../../server/utils/constants';
5959
import { CatIndex } from '../../../../server/models/types';
6060
import { containsIndex } from '../utils/helpers';
61-
import { DataSourceManagementPluginSetup, DataSourceViewConfig } from '../../../../../../src/plugins/data_source_management/public';
62-
import { getNotifications, getSavedObjectsClient } from '../../../services';
61+
import { DataSourceViewConfig } from '../../../../../../src/plugins/data_source_management/public';
62+
import { getDataSourceManagementPlugin, getNotifications, getSavedObjectsClient } from '../../../services';
6363

6464
export interface DetectorRouterProps {
6565
detectorId?: string;
6666
}
6767
interface DetectorDetailProps extends RouteComponentProps<DetectorRouterProps> {
6868
dataSourceEnabled: boolean;
69-
dataSourceManagement: DataSourceManagementPluginSetup;
7069
setActionMenu: (menuMount: MountPoint | undefined) => void;
7170
}
7271

@@ -360,7 +359,7 @@ export const DetectorDetail = (props: DetectorDetailProps) => {
360359
></EuiCallOut>
361360
) : null;
362361

363-
const DataSourceMenu = props.dataSourceManagement.ui.getDataSourceMenu<DataSourceViewConfig>();
362+
const DataSourceMenu = getDataSourceManagementPlugin().ui.getDataSourceMenu<DataSourceViewConfig>();
364363

365364
return (
366365
<React.Fragment>

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@ import {
8484
import { CoreStart, MountPoint } from '../../../../../../../src/core/public';
8585
import { CoreServicesContext } from '../../../../components/CoreServices/CoreServices';
8686
import {
87-
DataSourceManagementPluginSetup,
8887
DataSourceSelectableConfig,
8988
} from '../../../../../../../src/plugins/data_source_management/public';
90-
import { getNotifications, getSavedObjectsClient } from '../../../../services';
89+
import { getDataSourceManagementPlugin, getNotifications, getSavedObjectsClient } from '../../../../services';
9190

9291
export interface ListRouterParams {
9392
from: string;
@@ -100,7 +99,6 @@ export interface ListRouterParams {
10099
}
101100
interface ListProps extends RouteComponentProps<ListRouterParams> {
102101
dataSourceEnabled: boolean;
103-
dataSourceManagement: DataSourceManagementPluginSetup;
104102
setActionMenu: (menuMount: MountPoint | undefined) => void;
105103
}
106104
interface ListState {
@@ -661,7 +659,7 @@ export const DetectorList = (props: ListProps) => {
661659
const confirmModal = getConfirmModal();
662660

663661
const DataSourceMenu =
664-
props.dataSourceManagement.ui.getDataSourceMenu<DataSourceSelectableConfig>();
662+
getDataSourceManagementPlugin().ui.getDataSourceMenu<DataSourceSelectableConfig>();
665663
const renderDataSourceComponent = useMemo(() => {
666664
return (
667665
<DataSourceMenu

public/pages/main/Main.tsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { DashboardOverview } from '../Dashboard/Container/DashboardOverview';
2525
import { CoreServicesConsumer } from '../../components/CoreServices/CoreServices';
2626
import { CoreStart, MountPoint } from '../../../../../src/core/public';
2727
import { AnomalyDetectionOverview } from '../Overview';
28-
import { DataSourceManagementPluginSetup } from '../../../../../src/plugins/data_source_management/public';
2928

3029
enum Navigation {
3130
AnomalyDetection = 'Anomaly detection',
@@ -35,12 +34,11 @@ enum Navigation {
3534

3635
interface MainProps extends RouteComponentProps {
3736
dataSourceEnabled: boolean;
38-
dataSourceManagement: DataSourceManagementPluginSetup;
3937
setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
4038
}
4139

4240
export function Main(props: MainProps) {
43-
const { dataSourceEnabled, dataSourceManagement, setHeaderActionMenu } =
41+
const { dataSourceEnabled, setHeaderActionMenu } =
4442
props;
4543

4644
const hideSideNavBar = useSelector(
@@ -93,7 +91,6 @@ export function Main(props: MainProps) {
9391
render={(props: RouteComponentProps<ListRouterParams>) => (
9492
<DetectorList
9593
dataSourceEnabled={dataSourceEnabled}
96-
dataSourceManagement={dataSourceManagement}
9794
setActionMenu={setHeaderActionMenu}
9895
{...props}
9996
/>
@@ -125,7 +122,6 @@ export function Main(props: MainProps) {
125122
render={(props: RouteComponentProps) => (
126123
<DetectorDetail
127124
dataSourceEnabled={dataSourceEnabled}
128-
dataSourceManagement={dataSourceManagement}
129125
setActionMenu={setHeaderActionMenu}
130126
{...props} />
131127
)}

public/plugin.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import {
3636
setUISettings,
3737
setQueryService,
3838
setSavedObjectsClient,
39+
setDataSourceManagementPlugin,
3940
} from './services';
4041
import { AnomalyDetectionOpenSearchDashboardsPluginStart } from 'public';
4142
import {
@@ -88,7 +89,6 @@ export class AnomalyDetectionOpenSearchDashboardsPlugin
8889
return renderApp(
8990
coreStart,
9091
params,
91-
plugins.dataSourceManagement,
9292
plugins.dataSource
9393
);
9494
},
@@ -100,6 +100,8 @@ export class AnomalyDetectionOpenSearchDashboardsPlugin
100100
// direct server-side calls
101101
setClient(core.http);
102102

103+
setDataSourceManagementPlugin(plugins.dataSourceManagement);
104+
103105
// Create context menu actions
104106
const actions = getActions();
105107

public/services.ts

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
OverlayStart,
1111
} from '../../../src/core/public';
1212
import { DataPublicPluginStart } from '../../../src/plugins/data/public';
13+
import { DataSourceManagementPluginSetup } from '../../../src/plugins/data_source_management/public';
1314
import { EmbeddableStart } from '../../../src/plugins/embeddable/public';
1415
import { createGetterSetter } from '../../../src/plugins/opensearch_dashboards_utils/public';
1516
import { UiActionsStart } from '../../../src/plugins/ui_actions/public';
@@ -42,6 +43,9 @@ export const [getQueryService, setQueryService] =
4243
export const [getSavedObjectsClient, setSavedObjectsClient] =
4344
createGetterSetter<CoreStart['savedObjects']['client']>('SavedObjectsClient');
4445

46+
export const [getDataSourceManagementPlugin, setDataSourceManagementPlugin] =
47+
createGetterSetter<DataSourceManagementPluginSetup>('DataSourceManagement');
48+
4549
// This is primarily used for mocking this module and each of its fns in tests.
4650
export default {
4751
getSavedFeatureAnywhereLoader,

0 commit comments

Comments
 (0)