[Security Solution] Updates the text in the Actions log and Status command to match UX #135935
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /* | ||
| * 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 { i18n } from '@kbn/i18n'; | ||
| import { HostStatus } from '../../../../common/endpoint/types'; | ||
|
|
||
| export const agentStatusText = (hostStatus: HostStatus) => { | ||
|
There was a problem hiding this comment. Since there is no JSX code here this file can be a There was a problem hiding this comment. Name suggestion: |
||
| return i18n.translate('xpack.securitySolution.endpoint.list.hostStatusValue', { | ||
| defaultMessage: | ||
| '{hostStatus, select, healthy {Healthy} unhealthy {Unhealthy} updating {Updating} offline {Offline} inactive {Inactive} unenrolled {Unenrolled} other {Unhealthy}}', | ||
| values: { hostStatus }, | ||
| }); | ||
| }; | ||
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
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 |
|---|---|---|
|
|
@@ -6,8 +6,7 @@ | |
| */ | ||
|
|
||
| import React, { memo, useEffect, useMemo } from 'react'; | ||
| import { EuiDescriptionList } from '@elastic/eui'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import type { HttpFetchError } from '@kbn/core/public'; | ||
| import { v4 as uuidV4 } from 'uuid'; | ||
|
|
@@ -16,11 +15,12 @@ import type { EndpointCommandDefinitionMeta } from './types'; | |
| import { EndpointHostIsolationStatusProps } from '../../../common/components/endpoint/host_isolation'; | ||
| import { useGetEndpointPendingActionsSummary } from '../../hooks/endpoint/use_get_endpoint_pending_actions_summary'; | ||
| import { FormattedDate } from '../../../common/components/formatted_date'; | ||
| import { useGetEndpointDetails } from '../../hooks'; | ||
| import type { CommandExecutionComponentProps } from '../console/types'; | ||
| import { FormattedError } from '../formatted_error'; | ||
| import { ConsoleCodeBlock } from '../console/components/console_code_block'; | ||
| import { POLICY_STATUS_TO_TEXT } from '../../pages/endpoint_hosts/view/host_constants'; | ||
| import { agentStatusText } from '../../../common/components/endpoint/agent_status_text'; | ||
|
|
||
| export const EndpointStatusActionResult = memo< | ||
| CommandExecutionComponentProps< | ||
|
|
@@ -50,7 +50,7 @@ export const EndpointStatusActionResult = memo< | |
|
|
||
| const { data: fetchedPendingActionsSummary } = useGetEndpointPendingActionsSummary([endpointId], { | ||
| enabled: isPending, | ||
| queryKey: [queryKey, endpointId], | ||
| }); | ||
|
|
||
| const pendingIsolationActions = useMemo< | ||
|
|
@@ -127,50 +127,83 @@ export const EndpointStatusActionResult = memo< | |
| return <ResultComponent showAs="pending" />; | ||
| } | ||
|
|
||
| const statusDescriptionList = () => { | ||
|
There was a problem hiding this comment. I would suggest you move this inside a |
||
| const agentStatus = () => { | ||
| let isolateStatus = ''; | ||
|
|
||
| if (pendingIsolationActions.pendingIsolate > 0) { | ||
|
There was a problem hiding this comment. Let's not hold up on this PR, but this logic here for actions no longer makes sense now that we introduced more actions. Not sure that (FYI: I also found that our component that normally show the isolation status/pending actions is not showing all pending actions in the tooltip - opening issue now) |
||
| isolateStatus = i18n.translate( | ||
| 'xpack.securitySolution.endpointResponseActions.status.isolating', | ||
| { | ||
| defaultMessage: 'Isolating', | ||
| } | ||
| ); | ||
| } else if (pendingIsolationActions.pendingUnIsolate > 0) { | ||
| isolateStatus = i18n.translate( | ||
| 'xpack.securitySolution.endpointResponseActions.status.releasing', | ||
| { | ||
| defaultMessage: 'Releasing', | ||
| } | ||
| ); | ||
| } else if (endpointDetails.metadata.Endpoint.state?.isolation) { | ||
| isolateStatus = i18n.translate( | ||
| 'xpack.securitySolution.endpointResponseActions.status.isolated', | ||
| { | ||
| defaultMessage: 'Isolated', | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| return `${agentStatusText(endpointDetails.host_status)}${ | ||
| isolateStatus.length > 0 ? ` - ${isolateStatus}` : '' | ||
| }`; | ||
| }; | ||
|
|
||
| const statusData = [ | ||
|
There was a problem hiding this comment. This has also a dynamic result, move it in a There was a problem hiding this comment. @dasansol92 if I wrap the containing function into the There was a problem hiding this comment. Ohh! You are totally right! Github diff hided me the |
||
| { | ||
| title: ( | ||
| <ConsoleCodeBlock> | ||
| {i18n.translate('xpack.securitySolution.endpointResponseActions.status.agentStatus', { | ||
| defaultMessage: 'Agent status', | ||
| })} | ||
| </ConsoleCodeBlock> | ||
| ), | ||
| description: <ConsoleCodeBlock>{agentStatus()}</ConsoleCodeBlock>, | ||
| }, | ||
| { | ||
| title: ( | ||
| <ConsoleCodeBlock> | ||
| {i18n.translate('xpack.securitySolution.endpointResponseActions.status.version', { | ||
| defaultMessage: 'Version', | ||
| })} | ||
| </ConsoleCodeBlock> | ||
| ), | ||
| description: endpointDetails.metadata.agent.version, | ||
| }, | ||
| { | ||
| title: ( | ||
| <ConsoleCodeBlock> | ||
| {i18n.translate('xpack.securitySolution.endpointResponseActions.status.policyStatus', { | ||
| defaultMessage: 'Policy status', | ||
| })} | ||
| </ConsoleCodeBlock> | ||
| ), | ||
| description: ( | ||
| <ConsoleCodeBlock> | ||
| {POLICY_STATUS_TO_TEXT[endpointDetails.metadata.Endpoint.policy.applied.status]} | ||
| </ConsoleCodeBlock> | ||
| ), | ||
| }, | ||
| { | ||
| title: ( | ||
| <ConsoleCodeBlock> | ||
| {i18n.translate('xpack.securitySolution.endpointResponseActions.status.lastActive', { | ||
| defaultMessage: 'Last active', | ||
| })} | ||
| </ConsoleCodeBlock> | ||
| ), | ||
| description: ( | ||
| <ConsoleCodeBlock> | ||
| <FormattedDate | ||
| fieldName={i18n.translate( | ||
| 'xpack.securitySolution.endpointResponseActions.status.lastActive', | ||
|
|
@@ -179,10 +212,21 @@ export const EndpointStatusActionResult = memo< | |
| value={endpointDetails.metadata['@timestamp']} | ||
| className="eui-textTruncate" | ||
| /> | ||
| </ConsoleCodeBlock> | ||
| ), | ||
| }, | ||
| ]; | ||
| return ( | ||
| <EuiDescriptionList | ||
| compressed | ||
| type="column" | ||
| className="descriptionList-20_80" | ||
| listItems={statusData} | ||
| data-test-subj={'agent-status-console-output'} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| return <ResultComponent showTitle={false}>{statusDescriptionList()}</ResultComponent>; | ||
| }); | ||
| EndpointStatusActionResult.displayName = 'EndpointStatusActionResult'; | ||
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.