Skip to content

Commit

Permalink
advanced_ui_actions πŸ‘‰ ui_actions_enhanced (#68258)
Browse files Browse the repository at this point in the history
* chore: πŸ€– rename advanced_ui_actions to ui_actions_enhanced

* chore: πŸ€– rename exported interface to "enhanced"
  • Loading branch information
streamich authored Jun 5, 2020
1 parent b87eefc commit 99a6435
Show file tree
Hide file tree
Showing 70 changed files with 83 additions and 84 deletions.
2 changes: 1 addition & 1 deletion src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/

export const storybookAliases = {
advanced_ui_actions: 'x-pack/plugins/advanced_ui_actions/scripts/storybook.js',
apm: 'x-pack/plugins/apm/scripts/storybook.js',
canvas: 'x-pack/plugins/canvas/scripts/storybook_new.js',
codeeditor: 'src/plugins/kibana_react/public/code_editor/scripts/storybook.ts',
Expand All @@ -27,4 +26,5 @@ export const storybookAliases = {
embeddable: 'src/plugins/embeddable/scripts/storybook.js',
infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
security_solution: 'x-pack/plugins/security_solution/scripts/storybook.js',
ui_actions_enhanced: 'x-pack/plugins/ui_actions_enhanced/scripts/storybook.js',
};
3 changes: 1 addition & 2 deletions x-pack/.i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
"prefix": "xpack",
"paths": {
"xpack.actions": "plugins/actions",
"xpack.advancedUiActions": "plugins/advanced_ui_actions",
"xpack.uiActionsEnhanced": "examples/ui_actions_enhanced_examples",
"xpack.uiActionsEnhanced": ["plugins/ui_actions_enhanced", "examples/ui_actions_enhanced_examples"],
"xpack.alerts": "plugins/alerts",
"xpack.alertingBuiltins": "plugins/alerting_builtins",
"xpack.apm": ["legacy/plugins/apm", "plugins/apm"],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/examples/ui_actions_enhanced_examples/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"configPath": ["ui_actions_enhanced_examples"],
"server": false,
"ui": true,
"requiredPlugins": ["advancedUiActions", "data"],
"requiredPlugins": ["uiActionsEnhanced", "data"],
"optionalPlugins": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React from 'react';
import { EuiFormRow, EuiFieldText } from '@elastic/eui';
import { reactToUiComponent } from '../../../../../src/plugins/kibana_react/public';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../plugins/advanced_ui_actions/public';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../plugins/ui_actions_enhanced/public';
import {
RangeSelectTriggerContext,
ValueClickTriggerContext,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { StartServicesGetter } from '../../../../../src/plugins/kibana_utils/pub
import { ActionContext, Config, CollectConfigProps } from './types';
import { CollectConfigContainer } from './collect_config_container';
import { SAMPLE_DASHBOARD_TO_DISCOVER_DRILLDOWN } from './constants';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../plugins/advanced_ui_actions/public';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../plugins/ui_actions_enhanced/public';
import { txtGoToDiscover } from './i18n';

const isOutputWithIndexPatterns = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React from 'react';
import { EuiFormRow, EuiSwitch, EuiFieldText, EuiCallOut, EuiSpacer } from '@elastic/eui';
import { reactToUiComponent } from '../../../../../src/plugins/kibana_react/public';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../plugins/advanced_ui_actions/public';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../plugins/ui_actions_enhanced/public';
import {
RangeSelectTriggerContext,
ValueClickTriggerContext,
Expand Down
8 changes: 4 additions & 4 deletions x-pack/examples/ui_actions_enhanced_examples/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/pl
import {
AdvancedUiActionsSetup,
AdvancedUiActionsStart,
} from '../../../../x-pack/plugins/advanced_ui_actions/public';
} from '../../../../x-pack/plugins/ui_actions_enhanced/public';
import { DashboardHelloWorldDrilldown } from './dashboard_hello_world_drilldown';
import { DashboardToUrlDrilldown } from './dashboard_to_url_drilldown';
import { DashboardToDiscoverDrilldown } from './dashboard_to_discover_drilldown';
import { createStartServicesGetter } from '../../../../src/plugins/kibana_utils/public';

export interface SetupDependencies {
data: DataPublicPluginSetup;
advancedUiActions: AdvancedUiActionsSetup;
uiActionsEnhanced: AdvancedUiActionsSetup;
}

export interface StartDependencies {
data: DataPublicPluginStart;
advancedUiActions: AdvancedUiActionsStart;
uiActionsEnhanced: AdvancedUiActionsStart;
}

export class UiActionsEnhancedExamplesPlugin
implements Plugin<void, void, SetupDependencies, StartDependencies> {
public setup(
core: CoreSetup<StartDependencies>,
{ advancedUiActions: uiActions }: SetupDependencies
{ uiActionsEnhanced: uiActions }: SetupDependencies
) {
const start = createStartServicesGetter(core.getStartServices);

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/dashboard_enhanced/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "kibana",
"server": false,
"ui": true,
"requiredPlugins": ["data", "advancedUiActions", "drilldowns", "embeddable", "dashboard", "share"],
"requiredPlugins": ["data", "uiActionsEnhanced", "drilldowns", "embeddable", "dashboard", "share"],
"configPath": ["xpack", "dashboardEnhanced"]
}
6 changes: 3 additions & 3 deletions x-pack/plugins/dashboard_enhanced/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ import { SharePluginStart, SharePluginSetup } from '../../../../src/plugins/shar
import { EmbeddableSetup, EmbeddableStart } from '../../../../src/plugins/embeddable/public';
import { DashboardDrilldownsService } from './services';
import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../advanced_ui_actions/public';
import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../ui_actions_enhanced/public';
import { DrilldownsSetup, DrilldownsStart } from '../../drilldowns/public';
import { DashboardStart } from '../../../../src/plugins/dashboard/public';

export interface SetupDependencies {
advancedUiActions: AdvancedUiActionsSetup;
uiActionsEnhanced: AdvancedUiActionsSetup;
drilldowns: DrilldownsSetup;
embeddable: EmbeddableSetup;
share: SharePluginSetup;
}

export interface StartDependencies {
advancedUiActions: AdvancedUiActionsStart;
uiActionsEnhanced: AdvancedUiActionsStart;
data: DataPublicPluginStart;
drilldowns: DrilldownsStart;
embeddable: EmbeddableStart;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { FlyoutEditDrilldownAction, FlyoutEditDrilldownParams } from './flyout_e
import { coreMock } from '../../../../../../../../src/core/public/mocks';
import { drilldownsPluginMock } from '../../../../../../drilldowns/public/mocks';
import { ViewMode } from '../../../../../../../../src/plugins/embeddable/public';
import { uiActionsEnhancedPluginMock } from '../../../../../../advanced_ui_actions/public/mocks';
import { uiActionsEnhancedPluginMock } from '../../../../../../ui_actions_enhanced/public/mocks';
import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
import { MockEmbeddable, enhanceEmbeddable } from '../test_helpers';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React from 'react';
import { render, cleanup, act } from '@testing-library/react/pure';
import { MenuItem } from './menu_item';
import { createStateContainer } from '../../../../../../../../src/plugins/kibana_utils/public';
import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '../../../../../../advanced_ui_actions/public';
import { UiActionsEnhancedDynamicActionManager as DynamicActionManager } from '../../../../../../ui_actions_enhanced/public';
import { EnhancedEmbeddable } from '../../../../../../embeddable_enhanced/public';
import '@testing-library/jest-dom';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {
UiActionsEnhancedMemoryActionStorage as MemoryActionStorage,
UiActionsEnhancedDynamicActionManager as DynamicActionManager,
AdvancedUiActionsStart,
} from '../../../../../advanced_ui_actions/public';
} from '../../../../../ui_actions_enhanced/public';
import { TriggerContextMapping } from '../../../../../../../src/plugins/ui_actions/public';
import { uiActionsEnhancedPluginMock } from '../../../../../advanced_ui_actions/public/mocks';
import { uiActionsEnhancedPluginMock } from '../../../../../ui_actions_enhanced/public/mocks';

export class MockEmbeddable extends Embeddable {
public rootType = 'dashboard';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class DashboardDrilldownsService {

setupDrilldowns(
core: CoreSetup<StartDependencies>,
{ advancedUiActions: uiActions }: SetupDependencies
{ uiActionsEnhanced: uiActions }: SetupDependencies
) {
const start = createStartServicesGetter(core.getStartServices);
const getDashboardUrlGenerator = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ describe('.execute() & getHref', () => {
},
},
plugins: {
advancedUiActions: {},
uiActionsEnhanced: {},
data: {
actions: dataPluginActions,
},
},
self: {},
})) as unknown) as StartServicesGetter<Pick<StartDependencies, 'data' | 'advancedUiActions'>>,
})) as unknown) as StartServicesGetter<Pick<StartDependencies, 'data' | 'uiActionsEnhanced'>>,
getDashboardUrlGenerator: () =>
new UrlGeneratorsService().setup(coreMock.createSetup()).registerUrlGenerator(
createDashboardUrlGenerator(() =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { DashboardUrlGenerator } from '../../../../../../../src/plugins/dashboar
import { ActionContext, Config } from './types';
import { CollectConfigContainer } from './components';
import { DASHBOARD_TO_DASHBOARD_DRILLDOWN } from './constants';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../advanced_ui_actions/public';
import { UiActionsEnhancedDrilldownDefinition as Drilldown } from '../../../../../ui_actions_enhanced/public';
import { txtGoToDashboard } from './i18n';
import { esFilters } from '../../../../../../../src/plugins/data/public';
import { VisualizeEmbeddableContract } from '../../../../../../../src/plugins/visualizations/public';
Expand All @@ -22,7 +22,7 @@ import { StartServicesGetter } from '../../../../../../../src/plugins/kibana_uti
import { StartDependencies } from '../../../plugin';

export interface Params {
start: StartServicesGetter<Pick<StartDependencies, 'data' | 'advancedUiActions'>>;
start: StartServicesGetter<Pick<StartDependencies, 'data' | 'uiActionsEnhanced'>>;
getDashboardUrlGenerator: () => DashboardUrlGenerator;
}

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/drilldowns/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "kibana",
"server": false,
"ui": true,
"requiredPlugins": ["uiActions", "embeddable", "advancedUiActions"],
"requiredPlugins": ["uiActions", "embeddable", "uiActionsEnhanced"],
"configPath": ["xpack", "drilldowns"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import {
dashboardFactory,
urlFactory,
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
} from '../../../../ui_actions_enhanced/public/components/action_wizard/test_data';
import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
import { StubBrowserStorage } from '../../../../../../src/test_utils/public/stub_browser_storage';
import { mockDynamicActionManager } from './test_data';

const FlyoutManageDrilldowns = createFlyoutManageDrilldowns({
advancedUiActions: {
uiActionsEnhanced: {
getActionFactories() {
return [dashboardFactory, urlFactory];
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { createFlyoutManageDrilldowns } from './connected_flyout_manage_drilldow
import {
dashboardFactory,
urlFactory,
} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
} from '../../../../ui_actions_enhanced/public/components/action_wizard/test_data';
import { StubBrowserStorage } from '../../../../../../src/test_utils/public/stub_browser_storage';
import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
import { mockDynamicActionManager } from './test_data';
Expand All @@ -24,7 +24,7 @@ import { toastDrilldownsCRUDError } from './i18n';
const storage = new Storage(new StubBrowserStorage());
const notifications = coreMock.createStart().notifications;
const FlyoutManageDrilldowns = createFlyoutManageDrilldowns({
advancedUiActions: {
uiActionsEnhanced: {
getActionFactories() {
return [dashboardFactory, urlFactory];
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
import React, { useEffect, useState } from 'react';
import useMountedState from 'react-use/lib/useMountedState';
import {
AdvancedUiActionsActionFactory as ActionFactory,
UiActionsEnhancedActionFactory as ActionFactory,
AdvancedUiActionsStart,
UiActionsEnhancedDynamicActionManager as DynamicActionManager,
UiActionsEnhancedSerializedAction,
UiActionsEnhancedSerializedEvent,
} from '../../../../advanced_ui_actions/public';
} from '../../../../ui_actions_enhanced/public';
import { NotificationsStart } from '../../../../../../src/core/public';
import { DrilldownWizardConfig, FlyoutDrilldownWizard } from '../flyout_drilldown_wizard';
import { FlyoutListManageDrilldowns } from '../flyout_list_manage_drilldowns';
Expand Down Expand Up @@ -48,17 +48,17 @@ enum Routes {
}

export function createFlyoutManageDrilldowns({
advancedUiActions,
uiActionsEnhanced,
storage,
notifications,
}: {
advancedUiActions: AdvancedUiActionsStart;
uiActionsEnhanced: AdvancedUiActionsStart;
storage: IStorageWrapper;
notifications: NotificationsStart;
}) {
// fine to assume this is static,
// because all action factories should be registered in setup phase
const allActionFactories = advancedUiActions.getActionFactories();
const allActionFactories = uiActionsEnhanced.getActionFactories();
const allActionFactoriesById = allActionFactories.reduce((acc, next) => {
acc[next.id] = next;
return acc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
UiActionsEnhancedDynamicActionManager as DynamicActionManager,
UiActionsEnhancedDynamicActionManagerState as DynamicActionManagerState,
UiActionsEnhancedSerializedAction,
} from '../../../../advanced_ui_actions/public';
} from '../../../../ui_actions_enhanced/public';
import { TriggerContextMapping } from '../../../../../../src/plugins/ui_actions/public';
import { createStateContainer } from '../../../../../../src/plugins/kibana_utils/common';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
dashboardFactory,
urlFactory,
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
} from '../../../../advanced_ui_actions/public/components/action_wizard/test_data';
import { AdvancedUiActionsActionFactory as ActionFactory } from '../../../../advanced_ui_actions/public/';
} from '../../../../ui_actions_enhanced/public/components/action_wizard/test_data';
import { UiActionsEnhancedActionFactory as ActionFactory } from '../../../../ui_actions_enhanced/public/';

storiesOf('components/FlyoutDrilldownWizard', module)
.add('default', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
txtEditDrilldownTitle,
} from './i18n';
import { DrilldownHelloBar } from '../drilldown_hello_bar';
import { AdvancedUiActionsActionFactory as ActionFactory } from '../../../../advanced_ui_actions/public';
import { UiActionsEnhancedActionFactory as ActionFactory } from '../../../../ui_actions_enhanced/public';

export interface DrilldownWizardConfig<ActionConfig extends object = object> {
name: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import React from 'react';
import { EuiFieldText, EuiForm, EuiFormRow, EuiSpacer } from '@elastic/eui';
import { txtDrilldownAction, txtNameOfDrilldown, txtUntitledDrilldown } from './i18n';
import {
AdvancedUiActionsActionFactory as ActionFactory,
UiActionsEnhancedActionFactory as ActionFactory,
ActionWizard,
} from '../../../../advanced_ui_actions/public';
} from '../../../../ui_actions_enhanced/public';

const noopFn = () => {};

Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/drilldowns/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@

import { CoreStart, CoreSetup, Plugin } from 'src/core/public';
import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../advanced_ui_actions/public';
import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../ui_actions_enhanced/public';
import { createFlyoutManageDrilldowns } from './components/connected_flyout_manage_drilldowns';
import { Storage } from '../../../../src/plugins/kibana_utils/public';

export interface SetupDependencies {
uiActions: UiActionsSetup;
advancedUiActions: AdvancedUiActionsSetup;
uiActionsEnhanced: AdvancedUiActionsSetup;
}

export interface StartDependencies {
uiActions: UiActionsStart;
advancedUiActions: AdvancedUiActionsStart;
uiActionsEnhanced: AdvancedUiActionsStart;
}

// eslint-disable-next-line
Expand All @@ -36,7 +36,7 @@ export class DrilldownsPlugin
public start(core: CoreStart, plugins: StartDependencies): StartContract {
return {
FlyoutManageDrilldowns: createFlyoutManageDrilldowns({
advancedUiActions: plugins.advancedUiActions,
uiActionsEnhanced: plugins.uiActionsEnhanced,
storage: new Storage(localStorage),
notifications: core.notifications,
}),
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/embeddable_enhanced/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"version": "kibana",
"server": false,
"ui": true,
"requiredPlugins": ["embeddable", "advancedUiActions"]
"requiredPlugins": ["embeddable", "uiActionsEnhanced"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
EmbeddableActionStorage,
EmbeddableWithDynamicActionsInput,
} from './embeddable_action_storage';
import { UiActionsEnhancedSerializedEvent } from '../../../advanced_ui_actions/public';
import { UiActionsEnhancedSerializedEvent } from '../../../ui_actions_enhanced/public';
import { of } from '../../../../../src/plugins/kibana_utils/public';

class TestEmbeddable extends Embeddable<EmbeddableWithDynamicActionsInput> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import {
UiActionsEnhancedAbstractActionStorage as AbstractActionStorage,
UiActionsEnhancedSerializedEvent as SerializedEvent,
} from '../../../advanced_ui_actions/public';
} from '../../../ui_actions_enhanced/public';
import {
EmbeddableInput,
EmbeddableOutput,
Expand Down
Loading

0 comments on commit 99a6435

Please sign in to comment.