Skip to content

Commit bad74bc

Browse files
committed
[Alerting] fixes broken Alerting Example plugin (elastic#85774)
1 parent 689cb12 commit bad74bc

File tree

4 files changed

+26
-35
lines changed

4 files changed

+26
-35
lines changed

x-pack/examples/alerting_example/kibana.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"kibanaVersion": "kibana",
55
"server": true,
66
"ui": true,
7-
"requiredPlugins": ["triggersActionsUi", "charts", "data", "alerts", "actions", "features", "developerExamples"],
8-
"optionalPlugins": []
7+
"requiredPlugins": ["triggersActionsUi", "charts", "data", "alerts", "actions", "kibanaReact", "features", "developerExamples"],
8+
"optionalPlugins": [],
9+
"requiredBundles": ["kibanaReact"]
910
}

x-pack/examples/alerting_example/public/application.tsx

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,27 @@ import React from 'react';
88
import ReactDOM from 'react-dom';
99
import { BrowserRouter as Router, Route, RouteComponentProps } from 'react-router-dom';
1010
import { EuiPage } from '@elastic/eui';
11-
import {
12-
AppMountParameters,
13-
CoreStart,
14-
IUiSettingsClient,
15-
DocLinksStart,
16-
ToastsSetup,
17-
ApplicationStart,
18-
} from '../../../../src/core/public';
19-
import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
20-
import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
11+
import { AppMountParameters, CoreStart } from '../../../../src/core/public';
2112

2213
import { Page } from './components/page';
2314
import { DocumentationPage } from './components/documentation';
2415
import { ViewAlertPage } from './components/view_alert';
2516
import { TriggersAndActionsUIPublicPluginStart } from '../../../plugins/triggers_actions_ui/public';
2617
import { AlertingExamplePublicStartDeps } from './plugin';
2718
import { ViewPeopleInSpaceAlertPage } from './components/view_astros_alert';
19+
import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
2820

2921
export interface AlertingExampleComponentParams {
30-
application: CoreStart['application'];
3122
http: CoreStart['http'];
3223
basename: string;
3324
triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
34-
data: DataPublicPluginStart;
35-
charts: ChartsPluginStart;
36-
uiSettings: IUiSettingsClient;
37-
docLinks: DocLinksStart;
38-
toastNotifications: ToastsSetup;
39-
capabilities: ApplicationStart['capabilities'];
4025
}
4126

42-
const AlertingExampleApp = (deps: AlertingExampleComponentParams) => {
43-
const { basename, http } = deps;
27+
const AlertingExampleApp = ({
28+
basename,
29+
http,
30+
triggersActionsUi,
31+
}: AlertingExampleComponentParams) => {
4432
return (
4533
<Router basename={basename}>
4634
<EuiPage>
@@ -49,7 +37,7 @@ const AlertingExampleApp = (deps: AlertingExampleComponentParams) => {
4937
exact={true}
5038
render={() => (
5139
<Page title={`Home`} isHome={true}>
52-
<DocumentationPage {...deps} />
40+
<DocumentationPage triggersActionsUi={triggersActionsUi} />
5341
</Page>
5442
)}
5543
/>
@@ -79,21 +67,19 @@ const AlertingExampleApp = (deps: AlertingExampleComponentParams) => {
7967
};
8068

8169
export const renderApp = (
82-
{ application, notifications, http, uiSettings, docLinks }: CoreStart,
70+
core: CoreStart,
8371
deps: AlertingExamplePublicStartDeps,
8472
{ appBasePath, element }: AppMountParameters
8573
) => {
74+
const { http } = core;
8675
ReactDOM.render(
87-
<AlertingExampleApp
88-
basename={appBasePath}
89-
application={application}
90-
toastNotifications={notifications.toasts}
91-
http={http}
92-
uiSettings={uiSettings}
93-
docLinks={docLinks}
94-
capabilities={application.capabilities}
95-
{...deps}
96-
/>,
76+
<KibanaContextProvider services={{ ...core, ...deps }}>
77+
<AlertingExampleApp
78+
basename={appBasePath}
79+
http={http}
80+
triggersActionsUi={deps.triggersActionsUi}
81+
/>
82+
</KibanaContextProvider>,
9783
element
9884
);
9985

x-pack/examples/alerting_example/public/components/create_alert.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import { EuiIcon, EuiFlexItem, EuiCard, EuiFlexGroup } from '@elastic/eui';
1111
import { AlertingExampleComponentParams } from '../application';
1212
import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
1313

14-
export const CreateAlert = ({ triggersActionsUi }: AlertingExampleComponentParams) => {
14+
export const CreateAlert = ({
15+
triggersActionsUi,
16+
}: Pick<AlertingExampleComponentParams, 'triggersActionsUi'>) => {
1517
const [alertFlyoutVisible, setAlertFlyoutVisibility] = useState<boolean>(false);
1618

1719
const AddAlertFlyout = useMemo(

x-pack/examples/alerting_example/public/components/documentation.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import {
2121
import { CreateAlert } from './create_alert';
2222
import { AlertingExampleComponentParams } from '../application';
2323

24-
export const DocumentationPage = (deps: AlertingExampleComponentParams) => (
24+
export const DocumentationPage = (
25+
deps: Pick<AlertingExampleComponentParams, 'triggersActionsUi'>
26+
) => (
2527
<EuiPageBody>
2628
<EuiPageHeader>
2729
<EuiPageHeaderSection>

0 commit comments

Comments
 (0)