Skip to content

Commit 9dd057c

Browse files
CoenWarmerCoenWarmer
committed
Merge branch 'main' of github.com:elastic/kibana into chore/rename-getEditAlertFlyout
2 parents 71749a4 + d3a5ab0 commit 9dd057c

12 files changed

Lines changed: 60 additions & 92 deletions

File tree

x-pack/plugins/observability/public/pages/rule_details/components/center_justified_spinner.tsx renamed to x-pack/plugins/observability/public/components/center_justified_spinner.tsx

File renamed without changes.

x-pack/plugins/observability/public/pages/alert_details/components/alert_details.test.tsx renamed to x-pack/plugins/observability/public/pages/alert_details/alert_details.test.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import { Chance } from 'chance';
1212
import { waitFor } from '@testing-library/react';
1313
import { casesPluginMock } from '@kbn/cases-plugin/public/mocks';
1414

15-
import { Subset } from '../../../typings';
16-
import { render } from '../../../utils/test_helper';
17-
import { useKibana } from '../../../utils/kibana_react';
18-
import { kibanaStartMock } from '../../../utils/kibana_react.mock';
19-
import { useFetchAlertDetail } from '../../../hooks/use_fetch_alert_detail';
20-
import { useBreadcrumbs } from '../../../hooks/use_breadcrumbs';
15+
import { Subset } from '../../typings';
16+
import { render } from '../../utils/test_helper';
17+
import { useKibana } from '../../utils/kibana_react';
18+
import { kibanaStartMock } from '../../utils/kibana_react.mock';
19+
import { useFetchAlertDetail } from '../../hooks/use_fetch_alert_detail';
20+
import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
2121
import { AlertDetails } from './alert_details';
22-
import { ConfigSchema } from '../../../plugin';
23-
import { alert, alertWithNoData } from '../mock/alert';
22+
import { ConfigSchema } from '../../plugin';
23+
import { alert, alertWithNoData } from './mock/alert';
2424
import { ruleTypeRegistryMock } from '@kbn/triggers-actions-ui-plugin/public/application/rule_type_registry.mock';
2525
import { RuleTypeModel, ValidationResult } from '@kbn/triggers-actions-ui-plugin/public';
2626

@@ -29,7 +29,7 @@ jest.mock('react-router-dom', () => ({
2929
useParams: jest.fn(),
3030
}));
3131

32-
jest.mock('../../../utils/kibana_react');
32+
jest.mock('../../utils/kibana_react');
3333
const validationMethod = (): ValidationResult => ({ errors: {} });
3434
const ruleType: RuleTypeModel = {
3535
id: 'logs.alert.document.count',
@@ -61,8 +61,8 @@ const mockKibana = () => {
6161
});
6262
};
6363

