Skip to content

Commit 2957036

Browse files
authoredFeb 2, 2022
[Stack Monitoring] fix Alerts and Rules menu persisting to other apps (#124291)
* use shared component for header context menu * removed unused component
1 parent 67430f9 commit 2957036

File tree

2 files changed

+8
-39
lines changed

2 files changed

+8
-39
lines changed
 

‎x-pack/plugins/monitoring/public/application/pages/page_template.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ import {
2020
} from '../../lib/setup_mode';
2121
import { SetupModeFeature } from '../../../common/enums';
2222
import { AlertsDropdown } from '../../alerts/alerts_dropdown';
23-
import { ActionMenu } from '../../components/action_menu';
2423
import { useRequestErrorHandler } from '../hooks/use_request_error_handler';
24+
import { HeaderMenuPortal } from '../../../../observability/public';
25+
import { HeaderActionMenuContext } from '../../application/contexts/header_action_menu_context';
2526

2627
export interface TabMenuItem {
2728
id: string;
@@ -53,6 +54,7 @@ export const PageTemplate: React.FC<PageTemplateProps> = ({
5354
const history = useHistory();
5455
const [hasError, setHasError] = useState(false);
5556
const handleRequestError = useRequestErrorHandler();
57+
const { setHeaderActionMenu, theme$ } = useContext(HeaderActionMenuContext);
5658

5759
const getPageDataResponseHandler = useCallback(
5860
(result: any) => {
@@ -104,9 +106,11 @@ export const PageTemplate: React.FC<PageTemplateProps> = ({
104106

105107
return (
106108
<div className="app-container" data-test-subj="monitoringAppContainer">
107-
<ActionMenu>
108-
<AlertsDropdown />
109-
</ActionMenu>
109+
{setHeaderActionMenu && theme$ && (
110+
<HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu} theme$={theme$}>
111+
<AlertsDropdown />
112+
</HeaderMenuPortal>
113+
)}
110114
<MonitoringToolbar pageTitle={pageTitle} onRefresh={onRefresh} />
111115
{tabs && (
112116
<EuiTabs>

‎x-pack/plugins/monitoring/public/components/action_menu/index.tsx

-35
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.