[Security Solution][Endpoint][Admin] Endpoint Details UX Enhancements #90870
+137
−66
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,23 +10,27 @@ import { | |
| EuiDescriptionList, | ||
| EuiHealth, | ||
| EuiHorizontalRule, | ||
| EuiListGroup, | ||
| EuiListGroupItem, | ||
| EuiIcon, | ||
| EuiText, | ||
| EuiFlexGroup, | ||
| EuiFlexItem, | ||
| EuiBadge, | ||
| } from '@elastic/eui'; | ||
| import React, { memo, useMemo } from 'react'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import { isPolicyOutOfDate } from '../../utils'; | ||
| import { HostInfo, HostMetadata, HostStatus } from '../../../../../../common/endpoint/types'; | ||
| import { useEndpointSelector, useAgentDetailsIngestUrl } from '../hooks'; | ||
| import { useNavigateToAppEventHandler } from '../../../../../common/hooks/endpoint/use_navigate_to_app_event_handler'; | ||
| import { policyResponseStatus, uiQueryParams } from '../../store/selectors'; | ||
| import { | ||
| POLICY_STATUS_TO_HEALTH_COLOR, | ||
| POLICY_STATUS_TO_BADGE_COLOR, | ||
| HOST_STATUS_TO_HEALTH_COLOR, | ||
| } from '../host_constants'; | ||
| import { FormattedDateAndTime } from '../../../../../common/components/endpoint/formatted_date_time'; | ||
| import { useNavigateByRouterEventHandler } from '../../../../../common/hooks/endpoint/use_navigate_by_router_event_handler'; | ||
| import { LinkToApp } from '../../../../../common/components/endpoint/link_to_app'; | ||
|
|
@@ -48,6 +52,7 @@ const LinkToExternalApp = styled.div` | |
| margin-top: ${(props) => props.theme.eui.ruleMargins.marginMedium}; | ||
| .linkToAppIcon { | ||
| margin-right: ${(props) => props.theme.eui.ruleMargins.marginXSmall}; | ||
| vertical-align: top; | ||
| } | ||
| .linkToAppPopoutIcon { | ||
| margin-left: ${(props) => props.theme.eui.ruleMargins.marginXSmall}; | ||
|
|
@@ -57,7 +62,15 @@ const LinkToExternalApp = styled.div` | |
| const openReassignFlyoutSearch = '?openReassignFlyout=true'; | ||
|
|
||
| export const EndpointDetails = memo( | ||
| ({ | ||
| details, | ||
| policyInfo, | ||
| hostStatus, | ||
| }: { | ||
| details: HostMetadata; | ||
| policyInfo?: HostInfo['policy_info']; | ||
| hostStatus: HostStatus; | ||
| }) => { | ||
| const agentId = details.elastic.agent.id; | ||
| const { | ||
| url: agentDetailsUrl, | ||
|
|
@@ -78,14 +91,33 @@ export const EndpointDetails = memo( | |
| }), | ||
| description: details.host.os.full, | ||
| }, | ||
| { | ||
| title: i18n.translate('xpack.securitySolution.endpoint.details.agentStatus', { | ||
| defaultMessage: 'Agent Status', | ||
| }), | ||
| description: ( | ||
| <EuiHealth | ||
| color={HOST_STATUS_TO_HEALTH_COLOR[hostStatus]} | ||
| data-test-subj="agentStatusHealth" | ||
| > | ||
| <EuiText size="m"> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.endpoint.list.hostStatusValue" | ||
| defaultMessage="{hostStatus, select, online {Online} error {Error} unenrolling {Unenrolling} other {Offline}}" | ||
|
There was a problem hiding this comment. So here we use There was a problem hiding this comment. yup -- this is just following the pattern from the endpoint list, since it already shows Agent status. i'm not sure if we wanted to further differentiate things. |
||
| values={{ hostStatus }} | ||
| /> | ||
| </EuiText> | ||
| </EuiHealth> | ||
| ), | ||
| }, | ||
| { | ||
| title: i18n.translate('xpack.securitySolution.endpoint.details.lastSeen', { | ||
| defaultMessage: 'Last Seen', | ||
| }), | ||
| description: <FormattedDateAndTime date={new Date(details['@timestamp'])} />, | ||
| }, | ||
| ]; | ||
| }, [details, hostStatus]); | ||
|
|
||
| const [policyResponseUri, policyResponseRoutePath] = useMemo(() => { | ||
| // eslint-disable-next-line @typescript-eslint/naming-convention | ||
|
|
@@ -135,13 +167,15 @@ export const EndpointDetails = memo( | |
| defaultMessage: 'Integration Policy', | ||
| }), | ||
| description: ( | ||
| <EuiFlexGroup alignItems="center"> | ||
| <EuiFlexItem grow={false}> | ||
| <EndpointPolicyLink | ||
| policyId={details.Endpoint.policy.applied.id} | ||
| data-test-subj="policyDetailsValue" | ||
| > | ||
| {details.Endpoint.policy.applied.name} | ||
| </EndpointPolicyLink> | ||
| </EuiFlexItem> | ||
| <EuiFlexGroup gutterSize="s" alignItems="baseline"> | ||
| {details.Endpoint.policy.applied.endpoint_policy_version && ( | ||
| <EuiFlexItem grow={false}> | ||
|
|
@@ -167,33 +201,34 @@ export const EndpointDetails = memo( | |
| </EuiFlexItem> | ||
| )} | ||
| </EuiFlexGroup> | ||
| </EuiFlexGroup> | ||
| ), | ||
| }, | ||
| { | ||
| title: i18n.translate('xpack.securitySolution.endpoint.details.policyStatus', { | ||
| defaultMessage: 'Policy Response', | ||
| }), | ||
| description: ( | ||
| /** EuiBadge requires additional unnecessary props when the href prop is defined */ | ||
|
There was a problem hiding this comment. what does it require? Is it possible to pass empty values so that we can avoid the There was a problem hiding this comment. so there's actually a bug where euibadge uses the wrong type when both an onclick and an href are used, it's being tracked in this ticket: elastic/eui#4530 |
||
| // @ts-ignore | ||
| <EuiBadge | ||
| color={POLICY_STATUS_TO_BADGE_COLOR[policyStatus] || 'default'} | ||
| data-test-subj="policyStatusValue" | ||
| href={policyResponseUri} | ||
| onClick={policyStatusClickHandler} | ||
| onClickAriaLabel={i18n.translate( | ||
| 'xpack.securitySolution.endpoint.details.policyStatus', | ||
| { defaultMessage: 'Policy Response' } | ||
| )} | ||
| > | ||
| <EuiText size="m"> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.endpoint.details.policyStatusValue" | ||
| defaultMessage="{policyStatus, select, success {Success} warning {Warning} failure {Failed} other {Unknown}}" | ||
| values={{ policyStatus }} | ||
| /> | ||
| </EuiText> | ||
| </EuiBadge> | ||
| ), | ||
| }, | ||
| ]; | ||
|
|
@@ -248,7 +283,7 @@ export const EndpointDetails = memo( | |
| onClick={handleReassignEndpointsClick} | ||
| data-test-subj="endpointDetailsLinkToIngest" | ||
| > | ||
| <EuiIcon type="managementApp" className="linkToAppIcon" /> | ||
| <FormattedMessage | ||
| id="xpack.securitySolution.endpoint.details.linkToIngestTitle" | ||
| defaultMessage="Reassign Policy" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ import { | |
| import { useHistory } from 'react-router-dom'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import styled from 'styled-components'; | ||
| import { useToasts } from '../../../../../common/lib/kibana'; | ||
| import { useEndpointSelector } from '../hooks'; | ||
| import { urlFromQueryParams } from '../url_from_query_params'; | ||
|
|
@@ -36,6 +37,7 @@ import { | |
| policyResponseLoading, | ||
| policyResponseTimestamp, | ||
| policyVersionInfo, | ||
| hostStatusInfo, | ||
| } from '../../store/selectors'; | ||
| import { EndpointDetails } from './endpoint_details'; | ||
| import { PolicyResponse } from './policy_response'; | ||
|
|
@@ -57,6 +59,7 @@ export const EndpointDetailsFlyout = memo(() => { | |
| } = queryParams; | ||
| const details = useEndpointSelector(detailsData); | ||
| const policyInfo = useEndpointSelector(policyVersionInfo); | ||
| const hostStatus = useEndpointSelector(hostStatusInfo); | ||
| const loading = useEndpointSelector(detailsLoading); | ||
| const error = useEndpointSelector(detailsError); | ||
| const show = useEndpointSelector(showView); | ||
|
|
@@ -83,7 +86,7 @@ export const EndpointDetailsFlyout = memo(() => { | |
| onClose={handleFlyoutClose} | ||
| style={{ zIndex: 4001 }} | ||
| data-test-subj="endpointDetailsFlyout" | ||
| size="m" | ||
| > | ||
| <EuiFlyoutHeader hasBorder> | ||
| {loading ? ( | ||
|
|
@@ -112,7 +115,11 @@ export const EndpointDetailsFlyout = memo(() => { | |
| {show === 'details' && ( | ||
| <> | ||
| <EuiFlyoutBody data-test-subj="endpointDetailsFlyoutBody"> | ||
| <EndpointDetails | ||
| details={details} | ||
| policyInfo={policyInfo} | ||
| hostStatus={hostStatus} | ||
| /> | ||
| </EuiFlyoutBody> | ||
| </> | ||
| )} | ||
|
|
@@ -125,6 +132,14 @@ export const EndpointDetailsFlyout = memo(() => { | |
|
|
||
| EndpointDetailsFlyout.displayName = 'EndpointDetailsFlyout'; | ||
|
|
||
| const PolicyResponseFlyout = styled.div` | ||
|
There was a problem hiding this comment. 😨 cc:/ @bfishel There was a problem hiding this comment. there is a lot of space in between the back to endpoint details link and the beginning of the policy response, which is why the padding adjusted was added |
||
| .endpointDetailsPolicyResponseFlyoutBody { | ||
| .euiFlyoutBody__overflowContent { | ||
| padding-top: 0; | ||
| } | ||
| } | ||
| `; | ||
|
|
||
| const PolicyResponseFlyoutPanel = memo<{ | ||
| hostMeta: HostMetadata; | ||
| }>(({ hostMeta }) => { | ||
|
|
@@ -165,12 +180,15 @@ const PolicyResponseFlyoutPanel = memo<{ | |
| }, [backToDetailsClickHandler, detailsUri]); | ||
|
|
||
| return ( | ||
| <PolicyResponseFlyout> | ||
| <FlyoutSubHeader | ||
| backButton={backButtonProp} | ||
| data-test-subj="endpointDetailsPolicyResponseFlyoutHeader" | ||
| /> | ||
| <EuiFlyoutBody | ||
| data-test-subj="endpointDetailsPolicyResponseFlyoutBody" | ||
| className="endpointDetailsPolicyResponseFlyoutBody" | ||
| > | ||
| <EuiText data-test-subj="endpointDetailsPolicyResponseFlyoutTitle"> | ||
| <h4> | ||
| <FormattedMessage | ||
|
|
@@ -203,7 +221,7 @@ const PolicyResponseFlyoutPanel = memo<{ | |
| /> | ||
| )} | ||
| </EuiFlyoutBody> | ||
| </PolicyResponseFlyout> | ||
| ); | ||
| }); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious: was this missing? or was it introduced recently and part of an merge upstream?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i believe it was in the hostInfo type (aka the type for the endpoint list) but not for the details