From 5fd1974242c6c5196ca7df381f5c0c53a33e978d Mon Sep 17 00:00:00 2001
From: csrapr <26280794+csrapr@users.noreply.github.com>
Date: Fri, 12 Feb 2021 16:08:08 +0000
Subject: [PATCH] Feat: datatable prop to choose row size
---
new-lamassu-admin/src/components/fake-table/Table.js | 1 -
.../src/components/fake-table/Table.styles.js | 6 +++++-
new-lamassu-admin/src/components/tables/DataTable.js | 7 +++++--
new-lamassu-admin/src/pages/Transactions/Transactions.js | 2 ++
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/new-lamassu-admin/src/components/fake-table/Table.js b/new-lamassu-admin/src/components/fake-table/Table.js
index e560a9d8..051662b0 100644
--- a/new-lamassu-admin/src/components/fake-table/Table.js
+++ b/new-lamassu-admin/src/components/fake-table/Table.js
@@ -53,7 +53,6 @@ const Td = ({
[classes.size]: !header,
[classes.bold]: !header && bold
}
-
return
{children}
}
diff --git a/new-lamassu-admin/src/components/fake-table/Table.styles.js b/new-lamassu-admin/src/components/fake-table/Table.styles.js
index fd36aa3b..f322360a 100644
--- a/new-lamassu-admin/src/components/fake-table/Table.styles.js
+++ b/new-lamassu-admin/src/components/fake-table/Table.styles.js
@@ -72,7 +72,11 @@ export default {
backgroundColor: tableErrorColor
},
mainContent: ({ size }) => {
- const minHeight = size === 'lg' ? 68 : 48
+ const sizes = {
+ sm: 34,
+ lg: 68
+ }
+ const minHeight = sizes[size] || 48
return {
display: 'flex',
alignItems: 'center',
diff --git a/new-lamassu-admin/src/components/tables/DataTable.js b/new-lamassu-admin/src/components/tables/DataTable.js
index 168bdd90..d62f63a9 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.js
+++ b/new-lamassu-admin/src/components/tables/DataTable.js
@@ -35,7 +35,8 @@ const Row = ({
expandRow,
expWidth,
expandable,
- onClick
+ onClick,
+ size
}) => {
const classes = useStyles()
@@ -45,11 +46,11 @@ const Row = ({
[classes.row]: true,
[classes.expanded]: expanded
}
-
return (
{
expandable && expandRow(id)
@@ -97,6 +98,7 @@ const DataTable = ({
onClick,
loading,
emptyText,
+ rowSize,
...props
}) => {
const [expanded, setExpanded] = useState(initialExpanded)
@@ -131,6 +133,7 @@ const DataTable = ({
{
}
const getCustomerDisplayName = tx => {
+ console.log(tx)
if (tx.customerName) return tx.customerName
if (tx.customerIdCardData) return formatCustomerName(tx.customerIdCardData)
return tx.customerPhone
@@ -172,6 +173,7 @@ const Transactions = () => {
data={R.path(['transactions'])(txResponse)}
Details={DetailsRow}
expandable
+ rowSize="sm"
/>
>
)