From 60a9058b3bb5d2e42dd3966411d59611fa7f8ebc Mon Sep 17 00:00:00 2001
From: Yara Tercero <yara.tercero@elastic.co>
Date: Wed, 29 Jul 2020 17:37:31 -0400
Subject: [PATCH 1/2] make viewer nested entries appear nicer

---
 .../viewer/exception_item/exception_entries.tsx | 16 ++++++++++++----
 .../exceptions/viewer/helpers.test.tsx          | 17 ++---------------
 .../components/exceptions/viewer/helpers.tsx    |  5 +----
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
index 7069e99943f7b..bcc4adf54c9d7 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_entries.tsx
@@ -52,6 +52,14 @@ const MyActionButton = styled(EuiFlexItem)`
   align-self: flex-end;
 `;
 
+const MyNestedValueContainer = styled.div`
+  margin-left: ${({ theme }) => theme.eui.euiSizeL};
+`;
+
+const MyNestedValue = styled.span`
+  margin-left: ${({ theme }) => theme.eui.euiSizeS};
+`;
+
 interface ExceptionEntriesComponentProps {
   entries: FormattedEntry[];
   disableDelete: boolean;
@@ -78,10 +86,10 @@ const ExceptionEntriesComponent = ({
         render: (value: string | null, data: FormattedEntry) => {
           if (value != null && data.isNested) {
             return (
-              <>
-                <EuiIconTip type="grabHorizontal" size="m" />
-                {value}
-              </>
+              <MyNestedValueContainer>
+                <EuiIconTip type="nested" size="s" />
+                <MyNestedValue>{value}</MyNestedValue>
+              </MyNestedValueContainer>
             );
           } else {
             return value ?? getEmptyValue();
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
index 5d4340db9a448..14c005f057ea3 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
@@ -106,13 +106,13 @@ describe('Exception viewer helpers', () => {
           value: undefined,
         },
         {
-          fieldName: 'host.name.host.name',
+          fieldName: 'host.name',
           isNested: true,
           operator: 'is',
           value: 'some host name',
         },
         {
-          fieldName: 'host.name.host.name',
+          fieldName: 'host.name',
           isNested: true,
           operator: 'is one of',
           value: ['some host name'],
@@ -135,19 +135,6 @@ describe('Exception viewer helpers', () => {
 
       expect(formattedEntry).toEqual(expected);
     });
-
-    test('it formats as expected when "isNested" is "true"', () => {
-      const payload = getEntryMatchMock();
-      const formattedEntry = formatEntry({ isNested: true, parent: 'parent', item: payload });
-      const expected: FormattedEntry = {
-        fieldName: 'parent.host.name',
-        isNested: true,
-        operator: 'is',
-        value: 'some host name',
-      };
-
-      expect(formattedEntry).toEqual(expected);
-    });
   });
 
   describe('#getDescriptionListContent', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx
index 345db5bf1e75e..86b0512410e6f 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.tsx
@@ -20,18 +20,16 @@ import * as i18n from '../translations';
  */
 export const formatEntry = ({
   isNested,
-  parent,
   item,
 }: {
   isNested: boolean;
-  parent?: string;
   item: BuilderEntry;
 }): FormattedEntry => {
   const operator = getExceptionOperatorSelect(item);
   const value = getEntryValue(item);
 
   return {
-    fieldName: isNested ? `${parent}.${item.field}` : item.field ?? '',
+    fieldName: item.field ?? '',
     operator: operator.message,
     value,
     isNested,
@@ -57,7 +55,6 @@ export const getFormattedEntries = (entries: BuilderEntry[]): FormattedEntry[] =
         (acc, nestedEntry) => {
           const formattedEntry = formatEntry({
             isNested: true,
-            parent: item.field,
             item: nestedEntry,
           });
           return [...acc, { ...formattedEntry }];

From 144748591572b257e202a9e06d91fa7e7021c27c Mon Sep 17 00:00:00 2001
From: Yara Tercero <yara.tercero@elastic.co>
Date: Wed, 29 Jul 2020 17:51:56 -0400
Subject: [PATCH 2/2] update test

---
 .../components/exceptions/viewer/helpers.test.tsx   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
index 14c005f057ea3..5f6e54b0d3cff 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/helpers.test.tsx
@@ -135,6 +135,19 @@ describe('Exception viewer helpers', () => {
 
       expect(formattedEntry).toEqual(expected);
     });
+
+    test('it formats as expected when "isNested" is "true"', () => {
+      const payload = getEntryMatchMock();
+      const formattedEntry = formatEntry({ isNested: true, item: payload });
+      const expected: FormattedEntry = {
+        fieldName: 'host.name',
+        isNested: true,
+        operator: 'is',
+        value: 'some host name',
+      };
+
+      expect(formattedEntry).toEqual(expected);
+    });
   });
 
   describe('#getDescriptionListContent', () => {