From 012fac44b4937042309bbee2d7dd9cca8a3e09df Mon Sep 17 00:00:00 2001
From: Pieterjan Van Saet <pieterjan.vansaet@studiohyperdrive.be>
Date: Mon, 24 Jan 2022 11:39:06 +0100
Subject: [PATCH 1/3] feat: allow parsing of nested values

---
 package-lock.json                           |  3 +-
 package.json                                |  1 +
 packages/table/package.json                 |  1 +
 packages/table/src/Table.js                 |  2 +-
 packages/table/src/helpers/Table.helpers.js |  4 +-
 packages/table/src/mocks/Table.mock.js      | 66 ++++++++++++++-------
 6 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cda89a98..2f58dc07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18192,8 +18192,7 @@
 		"lodash.get": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-			"dev": true
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
 		},
 		"lodash.isequal": {
 			"version": "4.5.0",
diff --git a/package.json b/package.json
index ad389be7..93a64586 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
   "dependencies": {
     "@a-ui/core": "^5.0.0",
     "classnames": "~2.2.6",
+    "lodash.get": "^4.4.2",
     "moment": "^2.29.1",
     "react-input-mask": "^2.0.4",
     "react-modal": "~3.5.1",
diff --git a/packages/table/package.json b/packages/table/package.json
index 823779f4..6bc8f1fb 100644
--- a/packages/table/package.json
+++ b/packages/table/package.json
@@ -13,6 +13,7 @@
     "rc-slider": "~8.6.1",
     "classnames": "~2.2.6",
     "moment": "^2.24.0",
+    "lodash.get": "^4.4.2",
     "react-input-mask": "^2.0.4",
     "icon": "0.0.1-0"
   }
diff --git a/packages/table/src/Table.js b/packages/table/src/Table.js
index 001be90f..dbe08655 100644
--- a/packages/table/src/Table.js
+++ b/packages/table/src/Table.js
@@ -228,7 +228,7 @@ const Table = ({
           </tbody>
         </table>
       </div>
-      {currentPage && totalItems && currentPage && (
+      {!!currentPage && !!totalItems && !!currentPage && (
         <div className="m-table-pagination">
           <Select
             inline={true}
diff --git a/packages/table/src/helpers/Table.helpers.js b/packages/table/src/helpers/Table.helpers.js
index eead6a8b..2ae3979b 100644
--- a/packages/table/src/helpers/Table.helpers.js
+++ b/packages/table/src/helpers/Table.helpers.js
@@ -1,3 +1,5 @@
+import * as get from 'lodash.get';
+
 export const isNull = (value) => value === null;
 export const isUndefined = (value) => value === undefined;
 export const isNil = (value) => isNull(value) || isUndefined(value);
@@ -14,7 +16,7 @@ const getCellValue = (rowData, key, fallback) => {
     return null;
   }
 
-  const value = rowData[key];
+  const value = get(rowData, key);
 
   if (isObject(value)) {
     return String(value);
diff --git a/packages/table/src/mocks/Table.mock.js b/packages/table/src/mocks/Table.mock.js
index e6a391af..8a7f223b 100644
--- a/packages/table/src/mocks/Table.mock.js
+++ b/packages/table/src/mocks/Table.mock.js
@@ -13,19 +13,19 @@ export const TABLE_MOCK_COLUMNS = (
   {
     id: 'firstName',
     label: "First name",
-    value: "firstName",
+    value: "user.firstName",
   },
   {
     id: 'lastName',
     label: "Last name",
-    value: "lastName",
+    value: "user.lastName",
   },
   {
     id: 'fullName',
     label: "Full name",
     value: "fullName",
     format(data, col, rowData) {
-      const { firstName, lastName } = rowData;
+      const { user: { firstName, lastName } } = rowData;
 
       return `${firstName} ${lastName}`;
     },
@@ -94,53 +94,73 @@ export const TABLE_MOCK_FILTER = [
 export const TABLE_MOCK_ROWS = [
   {
     id: 0,
-    firstName: "Wyatt",
-    lastName: "Cooper",
+    user: {
+      firstName: "Wyatt",
+      lastName: "Cooper",
+    }
   },
   {
     id: 1,
-    firstName: "Mullen",
-    lastName: "Ballard",
+    user: {
+      firstName: "Mullen",
+      lastName: "Ballard",
+    }
   },
   {
     id: 2,
-    firstName: "Sonia",
-    lastName: "Bass",
+    user: {
+      firstName: "Sonia",
+      lastName: "Bass",
+    }
   },
   {
     id: 3,
-    firstName: "Kristen",
-    lastName: "Moore",
+    user: {
+      firstName: "Kristen",
+      lastName: "Moore",
+    }
   },
   {
     id: 4,
-    firstName: "Moss",
-    lastName: "Bowen",
+    user: {
+      firstName: "Moss",
+      lastName: "Bowen",
+    }
   },
   {
     id: 5,
-    firstName: "Elaine",
-    lastName: "Michael",
+    user: {
+      firstName: "Elaine",
+      lastName: "Michael",
+    }
   },
   {
     id: 6,
-    firstName: "Jerri",
-    lastName: "Hicks",
+    user: {
+      firstName: "Jerri",
+      lastName: "Hicks",
+    }
   },
   {
     id: 7,
-    firstName: "Sharron",
-    lastName: "Castro",
+    user: {
+      firstName: "Sharron",
+      lastName: "Castro",
+    }
   },
   {
     id: 8,
-    firstName: "Harriett",
-    lastName: "Horton",
+    user: {
+      firstName: "Harriett",
+      lastName: "Horton",
+    }
   },
   {
     id: 9,
-    firstName: "Griffin",
-    lastName: "Navarro",
+    user: {
+      firstName: "Griffin",
+      lastName: "Navarro",
+    }
   },
 ];
 

From d899e40922dc9bbc493bbbb7dab4e27889cdfae5 Mon Sep 17 00:00:00 2001
From: Pieterjan Van Saet <pieterjan.vansaet@studiohyperdrive.be>
Date: Mon, 24 Jan 2022 11:40:17 +0100
Subject: [PATCH 2/3] chore: add changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f101da2e..fe33e3c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+### Added
+- `Table` - allow parsing of nested values
+
 ## v6.3.1 - 2022-01-24
 
 ### Fixed

From e731596230a5dcd6bf6f4a71fa7e474a935bda29 Mon Sep 17 00:00:00 2001
From: Pieterjan Van Saet <pieterjan.vansaet@studiohyperdrive.be>
Date: Mon, 24 Jan 2022 11:45:43 +0100
Subject: [PATCH 3/3] fix: jest fluke

---
 packages/table/src/helpers/Table.helpers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/table/src/helpers/Table.helpers.js b/packages/table/src/helpers/Table.helpers.js
index 2ae3979b..37852775 100644
--- a/packages/table/src/helpers/Table.helpers.js
+++ b/packages/table/src/helpers/Table.helpers.js
@@ -16,7 +16,8 @@ const getCellValue = (rowData, key, fallback) => {
     return null;
   }
 
-  const value = get(rowData, key);
+  // Because of a weird fluke with jest & lerna we have to do this
+  const value = get.default ? get.default(rowData, key) : get(rowData, key);
 
   if (isObject(value)) {
     return String(value);