Skip to content

Commit

Permalink
Remove I prefix in UiActions types (#56898)
Browse files Browse the repository at this point in the history
  • Loading branch information
stacey-gammon authored Feb 6, 2020
1 parent 8951424 commit f736072
Show file tree
Hide file tree
Showing 68 changed files with 212 additions and 215 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import { i18n } from '@kbn/i18n';
import {
IAction,
Action,
createAction,
IncompatibleActionError,
} from '../../../../../plugins/ui_actions/public';
Expand Down Expand Up @@ -55,7 +55,7 @@ async function isCompatible(context: ActionContext) {
export function selectRangeAction(
filterManager: FilterManager,
timeFilter: TimefilterContract
): IAction<ActionContext> {
): Action<ActionContext> {
return createAction<ActionContext>({
type: SELECT_RANGE_ACTION,
id: SELECT_RANGE_ACTION,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import { i18n } from '@kbn/i18n';
import { toMountPoint } from '../../../../../plugins/kibana_react/public';
import {
IAction,
Action,
createAction,
IncompatibleActionError,
} from '../../../../../plugins/ui_actions/public';
Expand Down Expand Up @@ -58,7 +58,7 @@ async function isCompatible(context: ActionContext) {
export function valueClickAction(
filterManager: FilterManager,
timeFilter: TimefilterContract
): IAction<ActionContext> {
): Action<ActionContext> {
return createAction<ActionContext>({
type: VALUE_CLICK_ACTION,
id: VALUE_CLICK_ACTION,
Expand Down
6 changes: 3 additions & 3 deletions src/legacy/core_plugins/data/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ import {
VALUE_CLICK_TRIGGER,
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
} from '../../../../plugins/embeddable/public/lib/triggers';
import { IUiActionsSetup, IUiActionsStart } from '../../../../plugins/ui_actions/public';
import { UiActionsSetup, UiActionsStart } from '../../../../plugins/ui_actions/public';

import { SearchSetup, SearchStart, SearchService } from './search/search_service';

export interface DataPluginSetupDependencies {
data: DataPublicPluginSetup;
expressions: ExpressionsSetup;
uiActions: IUiActionsSetup;
uiActions: UiActionsSetup;
}

export interface DataPluginStartDependencies {
data: DataPublicPluginStart;
uiActions: IUiActionsStart;
uiActions: UiActionsStart;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import _ from 'lodash';
import * as Rx from 'rxjs';
import { Subscription } from 'rxjs';
import { i18n } from '@kbn/i18n';
import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
import { ExecuteTriggerActions } from 'src/plugins/ui_actions/public';
import { RequestAdapter, Adapters } from '../../../../../../../plugins/inspector/public';
import {
esFilters,
Expand Down Expand Up @@ -111,7 +111,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
filterManager,
}: SearchEmbeddableConfig,
initialInput: SearchInput,
private readonly executeTriggerActions: TExecuteTriggerActions,
private readonly executeTriggerActions: ExecuteTriggerActions,
parent?: Container
) {
super(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import { auto } from 'angular';
import { i18n } from '@kbn/i18n';
import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
import { ExecuteTriggerActions } from 'src/plugins/ui_actions/public';
import { getServices } from '../../kibana_services';
import {
EmbeddableFactory,
Expand All @@ -43,7 +43,7 @@ export class SearchEmbeddableFactory extends EmbeddableFactory<
public isEditable: () => boolean;

constructor(
private readonly executeTriggerActions: TExecuteTriggerActions,
private readonly executeTriggerActions: ExecuteTriggerActions,
getInjector: () => Promise<auto.IInjectorService>,
isEditable: () => boolean
) {
Expand Down
6 changes: 3 additions & 3 deletions src/legacy/core_plugins/kibana/public/discover/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import { i18n } from '@kbn/i18n';
import { AppMountParameters, CoreSetup, CoreStart, Plugin } from 'kibana/public';
import angular, { auto } from 'angular';
import { IUiActionsSetup, IUiActionsStart } from 'src/plugins/ui_actions/public';
import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
import { DataPublicPluginStart } from 'src/plugins/data/public';
import { registerFeature } from './np_ready/register_feature';
import './kibana_services';
Expand Down Expand Up @@ -47,13 +47,13 @@ export interface DiscoverSetup {
}
export type DiscoverStart = void;
export interface DiscoverSetupPlugins {
uiActions: IUiActionsSetup;
uiActions: UiActionsSetup;
embeddable: IEmbeddableSetup;
kibanaLegacy: KibanaLegacySetup;
home: HomePublicPluginSetup;
}
export interface DiscoverStartPlugins {
uiActions: IUiActionsStart;
uiActions: UiActionsStart;
embeddable: IEmbeddableStart;
navigation: NavigationStart;
charts: ChartsPluginStart;
Expand Down
6 changes: 3 additions & 3 deletions src/legacy/ui/public/new_platform/new_platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
import { IScope } from 'angular';

import { IUiActionsStart, IUiActionsSetup } from 'src/plugins/ui_actions/public';
import { UiActionsStart, UiActionsSetup } from 'src/plugins/ui_actions/public';
import { IEmbeddableStart, IEmbeddableSetup } from 'src/plugins/embeddable/public';
import { LegacyCoreSetup, LegacyCoreStart, App, AppMountDeprecated } from '../../../../core/public';
import { Plugin as DataPlugin } from '../../../../plugins/data/public';
Expand Down Expand Up @@ -52,7 +52,7 @@ export interface PluginsSetup {
expressions: ReturnType<ExpressionsPlugin['setup']>;
home: HomePublicPluginSetup;
inspector: InspectorSetup;
uiActions: IUiActionsSetup;
uiActions: UiActionsSetup;
navigation: NavigationPublicPluginSetup;
devTools: DevToolsSetup;
kibanaLegacy: KibanaLegacySetup;
Expand All @@ -70,7 +70,7 @@ export interface PluginsStart {
expressions: ReturnType<ExpressionsPlugin['start']>;
home: HomePublicPluginStart;
inspector: InspectorStart;
uiActions: IUiActionsStart;
uiActions: UiActionsStart;
navigation: NavigationPublicPluginStart;
devTools: DevToolsStart;
kibanaLegacy: KibanaLegacyStart;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import { i18n } from '@kbn/i18n';
import { IEmbeddable } from '../embeddable_plugin';
import { IAction, IncompatibleActionError } from '../ui_actions_plugin';
import { Action, IncompatibleActionError } from '../ui_actions_plugin';
import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';

export const EXPAND_PANEL_ACTION = 'togglePanel';
Expand All @@ -40,7 +40,7 @@ interface ActionContext {
embeddable: IEmbeddable;
}

export class ExpandPanelAction implements IAction<ActionContext> {
export class ExpandPanelAction implements Action<ActionContext> {
public readonly type = EXPAND_PANEL_ACTION;
public readonly id = EXPAND_PANEL_ACTION;
public order = 7;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n';
import { CoreStart } from '../../../../core/public';
import { IEmbeddable, ViewMode, IEmbeddableStart } from '../embeddable_plugin';
import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
import { IAction, IncompatibleActionError } from '../ui_actions_plugin';
import { Action, IncompatibleActionError } from '../ui_actions_plugin';
import { openReplacePanelFlyout } from './open_replace_panel_flyout';

export const REPLACE_PANEL_ACTION = 'replacePanel';
Expand All @@ -34,7 +34,7 @@ interface ActionContext {
embeddable: IEmbeddable;
}

export class ReplacePanelAction implements IAction<ActionContext> {
export class ReplacePanelAction implements Action<ActionContext> {
public readonly type = REPLACE_PANEL_ACTION;
public readonly id = REPLACE_PANEL_ACTION;
public order = 11;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import ReactDOM from 'react-dom';
import { I18nProvider } from '@kbn/i18n/react';
import { RefreshInterval, TimeRange, Query, esFilters } from '../../../data/public';
import { CoreStart } from '../../../../core/public';
import { IUiActionsStart } from '../ui_actions_plugin';
import { UiActionsStart } from '../ui_actions_plugin';
import {
Container,
ContainerInput,
Expand Down Expand Up @@ -81,7 +81,7 @@ export interface DashboardContainerOptions {
inspector: InspectorStartContract;
SavedObjectFinder: React.ComponentType<any>;
ExitFullScreenButton: React.ComponentType<any>;
uiActions: IUiActionsStart;
uiActions: UiActionsStart;
}

export type DashboardReactContextValue = KibanaReactContextValue<DashboardContainerOptions>;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/dashboard_embeddable_container/public/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import * as React from 'react';
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
import { IUiActionsSetup, IUiActionsStart } from '../../../plugins/ui_actions/public';
import { UiActionsSetup, UiActionsStart } from '../../../plugins/ui_actions/public';
import { CONTEXT_MENU_TRIGGER, IEmbeddableSetup, IEmbeddableStart } from './embeddable_plugin';
import { ExpandPanelAction, ReplacePanelAction } from '.';
import { DashboardContainerFactory } from './embeddable/dashboard_container_factory';
Expand All @@ -35,13 +35,13 @@ import {

interface SetupDependencies {
embeddable: IEmbeddableSetup;
uiActions: IUiActionsSetup;
uiActions: UiActionsSetup;
}

interface StartDependencies {
embeddable: IEmbeddableStart;
inspector: InspectorStartContract;
uiActions: IUiActionsStart;
uiActions: UiActionsStart;
}

export type Setup = void;
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/data/public/actions/apply_filter_action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import { i18n } from '@kbn/i18n';
import { toMountPoint } from '../../../kibana_react/public';
import { IAction, createAction, IncompatibleActionError } from '../../../ui_actions/public';
import { Action, createAction, IncompatibleActionError } from '../../../ui_actions/public';
import { getOverlays, getIndexPatterns } from '../services';
import { applyFiltersPopover } from '../ui/apply_filters';
import {
Expand All @@ -44,7 +44,7 @@ async function isCompatible(context: ActionContext) {
export function createFilterAction(
filterManager: FilterManager,
timeFilter: TimefilterContract
): IAction<ActionContext> {
): Action<ActionContext> {
return createAction<ActionContext>({
type: GLOBAL_APPLY_FILTER_ACTION,
id: GLOBAL_APPLY_FILTER_ACTION,
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/data/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import { CoreStart } from 'src/core/public';
import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
import { IUiActionsSetup, IUiActionsStart } from 'src/plugins/ui_actions/public';
import { UiActionsSetup, UiActionsStart } from 'src/plugins/ui_actions/public';
import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
import { FieldFormatsSetup, FieldFormatsStart } from './field_formats';
import { ISearchSetup, ISearchStart } from './search';
Expand All @@ -29,11 +29,11 @@ import { IndexPatternsContract } from './index_patterns';
import { StatefulSearchBarProps } from './ui/search_bar/create_search_bar';

export interface DataSetupDependencies {
uiActions: IUiActionsSetup;
uiActions: UiActionsSetup;
}

export interface DataStartDependencies {
uiActions: IUiActionsStart;
uiActions: UiActionsStart;
}

export interface DataPublicPluginSetup {
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/embeddable/public/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { IUiActionsSetup } from 'src/plugins/ui_actions/public';
import { UiActionsSetup } from 'src/plugins/ui_actions/public';
import {
CONTEXT_MENU_TRIGGER,
APPLY_FILTER_TRIGGER,
Expand All @@ -33,7 +33,7 @@ import {
*
* @param api
*/
export const bootstrap = (uiActions: IUiActionsSetup) => {
export const bootstrap = (uiActions: UiActionsSetup) => {
const triggerContext = {
id: CONTEXT_MENU_TRIGGER,
title: 'Context menu',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import { i18n } from '@kbn/i18n';
import { IAction, createAction, IncompatibleActionError } from '../ui_actions';
import { Action, createAction, IncompatibleActionError } from '../ui_actions';
import { IEmbeddable, EmbeddableInput } from '../embeddables';
import { esFilters } from '../../../../../plugins/data/public';

Expand All @@ -38,7 +38,7 @@ async function isCompatible(context: ActionContext) {
return Boolean(root.getInput().filters !== undefined && context.filters !== undefined);
}

export function createFilterAction(): IAction<ActionContext> {
export function createFilterAction(): Action<ActionContext> {
return createAction<ActionContext>({
type: APPLY_FILTER_ACTION,
id: APPLY_FILTER_ACTION,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import { i18n } from '@kbn/i18n';
import { IAction } from 'src/plugins/ui_actions/public';
import { Action } from 'src/plugins/ui_actions/public';
import { GetEmbeddableFactory, ViewMode } from '../types';
import { EmbeddableFactoryNotFoundError } from '../errors';
import { IEmbeddable } from '../embeddables';
Expand All @@ -29,7 +29,7 @@ interface ActionContext {
embeddable: IEmbeddable;
}

export class EditPanelAction implements IAction<ActionContext> {
export class EditPanelAction implements Action<ActionContext> {
public readonly type = EDIT_PANEL_ACTION_ID;
public readonly id = EDIT_PANEL_ACTION_ID;
public order = 15;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import React from 'react';
import { EuiLoadingChart } from '@elastic/eui';
import { Subscription } from 'rxjs';
import { CoreStart } from 'src/core/public';
import { TGetActionsCompatibleWithTrigger } from 'src/plugins/ui_actions/public';
import { GetActionsCompatibleWithTrigger } from 'src/plugins/ui_actions/public';

import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
import { ErrorEmbeddable, IEmbeddable } from '../embeddables';
Expand All @@ -35,7 +35,7 @@ export interface EmbeddableChildPanelProps {
embeddableId: string;
className?: string;
container: IContainer;
getActions: TGetActionsCompatibleWithTrigger;
getActions: GetActionsCompatibleWithTrigger;
getEmbeddableFactory: GetEmbeddableFactory;
getAllEmbeddableFactories: GetEmbeddableFactories;
overlays: CoreStart['overlays'];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { nextTick } from 'test_utils/enzyme_helpers';
import { findTestSubject } from '@elastic/eui/lib/test';
import { I18nProvider } from '@kbn/i18n/react';
import { CONTEXT_MENU_TRIGGER } from '../triggers';
import { IAction, ITrigger, IUiActionsApi } from 'src/plugins/ui_actions/public';
import { Action, UiActionsApi } from 'src/plugins/ui_actions/public';
import { Trigger, GetEmbeddableFactory, ViewMode } from '../types';
import { EmbeddableFactory, isErrorEmbeddable } from '../embeddables';
import { EmbeddablePanel } from './embeddable_panel';
Expand All @@ -44,8 +44,8 @@ import {
import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
import { EuiBadge } from '@elastic/eui';

const actionRegistry = new Map<string, IAction>();
const triggerRegistry = new Map<string, ITrigger>();
const actionRegistry = new Map<string, Action>();
const triggerRegistry = new Map<string, Trigger>();
const embeddableFactories = new Map<string, EmbeddableFactory>();
const getEmbeddableFactory: GetEmbeddableFactory = (id: string) => embeddableFactories.get(id);

Expand Down Expand Up @@ -177,7 +177,7 @@ test('HelloWorldContainer in view mode hides edit mode actions', async () => {

const renderInEditModeAndOpenContextMenu = async (
embeddableInputs: any,
getActions: IUiActionsApi['getTriggerCompatibleActions'] = () => Promise.resolve([])
getActions: UiActionsApi['getTriggerCompatibleActions'] = () => Promise.resolve([])
) => {
const inspector = inspectorPluginMock.createStartContract();

Expand Down
Loading

0 comments on commit f736072

Please sign in to comment.