[7.x] [Security Solution] Eliminates a redundant external link icon (#94194)

x-pack/plugins/security_solution/public/common/components/links/index.test.tsx

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mount, shallow, ShallowWrapper } from 'enzyme';
+import { mount, shallow, ReactWrapper, ShallowWrapper } from 'enzyme';
 import React from 'react';
 import { removeExternalLinkText } from '../../../../common/test_utils';
 import { mountWithIntl } from '@kbn/test/jest';
@@ -121,11 +121,11 @@ describe('Custom Links', () => {
   describe('External Link', () => {
     const mockLink = 'https://www.virustotal.com/gui/search/';
     const mockLinkName = 'Link';
-    let wrapper: ShallowWrapper;
+    let wrapper: ReactWrapper | ShallowWrapper;
 
     describe('render', () => {
       beforeAll(() => {
-        wrapper = shallow(
+        wrapper = mount(
           <ExternalLink url={mockLink} idx={0} allItemsLimit={5} overflowIndexStart={5}>
             {mockLinkName}
           </ExternalLink>
@@ -137,11 +137,13 @@ describe('Custom Links', () => {
       });
 
       test('it renders ExternalLinkIcon', () => {
-        expect(wrapper.find('[data-test-subj="externalLinkIcon"]').exists()).toBeTruthy();
+        expect(wrapper.find('span [data-euiicon-type="popout"]').length).toBe(1);
       });
 
       test('it renders correct url', () => {
-        expect(wrapper.find('[data-test-subj="externalLink"]').prop('href')).toEqual(mockLink);
+        expect(wrapper.find('[data-test-subj="externalLink"]').first().prop('href')).toEqual(
+          mockLink
+        );
       });
 
       test('it renders comma if id is given', () => {
@@ -435,14 +437,14 @@ describe('Custom Links', () => {
 
       test('it renders correct number of external icons by default', () => {
         const wrapper = mountWithIntl(<ReputationLink domain={'192.0.2.0'} />);
-        expect(wrapper.find('[data-test-subj="externalLinkIcon"]')).toHaveLength(5);
+        expect(wrapper.find('span [data-euiicon-type="popout"]')).toHaveLength(5);
       });
 
       test('it renders correct number of external icons', () => {
         const wrapper = mountWithIntl(
           <ReputationLink domain={'192.0.2.0'} overflowIndexStart={1} />
         );
-        expect(wrapper.find('[data-test-subj="externalLinkIcon"]')).toHaveLength(1);
+        expect(wrapper.find('span [data-euiicon-type="popout"]')).toHaveLength(1);
       });
     });
   });

x-pack/plugins/security_solution/public/common/components/links/index.tsx

@@ -39,7 +39,6 @@ import {
 } from '../../../../common/search_strategy/security_solution/network';
 import { useUiSetting$, useKibana } from '../../lib/kibana';
 import { isUrlInvalid } from '../../utils/validators';
-import { ExternalLinkIcon } from '../external_link_icon';
 
 import * as i18n from './translations';
 import { SecurityPageName } from '../../../app/types';
@@ -54,6 +53,13 @@ export const LinkAnchor: React.FC<EuiLinkProps> = ({ children, ...props }) => (
   <EuiLink {...props}>{children}</EuiLink>
 );
 
+export const PortContainer = styled.div`
+  & svg {
+    position: relative;
+    top: -1px;
+  }
+`;
+
 // Internal Links
 const HostDetailsLinkComponent: React.FC<{
   children?: React.ReactNode;
@@ -112,11 +118,12 @@ export const ExternalLink = React.memo<{
     const inAllowlist = allowedUrlSchemes.some((scheme) => url.indexOf(scheme) === 0);
     return url && inAllowlist && !isUrlInvalid(url) && children ? (
       <EuiToolTip content={url} position="top" data-test-subj="externalLinkTooltip">
-        <EuiLink href={url} target="_blank" rel="noopener" data-test-subj="externalLink">
-          {children}
-          <ExternalLinkIcon data-test-subj="externalLinkIcon" />
+        <>
+          <EuiLink href={url} target="_blank" rel="noopener" data-test-subj="externalLink">
+            {children}
+          </EuiLink>
           {!isNil(idx) && idx < lastIndexToShow && <Comma data-test-subj="externalLinkComma" />}
-        </EuiLink>
+        </>
       </EuiToolTip>
     ) : null;
   }
@@ -229,15 +236,17 @@ export const PortOrServiceNameLink = React.memo<{
   children?: React.ReactNode;
   portOrServiceName: number | string;
 }>(({ children, portOrServiceName }) => (
-  <EuiLink
-    data-test-subj="port-or-service-name-link"
-    href={`https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=${encodeURIComponent(
-      String(portOrServiceName)
-    )}`}
-    target="_blank"
-  >
-    {children ? children : portOrServiceName}
-  </EuiLink>
+  <PortContainer>
+    <EuiLink
+      data-test-subj="port-or-service-name-link"
+      href={`https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=${encodeURIComponent(
+        String(portOrServiceName)
+      )}`}
+      target="_blank"
+    >
+      {children ? children : portOrServiceName}
+    </EuiLink>
+  </PortContainer>
 ));
 
 PortOrServiceNameLink.displayName = 'PortOrServiceNameLink';

x-pack/plugins/security_solution/public/network/components/port/index.test.tsx

@@ -60,13 +60,13 @@ describe('Port', () => {
     );
   });
 
-  test('it renders an external link', () => {
+  test('it renders only one external link icon', () => {
     const wrapper = mount(
       <TestProviders>
         <Port contextId="test" eventId="abcd" fieldName="destination.port" value="443" />
       </TestProviders>
     );
 
-    expect(wrapper.find('[data-test-subj="external-link-icon"]').first().exists()).toBe(true);
+    expect(wrapper.find('span [data-euiicon-type="popout"]').length).toBe(1);
   });
 });

x-pack/plugins/security_solution/public/network/components/port/index.tsx

@@ -9,7 +9,6 @@ import React from 'react';
 
 import { DefaultDraggable } from '../../../common/components/draggables';
 import { getEmptyValue } from '../../../common/components/empty_value';
-import { ExternalLinkIcon } from '../../../common/components/external_link_icon';
 import { PortOrServiceNameLink } from '../../../common/components/links';
 
 export const CLIENT_PORT_FIELD_NAME = 'client.port';
@@ -40,7 +39,6 @@ export const Port = React.memo<{
     value={value}
   >
     <PortOrServiceNameLink portOrServiceName={value || getEmptyValue()} />
-    <ExternalLinkIcon />
   </DefaultDraggable>
 ));
 

x-pack/plugins/security_solution/public/timelines/components/certificate_fingerprint/index.tsx

@@ -10,7 +10,6 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { DraggableBadge } from '../../../common/components/draggables';
-import { ExternalLinkIcon } from '../../../common/components/external_link_icon';
 import { CertificateFingerprintLink } from '../../../common/components/links';
 
 import * as i18n from './translations';
@@ -61,7 +60,6 @@ export const CertificateFingerprint = React.memo<{
         {certificateType === 'client' ? i18n.CLIENT_CERT : i18n.SERVER_CERT}
       </FingerprintLabel>
       <CertificateFingerprintLink certificateFingerprint={value || ''} />
-      <ExternalLinkIcon />
     </DraggableBadge>
   );
 });

x-pack/plugins/security_solution/public/timelines/components/ja3_fingerprint/index.tsx

@@ -9,7 +9,6 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { DraggableBadge } from '../../../common/components/draggables';
-import { ExternalLinkIcon } from '../../../common/components/external_link_icon';
 import { Ja3FingerprintLink } from '../../../common/components/links';
 
 import * as i18n from './translations';
@@ -45,7 +44,6 @@ export const Ja3Fingerprint = React.memo<{
       {i18n.JA3_FINGERPRINT_LABEL}
     </Ja3FingerprintLabel>
     <Ja3FingerprintLink data-test-subj="ja3-hash-link" ja3Fingerprint={value || ''} />
-    <ExternalLinkIcon />
   </DraggableBadge>
 ));
 

x-pack/plugins/security_solution/public/timelines/components/row_renderers_browser/catalog/index.tsx

@@ -7,7 +7,6 @@
 
 import { EuiLink } from '@elastic/eui';
 import React from 'react';
-import { ExternalLinkIcon } from '../../../../common/components/external_link_icon';
 
 import { RowRendererId } from '../../../../../common/types/timeline';
 import {
@@ -37,7 +36,6 @@ const Link = ({ children, url }: { children: React.ReactNode; url: string }) =>
     data-test-subj="externalLink"
   >
     {children}
-    <ExternalLinkIcon data-test-subj="externalLinkIcon" />
   </EuiLink>
 );
 

x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/suricata/suricata_refs.tsx

@@ -9,7 +9,6 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
 
-import { ExternalLinkIcon } from '../../../../../../common/components/external_link_icon';
 import { getLinksFromSignature } from './suricata_links';
 
 const LinkEuiFlexItem = styled(EuiFlexItem)`
@@ -27,7 +26,6 @@ export const SuricataRefs = React.memo<{ signatureId: number }>(({ signatureId }
           <EuiLink href={link} color="subdued" target="_blank">
             {link}
           </EuiLink>
-          <ExternalLinkIcon />
         </LinkEuiFlexItem>
       ))}
     </EuiFlexGroup>