Skip to content

Commit

Permalink
Reassign from details page too
Browse files Browse the repository at this point in the history
  • Loading branch information
@nchaulet
nchaulet committed Apr 21, 2020
1 parent 4ba3fd6 commit 683fc46
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 27 deletions.
80 changes: 66 additions & 14 deletions ...lications/ingest_manager/sections/fleet/agent_details_page/components/details_section.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import React, { useState, Fragment } from 'react';
import React, { useState, Fragment, useCallback } from 'react';
import { FormattedMessage } from '@kbn/i18n/react';
import {
EuiTitle,
Expand All @@ -13,10 +13,13 @@ import {
EuiFlexItem,
EuiDescriptionList,
EuiButton,
EuiPopover,
EuiDescriptionListTitle,
EuiDescriptionListDescription,
EuiButtonEmpty,
EuiIconTip,
EuiContextMenuPanel,
EuiContextMenuItem,
EuiTextColor,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
Expand All @@ -26,7 +29,7 @@ import { Agent } from '../../../../types';
import { AgentHealth } from '../../components/agent_health';
import { useCapabilities, useGetOneAgentConfig } from '../../../../hooks';
import { Loading } from '../../../../components';
import { ConnectedLink } from '../../components';
import { ConnectedLink, AgentReassignConfigFlyout } from '../../components';
import { AgentUnenrollProvider } from '../../components/agent_unenroll_provider';

const Item: React.FunctionComponent<{ label: string }> = ({ label, children }) => {
Expand Down Expand Up @@ -56,6 +59,15 @@ export const AgentDetailSection: React.FunctionComponent<Props> = ({ agent }) =>
const hasWriteCapabilites = useCapabilities().write;
const metadataFlyout = useFlyout();
const refreshAgent = useAgentRefresh();
// Actions menu
const [isActionsPopoverOpen, setIsActionsPopoverOpen] = useState(false);
const handleCloseMenu = useCallback(() => setIsActionsPopoverOpen(false), [
setIsActionsPopoverOpen,
]);
const handleToggleMenu = useCallback(() => setIsActionsPopoverOpen(!isActionsPopoverOpen), [
isActionsPopoverOpen,
]);
const [isReassignFlyoutOpen, setIsReassignFlyoutOpen] = useState(false);

// Fetch AgentConfig information
const { isLoading: isAgentConfigLoading, data: agentConfigData } = useGetOneAgentConfig(
Expand Down Expand Up @@ -111,6 +123,12 @@ export const AgentDetailSection: React.FunctionComponent<Props> = ({ agent }) =>

return (
<>
{isReassignFlyoutOpen && (
<AgentReassignConfigFlyout
agentId={agent.id}
onClose={() => setIsReassignFlyoutOpen(false)}
/>
)}
<EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiTitle size="l">
Expand All @@ -123,21 +141,55 @@ export const AgentDetailSection: React.FunctionComponent<Props> = ({ agent }) =>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<AgentUnenrollProvider>
{unenrollAgentsPrompt => (
<EuiButton
disabled={!hasWriteCapabilites || !agent.active}
onClick={() => {
unenrollAgentsPrompt([agent.id], 1, refreshAgent);
}}
>
<EuiPopover
anchorPosition="downRight"
panelPaddingSize="none"
button={
<EuiButton onClick={handleToggleMenu}>
<FormattedMessage
id="xpack.ingestManager.agentDetails.unenrollButtonText"
defaultMessage="Unenroll"
id="xpack.ingestManager.agentDetails.actionsButton"
defaultMessage="Actions"
/>
</EuiButton>
)}
</AgentUnenrollProvider>
}
isOpen={isActionsPopoverOpen}
closePopover={handleCloseMenu}
>
<EuiContextMenuPanel
items={[
<EuiContextMenuItem
icon="pencil"
onClick={() => {
handleCloseMenu();
setIsReassignFlyoutOpen(true);
}}
key="reassignConfig"
>
<FormattedMessage
id="xpack.ingestManager.agentList.reassignActionText"
defaultMessage="Assign new agent config"
/>
</EuiContextMenuItem>,

<AgentUnenrollProvider>
{unenrollAgentsPrompt => (
<EuiContextMenuItem
icon="cross"
disabled={!hasWriteCapabilites || !agent.active}
onClick={() => {
unenrollAgentsPrompt([agent.id], 1, refreshAgent);
}}
>
<FormattedMessage
id="xpack.ingestManager.agentList.unenrollOneButton"
defaultMessage="Unenroll"
/>
</EuiContextMenuItem>
)}
</AgentUnenrollProvider>,
]}
/>
</EuiPopover>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size={'xl'} />
Expand Down
1 change: 0 additions & 1 deletion ...ger/public/applications/ingest_manager/sections/fleet/agent_list_page/components/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
* you may not use this file except in compliance with the Elastic License.
*/
export { AgentEnrollmentFlyout } from './agent_enrollment_flyout';
export { AgentReassignConfigFlyout } from './agent_reassign_config_flyout';
5 changes: 2 additions & 3 deletions ...ngest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
import { i18n } from '@kbn/i18n';
import { FormattedMessage, FormattedRelative } from '@kbn/i18n/react';
import { CSSProperties } from 'styled-components';
import { AgentEnrollmentFlyout, AgentReassignConfigFlyout } from './components';
import { AgentEnrollmentFlyout } from './components';
import { Agent } from '../../../types';
import {
usePagination,
Expand All @@ -35,7 +35,7 @@ import {
useUrlParams,
useLink,
} from '../../../hooks';
import { ConnectedLink } from '../components';
import { ConnectedLink, AgentReassignConfigFlyout } from '../components';
import { SearchBar } from '../../../components/search_bar';
import { AgentHealth } from '../components/agent_health';
import { AgentUnenrollProvider } from '../components/agent_unenroll_provider';
Expand Down Expand Up @@ -373,7 +373,6 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
{agentToReassignId && (
<AgentReassignConfigFlyout
agentId={agentToReassignId}
agentConfigs={agentConfigs}
onClose={() => {
setAgentToReassignId(undefined);
agentsRequest.sendRequest();
Expand Down
28 changes: 19 additions & 9 deletions ...ts/agent_reassign_config_flyout/index.tsx → ...ts/agent_reassign_config_flyout/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,27 @@ import {
EuiBadge,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { AgentConfig, Datasource } from '../../../../../types';
import { useGetOneAgentConfig, sendPutAgentReassign, useCore } from '../../../../../hooks';
import { PackageIcon } from '../../../../../components/package_icon';
import { Datasource } from '../../../../types';
import {
useGetOneAgentConfig,
sendPutAgentReassign,
useCore,
useGetAgentConfigs,
} from '../../../../hooks';
import { PackageIcon } from '../../../../components/package_icon';

interface Props {
onClose: () => void;
agentConfigs: AgentConfig[];
agentId: string;
}

export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({
onClose,
agentId,
agentConfigs = [],
}) => {
export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onClose, agentId }) => {
const { notifications } = useCore();
const [selectedAgentConfigId, setSelectedAgentConfigId] = useState<string | undefined>(undefined);

const agentConfigsRequest = useGetAgentConfigs();
const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];

const agentConfigRequest = useGetOneAgentConfig(selectedAgentConfigId as string);
const agentConfig = agentConfigRequest.data ? agentConfigRequest.data.item : null;

Expand All @@ -58,6 +61,13 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({
throw res.error;
}
setIsSubmitting(false);
const successMessage = i18n.translate(
'xpack.ingestManager.agentReassignConfig.successSingleNotificationTitle',
{
defaultMessage: 'Successfully changed the configuration',
}
);
notifications.toasts.addSuccess(successMessage);
onClose();
} catch (error) {
setIsSubmitting(false);
Expand Down
1 change: 1 addition & 0 deletions ...ins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
*/

export * from './loading';
export * from './agent_reassign_config_flyout';
export * from './navigation/child_routes';
export * from './navigation/connected_link';

0 comments on commit 683fc46

Please sign in to comment.