Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sub-menus to Resolver node (for 75% zoom) #63476

Merged
merged 13 commits into from
Apr 20, 2020
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ type ResolverColorNames =
| 'activeNoWarning'
| 'activeWarning'
| 'fullLabelBackground'
| 'inertDescription';
| 'inertDescription'
| 'labelBackgroundTerminatedProcess'
| 'labelBackgroundTerminatedTrigger'
| 'labelBackgroundRunningProcess'
| 'labelBackgroundRunningTrigger';

export const NamedColors: Record<ResolverColorNames, string> = {
ok: saturate(0.5, resolverPalette.temperatures[0]),
Expand All @@ -70,6 +74,10 @@ export const NamedColors: Record<ResolverColorNames, string> = {
activeNoWarning: '#0078FF',
activeWarning: '#C61F38',
fullLabelBackground: '#3B3C41',
labelBackgroundTerminatedProcess: '#8A96A8',
labelBackgroundTerminatedTrigger: '#8A96A8',
labelBackgroundRunningProcess: '#8A96A8',
labelBackgroundRunningTrigger: '#8A96A8',
inertDescription: '#747474',
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@
import React, { useCallback, useMemo } from 'react';
import styled from 'styled-components';
import { i18n } from '@kbn/i18n';
import { htmlIdGenerator, EuiKeyboardAccessible } from '@elastic/eui';
import {
htmlIdGenerator,
EuiKeyboardAccessible,
EuiButton,
EuiFlexGroup,
EuiFlexItem,
} from '@elastic/eui';
import { useSelector } from 'react-redux';
import { applyMatrix3 } from '../lib/vector2';
import { Vector2, Matrix3, AdjacentProcessMap, ResolverProcessType } from '../types';
Expand All @@ -21,40 +27,78 @@ import * as selectors from '../store/selectors';
const nodeAssets = {
runningProcessCube: {
cubeSymbol: `#${SymbolIds.runningProcessCube}`,
labelBackground: NamedColors.fullLabelBackground,
labelBackground: NamedColors.labelBackgroundRunningProcess,
descriptionFill: NamedColors.empty,
descriptionText: i18n.translate('xpack.endpoint.resolver.runningProcess', {
defaultMessage: 'Running Process',
}),
},
runningTriggerCube: {
cubeSymbol: `#${SymbolIds.runningTriggerCube}`,
labelBackground: NamedColors.fullLabelBackground,
labelBackground: NamedColors.labelBackgroundRunningTrigger,
descriptionFill: NamedColors.empty,
descriptionText: i18n.translate('xpack.endpoint.resolver.runningTrigger', {
defaultMessage: 'Running Trigger',
}),
},
terminatedProcessCube: {
cubeSymbol: `#${SymbolIds.terminatedProcessCube}`,
labelBackground: NamedColors.fullLabelBackground,
labelBackground: NamedColors.labelBackgroundTerminatedProcess,
descriptionFill: NamedColors.empty,
descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedProcess', {
defaultMessage: 'Terminated Process',
}),
},
terminatedTriggerCube: {
cubeSymbol: `#${SymbolIds.terminatedTriggerCube}`,
labelBackground: NamedColors.fullLabelBackground,
labelBackground: NamedColors.labelBackgroundTerminatedTrigger,
descriptionFill: NamedColors.empty,
descriptionText: i18n.translate('xpack.endpoint.resolver.terminatedTrigger', {
defaultMessage: 'Terminated Trigger',
}),
},
};

const ChildEventsButton = React.memo(() => {
return (
<EuiButton
onClick={useCallback((clickEvent: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
clickEvent.preventDefault();
clickEvent.stopPropagation();
}, [])}
color="ghost"
size="s"
iconType="arrowDown"
iconSide="right"
tabIndex={-1}
>
{i18n.translate('xpack.endpoint.resolver.relatedEvents', {
defaultMessage: 'Events',
})}
</EuiButton>
);
});

