From 9ddaebc3710c13cbf282a6d72fdd79709da9d995 Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Mon, 15 Jun 2020 11:45:15 -0700 Subject: [PATCH] Add enroll agent action to config action menu (#68840) Co-authored-by: Elastic Machine --- .../agent_config/components/actions_menu.tsx | 42 ++++++++++++------- .../agent_config/details_page/index.tsx | 4 +- .../sections/agent_config/list_page/index.tsx | 2 +- .../sections/fleet/components/list_layout.tsx | 2 +- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx index dc61da685c88..e126a8b871d4 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/components/actions_menu.tsx @@ -6,22 +6,32 @@ import React, { memo, useState } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiContextMenuItem, EuiPortal } from '@elastic/eui'; -import { useCapabilities, useLink } from '../../../hooks'; +import { AgentConfig } from '../../../types'; +import { useCapabilities } from '../../../hooks'; import { ContextMenuActions } from '../../../components'; +import { AgentEnrollmentFlyout } from '../../fleet/components'; import { ConfigYamlFlyout } from './config_yaml_flyout'; -export const AgentConfigActionMenu = memo<{ configId: string; fullButton?: boolean }>( - ({ configId, fullButton = false }) => { - const { getHref } = useLink(); +export const AgentConfigActionMenu = memo<{ config: AgentConfig; fullButton?: boolean }>( + ({ config, fullButton = false }) => { const hasWriteCapabilities = useCapabilities().write; const [isYamlFlyoutOpen, setIsYamlFlyoutOpen] = useState(false); + const [isEnrollmentFlyoutOpen, setIsEnrollmentFlyoutOpen] = useState(false); return ( <> {isYamlFlyoutOpen ? ( - setIsYamlFlyoutOpen(false)} /> + setIsYamlFlyoutOpen(false)} /> ) : null} + {isEnrollmentFlyoutOpen && ( + + setIsEnrollmentFlyoutOpen(false)} + /> + + )} setIsEnrollmentFlyoutOpen(true)} + key="enrollAgents" + > + + , setIsYamlFlyoutOpen(!isYamlFlyoutOpen)} @@ -50,17 +71,6 @@ export const AgentConfigActionMenu = memo<{ configId: string; fullButton?: boole defaultMessage="View config" /> , - - - , ]} /> diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx index 6fab78951038..c74958078ca9 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/index.tsx @@ -147,7 +147,9 @@ export const AgentConfigDetailsPage: React.FunctionComponent = () => { }, { isDivider: true }, { - content: agentConfig && , + content: agentConfig && ( + + ), }, ].map((item, index) => ( diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx index 0d43d8856c2f..487c1c070bb3 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/list_page/index.tsx @@ -189,7 +189,7 @@ export const AgentConfigListPage: React.FunctionComponent<{}> = () => { }), actions: [ { - render: (config: AgentConfig) => , + render: (config: AgentConfig) => , }, ], }, diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx index cc12ea19fbec..60cbc3108130 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx @@ -112,7 +112,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => { setIsEnrollmentFlyoutOpen(true)}>