From d8b60ca27c01d6a4c39ed8ae587f8a43007cdb15 Mon Sep 17 00:00:00 2001
From: Karel Hala <khala@redhat.com>
Date: Tue, 29 Jan 2019 13:11:57 +0100
Subject: [PATCH] fix(Table): Do not return value if table is not collapsed

---
 .../Table/__snapshots__/Table.test.js.snap    | 26 -------------------
 .../Table/utils/decorators/collapsible.js     |  8 +++---
 .../Table/utils/transformers.test.js          |  2 +-
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap b/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
index 2cc9282db12..c3ffe45f610 100644
--- a/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
+++ b/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
@@ -13462,12 +13462,10 @@ exports[`Collapsible nested table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -14651,12 +14649,10 @@ exports[`Collapsible nested table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -15370,12 +15366,10 @@ exports[`Collapsible nested table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -15735,12 +15729,10 @@ exports[`Collapsible nested table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -16100,12 +16092,10 @@ exports[`Collapsible nested table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -16465,12 +16455,10 @@ exports[`Collapsible nested table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -18399,12 +18387,10 @@ exports[`Collapsible table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -19116,12 +19102,10 @@ exports[`Collapsible table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -19540,12 +19524,10 @@ exports[`Collapsible table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -20259,12 +20241,10 @@ exports[`Collapsible table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -20624,12 +20604,10 @@ exports[`Collapsible table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -20989,12 +20967,10 @@ exports[`Collapsible table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
@@ -21354,12 +21330,10 @@ exports[`Collapsible table 1`] = `
                         data-key={1}
                         data-label="Header cell"
                         key="1-cell"
-                        title="one"
                       >
                         <td
                           data-key={1}
                           data-label="Header cell"
-                          title="one"
                         >
                           one
                         </td>
diff --git a/packages/patternfly-4/react-table/src/components/Table/utils/decorators/collapsible.js b/packages/patternfly-4/react-table/src/components/Table/utils/decorators/collapsible.js
index b859091e600..6ddcef60f4c 100644
--- a/packages/patternfly-4/react-table/src/components/Table/utils/decorators/collapsible.js
+++ b/packages/patternfly-4/react-table/src/components/Table/utils/decorators/collapsible.js
@@ -33,12 +33,10 @@ export const collapsible = (
 
 export const expandedRow = (colSpan) => {
   const expandedRowFormatter = (value, { rowIndex, rowData, column: { extraParams: { contentId = 'expanded-content' } } }) => {
-    return {
-      ...rowData.hasOwnProperty('parent') ? {
+    return rowData.hasOwnProperty('parent') && {
         colSpan: colSpan,
         children: <ExpandableRowContent id={contentId + rowIndex}>{value.title || value}</ExpandableRowContent>
-      } : value
-    };
-  }
+      }
+  };
   return expandedRowFormatter;
 }
diff --git a/packages/patternfly-4/react-table/src/components/Table/utils/transformers.test.js b/packages/patternfly-4/react-table/src/components/Table/utils/transformers.test.js
index 1bff6a164b9..88f76f6a8f5 100644
--- a/packages/patternfly-4/react-table/src/components/Table/utils/transformers.test.js
+++ b/packages/patternfly-4/react-table/src/components/Table/utils/transformers.test.js
@@ -138,7 +138,7 @@ describe('Transformer functions', () => {
     test('no parent', () => {
       expect(
         expandedRow(5)({ title: 'test' }, { rowData: {}, column: { extraParams: {} } })
-      ).toMatchObject({ title: 'test' });
+      ).toBe(false)
     });
   });