feat: optimize chart of accounts.

This commit is contained in:
Ahmed Bouhuolia
2020-04-12 17:13:34 +02:00
parent 54e2a43647
commit 4d4191dfc0
14 changed files with 178 additions and 36 deletions

View File

@@ -6,6 +6,8 @@ import {
MenuItem,
MenuDivider,
Position,
Classes,
Tooltip,
} from '@blueprintjs/core';
import { useParams } from 'react-router-dom';
import Icon from 'components/Icon';
@@ -16,6 +18,7 @@ import DashboardConnect from 'connectors/Dashboard.connector';
import ViewConnect from 'connectors/View.connector';
import LoadingIndicator from 'components/LoadingIndicator';
import DataTable from 'components/DataTable';
import Money from 'components/Money';
function AccountsDataTable({
accounts,
@@ -45,9 +48,10 @@ function AccountsDataTable({
// Clear page subtitle when unmount the page.
useEffect(() => () => { changePageSubtitle(''); }, []);
const handleEditAccount = account => () => {
const handleEditAccount = useCallback((account) => () => {
openDialog('account-form', { action: 'edit', id: account.id });
};
}, [openDialog]);
const actionMenuList = account => (
<Menu>
<MenuItem text='View Details' />
@@ -64,20 +68,71 @@ function AccountsDataTable({
</Menu>
);
const columns = useMemo(() => [
{
// Build our expander column
id: 'expander', // Make sure it has an ID
className: 'expander',
Header: ({
getToggleAllRowsExpandedProps,
isAllRowsExpanded
}) => (
<span {...getToggleAllRowsExpandedProps()} className="toggle">
{isAllRowsExpanded ?
(<span class="arrow-down" />) :
(<span class="arrow-right" />)
}
</span>
),
Cell: ({ row }) =>
// Use the row.canExpand and row.getToggleRowExpandedProps prop getter
// to build the toggle for expanding a row
row.canExpand ? (
<span
{...row.getToggleRowExpandedProps({
style: {
// We can even use the row.depth property
// and paddingLeft to indicate the depth
// of the row
paddingLeft: `${row.depth * 2}rem`,
},
className: 'toggle',
})}
>
{row.isExpanded ?
(<span class="arrow-down" />) :
(<span class="arrow-right" />)
}
</span>
) : null,
width: 20,
disableResizing: true,
},
{
id: 'name',
Header: 'Account Name',
accessor: 'name',
accessor: row => {
return (row.description) ?
(<Tooltip
className={Classes.TOOLTIP_INDICATOR}
content={row.description}
position={Position.RIGHT_TOP}
hoverOpenDelay={500}>
{ row.name }
</Tooltip>) : row.name;
},
className: 'account_name',
},
{
id: 'code',
Header: 'Code',
accessor: 'code'
accessor: 'code',
className: 'code',
},
{
id: 'type',
Header: 'Type',
accessor: 'type.name'
accessor: 'type.name',
className: 'type',
},
{
id: 'normal',
@@ -96,14 +151,14 @@ function AccountsDataTable({
Header: 'Balance',
Cell: ({ cell }) => {
const account = cell.row.original;
const {balance} = account;
const {balance = null} = account;
return ('undefined' !== typeof balance) ?
(<span>{ balance.amount }</span>) :
(<span>--</span>);
return (balance) ?
(<span>
<Money amount={balance.amount} currency={balance.currency_code} />
</span>) :
(<span class="placeholder">--</span>);
},
// canResize: false,
},
{
id: 'actions',
@@ -111,18 +166,23 @@ function AccountsDataTable({
Cell: ({ cell }) => (
<Popover
content={actionMenuList(cell.row.original)}
position={Position.RIGHT_BOTTOM}>
position={Position.RIGHT_TOP}>
<Button icon={<Icon icon='ellipsis-h' />} />
</Popover>
),
className: 'actions',
width: 50,
// canResize: false
}
], []);
const handleDatatableFetchData = useCallback(() => {
onFetchData && onFetchData();
const selectionColumn = useMemo(() => ({
minWidth: 42,
width: 42,
maxWidth: 42,
}), [])
const handleDatatableFetchData = useCallback((...params) => {
onFetchData && onFetchData(...params);
}, []);
return (
@@ -132,7 +192,7 @@ function AccountsDataTable({
data={accounts}
onFetchData={handleDatatableFetchData}
manualSortBy={true}
selectionColumn={true} />
selectionColumn={selectionColumn} />
</LoadingIndicator>
);
}

View File

@@ -103,6 +103,8 @@ export default function DataTable({
<IndeterminateCheckbox {...row.getToggleRowSelectedProps()} />
</div>
),
className: 'selection',
...(typeof selectionColumn === 'object') ? selectionColumn : {},
}] : [],
...columns,
])

View File

@@ -45,7 +45,11 @@ const ItemsCategoryList = ({
Header: 'Description',
accessor: 'description'
},
{
id: 'count',
Header: 'Count',
// accessor: ''
},
{
id: 'actions',
Header: '',

View File

@@ -1,4 +1,4 @@
import React, { useMemo, useState } from 'react';
import React, { useMemo, useState, useCallback } from 'react';
import Icon from 'components/Icon';
import {
Button,
@@ -37,9 +37,10 @@ function ManualJournalActionsBar({
);
});
const onClickNewManualJournal = () => {
const onClickNewManualJournal = useCallback(() => {
history.push('/dashboard/accounting/make-journal-entry');
};
}, [history]);
const filterDropdown = FilterDropdown({
fields: manualJournalFields,
onFilterChange: filterConditions => {
@@ -83,12 +84,15 @@ function ManualJournalActionsBar({
icon={<Icon icon='filter' />}
/>
</Popover>
<Button
className={Classes.MINIMAL}
icon={<Icon icon='trash' iconSize={15} />}
text='Delete'
intent={Intent.DANGER}
/>
{ (false) && (
<Button
className={Classes.MINIMAL}
icon={<Icon icon='trash' iconSize={15} />}
text='Delete'
intent={Intent.DANGER}
/>
)}
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-import' />}

View File

@@ -107,6 +107,7 @@ function ManualJournalsDataTable({
Header: 'Note',
accessor: r => (<Icon icon={'file-alt'} iconSize={16} />),
disableResizing: true,
disableSorting: true,
width: 100,
className: 'note',
},

View File

@@ -85,6 +85,7 @@ function ManualJournalsViewTabs({
className='button--new-view'
icon={<Icon icon='plus' />}
onClick={handleClickNewView}
minimal={true}
/>
</Tabs>
</NavbarGroup>