From dca2f55a21c1f51de56b5ba198bbd4edc69bdbc4 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Mon, 19 Feb 2024 16:03:24 -0500
Subject: [PATCH] [8.13] [Observability AI Assistant] Mobile fixes (#177154)
(#177238)
# Backport
This will backport the following commits from `main` to `8.13`:
- [[Observability AI Assistant] Mobile fixes
(#177154)](https://github.com/elastic/kibana/pull/177154)
### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)
Co-authored-by: Coen Warmer
---
.../app_root/apm_header_action_menu/index.tsx | 10 +--
.../components/routing/app_root/index.tsx | 18 +++++-
.../components/action_menu/index.tsx | 17 ++++-
.../infra/public/pages/logs/page_content.tsx | 36 ++++++-----
.../infra/public/pages/metrics/index.tsx | 50 +++++++++------
.../components/header_menu/header_menu.tsx | 36 ++++++-----
.../action_menu_item/action_menu_item.tsx | 19 +++++-
.../public/components/chat/chat_body.tsx | 17 ++++-
.../public/components/chat/chat_flyout.tsx | 27 +++++++-
.../public/components/chat/chat_header.tsx | 21 +++++--
.../components/logs_explorer_top_nav_menu.tsx | 16 +++--
x-pack/plugins/profiling/public/app.tsx | 19 +++++-
.../profiling_header_action_menu.tsx | 6 --
.../components/common/header/action_menu.tsx | 32 +++++++---
.../common/header/action_menu_content.tsx | 7 +--
.../public/legacy_uptime/app/uptime_app.tsx | 5 +-
.../components/common/header/action_menu.tsx | 19 +++++-
.../common/header/action_menu_content.tsx | 4 --
.../app/rum_dashboard/action_menu/index.tsx | 62 +++++++++++--------
19 files changed, 287 insertions(+), 134 deletions(-)
diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx b/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx
index 9be079fe43c524..50d0ce4bdf7371 100644
--- a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx
+++ b/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx
@@ -23,12 +23,7 @@ import { InspectorHeaderLink } from './inspector_header_link';
import { Labs } from './labs';
export function ApmHeaderActionMenu() {
- const {
- core,
- plugins,
- config,
- observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem },
- } = useApmPluginContext();
+ const { core, plugins, config } = useApmPluginContext();
const { search } = window.location;
const { application, http } = core;
const { basePath } = http;
@@ -101,9 +96,6 @@ export function ApmHeaderActionMenu() {
})}
- {ObservabilityAIAssistantActionMenuItem ? (
-
- ) : null}
);
}
diff --git a/x-pack/plugins/apm/public/components/routing/app_root/index.tsx b/x-pack/plugins/apm/public/components/routing/app_root/index.tsx
index 6f95463f619b63..766e9e8c9d4430 100644
--- a/x-pack/plugins/apm/public/components/routing/app_root/index.tsx
+++ b/x-pack/plugins/apm/public/components/routing/app_root/index.tsx
@@ -21,6 +21,7 @@ import { RouteRenderer, RouterProvider } from '@kbn/typed-react-router-config';
import { euiDarkVars, euiLightVars } from '@kbn/ui-theme';
import React from 'react';
import { DefaultTheme, ThemeProvider } from 'styled-components';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { useKibanaEnvironmentContextProvider } from '../../../context/kibana_environment_context/use_kibana_environment_context';
import { AnomalyDetectionJobsContextProvider } from '../../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
import {
@@ -128,12 +129,23 @@ export function ApmAppRoot({
}
function MountApmHeaderActionMenu() {
- const { setHeaderActionMenu, theme$ } =
- useApmPluginContext().appMountParameters;
+ const {
+ appMountParameters: { setHeaderActionMenu, theme$ },
+ observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem },
+ } = useApmPluginContext();
return (
-
+
+
+
+
+ {ObservabilityAIAssistantActionMenuItem ? (
+
+
+
+ ) : null}
+
);
}
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/components/action_menu/index.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/components/action_menu/index.tsx
index 48de28e070eaf7..f28ffb7e493d60 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/components/action_menu/index.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/components/action_menu/index.tsx
@@ -8,8 +8,10 @@
import React from 'react';
import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
import { HeaderMenuPortal } from '@kbn/observability-shared-plugin/public';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { ExpViewActionMenuContent } from './action_menu';
import { useExploratoryView } from '../../contexts/exploratory_view_config';
+import { useKibana } from '../../hooks/use_kibana';
interface Props {
timeRange?: { from: string; to: string };
@@ -18,9 +20,22 @@ interface Props {
export function ExpViewActionMenu(props: Props) {
const { setHeaderActionMenu, theme$ } = useExploratoryView();
+ const {
+ observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem },
+ } = useKibana().services;
+
return (
-
+
+
+
+
+ {ObservabilityAIAssistantActionMenuItem ? (
+
+
+
+ ) : null}
+
);
}
diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
index 39868c74797d4f..d2c8309606823b 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React, { useContext } from 'react';
import { Routes, Route } from '@kbn/shared-ux-router';
@@ -74,22 +74,28 @@ export const LogsPageContent: React.FunctionComponent = () => {
{setHeaderActionMenu && theme$ && (
-
-
- {settingsTabTitle}
-
-
-
- {ADD_DATA_LABEL}
-
+
+
+
+
+ {settingsTabTitle}
+
+
+
+ {ADD_DATA_LABEL}
+
+
+
{ObservabilityAIAssistantActionMenuItem ? (
-
+
+
+
) : null}
-
+
)}
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index e617edcebf9650..d38d78265ce2c1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -10,7 +10,13 @@ import { i18n } from '@kbn/i18n';
import React, { useContext } from 'react';
import { Routes, Route } from '@kbn/shared-ux-router';
-import { EuiErrorBoundary, EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
+import {
+ EuiErrorBoundary,
+ EuiHeaderLinks,
+ EuiHeaderLink,
+ EuiFlexGroup,
+ EuiFlexItem,
+} from '@elastic/eui';
import { useKibana, useUiSetting } from '@kbn/kibana-react-plugin/public';
import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-shared-plugin/public';
import { enableInfrastructureHostsView } from '@kbn/observability-plugin/common';
@@ -83,25 +89,33 @@ export const InfrastructurePage = () => {
/>
{setHeaderActionMenu && theme$ && (
-
-
- {settingsTabTitle}
-
-
- {config.featureFlags.alertsAndRulesDropdownEnabled && (
-
- )}
-
- {ADD_DATA_LABEL}
-
+
+
+
+
+ {settingsTabTitle}
+
+
+ {config.featureFlags.alertsAndRulesDropdownEnabled && (
+
+ )}
+
+ {ADD_DATA_LABEL}
+
+
+
{ObservabilityAIAssistantActionMenuItem ? (
-
+
+
+
) : null}
-
+
)}
diff --git a/x-pack/plugins/observability/public/pages/overview/components/header_menu/header_menu.tsx b/x-pack/plugins/observability/public/pages/overview/components/header_menu/header_menu.tsx
index 0dfaf3eeed9973..a579eb3cd0eca2 100644
--- a/x-pack/plugins/observability/public/pages/overview/components/header_menu/header_menu.tsx
+++ b/x-pack/plugins/observability/public/pages/overview/components/header_menu/header_menu.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import React from 'react';
import { usePluginContext } from '../../../../hooks/use_plugin_context';
@@ -25,20 +25,26 @@ export function HeaderMenu(): React.ReactElement | null {
return (
-
-
- {addDataLinkText}
-
- {ObservabilityAIAssistantActionMenuItem ? : null}
-
+
+ {ObservabilityAIAssistantActionMenuItem ? (
+
+
+
+ ) : null}
+
+
+
+ {i18n.translate('xpack.observability.home.addData', {
+ defaultMessage: 'Add integrations',
+ })}
+
+
+
+
);
}
-
-const addDataLinkText = i18n.translate('xpack.observability.home.addData', {
- defaultMessage: 'Add integrations',
-});
diff --git a/x-pack/plugins/observability_ai_assistant/public/components/action_menu_item/action_menu_item.tsx b/x-pack/plugins/observability_ai_assistant/public/components/action_menu_item/action_menu_item.tsx
index ca8af6956ff363..e0f77f59859495 100644
--- a/x-pack/plugins/observability_ai_assistant/public/components/action_menu_item/action_menu_item.tsx
+++ b/x-pack/plugins/observability_ai_assistant/public/components/action_menu_item/action_menu_item.tsx
@@ -6,8 +6,15 @@
*/
import React, { useEffect, useMemo, useState } from 'react';
import datemath from '@elastic/datemath';
-import { EuiFlexGroup, EuiFlexItem, EuiHeaderLink, EuiLoadingSpinner } from '@elastic/eui';
+import {
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiHeaderLink,
+ EuiLoadingSpinner,
+ useCurrentEuiBreakpoint,
+} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
+import { css } from '@emotion/css';
import moment from 'moment';
import { ObservabilityAIAssistantChatServiceProvider } from '../../context/observability_ai_assistant_chat_service_provider';
import { useAbortableAsync } from '../../hooks/use_abortable_async';
@@ -16,8 +23,14 @@ import { AssistantAvatar } from '../assistant_avatar';
import { ChatFlyout } from '../chat/chat_flyout';
import { useKibana } from '../../hooks/use_kibana';
+const buttonLabelClassName = css`
+ display: none;
+`;
+
export function ObservabilityAIAssistantActionMenuItem() {
const service = useObservabilityAIAssistant();
+ const breakpoint = useCurrentEuiBreakpoint();
+
const { plugins } = useKibana().services;
const [isOpen, setIsOpen] = useState(false);
@@ -71,7 +84,7 @@ export function ObservabilityAIAssistantActionMenuItem() {
setIsOpen(() => true);
}}
>
-
+
{!isOpen || chatService.value ? (
@@ -79,7 +92,7 @@ export function ObservabilityAIAssistantActionMenuItem() {
)}
-
+
{i18n.translate('xpack.observabilityAiAssistant.actionMenuItemLabel', {
defaultMessage: 'AI Assistant',
})}
diff --git a/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx b/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx
index 83eae35e59f97e..ba155c14ac2a6d 100644
--- a/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx
+++ b/x-pack/plugins/observability_ai_assistant/public/components/chat/chat_body.tsx
@@ -154,6 +154,7 @@ export function ChatBody({
}
const containerClassName = css`
+ background: white;
min-width: 0;
max-height: 100%;
max-width: ${startedFrom === 'conversationView'
@@ -161,6 +162,10 @@ export function ChatBody({
: '100%'};
`;
+ const headerContainerClassName = css`
+ padding-right: ${showLinkToConversationsApp ? '32px' : '0'};
+ `;
+
const [stickToBottom, setStickToBottom] = useState(true);
const isAtBottom = (parent: HTMLElement) =>
@@ -401,9 +406,10 @@ export function ChatBody({
return (
+
) : null}
-
+
void;
}) {
const { euiTheme } = useEuiTheme();
+ const breakpoint = useCurrentEuiBreakpoint();
const currentUser = useCurrentUser();
@@ -66,6 +68,10 @@ export function ChatFlyout({
const [secondSlotContainer, setSecondSlotContainer] = useState(null);
const [isSecondSlotVisible, setIsSecondSlotVisible] = useState(false);
+ const flyoutClassName = css`
+ max-inline-size: 100% !important;
+ `;
+
const sidebarClass = css`
max-width: ${conversationsExpanded
? CONVERSATIONS_SIDEBAR_WIDTH
@@ -91,12 +97,17 @@ export function ChatFlyout({
const containerClassName = css`
height: 100%;
+ flex-wrap: nowrap;
`;
const chatBodyContainerClassName = css`
min-width: 0;
`;
+ const hideClassName = css`
+ display: none;
+ `;
+
const newChatButtonClassName = css`
position: absolute;
bottom: 31px;
@@ -142,13 +153,18 @@ export function ChatFlyout({
}}
>
{
@@ -160,7 +176,7 @@ export function ChatFlyout({
}}
>
-
+
void;
}) {
const theme = useEuiTheme();
+ const breakpoint = useCurrentEuiBreakpoint();
const router = useObservabilityAIAssistantRouter();
@@ -87,20 +94,24 @@ export function ChatHeader({
return (
- {loading ? : }
+ {loading ? (
+
+ ) : (
+
+ )}
-
+
{flyoutWidthMode && onToggleFlyoutWidthMode ? (
<>
diff --git a/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/logs_explorer_top_nav_menu.tsx b/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/logs_explorer_top_nav_menu.tsx
index 0f64f586ab3fdb..74c6347477ec6a 100644
--- a/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/logs_explorer_top_nav_menu.tsx
+++ b/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/logs_explorer_top_nav_menu.tsx
@@ -70,15 +70,17 @@ const ServerlessTopNav = () => {
- {ObservabilityAIAssistantActionMenuItem ? (
-
- ) : null}
+ {ObservabilityAIAssistantActionMenuItem ? (
+
+
+
+ ) : null}
);
};
@@ -148,12 +150,14 @@ const StatefulTopNav = () => {
- {ObservabilityAIAssistantActionMenuItem ? (
-
- ) : null}
+ {ObservabilityAIAssistantActionMenuItem ? (
+
+
+
+ ) : null}
);
diff --git a/x-pack/plugins/profiling/public/app.tsx b/x-pack/plugins/profiling/public/app.tsx
index e91c2eef4ec72d..8600d4db602f27 100644
--- a/x-pack/plugins/profiling/public/app.tsx
+++ b/x-pack/plugins/profiling/public/app.tsx
@@ -8,6 +8,7 @@
import { AppMountParameters, CoreSetup, CoreStart } from '@kbn/core/public';
import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
import { Storage } from '@kbn/kibana-utils-plugin/public';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
import { RouteRenderer, RouterProvider } from '@kbn/typed-react-router-config';
import React, { useMemo } from 'react';
@@ -25,6 +26,7 @@ import { ProfilingHeaderActionMenu } from './components/profiling_header_action_
import { RouterErrorBoundary } from './routing/router_error_boundary';
import { LicenseProvider } from './components/contexts/license/license_context';
import { ProfilingSetupStatusContextProvider } from './components/contexts/profiling_setup_status/profiling_setup_status_context';
+import { useProfilingDependencies } from './components/contexts/profiling_dependencies/use_profiling_dependencies';
interface Props {
profilingFetchServices: Services;
@@ -46,9 +48,24 @@ function MountProfilingActionMenu({
theme$: AppMountParameters['theme$'];
setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
}) {
+ const {
+ start: {
+ observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem },
+ },
+ } = useProfilingDependencies();
+
return (
-
+
+
+
+
+ {ObservabilityAIAssistantActionMenuItem ? (
+
+
+
+ ) : null}
+
);
}
diff --git a/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx b/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx
index 5c0189a35c5f86..dc8d7123c9a583 100644
--- a/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx
+++ b/x-pack/plugins/profiling/public/components/profiling_header_action_menu.tsx
@@ -19,16 +19,11 @@ import { useHistory } from 'react-router-dom';
import url from 'url';
import { useProfilingRouter } from '../hooks/use_profiling_router';
import { AddDataTabs } from '../views/add_data_view';
-import { useProfilingDependencies } from './contexts/profiling_dependencies/use_profiling_dependencies';
export function ProfilingHeaderActionMenu() {
const router = useProfilingRouter();
const history = useHistory();
- const {
- observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem },
- } = useProfilingDependencies().start;
-
return (
- {ObservabilityAIAssistantActionMenuItem ? : null}
);
}
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu.tsx
index 4f166211057ea7..7054ff53fd4e8d 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu.tsx
@@ -8,13 +8,29 @@
import React from 'react';
import { HeaderMenuPortal } from '@kbn/observability-shared-plugin/public';
import { AppMountParameters } from '@kbn/core/public';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ClientPluginsStart } from '../../../../../plugin';
import { ActionMenuContent } from './action_menu_content';
-export const ActionMenu = ({ appMountParameters }: { appMountParameters: AppMountParameters }) => (
-
-
-
-);
+export const ActionMenu = ({ appMountParameters }: { appMountParameters: AppMountParameters }) => {
+ const {
+ observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem },
+ } = useKibana().services;
+
+ return (
+
+
+
+
+
+
+
+ {ObservabilityAIAssistantActionMenuItem ? : null}
+
+
+ );
+};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu_content.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu_content.tsx
index c9a0118815eca1..090eeea83cc9cd 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu_content.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/header/action_menu_content.tsx
@@ -13,7 +13,7 @@ import { useHistory, useRouteMatch } from 'react-router-dom';
import { createExploratoryViewUrl } from '@kbn/exploratory-view-plugin/public';
import { LastRefreshed } from '../components/last_refreshed';
import { AutoRefreshButton } from '../components/auto_refresh_button';
-import { useSyntheticsSettingsContext, useSyntheticsStartPlugins } from '../../../contexts';
+import { useSyntheticsSettingsContext } from '../../../contexts';
import { useGetUrlParams } from '../../../hooks';
import { MONITOR_ROUTE, SETTINGS_ROUTE } from '../../../../../../common/constants';
import { stringifyUrlParams } from '../../../utils/url_params';
@@ -32,8 +32,6 @@ const ANALYZE_MESSAGE = i18n.translate('xpack.synthetics.analyzeDataButtonLabel.
export function ActionMenuContent(): React.ReactElement {
const { basePath } = useSyntheticsSettingsContext();
- const { observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem } = {} } =
- useSyntheticsStartPlugins();
const params = useGetUrlParams();
const { dateRangeStart, dateRangeEnd } = params;
const history = useHistory();
@@ -106,9 +104,6 @@ export function ActionMenuContent(): React.ReactElement {
- {ObservabilityAIAssistantActionMenuItem && ObservabilityAIAssistantActionMenuItem ? (
-
- ) : null}
);
}
diff --git a/x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx b/x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx
index c82ac50a72594d..41a18cebdb1ccd 100644
--- a/x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx
+++ b/x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx
@@ -143,7 +143,10 @@ const Application = (props: UptimeAppProps) => {
-
+
diff --git a/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu.tsx b/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu.tsx
index 4f166211057ea7..937cacaab165d7 100644
--- a/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu.tsx
+++ b/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu.tsx
@@ -8,13 +8,28 @@
import React from 'react';
import { HeaderMenuPortal } from '@kbn/observability-shared-plugin/public';
import { AppMountParameters } from '@kbn/core/public';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import type { ObservabilityAIAssistantPluginStart } from '@kbn/observability-ai-assistant-plugin/public';
import { ActionMenuContent } from './action_menu_content';
-export const ActionMenu = ({ appMountParameters }: { appMountParameters: AppMountParameters }) => (
+export const ActionMenu = ({
+ appMountParameters,
+ observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem },
+}: {
+ appMountParameters: AppMountParameters;
+ observabilityAIAssistant: ObservabilityAIAssistantPluginStart;
+}) => (
-
+
+
+
+
+
+ {ObservabilityAIAssistantActionMenuItem ? : null}
+
+
);
diff --git a/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu_content.tsx b/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu_content.tsx
index 58756b4a5669a4..11c59ea7ccbdd0 100644
--- a/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu_content.tsx
+++ b/x-pack/plugins/uptime/public/legacy_uptime/components/common/header/action_menu_content.tsx
@@ -22,7 +22,6 @@ import { MONITOR_ROUTE, SETTINGS_ROUTE } from '../../../../../common/constants';
import { InspectorHeaderLink } from './inspector_header_link';
import { monitorStatusSelector } from '../../../state/selectors';
import { ManageMonitorsBtn } from './manage_monitors_btn';
-import { useUptimeStartPlugins } from '../../../contexts/uptime_startup_plugins_context';
const ADD_DATA_LABEL = i18n.translate('xpack.uptime.addDataButtonLabel', {
defaultMessage: 'Add data',
@@ -41,8 +40,6 @@ export function ActionMenuContent(): React.ReactElement {
const kibana = useKibana();
const { basePath } = useUptimeSettingsContext();
- const { observabilityAIAssistant: { ObservabilityAIAssistantActionMenuItem } = {} } =
- useUptimeStartPlugins();
const params = useGetUrlParams();
const { dateRangeStart, dateRangeEnd } = params;
const history = useHistory();
@@ -121,7 +118,6 @@ export function ActionMenuContent(): React.ReactElement {
{ADD_DATA_LABEL}
- {ObservabilityAIAssistantActionMenuItem ? : null}
);
}
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
index da0cc4f8cfc7e5..83350afcf8ac28 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/action_menu/index.tsx
@@ -6,7 +6,13 @@
*/
import React from 'react';
-import { EuiHeaderLinks, EuiHeaderLink, EuiToolTip } from '@elastic/eui';
+import {
+ EuiHeaderLinks,
+ EuiHeaderLink,
+ EuiToolTip,
+ EuiFlexGroup,
+ EuiFlexItem,
+} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { HeaderMenuPortal } from '@kbn/observability-shared-plugin/public';
import {
@@ -70,32 +76,38 @@ export function UXActionMenu({
setHeaderActionMenu={appMountParameters.setHeaderActionMenu}
theme$={appMountParameters.theme$}
>
-
- {ANALYZE_MESSAGE}
}>
-
- {ANALYZE_DATA}
-
-
-
- {i18n.translate('xpack.ux.addDataButtonLabel', {
- defaultMessage: 'Add data',
- })}
-
-
+
+
+
+ {ANALYZE_MESSAGE}}>
+
+ {ANALYZE_DATA}
+
+
+
+ {i18n.translate('xpack.ux.addDataButtonLabel', {
+ defaultMessage: 'Add data',
+ })}
+
+
+
+
{ObservabilityAIAssistantActionMenuItem ? (
-
+
+
+
) : null}
-
+
);
}