Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ import { usePackagePoliciesWithAgentPolicy } from './use_package_policies_with_a
import { AgentBasedPackagePoliciesTable } from './components/agent_based_table';
import { AgentlessPackagePoliciesTable } from './components/agentless_table';

export const PackagePoliciesPage = ({ packageInfo }: { packageInfo: PackageInfo }) => {
export const PackagePoliciesPage = ({
packageInfo,
embedded,
}: {
packageInfo: PackageInfo;
embedded?: boolean;
}) => {
const { name, version } = packageInfo;
const { search } = useLocation();
const queryParams = useMemo(() => new URLSearchParams(search), [search]);
Expand Down Expand Up @@ -154,7 +160,11 @@ export const PackagePoliciesPage = ({ packageInfo }: { packageInfo: PackageInfo
// if they arrive at this page and the package is not installed, send them to overview
// this happens if they arrive with a direct url or they uninstall while on this tab
// Check `addAgentToPolicyIdFromParams` otherwise right after installing a new integration the flyout won't open
if (packageInstallStatus.status !== InstallStatus.installed && !addAgentToPolicyIdFromParams) {
if (
packageInstallStatus &&
packageInstallStatus.status !== InstallStatus.installed &&
!addAgentToPolicyIdFromParams
) {
return (
<Redirect to={getPath('integration_details_overview', { pkgkey: `${name}-${version}` })} />
);
Expand All @@ -170,7 +180,7 @@ export const PackagePoliciesPage = ({ packageInfo }: { packageInfo: PackageInfo
}}
>
<EuiFlexGroup alignItems="flexStart">
<SideBarColumn grow={1} />
{embedded ? null : <SideBarColumn grow={1} />}
<EuiFlexItem grow={7}>
{!canHaveAgentlessPolicies ? (
<AgentBasedPackagePoliciesTable
Expand Down Expand Up @@ -200,17 +210,17 @@ export const PackagePoliciesPage = ({ packageInfo }: { packageInfo: PackageInfo
>
<EuiFlexItem grow={false}>
<EuiText size="m">
<h3>
<h4>
<FormattedMessage
id="xpack.fleet.epm.packageDetails.integrationList.agentlessHeader"
defaultMessage="Agentless"
/>
</h3>
</h4>
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiNotificationBadge color="subdued" size="m">
<h3>{agentlessData?.total ?? 0}</h3>
<h4>{agentlessData?.total ?? 0}</h4>
</EuiNotificationBadge>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down Expand Up @@ -244,17 +254,17 @@ export const PackagePoliciesPage = ({ packageInfo }: { packageInfo: PackageInfo
>
<EuiFlexItem grow={false}>
<EuiText size="m">
<h3>
<h4>
<FormattedMessage
id="xpack.fleet.epm.packageDetails.integrationList.agentBasedHeader"
defaultMessage="Agent-based"
/>
</h3>
</h4>
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiNotificationBadge color="subdued" size="m">
<h3>{agentBasedData?.total ?? 0}</h3>
<h4>{agentBasedData?.total ?? 0}</h4>
</EuiNotificationBadge>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { TableIcon } from '../../../../../../../components/package_icon';
import type { PackageListItem } from '../../../../../../../../common';
import { type UrlPagination, useLink, useAuthz } from '../../../../../../../hooks';
import type { InstalledPackageUIPackageListItem } from '../types';
import { useViewPolicies } from '../hooks/use_url_filters';

import { InstallationVersionStatus } from './installation_version_status';
import { DisabledWrapperTooltip } from './disabled_wrapper_tooltip';
Expand All @@ -39,6 +40,7 @@ export const InstalledIntegrationsTable: React.FunctionComponent<{
const authz = useAuthz();
const { getHref } = useLink();
const { selectedItems, setSelectedItems } = selection;
const { addViewPolicies } = useViewPolicies();

const { setPagination } = pagination;
const handleTablePagination = React.useCallback(
Expand Down Expand Up @@ -148,7 +150,7 @@ export const InstalledIntegrationsTable: React.FunctionComponent<{
}
disabled={isDisabled}
>
<EuiLink onClick={() => {}} disabled={isDisabled}>
<EuiLink onClick={() => addViewPolicies(item.name)} disabled={isDisabled}>
<FormattedMessage
id="xpack.fleet.epmInstalledIntegrations.viewAttachedPoliciesButton"
defaultMessage={
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import React from 'react';

import { EuiFlexGroup, EuiFlexItem, EuiText, useEuiPaddingCSS } from '@elastic/eui';

import type { PackageInfo } from '../../../../../../../../common';
import { IntegrationsStateContextProvider } from '../../../../../hooks';
import type { InstalledPackageUIPackageListItem } from '../types';
import { TableIcon } from '../../../../../../../components/package_icon';
import { PackagePoliciesPage } from '../../detail/policies';
import { useViewPolicies } from '../hooks/use_url_filters';

import { ResizablePanel } from './resizable_panel';

export const PackagePoliciesPanel: React.FunctionComponent<{
installedPackage: InstalledPackageUIPackageListItem;
}> = ({ installedPackage }) => {
const { addViewPolicies } = useViewPolicies();
const paddingStyles = useEuiPaddingCSS();
const cssStyles = [paddingStyles.s];

const title = (
<EuiFlexGroup gutterSize="s" alignItems="center">
<EuiFlexItem grow={false}>
<TableIcon
size="m"
icons={installedPackage.icons}
packageName={installedPackage.name}
version={installedPackage.version}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText size="s">{installedPackage.title}</EuiText>
</EuiFlexItem>
</EuiFlexGroup>
);

const content = (
<div css={cssStyles}>
<IntegrationsStateContextProvider>
<PackagePoliciesPage embedded={true} packageInfo={installedPackage as any as PackageInfo} />
</IntegrationsStateContextProvider>
</div>
);

return <ResizablePanel title={title} content={content} onClose={() => addViewPolicies('')} />;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import React, { useState, useCallback, useRef, useEffect } from 'react';
import {
EuiButtonIcon,
EuiFlexGroup,
EuiFlexItem,
EuiPortal,
useEuiPaddingCSS,
useEuiTheme,
} from '@elastic/eui';
import { EuiResizableButton, EuiPanel, keys } from '@elastic/eui';
import { css } from '@emotion/react';
import { i18n } from '@kbn/i18n';

const getMouseOrTouchY = (
e: TouchEvent | MouseEvent | React.MouseEvent | React.TouchEvent
): number => {
const x = (e as TouchEvent).targetTouches
? (e as TouchEvent).targetTouches[0].pageY
: (e as MouseEvent).pageY;
return -x;
};

export const ResizablePanelComponent: React.FunctionComponent<{
Copy link
Copy Markdown
Member Author

@nchaulet nchaulet Apr 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heavily inspired from https://eui.elastic.co/#/layout/resizable-container#custom-resize-logic,

I tried two approach:

  • this one a behaviour that looks like a flyout with an absolution position.
  • splitting the screen in two with a resizable container, this was harder to manage, as we needed to get fixed height for the container.

topBar: React.ReactNode;
children: React.ReactNode;
isCollapsed: boolean;
}> = ({ children, isCollapsed, topBar }) => {
const euiTheme = useEuiTheme();
const [panelHeight, setPanelHeight] = useState(300);
const initialPanelHeight = useRef(panelHeight);
const initialMouseY = useRef(0);

const normalizeHeight = useCallback(
(height: number) => {
const marginTop = parseInt(euiTheme.euiTheme.size.xxxxl, 10);
// Be sure to not go over top bar
return Math.min(Math.max(height, 0), window.innerHeight - marginTop * 3);
},
[euiTheme.euiTheme.size.xxxxl]
);

useEffect(() => {
function onResize() {
const normalizedHeight = normalizeHeight(panelHeight);
if (normalizedHeight !== panelHeight) {
setPanelHeight(normalizedHeight);
}
}
window.addEventListener('resize', onResize);
return () => {
window.removeEventListener('resize', onResize);
};
}, [panelHeight, normalizeHeight]);

const onMouseMove = useCallback(
(e: MouseEvent | TouchEvent) => {
const mouseOffset = getMouseOrTouchY(e) - initialMouseY.current;
const changedPanelHeight = initialPanelHeight.current + mouseOffset;

setPanelHeight(normalizeHeight(changedPanelHeight));
},
[normalizeHeight]
);

const onMouseUp = useCallback(() => {
initialMouseY.current = 0;

window.removeEventListener('mousemove', onMouseMove);
window.removeEventListener('mouseup', onMouseUp);
window.removeEventListener('touchmove', onMouseMove);
window.removeEventListener('touchend', onMouseUp);
}, [onMouseMove]);

const onMouseDown = useCallback(
(e: React.MouseEvent | React.TouchEvent) => {
initialMouseY.current = getMouseOrTouchY(e);
initialPanelHeight.current = panelHeight;

// Window event listeners instead of React events are used
// in case the user's mouse leaves the component
window.addEventListener('mousemove', onMouseMove);
window.addEventListener('mouseup', onMouseUp);
window.addEventListener('touchmove', onMouseMove);
window.addEventListener('touchend', onMouseUp);
},
[panelHeight, onMouseMove, onMouseUp]
);

const onKeyDown = useCallback(
(e: React.KeyboardEvent) => {
const KEYBOARD_OFFSET = 10;

switch (e.key) {
case keys.ARROW_UP:
e.preventDefault(); // Safari+VO will screen reader navigate off the button otherwise
setPanelHeight((currentPanelHeight) =>
normalizeHeight(currentPanelHeight + KEYBOARD_OFFSET)
);
break;
case keys.ARROW_DOWN:
e.preventDefault(); // Safari+VO will screen reader navigate off the button otherwise
setPanelHeight((currentPanelHeight) =>
normalizeHeight(currentPanelHeight - KEYBOARD_OFFSET)
);
}
},
[normalizeHeight]
);

return (
<EuiPanel
css={css`
position: fixed;
padding: 0;
bottom: 0;
background: ${euiTheme.euiTheme.colors.backgroundBasePlain};
`}
>
{topBar}
<EuiResizableButton
css={css`
position: absolute;
top: 0;
`}
onMouseDown={onMouseDown}
onTouchStart={onMouseDown}
onKeyDown={onKeyDown}
disabled={isCollapsed}
/>
<EuiPanel
paddingSize="none"
css={css`
background: ${euiTheme.euiTheme.colors.backgroundBasePlain};
height: ${isCollapsed ? 0 : panelHeight}px;
overflow: auto;
`}
>
{children}
</EuiPanel>
</EuiPanel>
);
};

export const ResizablePanel: React.FunctionComponent<{
title: React.ReactNode;
content: React.ReactNode;
onClose: () => void;
}> = ({ title, content, onClose }) => {
const euiTheme = useEuiTheme();

const paddingStyles = useEuiPaddingCSS();
const cssStyles = [paddingStyles.m];

const toggleCollpase = useCallback(() => {
setIsCollapsed((current) => !current);
}, []);

const [isCollapsed, setIsCollapsed] = useState(false);

const topBar = (
<EuiFlexGroup
css={css`
background: ${euiTheme.euiTheme.colors.backgroundBaseFormsPrepend};
${cssStyles}
`}
responsive={false}
gutterSize="s"
>
<EuiFlexItem>{title}</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiFlexGroup responsive={false} gutterSize="none">
<EuiFlexItem grow={false}>
{isCollapsed ? (
<EuiButtonIcon
key="arrowUp"
iconType="arrowUp"
aria-label={i18n.translate(
'xpack.fleet.integrationsResizablePanel.collapseButton',
{ defaultMessage: 'Collapse panel' }
)}
color="text"
onClick={toggleCollpase}
/>
) : (
<EuiButtonIcon
key="arrowDown"
iconType="arrowDown"
aria-label={i18n.translate(
'xpack.fleet.integrationsResizablePanel.collapseButton',
{ defaultMessage: 'Collapse panel' }
)}
color="text"
onClick={toggleCollpase}
/>
)}
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonIcon
iconType="cross"
aria-label={i18n.translate('xpack.fleet.integrationsResizablePanel.closeButton', {
defaultMessage: 'Close panel',
})}
color="text"
onClick={onClose}
/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
);

return (
<EuiPortal>
<ResizablePanelComponent isCollapsed={isCollapsed} topBar={topBar}>
{content}
</ResizablePanelComponent>
</EuiPortal>
);
};
Loading