From b4e9ee7ff354a409aa37c51ba53afee9899463e7 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Tue, 28 Dec 2021 19:52:21 +0200 Subject: [PATCH] feat(GLTable): columns text overflow. --- .../CashflowTransactionDrawerHeader.js | 29 ++++--------------- .../InvoicePaymentTransactions/components.js | 1 + src/containers/JournalEntriesTable/utils.js | 6 +++- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js index 28acda798..a236832a6 100644 --- a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js +++ b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.js @@ -7,7 +7,6 @@ import { FormattedMessage as T, Row, Col, - CommercialDocTopHeader, CommercialDocHeader, } from 'components'; import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider'; @@ -16,23 +15,14 @@ import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawer * Cashlflow transaction drawer detail Header. */ export default function CashflowTransactionDrawerHeader() { - const { - cashflowTransaction: { - formatted_amount, - transaction_type_formatted, - transaction_number, - reference_no, - date, - description, - }, - } = useCashflowTransactionDrawerContext(); + const { cashflowTransaction } = useCashflowTransactionDrawerContext(); return ( }> -

{formatted_amount}

+

{cashflowTransaction.formatted_amount}

@@ -44,33 +34,26 @@ export default function CashflowTransactionDrawerHeader() { name={'transaction_type'} label={} > - {transaction_type_formatted} + {cashflowTransaction.transaction_type_formatted} } > - {transaction_number} + {cashflowTransaction.transaction_number} }> - + }> - {defaultTo(reference_no, '-')} + {defaultTo(cashflowTransaction.reference_no, '-')} - - {/*
- - - - : {defaultTo(description, '—')} -
*/}
); } diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js index 3461c7a97..8862e3e4d 100644 --- a/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js +++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/components.js @@ -75,6 +75,7 @@ export const useInvoicePaymentTransactionsColumns = () => { accessor: 'payment_number', width: 100, className: 'payment_number', + textOverview: true, }, { id: 'payment_reference_no', diff --git a/src/containers/JournalEntriesTable/utils.js b/src/containers/JournalEntriesTable/utils.js index 0375ea5ce..3ad3418e9 100644 --- a/src/containers/JournalEntriesTable/utils.js +++ b/src/containers/JournalEntriesTable/utils.js @@ -8,22 +8,24 @@ export const useGLEntriesTableColumns = () => { () => [ { Header: intl.get('date'), - accessor: 'date', accessor: ({ formatted_date }) => moment(formatted_date).format('YYYY MMM DD'), width: 140, className: 'date', + textOverview: true, }, { Header: intl.get('account_name'), accessor: 'account_name', width: 140, className: 'account_name', + textOverview: true, }, { Header: intl.get('contact'), accessor: 'contactTypeFormatted', width: 140, + textOverview: true, }, { Header: intl.get('credit'), @@ -31,12 +33,14 @@ export const useGLEntriesTableColumns = () => { width: 100, className: 'credit', textAligment: 'right', + textOverview: true, }, { Header: intl.get('debit'), accessor: ({ debit }) => debit.formatted_amount, width: 100, className: 'debit', + textOverview: true, }, ], [],