Skip to content

Commit f33192d

Browse files
authored
[refactor] remove drilldown plugin, move components to uiActionsEnhanced (#69403)
* refactor: remove drilldown plugin by moving components to uiActionsEnhanced * fix * fix mistake in test * fix i18n
1 parent 4f271c0 commit f33192d

File tree

55 files changed

+194
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+194
-310
lines changed

src/dev/storybook/aliases.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export const storybookAliases = {
2222
canvas: 'x-pack/plugins/canvas/scripts/storybook_new.js',
2323
codeeditor: 'src/plugins/kibana_react/public/code_editor/scripts/storybook.ts',
2424
dashboard_enhanced: 'x-pack/plugins/dashboard_enhanced/scripts/storybook.js',
25-
drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js',
2625
embeddable: 'src/plugins/embeddable/scripts/storybook.js',
2726
infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
2827
security_solution: 'x-pack/plugins/security_solution/scripts/storybook.js',

src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ function renderNotifications(
8181

8282
if (tooltip) {
8383
badge = (
84-
<EuiToolTip position="top" delay="regular" content={tooltip}>
84+
<EuiToolTip position="top" delay="regular" content={tooltip} key={notification.id}>
8585
{badge}
8686
</EuiToolTip>
8787
);

x-pack/.i18nrc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"xpack.crossClusterReplication": "plugins/cross_cluster_replication",
1414
"xpack.dashboardMode": "legacy/plugins/dashboard_mode",
1515
"xpack.data": "plugins/data_enhanced",
16-
"xpack.drilldowns": "plugins/drilldowns",
1716
"xpack.embeddableEnhanced": "plugins/embeddable_enhanced",
1817
"xpack.endpoint": "plugins/endpoint",
1918
"xpack.features": "plugins/features",

x-pack/plugins/dashboard_enhanced/kibana.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "kibana",
44
"server": false,
55
"ui": true,
6-
"requiredPlugins": ["data", "uiActionsEnhanced", "drilldowns", "embeddable", "dashboard", "share"],
6+
"requiredPlugins": ["data", "uiActionsEnhanced", "embeddable", "dashboard", "share"],
77
"configPath": ["xpack", "dashboardEnhanced"]
88
}

x-pack/plugins/dashboard_enhanced/public/plugin.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,17 @@ import { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embedd
1010
import { DashboardDrilldownsService } from './services';
1111
import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
1212
import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../ui_actions_enhanced/public';
13-
import { DrilldownsSetup, DrilldownsStart } from '../../drilldowns/public';
1413
import { DashboardStart } from '../../../../src/plugins/dashboard/public';
1514

1615
export interface SetupDependencies {
1716
uiActionsEnhanced: AdvancedUiActionsSetup;
18-
drilldowns: DrilldownsSetup;
1917
embeddable: EmbeddableSetup;
2018
share: SharePluginSetup;
2119
}
2220

2321
export interface StartDependencies {
2422
uiActionsEnhanced: AdvancedUiActionsStart;
2523
data: DataPublicPluginStart;
26-
drilldowns: DrilldownsStart;
2724
embeddable: EmbeddableStart;
2825
share: SharePluginStart;
2926
dashboard: DashboardStart;

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ import {
99
OpenFlyoutAddDrilldownParams,
1010
} from './flyout_create_drilldown';
1111
import { coreMock } from '../../../../../../../../src/core/public/mocks';
12-
import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
1312
import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
1413
import { TriggerContextMapping } from '../../../../../../../../src/plugins/ui_actions/public';
1514
import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';
15+
import { uiActionsEnhancedPluginMock } from '../../../../../../ui_actions_enhanced/public/mocks';
1616

1717
const overlays = coreMock.createStart().overlays;
18-
const drilldowns = drilldownsPluginMock.createStartContract();
18+
const uiActionsEnhanced = uiActionsEnhancedPluginMock.createStartContract();
1919

2020
const actionParams: OpenFlyoutAddDrilldownParams = {
2121
start: () => ({
2222
core: {
2323
overlays,
2424
} as any,
2525
plugins: {
26-
drilldowns,
26+
uiActionsEnhanced,
2727
},
2828
self: {},
2929
}),

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { StartServicesGetter } from '../../../../../../../../src/plugins/kibana_
1616
export const OPEN_FLYOUT_ADD_DRILLDOWN = 'OPEN_FLYOUT_ADD_DRILLDOWN';
1717

1818
export interface OpenFlyoutAddDrilldownParams {
19-
start: StartServicesGetter<Pick<StartDependencies, 'drilldowns'>>;
19+
start: StartServicesGetter<Pick<StartDependencies, 'uiActionsEnhanced'>>;
2020
}
2121

2222
export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_ADD_DRILLDOWN> {
@@ -62,7 +62,7 @@ export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLY
6262

6363
const handle = core.overlays.openFlyout(
6464
toMountPoint(
65-
<plugins.drilldowns.FlyoutManageDrilldowns
65+
<plugins.uiActionsEnhanced.FlyoutManageDrilldowns
6666
onClose={() => handle.close()}
6767
viewMode={'create'}
6868
dynamicActionManager={embeddable.enhancements.dynamicActions}

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.test.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66

77
import { FlyoutEditDrilldownAction, FlyoutEditDrilldownParams } from './flyout_edit_drilldown';
88
import { coreMock } from '../../../../../../../../src/core/public/mocks';
9-
import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
109
import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
1110
import { uiActionsEnhancedPluginMock } from '../../../../../../ui_actions_enhanced/public/mocks';
1211
import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
1312
import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';
1413

1514
const overlays = coreMock.createStart().overlays;
16-
const drilldowns = drilldownsPluginMock.createStartContract();
1715
const uiActionsPlugin = uiActionsEnhancedPluginMock.createPlugin();
1816
const uiActions = uiActionsPlugin.doStart();
1917

@@ -32,7 +30,7 @@ const actionParams: FlyoutEditDrilldownParams = {
3230
overlays,
3331
} as any,
3432
plugins: {
35-
drilldowns,
33+
uiActionsEnhanced: uiActions,
3634
},
3735
self: {},
3836
}),

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_edit_drilldown/flyout_edit_drilldown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { StartServicesGetter } from '../../../../../../../../src/plugins/kibana_
2020
export const OPEN_FLYOUT_EDIT_DRILLDOWN = 'OPEN_FLYOUT_EDIT_DRILLDOWN';
2121

2222
export interface FlyoutEditDrilldownParams {
23-
start: StartServicesGetter<Pick<StartDependencies, 'drilldowns'>>;
23+
start: StartServicesGetter<Pick<StartDependencies, 'uiActionsEnhanced'>>;
2424
}
2525

2626
export class FlyoutEditDrilldownAction implements ActionByType<typeof OPEN_FLYOUT_EDIT_DRILLDOWN> {
@@ -58,7 +58,7 @@ export class FlyoutEditDrilldownAction implements ActionByType<typeof OPEN_FLYOU
5858

5959
const handle = core.overlays.openFlyout(
6060
toMountPoint(
61-
<plugins.drilldowns.FlyoutManageDrilldowns
61+
<plugins.uiActionsEnhanced.FlyoutManageDrilldowns
6262
onClose={() => handle.close()}
6363
viewMode={'manage'}
6464
dynamicActionManager={embeddable.enhancements.dynamicActions}

x-pack/plugins/drilldowns/README.md

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

0 commit comments

Comments
 (0)