const RelatedAlertsButton = React.memo(() => {
return (
<EuiButton
onClick={useCallback((clickEvent: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
clickEvent.preventDefault();
clickEvent.stopPropagation();
}, [])}
color="ghost"
size="s"
tabIndex={-1}
>
{i18n.translate('xpack.endpoint.resolver.relatedAlerts', {
defaultMessage: 'Related Alerts',
})}
</EuiButton>
);
});

/**
* A placeholder view for a process node.
* An artefact that represents a process node.
*/
export const ProcessEventDot = styled(
React.memo(
Expand Down Expand Up @@ -184,6 +228,7 @@ export const ProcessEventDot = styled(
},
[animationTarget, dispatch, nodeId]
);

/* eslint-disable jsx-a11y/click-events-have-key-events */
/**
* Key event handling (e.g. 'Enter'/'Space') is provisioned by the `EuiKeyboardAccessible` component
Expand Down Expand Up @@ -256,13 +301,17 @@ export const ProcessEventDot = styled(
</svg>
<div
style={{
display: 'flex',
flexFlow: 'column',
left: '25%',
top: '30%',
position: 'absolute',
width: '50%',
color: 'white',
color: NamedColors.full,
fontSize: `${scaledTypeSize}px`,
lineHeight: '140%',
backgroundColor: NamedColors.resolverBackground,
padding: '.25rem',
}}
>
<div
Expand All @@ -271,33 +320,50 @@ export const ProcessEventDot = styled(
textTransform: 'uppercase',
letterSpacing: '-0.01px',
backgroundColor: NamedColors.resolverBackground,
lineHeight: '1.2',
lineHeight: '1',
fontWeight: 'bold',
fontSize: '.5em',
fontSize: '0.8rem',
width: '100%',
margin: '0 0 .05em 0',
margin: '0',
textAlign: 'left',
padding: '0',
color: NamedColors.empty,
}}
>
{descriptionText}
</div>
<div
className={magFactorX >= 2 ? 'euiButton' : 'euiButton euiButton--small'}
data-test-subject="nodeLabel"
id={labelId}
style={{
backgroundColor: labelBackground,
padding: '.15em 0',
padding: '.15rem 0',
textAlign: 'center',
maxWidth: '100%',
maxWidth: '20rem',
minWidth: '12rem',
width: '60%',
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
contain: 'content',
margin: '.25rem 0 .35rem 0',
}}
>
{eventModel.eventName(event)}
<span className="euiButton__content">
<span className="euiButton__text">{eventModel.eventName(event)}</span>
</span>
</div>
{magFactorX >= 2 && (
bkimmel marked this conversation as resolved.
Show resolved Hide resolved
<EuiFlexGroup justifyContent="flexStart" gutterSize="xs">
<EuiFlexItem grow={false}>
<RelatedAlertsButton />
</EuiFlexItem>
<EuiFlexItem grow={false}>
<ChildEventsButton />
</EuiFlexItem>
</EuiFlexGroup>
)}
</div>
</div>
</EuiKeyboardAccessible>
Expand All @@ -317,6 +383,8 @@ export const ProcessEventDot = styled(
white-space: nowrap;
will-change: left, top, width, height;
contain: strict;
min-width: 280px;
min-height: 90px;

//dasharray & dashoffset should be equal to "pull" the stroke back
//when it is transitioned.
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/endpoint/scripts/resolver_generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async function main() {
alertIndex: {
alias: 'ai',
describe: 'index to store alerts in',
default: '.alerts-endpoint-000001',
default: 'events-endpoint-1',
Copy link
Contributor

Choose a reason for hiding this comment

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

@bkimmel I agree that we should probably keep this as events-endpoint-1 since that's what the app is looking for in master.

@elastic/endpoint-response are you ok with this?

type: 'string',
},
eventIndex: {
Expand Down