Skip to content

Commit a2fbc47

Browse files
committed
remove legacy saved object finder
1 parent 6bbdddc commit a2fbc47

File tree

36 files changed

+158
-261
lines changed

36 files changed

+158
-261
lines changed

src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,16 @@ import {
3232
EuiFlyoutBody,
3333
EuiTitle,
3434
} from '@elastic/eui';
35-
import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
35+
import { SavedObjectFinderUi } from '../../../../../../../plugins/kibana_react/public';
36+
import { getServices } from '../../kibana_services';
3637

3738
const SEARCH_OBJECT_TYPE = 'search';
3839

3940
export function OpenSearchPanel(props) {
41+
const {
42+
core: { uiSettings, savedObjects },
43+
} = getServices();
44+
4045
return (
4146
<EuiFlyout ownFocus onClose={props.onClose} data-test-subj="loadSearchForm">
4247
<EuiFlyoutHeader hasBorder>
@@ -50,7 +55,7 @@ export function OpenSearchPanel(props) {
5055
</EuiTitle>
5156
</EuiFlyoutHeader>
5257
<EuiFlyoutBody>
53-
<SavedObjectFinder
58+
<SavedObjectFinderUi
5459
noItemsMessage={
5560
<FormattedMessage
5661
id="kbn.discover.topNav.openSearchPanel.noSearchesFoundDescription"
@@ -70,6 +75,8 @@ export function OpenSearchPanel(props) {
7075
window.location.assign(props.makeUrl(id));
7176
props.onClose();
7277
}}
78+
uiSettings={uiSettings}
79+
savedObjects={savedObjects}
7380
/>
7481
</EuiFlyoutBody>
7582
<EuiFlyoutFooter>

src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
2323
import React from 'react';
2424

2525
import { VisType, getServices } from '../../kibana_services';
26-
import { SavedObjectFinder } from '../../../../../../../plugins/kibana_react/public';
26+
import { SavedObjectFinderUi } from '../../../../../../../plugins/kibana_react/public';
2727

2828
interface SearchSelectionProps {
2929
onSearchSelected: (searchId: string, searchType: string) => void;
@@ -54,7 +54,7 @@ export class SearchSelection extends React.Component<SearchSelectionProps> {
5454
</EuiModalHeaderTitle>
5555
</EuiModalHeader>
5656
<EuiModalBody>
57-
<SavedObjectFinder
57+
<SavedObjectFinderUi
5858
key="searchSavedObjectFinder"
5959
onChoose={this.props.onSearchSelected}
6060
showFilter

src/legacy/ui/public/saved_objects/components/saved_object_finder.tsx

Lines changed: 0 additions & 108 deletions
This file was deleted.

src/plugins/dashboard_embeddable_container/public/actions/expand_panel_action.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ let embeddable: ContactCardEmbeddable;
4242
beforeEach(async () => {
4343
const options: DashboardOptions = {
4444
ExitFullScreenButton: () => null,
45-
SavedObjectFinder: () => null,
4645
application: {} as any,
4746
embeddable: {
4847
getEmbeddableFactory: (id: string) => embeddableFactories.get(id)!,
@@ -52,6 +51,8 @@ beforeEach(async () => {
5251
overlays: {} as any,
5352
savedObjectMetaData: {} as any,
5453
uiActions: {} as any,
54+
uiSettings: {} as any,
55+
savedObjects: {} as any,
5556
};
5657
const input = getSampleDashboardInput({
5758
panels: {

src/plugins/dashboard_embeddable_container/public/actions/open_replace_panel_flyout.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,10 @@ import {
3131
export async function openReplacePanelFlyout(options: {
3232
embeddable: IContainer;
3333
core: CoreStart;
34-
savedObjectFinder: React.ComponentType<any>;
35-
notifications: CoreStart['notifications'];
3634
panelToRemove: IEmbeddable<EmbeddableInput, EmbeddableOutput>;
3735
getEmbeddableFactories: IEmbeddableStart['getEmbeddableFactories'];
3836
}) {
39-
const {
40-
embeddable,
41-
core,
42-
panelToRemove,
43-
savedObjectFinder,
44-
notifications,
45-
getEmbeddableFactories,
46-
} = options;
37+
const { embeddable, core, panelToRemove, getEmbeddableFactories } = options;
4738
const flyoutSession = core.overlays.openFlyout(
4839
toMountPoint(
4940
<ReplacePanelFlyout
@@ -54,8 +45,9 @@ export async function openReplacePanelFlyout(options: {
5445
}
5546
}}
5647
panelToRemove={panelToRemove}
57-
savedObjectsFinder={savedObjectFinder}
58-
notifications={notifications}
48+
notifications={core.notifications}
49+
uiSettings={core.uiSettings}
50+
savedObjects={core.savedObjects}
5951
getEmbeddableFactories={getEmbeddableFactories}
6052
/>
6153
),

src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.test.tsx

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ let embeddable: ContactCardEmbeddable;
4343
beforeEach(async () => {
4444
const options: DashboardOptions = {
4545
ExitFullScreenButton: () => null,
46-
SavedObjectFinder: () => null,
4746
application: {} as any,
4847
embeddable: {
4948
getEmbeddableFactory: (id: string) => embeddableFactories.get(id)!,
5049
} as any,
5150
inspector: {} as any,
5251
notifications: {} as any,
5352
overlays: {} as any,
53+
uiSettings: {} as any,
54+
savedObjects: {} as any,
5455
savedObjectMetaData: {} as any,
5556
uiActions: {} as any,
5657
};
@@ -81,27 +82,13 @@ beforeEach(async () => {
8182

8283
test('Executes the replace panel action', async () => {
8384
let core: any;
84-
let SavedObjectFinder: any;
85-
let notifications: any;
86-
const action = new ReplacePanelAction(
87-
core,
88-
SavedObjectFinder,
89-
notifications,
90-
getEmbeddableFactories
91-
);
85+
const action = new ReplacePanelAction(core, getEmbeddableFactories);
9286
action.execute({ embeddable });
9387
});
9488

9589
test('Is not compatible when embeddable is not in a dashboard container', async () => {
9690
let core: any;
97-
let SavedObjectFinder: any;
98-
let notifications: any;
99-
const action = new ReplacePanelAction(
100-
core,
101-
SavedObjectFinder,
102-
notifications,
103-
getEmbeddableFactories
104-
);
91+
const action = new ReplacePanelAction(core, getEmbeddableFactories);
10592
expect(
10693
await action.isCompatible({
10794
embeddable: new ContactCardEmbeddable(
@@ -114,14 +101,7 @@ test('Is not compatible when embeddable is not in a dashboard container', async
114101

115102
test('Execute throws an error when called with an embeddable not in a parent', async () => {
116103
let core: any;
117-
let SavedObjectFinder: any;
118-
let notifications: any;
119-
const action = new ReplacePanelAction(
120-
core,
121-
SavedObjectFinder,
122-
notifications,
123-
getEmbeddableFactories
124-
);
104+
const action = new ReplacePanelAction(core, getEmbeddableFactories);
125105
async function check() {
126106
await action.execute({ embeddable: container });
127107
}
@@ -130,26 +110,12 @@ test('Execute throws an error when called with an embeddable not in a parent', a
130110

131111
test('Returns title', async () => {
132112
let core: any;
133-
let SavedObjectFinder: any;
134-
let notifications: any;
135-
const action = new ReplacePanelAction(
136-
core,
137-
SavedObjectFinder,
138-
notifications,
139-
getEmbeddableFactories
140-
);
113+
const action = new ReplacePanelAction(core, getEmbeddableFactories);
141114
expect(action.getDisplayName({ embeddable })).toBeDefined();
142115
});
143116

144117
test('Returns an icon', async () => {
145118
let core: any;
146-
let SavedObjectFinder: any;
147-
let notifications: any;
148-
const action = new ReplacePanelAction(
149-
core,
150-
SavedObjectFinder,
151-
notifications,
152-
getEmbeddableFactories
153-
);
119+
const action = new ReplacePanelAction(core, getEmbeddableFactories);
154120
expect(action.getIconType({ embeddable })).toBeDefined();
155121
});

src/plugins/dashboard_embeddable_container/public/actions/replace_panel_action.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ export class ReplacePanelAction implements IAction<ActionContext> {
4141

4242
constructor(
4343
private core: CoreStart,
44-
private savedobjectfinder: React.ComponentType<any>,
45-
private notifications: CoreStart['notifications'],
4644
private getEmbeddableFactories: IEmbeddableStart['getEmbeddableFactories']
4745
) {}
4846

@@ -82,8 +80,6 @@ export class ReplacePanelAction implements IAction<ActionContext> {
8280
openReplacePanelFlyout({
8381
embeddable: dash,
8482
core: this.core,
85-
savedObjectFinder: this.savedobjectfinder,
86-
notifications: this.notifications,
8783
panelToRemove: view,
8884
getEmbeddableFactories: this.getEmbeddableFactories,
8985
});

src/plugins/dashboard_embeddable_container/public/actions/replace_panel_flyout.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ import React from 'react';
2222
import { EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
2323
import { GetEmbeddableFactories } from 'src/plugins/embeddable/public';
2424
import { DashboardPanelState } from '../embeddable';
25-
import { NotificationsStart, Toast } from '../../../../core/public';
25+
import { CoreStart, NotificationsStart, Toast } from '../../../../core/public';
2626
import { IContainer, IEmbeddable, EmbeddableInput, EmbeddableOutput } from '../embeddable_plugin';
27+
import { SavedObjectFinderUi } from '../../../kibana_react/public';
2728

2829
interface Props {
2930
container: IContainer;
30-
savedObjectsFinder: React.ComponentType<any>;
3131
onClose: () => void;
3232
notifications: NotificationsStart;
33+
uiSettings: CoreStart['uiSettings'];
34+
savedObjects: CoreStart['savedObjects'];
3335
panelToRemove: IEmbeddable<EmbeddableInput, EmbeddableOutput>;
3436
getEmbeddableFactories: GetEmbeddableFactories;
3537
}
@@ -94,9 +96,8 @@ export class ReplacePanelFlyout extends React.Component<Props> {
9496
};
9597

9698
public render() {
97-
const SavedObjectFinder = this.props.savedObjectsFinder;
9899
const savedObjectsFinder = (
99-
<SavedObjectFinder
100+
<SavedObjectFinderUi
100101
noItemsMessage={i18n.translate(
101102
'dashboardEmbeddableContainer.addPanel.noMatchingObjectsMessage',
102103
{
@@ -111,6 +112,8 @@ export class ReplacePanelFlyout extends React.Component<Props> {
111112
.map(({ savedObjectMetaData }) => savedObjectMetaData as any)}
112113
showFilter={true}
113114
onChoose={this.onReplacePanel}
115+
uiSettings={this.props.uiSettings}
116+
savedObjects={this.props.savedObjects}
114117
/>
115118
);
116119

src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ const options: DashboardContainerOptions = {
4141
notifications: {} as any,
4242
overlays: {} as any,
4343
inspector: {} as any,
44-
SavedObjectFinder: () => null,
4544
ExitFullScreenButton: () => null,
4645
uiActions: {} as any,
46+
uiSettings: {} as any,
47+
savedObjects: {} as any,
4748
};
4849

4950
beforeEach(() => {

src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_container.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,10 @@ export interface DashboardContainerOptions {
7777
application: CoreStart['application'];
7878
overlays: CoreStart['overlays'];
7979
notifications: CoreStart['notifications'];
80+
savedObjects: CoreStart['savedObjects'];
81+
uiSettings: CoreStart['uiSettings'];
8082
embeddable: IEmbeddableStart;
8183
inspector: InspectorStartContract;
82-
SavedObjectFinder: React.ComponentType<any>;
8384
ExitFullScreenButton: React.ComponentType<any>;
8485
uiActions: IUiActionsStart;
8586
}

0 commit comments

Comments
 (0)