Skip to content

Commit 0ce0245

Browse files
authored
Removing stateful saved object finder (#52166) (#52654)
1 parent f283751 commit 0ce0245

File tree

28 files changed

+196
-202
lines changed

28 files changed

+196
-202
lines changed

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
AppStateClass as TAppStateClass,
3636
KbnUrl,
3737
SaveOptions,
38-
SavedObjectFinder,
3938
unhashUrl,
4039
} from './legacy_imports';
4140
import { FilterStateManager, IndexPattern } from '../../../data/public';
@@ -71,6 +70,10 @@ import { DashboardAppScope } from './dashboard_app';
7170
import { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize/embeddable';
7271
import { convertSavedDashboardPanelToPanelState } from './lib/embeddable_saved_object_converters';
7372
import { RenderDeps } from './application';
73+
import {
74+
SavedObjectFinderProps,
75+
SavedObjectFinderUi,
76+
} from '../../../../../plugins/kibana_react/public';
7477

7578
export interface DashboardAppControllerDependencies extends RenderDeps {
7679
$scope: DashboardAppScope;
@@ -115,7 +118,7 @@ export class DashboardAppController {
115118
timefilter: { timefilter },
116119
},
117120
},
118-
core: { notifications, overlays, chrome, injectedMetadata },
121+
core: { notifications, overlays, chrome, injectedMetadata, uiSettings, savedObjects },
119122
}: DashboardAppControllerDependencies) {
120123
new FilterStateManager(globalState, getAppState, filterManager);
121124
const queryFilter = filterManager;
@@ -718,6 +721,10 @@ export class DashboardAppController {
718721
};
719722
navActions[TopNavIds.ADD] = () => {
720723
if (dashboardContainer && !isErrorEmbeddable(dashboardContainer)) {
724+
const SavedObjectFinder = (props: SavedObjectFinderProps) => (
725+
<SavedObjectFinderUi {...props} savedObjects={savedObjects} uiSettings={uiSettings} />
726+
);
727+
721728
openAddPanelFlyout({
722729
embeddable: dashboardContainer,
723730
getAllFactories: embeddables.getEmbeddableFactories,

src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,3 @@ export { stateMonitorFactory, StateMonitor } from 'ui/state_management/state_mon
6565
export { ensureDefaultIndexPattern } from 'ui/legacy_compat';
6666
export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
6767
export { IInjector } from 'ui/chrome';
68-
export { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';

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

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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/discover/components/top_nav/open_search_panel.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { shallow } from 'enzyme';
2323
jest.mock('../../kibana_services', () => {
2424
return {
2525
getServices: () => ({
26-
SavedObjectFinder: jest.fn()
26+
core: { uiSettings: {}, savedObjects: {} },
2727
}),
2828
};
2929
});

src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
199199
editorParams: ['addToDashboard'],
200200
},
201201
npStart.core.http.basePath.prepend,
202-
npStart.core.uiSettings
202+
npStart.core.uiSettings,
203+
npStart.core.savedObjects
203204
);
204205
}
205206
return undefined;

src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export { PrivateProvider } from 'ui/private/private';
4545

4646
export { SavedObjectRegistryProvider } from 'ui/saved_objects';
4747
export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
48-
export { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
4948
export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
5049

5150
export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';

src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
vis-types-registry="listingController.visTypeRegistry"
1717
add-base-path="listingController.addBasePath"
1818
ui-settings="listingController.uiSettings"
19+
saved-objects="listingController.savedObjects"
1920
></new-vis-modal>
2021

2122
</div>

src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export function initListingDirective(app) {
3434
['onClose', { watchDepth: 'reference' }],
3535
['addBasePath', { watchDepth: 'reference' }],
3636
['uiSettings', { watchDepth: 'reference' }],
37+
['savedObjects', { watchDepth: 'reference' }],
3738
'isOpen',
3839
])
3940
);
@@ -54,7 +55,7 @@ export function VisualizeListingController($injector, createNewVis) {
5455
toastNotifications,
5556
uiSettings,
5657
visualizations,
57-
core: { docLinks },
58+
core: { docLinks, savedObjects },
5859
} = getServices();
5960
const kbnUrl = $injector.get('kbnUrl');
6061

@@ -64,6 +65,7 @@ export function VisualizeListingController($injector, createNewVis) {
6465
this.showNewVisModal = false;
6566
this.addBasePath = addBasePath;
6667
this.uiSettings = uiSettings;
68+
this.savedObjects = savedObjects;
6769

6870
this.createNewVis = () => {
6971
this.showNewVisModal = true;

src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)