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

Rename getEditAlertFlyout to getEditRuleFlyout #153243

Merged
merged 2 commits into from
Mar 20, 2023
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 x-pack/plugins/ml/public/alerting/ml_alerting_flyout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const MlAnomalyAlertFlyout: FC<MlAnomalyAlertFlyoutProps> = ({
};

if (initialAlert) {
return triggersActionsUi.getEditAlertFlyout({
return triggersActionsUi.getEditRuleFlyout({
...commonProps,
initialRule: {
...initialAlert,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/monitoring/public/alerts/configuration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const AlertConfiguration: React.FC<Props> = (props: Props) => {
const flyoutUi = useMemo(
() =>
showFlyout &&
Legacy.shims.triggersActionsUi.getEditAlertFlyout({
Legacy.shims.triggersActionsUi.getEditRuleFlyout({
initialRule: {
...alert,
ruleTypeId: alert.alertTypeId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ const triggersActionsUiStartMock = {
<div data-test-subj="alerts-state-table">mocked component</div>
)),
getAddRuleFlyout: jest.fn(() => <div data-test-subj="add-rule-flyout">mocked component</div>),
getEditAlertFlyout: jest.fn(() => (
<div data-test-subj="edit-alert-flyout">mocked component</div>
getEditRuleFlyout: jest.fn(() => (
<div data-test-subj="edit-rule-flyout">mocked component</div>
)),
getRuleAlertsSummary: jest.fn(() => (
<div data-test-subj="rule-alerts-summary">mocked component</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function HeaderActions({ alert }: HeaderActionsProps) {
cases: {
hooks: { getUseCasesAddToExistingCaseModal },
},
triggersActionsUi: { getEditAlertFlyout: EditRuleFlyout, getRuleSnoozeModal: RuleSnoozeModal },
triggersActionsUi: { getEditRuleFlyout: EditRuleFlyout, getRuleSnoozeModal: RuleSnoozeModal },
} = useKibana<ObservabilityAppServices>().services;

const { rule, reloadRule } = useFetchRule({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function RuleDetailsPage() {
triggersActionsUi: {
alertsTableConfigurationRegistry,
ruleTypeRegistry,
getEditAlertFlyout: EditAlertFlyout,
getEditRuleFlyout: EditRuleFlyout,
getRuleEventLogList,
getAlertsStateTable: AlertsStateTable,
getAlertSummaryWidget: AlertSummaryWidget,
Expand Down Expand Up @@ -424,7 +424,7 @@ export function RuleDetailsPage() {
}}
/>
{editFlyoutVisible && (
<EditAlertFlyout
<EditRuleFlyout
initialRule={rule}
onClose={() => {
setEditFlyoutVisible(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const useSyntheticsAlert = (isOpen: boolean) => {
if (!alert) {
return null;
}
return triggersActionsUi.getEditAlertFlyout({
return triggersActionsUi.getEditRuleFlyout({
onClose: () => dispatch(setAlertFlyoutVisible(false)),
initialRule: alert,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const UptimeEditAlertFlyoutComponent = ({

const EditAlertFlyout = useMemo(
() =>
triggersActionsUi.getEditAlertFlyout({
triggersActionsUi.getEditRuleFlyout({
initialRule: initialAlert,
onClose: () => {
setAlertFlyoutVisibility(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('ML Integrations', () => {
it('renders without errors', () => {
const wrapper = renderWithRouter(
<KibanaContextProvider
services={{ ...core, triggersActionsUi: { getEditAlertFlyout: jest.fn() } }}
services={{ ...core, triggersActionsUi: { getEditRuleFlyout: jest.fn() } }}
>
<MLIntegrationComponent />
</KibanaContextProvider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const TransformAlertFlyout: FC<TransformAlertFlyoutProps> = ({
};

if (initialAlert) {
return triggersActionsUi.getEditAlertFlyout({
return triggersActionsUi.getEditRuleFlyout({
...commonProps,
initialRule: {
...initialAlert,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ConnectorProvider } from '../application/context/connector_context';
import { RuleEdit } from '../application/sections/rule_form';
import type { ConnectorServices, RuleEditProps as AlertEditProps } from '../types';

export const getEditAlertFlyoutLazy = (
export const getEditRuleFlyoutLazy = (
props: AlertEditProps & { connectorServices: ConnectorServices }
) => {
return (
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/triggers_actions_ui/public/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type { TriggersAndActionsUIPublicPluginStart } from './plugin';
import { getAddConnectorFlyoutLazy } from './common/get_add_connector_flyout';
import { getEditConnectorFlyoutLazy } from './common/get_edit_connector_flyout';
import { getAddRuleFlyoutLazy } from './common/get_add_rule_flyout';
import { getEditAlertFlyoutLazy } from './common/get_edit_alert_flyout';
import { getEditRuleFlyoutLazy } from './common/get_edit_rule_flyout';
import { TypeRegistry } from './application/type_registry';
import {
ActionTypeModel,
Expand Down Expand Up @@ -78,8 +78,8 @@ function createStartMock(): TriggersAndActionsUIPublicPluginStart {
connectorServices,
});
},
getEditAlertFlyout: (props: Omit<RuleEditProps, 'actionTypeRegistry' | 'ruleTypeRegistry'>) => {
return getEditAlertFlyoutLazy({
getEditRuleFlyout: (props: Omit<RuleEditProps, 'actionTypeRegistry' | 'ruleTypeRegistry'>) => {
return getEditRuleFlyoutLazy({
...props,
actionTypeRegistry,
ruleTypeRegistry,
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/triggers_actions_ui/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { TypeRegistry } from './application/type_registry';
import { getAddConnectorFlyoutLazy } from './common/get_add_connector_flyout';
import { getEditConnectorFlyoutLazy } from './common/get_edit_connector_flyout';
import { getAddRuleFlyoutLazy } from './common/get_add_rule_flyout';
import { getEditAlertFlyoutLazy } from './common/get_edit_alert_flyout';
import { getEditRuleFlyoutLazy } from './common/get_edit_rule_flyout';
import { getAlertsTableLazy } from './common/get_alerts_table';
import { getFieldBrowserLazy } from './common/get_field_browser';
import { getRuleStatusDropdownLazy } from './common/get_rule_status_dropdown';
Expand Down Expand Up @@ -108,7 +108,7 @@ export interface TriggersAndActionsUIPublicPluginStart {
getAddRuleFlyout: (
props: Omit<RuleAddProps, 'actionTypeRegistry' | 'ruleTypeRegistry'>
) => ReactElement<RuleAddProps>;
getEditAlertFlyout: (
getEditRuleFlyout: (
props: Omit<RuleEditProps, 'actionTypeRegistry' | 'ruleTypeRegistry'>
) => ReactElement<RuleEditProps>;
getAlertsTable: (props: AlertsTableProps) => ReactElement<AlertsTableProps>;
Expand Down Expand Up @@ -374,10 +374,10 @@ export class Plugin
connectorServices: this.connectorServices!,
});
},
getEditAlertFlyout: (
getEditRuleFlyout: (
props: Omit<RuleEditProps, 'actionTypeRegistry' | 'ruleTypeRegistry'>
) => {
return getEditAlertFlyoutLazy({
return getEditRuleFlyoutLazy({
...props,
actionTypeRegistry: this.actionTypeRegistry,
ruleTypeRegistry: this.ruleTypeRegistry,
Expand Down