[Security Solution][Endpoint][Admin] Endpoint Details UX Enhancements (…

…elastic#90870) (elastic#91600)
brokensound77 · Feb 17, 2021 · c5599fe · c5599fe
1 parent 06580cd
commit c5599fe
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 66 deletions.
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
@@ -43,6 +43,7 @@ export const initialEndpointListState: Immutable<EndpointState> = {
   endpointsTotalError: undefined,
   queryStrategyVersion: undefined,
   policyVersionInfo: undefined,
+  hostStatus: undefined,
 };
 
 /* eslint-disable-next-line complexity */
@@ -109,6 +110,7 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
       ...state,
       details: action.payload.metadata,
       policyVersionInfo: action.payload.policy_info,
+      hostStatus: action.payload.host_status,
       detailsLoading: false,
       detailsError: undefined,
     };

diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
@@ -16,6 +16,7 @@ import {
   HostPolicyResponseConfiguration,
   HostPolicyResponseActionStatus,
   MetadataQueryStrategyVersions,
+  HostStatus,
 } from '../../../../../common/endpoint/types';
 import { EndpointState, EndpointIndexUIQueryParams } from '../types';
 import { extractListPaginationParams } from '../../../common/routing';
@@ -224,6 +225,16 @@ export const showView: (state: EndpointState) => 'policy_response' | 'details' =
   }
 );
 
+/**
+ * Returns the Host Status which is connected the fleet agent
+ */
+export const hostStatusInfo: (state: Immutable<EndpointState>) => HostStatus = createSelector(
+  (state) => state.hostStatus,
+  (hostStatus) => {
+    return hostStatus ? hostStatus : HostStatus.ERROR;
+  }
+);
+
 /**
  * Returns the Policy Response overall status
  */

diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
@@ -13,6 +13,7 @@ import {
   AppLocation,
   PolicyData,
   MetadataQueryStrategyVersions,
+  HostStatus,
 } from '../../../../common/endpoint/types';
 import { ServerApiError } from '../../../common/types';
 import { GetPackagesResponse } from '../../../../../fleet/common';
@@ -79,6 +80,9 @@ export interface EndpointState {
   queryStrategyVersion?: MetadataQueryStrategyVersions;
   /** The policy IDs and revision number of the corresponding agent, and endpoint. May be more recent than what's running */
   policyVersionInfo?: HostInfo['policy_info'];
+  /** The status of the host, which is mapped to the Elastic Agent status in Fleet
+   */
+  hostStatus?: HostStatus;
 }
 
 /**

diff --git a/...ecurity_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx b/...ecurity_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
@@ -10,23 +10,27 @@ import {
   EuiDescriptionList,
   EuiHealth,
   EuiHorizontalRule,
-  EuiLink,
   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 } from '../../../../../../common/endpoint/types';
+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 } from '../host_constants';
+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 }: { details: HostMetadata; policyInfo?: HostInfo['policy_info'] }) => {
+  ({
+    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}}"
+                  values={{ hostStatus }}
+                />
+              </EuiText>
+            </EuiHealth>
+          ),
+        },
         {
           title: i18n.translate('xpack.securitySolution.endpoint.details.lastSeen', {
             defaultMessage: 'Last Seen',
           }),
           description: <FormattedDateAndTime date={new Date(details['@timestamp'])} />,
         },
       ];
-    }, [details]);
+    }, [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: (
-            <>
-              <EndpointPolicyLink
-                policyId={details.Endpoint.policy.applied.id}
-                data-test-subj="policyDetailsValue"
-              >
-                {details.Endpoint.policy.applied.name}
-              </EndpointPolicyLink>
+            <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: (
-            <EuiHealth
-              color={POLICY_STATUS_TO_HEALTH_COLOR[policyStatus] || 'subdued'}
-              data-test-subj="policyStatusHealth"
+            // https://github.com/elastic/eui/issues/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' }
+              )}
             >
-              {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
-              <EuiLink
-                data-test-subj="policyStatusValue"
-                href={policyResponseUri}
-                onClick={policyStatusClickHandler}
-              >
-                <EuiText size="m">
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.details.policyStatusValue"
-                    defaultMessage="{policyStatus, select, success {Success} warning {Warning} failure {Failed} other {Unknown}}"
-                    values={{ policyStatus }}
-                  />
-                </EuiText>
-              </EuiLink>
-            </EuiHealth>
+              <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="savedObjectsApp" className="linkToAppIcon" />
+            <EuiIcon type="managementApp" className="linkToAppIcon" />
             <FormattedMessage
               id="xpack.securitySolution.endpoint.details.linkToIngestTitle"
               defaultMessage="Reassign Policy"

diff --git a/...k/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx b/...k/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx
@@ -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="s"
+      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} />
+                <EndpointDetails
+                  details={details}
+                  policyInfo={policyInfo}
+                  hostStatus={hostStatus}
+                />
               </EuiFlyoutBody>
             </>
           )}
@@ -125,6 +132,14 @@ export const EndpointDetailsFlyout = memo(() => {
 
 EndpointDetailsFlyout.displayName = 'EndpointDetailsFlyout';
 
+const PolicyResponseFlyout = styled.div`
+  .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">
+      <EuiFlyoutBody
+        data-test-subj="endpointDetailsPolicyResponseFlyoutBody"
+        className="endpointDetailsPolicyResponseFlyoutBody"
+      >
         <EuiText data-test-subj="endpointDetailsPolicyResponseFlyoutTitle">
           <h4>
             <FormattedMessage
@@ -203,7 +221,7 @@ const PolicyResponseFlyoutPanel = memo<{
           />
         )}
       </EuiFlyoutBody>
-    </>
+    </PolicyResponseFlyout>
   );
 });
 

diff --git a/...security_solution/public/management/pages/endpoint_hosts/view/details/policy_response.tsx b/...security_solution/public/management/pages/endpoint_hosts/view/details/policy_response.tsx
@@ -29,7 +29,7 @@ import {
  */
 const PolicyResponseConfigAccordion = styled(EuiAccordion)`
   .euiAccordion__triggerWrapper {
-    padding: ${(props) => props.theme.eui.paddingSizes.s};
+    padding: ${(props) => props.theme.eui.paddingSizes.xs};
   }
 
   &.euiAccordion-isOpen {

diff --git a/...k/plugins/security_solution/public/management/pages/endpoint_hosts/view/host_constants.ts b/...k/plugins/security_solution/public/management/pages/endpoint_hosts/view/host_constants.ts
@@ -28,6 +28,15 @@ export const POLICY_STATUS_TO_HEALTH_COLOR = Object.freeze<
   unsupported: 'subdued',
 });
 
+export const POLICY_STATUS_TO_BADGE_COLOR = Object.freeze<
+  { [key in keyof typeof HostPolicyResponseActionStatus]: string }
+>({
+  success: 'secondary',
+  warning: 'warning',
+  failure: 'danger',
+  unsupported: 'default',
+});
+
 export const POLICY_STATUS_TO_TEXT = Object.freeze<
   { [key in keyof typeof HostPolicyResponseActionStatus]: string }
 >({