64-
jest.mock('../../../hooks/use_fetch_alert_detail');
65-
jest.mock('../../../hooks/use_fetch_rule', () => {
64+
jest.mock('../../hooks/use_fetch_alert_detail');
65+
jest.mock('../../hooks/use_fetch_rule', () => {
6666
return {
6767
useFetchRule: () => ({
6868
reloadRule: jest.fn(),
@@ -73,8 +73,8 @@ jest.mock('../../../hooks/use_fetch_rule', () => {
7373
}),
7474
};
7575
});
76-
jest.mock('../../../hooks/use_breadcrumbs');
77-
jest.mock('../../../hooks/use_get_user_cases_permissions', () => ({
76+
jest.mock('../../hooks/use_breadcrumbs');
77+
jest.mock('../../hooks/use_get_user_cases_permissions', () => ({
7878
useGetUserCasesPermissions: () => ({
7979
all: true,
8080
create: true,

x-pack/plugins/observability/public/pages/alert_details/components/alert_details.tsx renamed to x-pack/plugins/observability/public/pages/alert_details/alert_details.tsx

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,38 @@ import { useParams } from 'react-router-dom';
1111
import { EuiEmptyPrompt, EuiPanel, EuiSpacer } from '@elastic/eui';
1212
import { ALERT_RULE_TYPE_ID, ALERT_RULE_UUID } from '@kbn/rule-data-utils';
1313
import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
14-
import { getTimeZone } from '../../../utils/get_time_zone';
15-
import { useFetchRule } from '../../../hooks/use_fetch_rule';
16-
import { isAlertDetailsEnabledPerApp } from '../../../utils/is_alert_details_enabled';
17-
import { useKibana } from '../../../utils/kibana_react';
18-
import { usePluginContext } from '../../../hooks/use_plugin_context';
19-
import { useBreadcrumbs } from '../../../hooks/use_breadcrumbs';
20-
import { useFetchAlertDetail } from '../../../hooks/use_fetch_alert_detail';
2114

22-
import { AlertSummary, HeaderActions, PageTitle } from '.';
23-
import { CenterJustifiedSpinner } from '../../rule_details/components/center_justified_spinner';
24-
import PageNotFound from '../../404';
15+
import { useKibana } from '../../utils/kibana_react';
16+
import { useFetchRule } from '../../hooks/use_fetch_rule';
17+
import { usePluginContext } from '../../hooks/use_plugin_context';
18+
import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
19+
import { useFetchAlertDetail } from '../../hooks/use_fetch_alert_detail';
20+
import { PageTitle } from './components/page_title';
21+
import { HeaderActions } from './components/header_actions';
22+
import { AlertSummary, AlertSummaryField } from './components/alert_summary';
23+
import { CenterJustifiedSpinner } from '../../components/center_justified_spinner';
24+
import PageNotFound from '../404';
25+
import { getTimeZone } from '../../utils/get_time_zone';
26+
import { isAlertDetailsEnabledPerApp } from '../../utils/is_alert_details_enabled';
27+
import { observabilityFeatureId } from '../../../common';
28+
import { paths } from '../../config/paths';
29+
import type { ObservabilityAppServices } from '../../application/types';
2530

26-
import { ObservabilityAppServices } from '../../../application/types';
27-
import { AlertDetailsPathParams } from '../types';
28-
import { observabilityFeatureId } from '../../../../common';
29-
import { paths } from '../../../config/paths';
30-
import type { AlertSummaryField } from './alert_summary';
31+
interface AlertDetailsPathParams {
32+
alertId: string;
33+
}
34+
35+
export const ALERT_DETAILS_PAGE_ID = 'alert-details-o11y';
3136

3237
export function AlertDetails() {
3338
const {
34-
uiSettings,
35-
http,
3639
cases: {
3740
helpers: { canUseCases },
3841
ui: { getCasesContext },
3942
},
43+
http,
4044
triggersActionsUi: { ruleTypeRegistry },
45+
uiSettings,
4146
} = useKibana<ObservabilityAppServices>().services;
4247

4348
const { ObservabilityPageTemplate, config } = usePluginContext();

‎x-pack/plugins/observability/public/pages/alert_details/components/alert_summary.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import {
2828
} from '@kbn/rule-data-utils';
2929
import { asDuration } from '../../../../common/utils/formatters';
3030
import { AlertStatusIndicator } from '../../../components/shared/alert_status_indicator';
31-
import { DEFAULT_DATE_FORMAT } from '../constants';
32-
3331
import type { TopAlert } from '../../../typings/alerts';
3432

3533
export interface AlertSummaryField {
@@ -41,6 +39,8 @@ export interface AlertSummaryProps {
4139
alertSummaryFields?: AlertSummaryField[];
4240
}
4341

42+
const DEFAULT_DATE_FORMAT = 'MMM D, YYYY @ HH:mm:ss.SSS';
43+
4444
const getAndFormatAlertSummaryBasicFields = (alert: TopAlert | null): React.ReactElement => {
4545
const tags = alert?.fields[ALERT_RULE_TAGS];
4646
return (

‎x-pack/plugins/observability/public/pages/alert_details/components/header_actions.tsx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { ALERT_RULE_UUID, ALERT_UUID } from '@kbn/rule-data-utils';
1515

1616
import { useKibana } from '../../../utils/kibana_react';
1717
import { useFetchRule } from '../../../hooks/use_fetch_rule';
18-
import { ObservabilityAppServices } from '../../../application/types';
18+
import type { ObservabilityAppServices } from '../../../application/types';
1919
import type { TopAlert } from '../../../typings/alerts';
2020

2121
export interface HeaderActionsProps {
@@ -28,7 +28,7 @@ export function HeaderActions({ alert }: HeaderActionsProps) {
2828
cases: {
2929
hooks: { getUseCasesAddToExistingCaseModal },
3030
},
31-
triggersActionsUi: { getEditRuleFlyout, getRuleSnoozeModal },
31+
triggersActionsUi: { getEditRuleFlyout: EditRuleFlyout, getRuleSnoozeModal: RuleSnoozeModal },
3232
} = useKibana<ObservabilityAppServices>().services;
3333

3434
const { rule, reloadRule } = useFetchRule({
@@ -137,24 +137,24 @@ export function HeaderActions({ alert }: HeaderActionsProps) {
137137
</EuiFlexGroup>
138138
</EuiPopover>
139139

140-
{rule && ruleConditionsFlyoutOpen
141-
? getEditRuleFlyout({
142-
initialRule: rule,
143-
onClose: () => {
144-
setRuleConditionsFlyoutOpen(false);
145-
},
146-
onSave: reloadRule,
147-
})
148-
: null}
149-
150-
{rule && snoozeModalOpen
151-
? getRuleSnoozeModal({
152-
rule,
153-
onClose: () => setSnoozeModalOpen(false),
154-
onRuleChanged: reloadRule,
155-
onLoading: noop,
156-
})
157-
: null}
140+
{rule && ruleConditionsFlyoutOpen ? (
141+
<EditRuleFlyout
142+
initialRule={rule}
143+
onClose={() => {
144+
setRuleConditionsFlyoutOpen(false);
145+
}}
146+
onSave={reloadRule}
147+
/>
148+
) : null}
149+
150+
{rule && snoozeModalOpen ? (
151+
<RuleSnoozeModal
152+
rule={rule}
153+
onClose={() => setSnoozeModalOpen(false)}
154+
onRuleChanged={reloadRule}
155+
onLoading={noop}
156+
/>
157+
) : null}
158158
</>
159159
);
160160
}

‎x-pack/plugins/observability/public/pages/alert_details/components/index.ts‎

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

‎x-pack/plugins/observability/public/pages/alert_details/constants.ts‎

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

‎x-pack/plugins/observability/public/pages/alert_details/index.ts‎

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

‎x-pack/plugins/observability/public/pages/alert_details/types.ts‎

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

‎x-pack/plugins/observability/public/pages/rule_details/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import {
4545
} from '../../utils/alert_summary_widget';
4646
import { ObservabilityAlertSearchbarWithUrlSync } from '../../components/shared/alert_search_bar';
4747
import { DeleteModalConfirmation } from './components/delete_modal_confirmation';
48-
import { CenterJustifiedSpinner } from './components/center_justified_spinner';
48+
import { CenterJustifiedSpinner } from '../../components/center_justified_spinner';
4949

5050
import {
5151
EXECUTION_TAB,

0 commit comments

Comments
 (0)