feat(expenses): filter expenses accounts.

client/src/components/AccountsSelectList.js

@@ -3,7 +3,7 @@ import { MenuItem, Button } from '@blueprintjs/core';
 import { Select } from '@blueprintjs/select';
 import { FormattedMessage as T } from 'react-intl';
 import classNames from 'classnames';
-import { isEmpty } from 'lodash';
+import { filterAccountsByQuery } from './utils';
 import { CLASSES } from 'common/classes';
 
 export default function AccountsSelectList({
@@ -14,32 +14,30 @@ export default function AccountsSelectList({
   onAccountSelected,
   disabled = false,
   popoverFill = false,
-  filterByParentTypes = [],
+
-  filterByTypes = [],
+  filterByParentTypes,
+  filterByTypes,
   filterByNormal,
-  buttonProps = {}
+  filterByRootTypes,
+
+  buttonProps = {},
 }) {
   // Filters accounts based on filter props.
   const filteredAccounts = useMemo(() => {
-    let filteredAccounts = [...accounts];
+    let filteredAccounts = filterAccountsByQuery(accounts, {
-
+      filterByRootTypes,
-    if (!isEmpty(filterByParentTypes)) {
+      filterByParentTypes,
-      filteredAccounts = filteredAccounts.filter(
+      filterByTypes,
-        (account) => filterByParentTypes.indexOf(account.account_parent_type) !== -1,
+      filterByNormal,
-      );
+    });
-    }
-    if (!isEmpty(filterByTypes)) {
-      filteredAccounts = filteredAccounts.filter(
-        (account) => filterByTypes.indexOf(account.account_type) !== -1,
-      );
-    }
-    if (!isEmpty(filterByNormal)) {
-      filteredAccounts = filteredAccounts.filter(
-        (account) => filterByTypes.indexOf(account.account_normal) === filterByNormal,
-      );
-    }
     return filteredAccounts;
-  }, [accounts, filterByParentTypes, filterByTypes, filterByNormal]);
+  }, [
+    accounts,
+    filterByRootTypes,
+    filterByParentTypes,
+    filterByTypes,
+    filterByNormal,
+  ]);
 
   // Find initial account object to set it as default account in initial render.
   const initialAccount = useMemo(
@@ -103,7 +101,11 @@ export default function AccountsSelectList({
       noResults={<MenuItem disabled={true} text={<T id={'no_accounts'} />} />}
       itemRenderer={accountItem}
       itemPredicate={filterAccountsPredicater}
-      popoverProps={{ minimal: true, usePortal: !popoverFill, inline: popoverFill }}
+      popoverProps={{
+        minimal: true,
+        usePortal: !popoverFill,
+        inline: popoverFill,
+      }}
       filterable={true}
       onItemSelect={onAccountSelect}
       disabled={disabled}

client/src/components/AccountsSuggestField.js

@@ -1,48 +1,47 @@
 import React, { useState, useCallback, useEffect, useMemo } from 'react';
 import { MenuItem } from '@blueprintjs/core';
 import { Suggest } from '@blueprintjs/select';
-import { isEmpty } from 'lodash';
 
 import classNames from 'classnames';
 import { CLASSES } from 'common/classes';
 
 import { FormattedMessage as T } from 'react-intl';
+import { filterAccountsByQuery } from './utils';
 
+/**
+ * Accounts suggest field.
+ */
 export default function AccountsSuggestField({
   accounts,
   initialAccountId,
   selectedAccountId,
   defaultSelectText = 'Select account',
+  popoverFill = false,
   onAccountSelected,
 
   filterByParentTypes = [],
   filterByTypes = [],
   filterByNormal,
-  popoverFill = false,
+  filterByRootTypes = [],
 
   ...suggestProps
 }) {
   // Filters accounts based on filter props.
   const filteredAccounts = useMemo(() => {
-    let filteredAccounts = [...accounts];
+    let filteredAccounts = filterAccountsByQuery(accounts, {
-
+      filterByRootTypes,
-    if (!isEmpty(filterByParentTypes)) {
+      filterByParentTypes,
-      filteredAccounts = filteredAccounts.filter(
+      filterByTypes,
-        (account) => filterByParentTypes.indexOf(account.account_parent_type) !== -1,
+      filterByNormal,  
-      );
+    });
-    }
-    if (!isEmpty(filterByTypes)) {
-      filteredAccounts = filteredAccounts.filter(
-        (account) => filterByTypes.indexOf(account.account_type) !== -1,
-      );
-    }
-    if (!isEmpty(filterByNormal)) {
-      filteredAccounts = filteredAccounts.filter(
-        (account) => filterByTypes.indexOf(account.account_normal) === filterByNormal,
-      );
-    }
     return filteredAccounts;
-  }, [accounts, filterByParentTypes, filterByTypes, filterByNormal]);
+  }, [
+    accounts,
+    filterByRootTypes,
+    filterByParentTypes,
+    filterByTypes,
+    filterByNormal,
+  ]);
 
   // Find initial account object to set it as default account in initial render.
   const initialAccount = useMemo(

client/src/components/DataTableCells/AccountsListFieldCell.js

@@ -7,12 +7,14 @@ import AccountsSuggestField from 'components/AccountsSuggestField';
 // import AccountsSelectList from 'components/AccountsSelectList';
 import { FormGroup, Classes, Intent } from '@blueprintjs/core';
 
-// Account cell renderer.
+/**
+ * Account cell renderer.
+ */
 export default function AccountCellRenderer({
   column: {
     id,
     accountsDataProp,
-    filterAccountsByRootType,
+    filterAccountsByRootTypes,
     filterAccountsByTypes,
   },
   row: { index, original },
@@ -55,7 +57,7 @@ export default function AccountCellRenderer({
         accounts={accounts}
         onAccountSelected={handleAccountSelected}
         selectedAccountId={initialValue}
-        filterByRootTypes={filterAccountsByRootType}
+        filterByRootTypes={filterAccountsByRootTypes}
         filterByTypes={filterAccountsByTypes}
         inputProps={{
           inputRef: (ref) => (accountRef.current = ref),

client/src/components/utils.js

@@ -0,0 +1,46 @@
+import { castArray, isEmpty, includes, pickBy } from 'lodash';
+
+/**
+ * Filters the given accounts of the given query.
+ * @param {*} accounts
+ * @param {*} queryProps
+ * @returns {*}
+ */
+export const filterAccountsByQuery = (accounts, queryProps) => {
+  const defaultQuery = {
+    filterByParentTypes: [],
+    filterByTypes: [],
+    filterByNormal: [],
+    filterByRootTypes: [],
+    ...pickBy(queryProps, v => v !== undefined),
+  };
+  const query = {
+    filterByParentTypes: castArray(defaultQuery.filterByParentTypes),
+    filterByTypes: castArray(defaultQuery.filterByTypes),
+    filterByNormal: castArray(defaultQuery.filterByNormal),
+    filterByRootTypes: castArray(defaultQuery.filterByRootTypes),
+  };
+  let filteredAccounts = [...accounts];
+
+  if (!isEmpty(query.filterByParentTypes)) {
+    filteredAccounts = filteredAccounts.filter((account) =>
+      includes(query.filterByParentTypes, account.account_parent_type),
+    );
+  }
+  if (!isEmpty(query.filterByTypes)) {
+    filteredAccounts = filteredAccounts.filter((account) =>
+      includes(query.filterByTypes, account.account_type),
+    );
+  }
+  if (!isEmpty(query.filterByNormal)) {
+    filteredAccounts = filteredAccounts.filter((account) =>
+      includes(query.filterByTypes, account.account_normal),
+    );
+  }
+  if (!isEmpty(query.filterByRootTypes)) {
+    filteredAccounts = filteredAccounts.filter((account) =>
+      includes(query.filterByRootTypes, account.account_root_type),
+    );
+  }
+  return filteredAccounts;
+};

client/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js

@@ -32,7 +32,9 @@ export default function ExpenseFormEntriesTable({
   const handleUpdateData = useCallback(
     (rowIndex, columnId, value) => {
       const newRows = compose(
+        // Update auto-adding new line.
         updateAutoAddNewLine(defaultEntry, ['expense_account_id']),
+        // Update the row value of the given row index and column id.
         updateTableRow(rowIndex, columnId, value),
       )(entries);
 

client/src/containers/Expenses/ExpenseForm/components.js

@@ -89,7 +89,7 @@ export function useExpenseFormTableColumns() {
         className: 'expense_account_id',
         disableSortBy: true,
         width: 40,
-        filterAccountsByRootType: ['expense'],
+        filterAccountsByRootTypes: ['expense'],
       },
       {
         Header: formatMessage({ id: 'amount_currency' }, { currency: 'USD' }),

client/src/style/pages/Expense/List.scss

@@ -1,4 +1,3 @@
-
 // Blueprint framework.
 // @import '@blueprintjs/core/src/blueprint.scss';
 
@@ -6,15 +5,12 @@
   .bigcapital-datatable {
     .table {
       .tbody {
-          
+        .td.amount {
-
-            .td.total_amount{
           span {
-                    font-weight: 500;
+            font-weight: 600;
           }
         }
       }
     }
   }
 }
-  

client/src/utils.js

@@ -1,5 +1,5 @@
 import moment from 'moment';
-import _ from 'lodash';
+import _, { castArray } from 'lodash';
 import { Intent } from '@blueprintjs/core';
 import Currency from 'js-money/lib/currency';
 import accounting from 'accounting';
@@ -92,7 +92,6 @@ export const compose = (...funcs) =>
     (arg) => arg,
   );
 
-
 export const getObjectDiff = (a, b) => {
   return _.reduce(
     a,
@@ -158,9 +157,9 @@ export function formattedAmount(cents, currency, props) {
     symbol,
     precision: 0,
     format: {
-      pos : "%s%v",
+      pos: '%s%v',
-      neg : "%s%v",
+      neg: '%s%v',
-      zero: parsedProps.noZero ? "" : '%s%v'
+      zero: parsedProps.noZero ? '' : '%s%v',
     },
   };
 
@@ -384,7 +383,7 @@ export function defaultToTransform(
 }
 
 export function isBlank(value) {
-  return _.isEmpty(value) && !_.isNumber(value) || _.isNaN(value);
+  return (_.isEmpty(value) && !_.isNumber(value)) || _.isNaN(value);
 }
 
 export const getColumnWidth = (
@@ -403,15 +402,12 @@ export const getColumnWidth = (
   return result;
 };
 
-export const getForceWidth = (
+export const getForceWidth = (text, magicSpacing = 14) => {
-  text,
-  magicSpacing = 14,
-) => {
   const textLength = text.length;
-  const result = textLength * magicSpacing
+  const result = textLength * magicSpacing;
 
   return result;
-}
+};
 
 export const toSafeNumber = (number) => {
   return _.toNumber(_.defaultTo(number, 0));
@@ -436,7 +432,7 @@ export function flatObject(obj) {
   function dig(obj) {
     if (obj !== Object(obj))
       /*is primitive, end of path*/
-          return flatObject[path.join('.')] = obj; /*<- value*/ 
+      return (flatObject[path.join('.')] = obj); /*<- value*/
 
     //no? so this is an object with keys. go deeper on each key down
     for (let key in obj) {
@@ -450,7 +446,6 @@ export function flatObject(obj) {
   return flatObject;
 }
 
-
 export function randomNumber(min, max) {
   if (min > max) {
     let temp = max;
@@ -464,7 +459,6 @@ export function randomNumber(min, max) {
   }
 }
 
-
 export function transformResponse(response) {
   return transformToCamelCase(response);
 }
@@ -479,7 +473,6 @@ export function transactionNumber(prefix, number) {
     codes.push(number);
   }
   return codes.join('-');
-
 }
 
 export function safeCallback(callback, ...args) {
@@ -488,7 +481,7 @@ export function safeCallback(callback, ...args) {
 
 export const createDeepEqualSelector = createSelectorCreator(
   defaultMemoize,
-  isEqual
+  isEqual,
 );
 
 /**
@@ -499,8 +492,8 @@ export const isTableEmptyStatus = ({ data, pagination, filterMeta }) => {
     _.isEmpty(data),
     _.isEmpty(filterMeta.view),
     pagination.page === 1,
-  ].every(cond => cond === true)
+  ].every((cond) => cond === true);
-}
+};
 
 /**
  * Transformes the pagination meta to table props.
@@ -559,23 +552,19 @@ export function removeRowsByIndex(rows, rowIndex) {
   return newRows;
 }
 
-
 export function safeSumBy(entries, getter) {
   return _.chain(entries)
-    .map(row => toSafeNumber(_.get(row, getter)))
+    .map((row) => toSafeNumber(_.get(row, getter)))
     .sum()
     .value();
 }
 
-
-
 export const fullAmountPaymentEntries = (entries) => {
   return entries.map((item) => ({
     ...item,
     payment_amount: item.due_amount,
   }));
-}
+};
-
 
 export const amountPaymentEntries = (amount, entries) => {
   let total = amount;
@@ -609,6 +598,7 @@ export const updateMinEntriesLines = (min, defaultEntry) => (lines) => {
     const diffLines = Math.max(min - lines.length, 0);
     return [...lines, ...repeatValue(defaultEntry, diffLines)];
   }
+  return lines;
 };
 
 export const updateRemoveLineByIndex = (rowIndex) => (entries) => {
@@ -622,8 +612,8 @@ export const updateTableRow = (rowIndex, columnId, value) => (old) => {
       return {
         ...old[rowIndex],
         [columnId]: value,
-      }
+      };
-    }
+    }
-    return row
+    return row;
-  })
+  });
 };