Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] Change plugin id for triggers_actions_ui to triggersActionsUi (#78555) #79575

Merged
merged 1 commit into from
Oct 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ using the CURL scripts in the scripts folder.
|WARNING: Missing README.


|{kib-repo}blob/{branch}/x-pack/plugins/triggers_actions_ui/README.md[triggers_actions_ui]
|{kib-repo}blob/{branch}/x-pack/plugins/triggers_actions_ui/README.md[triggersActionsUi]
|The Kibana alerts and actions UI plugin provides a user interface for managing alerts and actions.
As a developer you can reuse and extend built-in alerts and actions UI functionality:

Expand Down
2 changes: 1 addition & 1 deletion x-pack/examples/alerting_example/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"kibanaVersion": "kibana",
"server": true,
"ui": true,
"requiredPlugins": ["triggers_actions_ui", "charts", "data", "alerts", "actions", "features", "developerExamples"],
"requiredPlugins": ["triggersActionsUi", "charts", "data", "alerts", "actions", "features", "developerExamples"],
"optionalPlugins": []
}
2 changes: 1 addition & 1 deletion x-pack/examples/alerting_example/public/application.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export interface AlertingExampleComponentParams {
application: CoreStart['application'];
http: CoreStart['http'];
basename: string;
triggers_actions_ui: TriggersAndActionsUIPublicPluginStart;
triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
data: DataPublicPluginStart;
charts: ChartsPluginStart;
uiSettings: IUiSettingsClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';

export const CreateAlert = ({
http,
// eslint-disable-next-line @typescript-eslint/naming-convention
triggers_actions_ui,
triggersActionsUi,
charts,
uiSettings,
docLinks,
Expand All @@ -39,8 +38,8 @@ export const CreateAlert = ({
<AlertsContextProvider
value={{
http,
actionTypeRegistry: triggers_actions_ui.actionTypeRegistry,
alertTypeRegistry: triggers_actions_ui.alertTypeRegistry,
actionTypeRegistry: triggersActionsUi.actionTypeRegistry,
alertTypeRegistry: triggersActionsUi.alertTypeRegistry,
toastNotifications,
uiSettings,
docLinks,
Expand Down
11 changes: 5 additions & 6 deletions x-pack/examples/alerting_example/public/plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,21 @@ export type Start = void;

export interface AlertingExamplePublicSetupDeps {
alerts: AlertingSetup;
triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
developerExamples: DeveloperExamplesSetup;
}

export interface AlertingExamplePublicStartDeps {
alerts: AlertingSetup;
triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
charts: ChartsPluginStart;
data: DataPublicPluginStart;
}

export class AlertingExamplePlugin implements Plugin<Setup, Start, AlertingExamplePublicSetupDeps> {
public setup(
core: CoreSetup<AlertingExamplePublicStartDeps, Start>,
// eslint-disable-next-line @typescript-eslint/naming-convention
{ alerts, triggers_actions_ui, developerExamples }: AlertingExamplePublicSetupDeps
{ alerts, triggersActionsUi, developerExamples }: AlertingExamplePublicSetupDeps
) {
core.application.register({
id: 'AlertingExample',
Expand All @@ -52,8 +51,8 @@ export class AlertingExamplePlugin implements Plugin<Setup, Start, AlertingExamp
},
});

triggers_actions_ui.alertTypeRegistry.register(getAlwaysFiringAlertType());
triggers_actions_ui.alertTypeRegistry.register(getPeopleInSpaceAlertType());
triggersActionsUi.alertTypeRegistry.register(getAlwaysFiringAlertType());
triggersActionsUi.alertTypeRegistry.register(getPeopleInSpaceAlertType());

registerNavigation(alerts);

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"apmOss",
"data",
"licensing",
"triggers_actions_ui",
"triggersActionsUi",
"embeddable"
],
"optionalPlugins": [
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/application/application.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('renderApp', () => {
const { core, config } = mockApmPluginContextValue;
const plugins = {
licensing: { license$: new Observable() },
triggers_actions_ui: { actionTypeRegistry: {}, alertTypeRegistry: {} },
triggersActionsUi: { actionTypeRegistry: {}, alertTypeRegistry: {} },
usageCollection: { reportUiStats: () => {} },
};
const params = {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/public/application/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ export function ApmAppRoot({
docLinks: core.docLinks,
capabilities: core.application.capabilities,
toastNotifications: core.notifications.toasts,
actionTypeRegistry: plugins.triggers_actions_ui.actionTypeRegistry,
alertTypeRegistry: plugins.triggers_actions_ui.alertTypeRegistry,
actionTypeRegistry: plugins.triggersActionsUi.actionTypeRegistry,
alertTypeRegistry: plugins.triggersActionsUi.alertTypeRegistry,
}}
>
<KibanaContextProvider services={{ ...core, ...plugins }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { AlertType } from '../../../common/alert_types';
import { ApmPluginStartDeps } from '../../plugin';

export function registerApmAlerts(
alertTypeRegistry: ApmPluginStartDeps['triggers_actions_ui']['alertTypeRegistry']
alertTypeRegistry: ApmPluginStartDeps['triggersActionsUi']['alertTypeRegistry']
) {
alertTypeRegistry.register({
id: AlertType.ErrorCount,
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/apm/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export interface ApmPluginSetupDeps {
features: FeaturesPluginSetup;
home?: HomePublicPluginSetup;
licensing: LicensingPluginSetup;
triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
observability?: ObservabilityPluginSetup;
}

Expand All @@ -58,7 +58,7 @@ export interface ApmPluginStartDeps {
data: DataPublicPluginStart;
home: void;
licensing: void;
triggers_actions_ui: TriggersAndActionsUIPublicPluginStart;
triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
embeddable: EmbeddableStart;
}

Expand Down Expand Up @@ -148,6 +148,6 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
}
public start(core: CoreStart, plugins: ApmPluginStartDeps) {
toggleAppLinkInNav(core, this.initializerContext.config.get());
registerApmAlerts(plugins.triggers_actions_ui.alertTypeRegistry);
registerApmAlerts(plugins.triggersActionsUi.alertTypeRegistry);
}
}
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dataEnhanced",
"visTypeTimeseries",
"alerts",
"triggers_actions_ui"
"triggersActionsUi"
],
"optionalPlugins": ["ml", "observability", "home"],
"server": true,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/apps/logs_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const LogsApp: React.FC<{
<CoreProviders core={core} plugins={plugins}>
<CommonInfraProviders
apolloClient={apolloClient}
triggersActionsUI={plugins.triggers_actions_ui}
triggersActionsUI={plugins.triggersActionsUi}
>
<Router history={history}>
<Switch>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/apps/metrics_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const MetricsApp: React.FC<{
<CoreProviders core={core} plugins={plugins}>
<CommonInfraProviders
apolloClient={apolloClient}
triggersActionsUI={plugins.triggers_actions_ui}
triggersActionsUI={plugins.triggersActionsUi}
>
<Router history={history}>
<Switch>
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/infra/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export class Plugin implements InfraClientPluginClass {
registerFeatures(pluginsSetup.home);
}

pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(createInventoryMetricAlertType());
pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getLogsAlertType());
pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(createMetricThresholdAlertType());
pluginsSetup.triggersActionsUi.alertTypeRegistry.register(createInventoryMetricAlertType());
pluginsSetup.triggersActionsUi.alertTypeRegistry.register(getLogsAlertType());
pluginsSetup.triggersActionsUi.alertTypeRegistry.register(createMetricThresholdAlertType());

if (pluginsSetup.observability) {
pluginsSetup.observability.dashboard.register({
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/infra/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export interface InfraClientSetupDeps {
dataEnhanced: DataEnhancedSetup;
home?: HomePublicPluginSetup;
observability: ObservabilityPluginSetup;
triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
usageCollection: UsageCollectionSetup;
}

Expand All @@ -36,7 +36,7 @@ export interface InfraClientStartDeps {
dataEnhanced: DataEnhancedStart;
observability: ObservabilityPluginStart;
spaces: SpacesPluginStart;
triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
usageCollection: UsageCollectionStart;
}

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"data",
"navigation",
"kibanaLegacy",
"triggers_actions_ui",
"triggersActionsUi",
"alerts",
"actions",
"encryptedSavedObjects",
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/monitoring/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { createMemoryUsageAlertType } from './alerts/memory_usage_alert';
interface MonitoringSetupPluginDependencies {
home?: HomePublicPluginSetup;
cloud?: { isCloudEnabled: boolean };
triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
usageCollection: UsageCollectionSetup;
}

Expand Down Expand Up @@ -73,7 +73,7 @@ export class MonitoringPlugin
});
}

const { alertTypeRegistry } = plugins.triggers_actions_ui;
const { alertTypeRegistry } = plugins.triggersActionsUi;
alertTypeRegistry.register(createCpuUsageAlertType());
alertTypeRegistry.register(createDiskUsageAlertType());
alertTypeRegistry.register(createMemoryUsageAlertType());
Expand Down Expand Up @@ -102,7 +102,7 @@ export class MonitoringPlugin
isCloud: Boolean(plugins.cloud?.isCloudEnabled),
pluginInitializerContext: this.initializerContext,
externalConfig: this.getExternalConfig(),
triggersActionsUi: plugins.triggers_actions_ui,
triggersActionsUi: plugins.triggersActionsUi,
usageCollection: plugins.usageCollection,
};

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"inspector",
"licensing",
"maps",
"triggers_actions_ui",
"triggersActionsUi",
"uiActions"
],
"optionalPlugins": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const useGetUrlSearchMock = useGetUrlSearch as jest.Mock;

describe('ConfigureCases', () => {
beforeEach(() => {
useKibanaMock().services.triggers_actions_ui = ({
useKibanaMock().services.triggersActionsUi = ({
actionTypeRegistry: actionTypeRegistryMock.create(),
} as unknown) as TriggersAndActionsUIPublicPluginStart;
});
Expand All @@ -62,17 +62,17 @@ describe('ConfigureCases', () => {
});

test('it renders the ActionsConnectorsContextProvider', () => {
// Components from triggers_actions_ui do not have a data-test-subj
// Components from triggersActionsUi do not have a data-test-subj
expect(wrapper.find(ActionsConnectorsContextProvider).exists()).toBeTruthy();
});

test('it renders the ConnectorAddFlyout', () => {
// Components from triggers_actions_ui do not have a data-test-subj
// Components from triggersActionsUi do not have a data-test-subj
expect(wrapper.find(ConnectorAddFlyout).exists()).toBeTruthy();
});

test('it does NOT render the ConnectorEditFlyout', () => {
// Components from triggers_actions_ui do not have a data-test-subj
// Components from triggersActionsUi do not have a data-test-subj
expect(wrapper.find(ConnectorEditFlyout).exists()).toBeFalsy();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ interface ConfigureCasesComponentProps {
}

const ConfigureCasesComponent: React.FC<ConfigureCasesComponentProps> = ({ userCanCrud }) => {
// eslint-disable-next-line @typescript-eslint/naming-convention
const { http, triggers_actions_ui, notifications, application, docLinks } = useKibana().services;
const { http, triggersActionsUi, notifications, application, docLinks } = useKibana().services;

const [connectorIsValid, setConnectorIsValid] = useState(true);
const [addFlyoutVisible, setAddFlyoutVisibility] = useState<boolean>(false);
Expand Down Expand Up @@ -197,7 +196,7 @@ const ConfigureCasesComponent: React.FC<ConfigureCasesComponentProps> = ({ userC
<ActionsConnectorsContextProvider
value={{
http,
actionTypeRegistry: triggers_actions_ui.actionTypeRegistry,
actionTypeRegistry: triggersActionsUi.actionTypeRegistry,
toastNotifications: notifications.toasts,
capabilities: application.capabilities,
reloadConnectors,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('RuleActionsField', () => {
it('should not render ActionForm if no actions are supported', () => {
(useKibana as jest.Mock).mockReturnValue({
services: {
triggers_actions_ui: {
triggersActionsUi: {
actionTypeRegistry: {},
},
application: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const RuleActionsField: ThrottleSelectField = ({ field, messageVariables
const { isSubmitted, isSubmitting, isValid } = form;
const {
http,
triggers_actions_ui: { actionTypeRegistry },
triggersActionsUi: { actionTypeRegistry },
notifications,
docLinks,
application: { capabilities },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jest.mock('../../../../common/lib/kibana', () => ({
},
},
},
triggers_actions_ui: {
triggersActionsUi: {
actionTypeRegistry: jest.fn(),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const StepRuleActionsComponent: FC<StepRuleActionsProps> = ({
const {
services: {
application,
triggers_actions_ui: { actionTypeRegistry },
triggersActionsUi: { actionTypeRegistry },
},
} = useKibana();
const kibanaAbsoluteUrl = useMemo(
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { MlPluginSetup, MlPluginStart } from '../../ml/public';
export interface SetupPlugins {
home?: HomePublicPluginSetup;
security: SecurityPluginSetup;
triggers_actions_ui: TriggersActionsSetup;
triggersActionsUi: TriggersActionsSetup;
usageCollection?: UsageCollectionSetup;
ml?: MlPluginSetup;
}
Expand All @@ -40,7 +40,7 @@ export interface StartPlugins {
ingestManager?: IngestManagerStart;
lists?: ListsPluginStart;
newsfeed?: NewsfeedStart;
triggers_actions_ui: TriggersActionsStart;
triggersActionsUi: TriggersActionsStart;
uiActions: UiActionsStart;
ml?: MlPluginStart;
}
Expand Down
Loading