asdfasdF

packages/server/src/api/controllers/Accounts.ts

@@ -9,7 +9,6 @@ import DynamicListingService from '@/services/DynamicListing/DynamicListService'
 import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AccountsApplication } from '@/services/Accounts/AccountsApplication';
-import { MAX_ACCOUNTS_CHART_DEPTH } from 'services/Accounts/constants';
 
 @Service()
 export default class AccountsController extends BaseController {
@@ -495,22 +494,6 @@ export default class AccountsController extends BaseController {
           }
         );
       }
-      if (error.errorType === 'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL') {
-        return res.boom.badRequest(
-          'The parent account exceeded the depth level of accounts chart.',
-          {
-            errors: [
-              {
-                type: 'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL',
-                code: 1500,
-                data: {
-                  maxDepth: MAX_ACCOUNTS_CHART_DEPTH,
-                },
-              },
-            ],
-          }
-        );
-      }
     }
     next(error);
   }

packages/server/src/server.ts

@@ -5,6 +5,9 @@ import './before';
 import express from 'express';
 import loadersFactory from 'loaders';
 
+
+console.log("asdfasf");
+
 async function startServer() {
   const app = express();
 

packages/server/src/services/Accounts/CommandAccountValidators.ts

@@ -3,7 +3,7 @@ import TenancyService from '@/services/Tenancy/TenancyService';
 import { ServiceError } from '@/exceptions';
 import { IAccountDTO, IAccount, IAccountCreateDTO } from '@/interfaces';
 import AccountTypesUtils from '@/lib/AccountTypes';
-import { ERRORS, MAX_ACCOUNTS_CHART_DEPTH } from './constants';
+import { ERRORS } from './constants';
 
 @Service()
 export class CommandAccountValidators {
@@ -154,13 +154,13 @@ export class CommandAccountValidators {
    * parent account.
    * @param  {IAccountCreateDTO} accountDTO
    * @param  {IAccount} parentAccount
-   * @param  {string} baseCurrency -
+   * @param  {string} baseCurrency - 
    * @throws {ServiceError(ERRORS.ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT)}
    */
   public validateCurrentSameParentAccount = (
     accountDTO: IAccountCreateDTO,
     parentAccount: IAccount,
-    baseCurrency: string
+    baseCurrency: string,
   ) => {
     // If the account DTO currency not assigned and the parent account has no base currency.
     if (
@@ -208,24 +208,4 @@ export class CommandAccountValidators {
     }
     return account;
   }
-
-  /**
-   * Validates the max depth level of accounts chart.
-   * @param {numebr} tenantId - Tenant id.
-   * @param {number} parentAccountId - Parent account id.
-   */
-  public async validateMaxParentAccountDepthLevels(
-    tenantId: number,
-    parentAccountId: number
-  ) {
-    const { accountRepository } = this.tenancy.repositories(tenantId);
-
-    const accountsGraph = await accountRepository.getDependencyGraph();
-
-    const parentDependantsIds = accountsGraph.dependantsOf(parentAccountId);
-
-    if (parentDependantsIds.length >= MAX_ACCOUNTS_CHART_DEPTH) {
-      throw new ServiceError(ERRORS.PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL);
-    }
-  }
 }

packages/server/src/services/Accounts/CreateAccount.ts

@@ -70,11 +70,6 @@ export class CreateAccount {
         parentAccount,
         baseCurrency
       );
-      // Validates the max depth level of accounts chart.
-      await this.validator.validateMaxParentAccountDepthLevels(
-        tenantId,
-        accountDTO.parentAccountId
-      );
     }
     // Validates the given account type supports the multi-currency.
     this.validator.validateAccountTypeSupportCurrency(accountDTO, baseCurrency);

packages/server/src/services/Accounts/GetAccounts.ts

@@ -5,7 +5,6 @@ import TenancyService from '@/services/Tenancy/TenancyService';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { AccountTransformer } from './AccountTransform';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-import { flatToNestedArray } from '@/utils';
 
 @Service()
 export class GetAccounts {
@@ -54,17 +53,11 @@ export class GetAccounts {
       builder.modify('inactiveMode', filter.inactiveMode);
     });
     // Retrievs the formatted accounts collection.
-    const preTransformedAccounts = await this.transformer.transform(
+    const transformedAccounts = await this.transformer.transform(
       tenantId,
       accounts,
       new AccountTransformer()
     );
-    // Transform accounts to nested array.
-    const transformedAccounts = flatToNestedArray(preTransformedAccounts, {
-      id: 'id',
-      parentId: 'parentAccountId',
-    });
-
     return {
       accounts: transformedAccounts,
       filterMeta: dynamicList.getResponseMeta(),

packages/server/src/services/Accounts/constants.ts

@@ -13,12 +13,8 @@ export const ERRORS = {
   CLOSE_ACCOUNT_AND_TO_ACCOUNT_NOT_SAME_TYPE:
     'close_account_and_to_account_not_same_type',
   ACCOUNTS_NOT_FOUND: 'accounts_not_found',
-  ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY:
+  ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY: 'ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY',
-    'ACCOUNT_TYPE_NOT_SUPPORTS_MULTI_CURRENCY',
+  ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT: 'ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT',
-  ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT:
-    'ACCOUNT_CURRENCY_NOT_SAME_PARENT_ACCOUNT',
-  PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL:
-    'PARENT_ACCOUNT_EXCEEDED_THE_DEPTH_LEVEL',
 };
 
 // Default views columns.
@@ -31,8 +27,6 @@ export const DEFAULT_VIEW_COLUMNS = [
   { key: 'currencyCode', label: 'Currency' },
 ];
 
-export const MAX_ACCOUNTS_CHART_DEPTH = 5;
-
 // Accounts default views.
 export const DEFAULT_VIEWS = [
   {
@@ -49,12 +43,7 @@ export const DEFAULT_VIEWS = [
     slug: 'liabilities',
     rolesLogicExpression: '1',
     roles: [
-      {
+      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'liability' },
-        fieldKey: 'root_type',
-        index: 1,
-        comparator: 'equals',
-        value: 'liability',
-      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -63,12 +52,7 @@ export const DEFAULT_VIEWS = [
     slug: 'equity',
     rolesLogicExpression: '1',
     roles: [
-      {
+      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'equity' },
-        fieldKey: 'root_type',
-        index: 1,
-        comparator: 'equals',
-        value: 'equity',
-      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -77,12 +61,7 @@ export const DEFAULT_VIEWS = [
     slug: 'income',
     rolesLogicExpression: '1',
     roles: [
-      {
+      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'income' },
-        fieldKey: 'root_type',
-        index: 1,
-        comparator: 'equals',
-        value: 'income',
-      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },
@@ -91,12 +70,7 @@ export const DEFAULT_VIEWS = [
     slug: 'expenses',
     rolesLogicExpression: '1',
     roles: [
-      {
+      { fieldKey: 'root_type', index: 1, comparator: 'equals', value: 'expense' },
-        fieldKey: 'root_type',
-        index: 1,
-        comparator: 'equals',
-        value: 'expense',
-      },
     ],
     columns: DEFAULT_VIEW_COLUMNS,
   },

packages/webapp/package.json

@@ -99,7 +99,7 @@
     "yup": "^0.28.1"
   },
   "scripts": {
-    "dev": "PORT=4000 craco start",
+    "dev": "craco start",
     "build": "craco build",
     "test": "node scripts/test.js",
     "storybook": "start-storybook -p 6006"

packages/webapp/src/components/Datatable/TableCell.tsx

@@ -72,7 +72,6 @@ export default function TableCell({ cell, row, index }) {
           [`td-${cell.column.id}`]: cell.column.id,
           [`td-${cellType}-type`]: !!cellType,
         }),
-        tabindex: 0,
         onClick: handleCellClick,
       })}
     >

packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogForm.tsx

@@ -3,6 +3,7 @@ import React, { useCallback } from 'react';
 import intl from 'react-intl-universal';
 import { Intent } from '@blueprintjs/core';
 import { Formik } from 'formik';
+import { omit } from 'lodash';
 import { AppToaster } from '@/components';
 
 import AccountDialogFormContent from './AccountDialogFormContent';
@@ -13,11 +14,7 @@ import {
   CreateAccountFormSchema,
 } from './AccountForm.schema';
 import { compose, transformToForm } from '@/utils';
-import {
+import { transformApiErrors, transformAccountToForm } from './utils';
-  transformApiErrors,
-  transformAccountToForm,
-  transformFormToReq,
-} from './utils';
 
 import '@/style/pages/Accounts/AccountFormDialog.scss';
 import { useAccountDialogContext } from './AccountDialogProvider';
@@ -29,7 +26,7 @@ const defaultInitialValues = {
   name: '',
   code: '',
   description: '',
-  currency_code: '',
+  currency_code:'',
   subaccount: false,
 };
 
@@ -46,6 +43,7 @@ function AccountFormDialogContent({
     createAccountMutate,
     account,
 
+    accountId,
     payload,
     isNewMode,
     dialogName,
@@ -58,7 +56,7 @@ function AccountFormDialogContent({
 
   // Callbacks handles form submit.
   const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
-    const form = transformFormToReq(values);
+    const form = omit(values, ['subaccount']);
     const toastAccountName = values.code
       ? `${values.code} - ${values.name}`
       : values.name;
@@ -92,8 +90,8 @@ function AccountFormDialogContent({
       setErrors({ ...errorsTransformed });
       setSubmitting(false);
     };
-    if (payload.accountId) {
+    if (accountId) {
-      editAccountMutate([payload.accountId, form])
+      editAccountMutate([accountId, form])
         .then(handleSuccess)
         .catch(handleError);
     } else {
@@ -115,6 +113,7 @@ function AccountFormDialogContent({
       defaultInitialValues,
     ),
   };
+
   // Handles dialog close.
   const handleClose = useCallback(() => {
     closeDialog(dialogName);

packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.tsx

@@ -26,7 +26,6 @@ import { inputIntent, compose } from '@/utils';
 import { useAutofocus } from '@/hooks';
 import { FOREIGN_CURRENCY_ACCOUNTS } from '@/constants/accountTypes';
 import { useAccountDialogContext } from './AccountDialogProvider';
-import { parentAccountShouldUpdate } from './utils';
 
 /**
  * Account form dialogs fields.
@@ -116,7 +115,12 @@ function AccountFormDialogFields({
             >
               <Checkbox
                 inline={true}
-                label={<T id={'sub_account'} />}
+                label={
+                  <>
+                    <T id={'sub_account'} />
+                    <Hint />
+                  </>
+                }
                 name={'subaccount'}
                 {...field}
               />
@@ -124,36 +128,37 @@ function AccountFormDialogFields({
           )}
         </Field>
 
-        <FastField
+        <If condition={values.subaccount}>
-          name={'parent_account_id'}
+          <FastField name={'parent_account_id'}>
-          shouldUpdate={parentAccountShouldUpdate}
+            {({
-        >
+              form: { values, setFieldValue },
-          {({
+              field: { value },
-            form: { values, setFieldValue },
+              meta: { error, touched },
-            field: { value },
+            }) => (
-            meta: { error, touched },
+              <FormGroup
-          }) => (
+                label={<T id={'parent_account'} />}
-            <FormGroup
+                className={classNames(
-              label={<T id={'parent_account'} />}
+                  'form-group--parent-account',
-              className={classNames('form-group--parent-account', Classes.FILL)}
+                  Classes.FILL,
-              inline={true}
+                )}
-              intent={inputIntent({ error, touched })}
+                inline={true}
-              helperText={<ErrorMessage name="parent_account_id" />}
+                intent={inputIntent({ error, touched })}
-            >
+                helperText={<ErrorMessage name="parent_account_id" />}
-              <AccountsSelectList
+              >
-                accounts={accounts}
+                <AccountsSelectList
-                onAccountSelected={(account) => {
+                  accounts={accounts}
-                  setFieldValue('parent_account_id', account.id);
+                  onAccountSelected={(account) => {
-                }}
+                    setFieldValue('parent_account_id', account.id);
-                defaultSelectText={<T id={'select_parent_account'} />}
+                  }}
-                selectedAccountId={value}
+                  defaultSelectText={<T id={'select_parent_account'} />}
-                popoverFill={true}
+                  selectedAccountId={value}
-                filterByTypes={values.account_type}
+                  popoverFill={true}
-                disabled={!values.subaccount}
+                  filterByTypes={values.account_type}
-              />
+                />
-            </FormGroup>
+              </FormGroup>
-          )}
+            )}
-        </FastField>
+          </FastField>
+        </If>
 
         <If condition={FOREIGN_CURRENCY_ACCOUNTS.includes(values.account_type)}>
           {/*------------ Currency  -----------*/}

packages/webapp/src/containers/Dialogs/AccountDialog/utils.tsx

@@ -2,7 +2,6 @@
 import intl from 'react-intl-universal';
 import * as R from 'ramda';
 import { isUndefined } from 'lodash';
-import { defaultFastFieldShouldUpdate } from '@/utils';
 
 export const AccountDialogAction = {
   Edit: 'edit',
@@ -34,7 +33,7 @@ export const transformApiErrors = (errors) => {
 /**
  * Payload transformer in account edit mode.
  */
-function tranformNewChildAccountPayload(account, payload) {
+function tranformNewChildAccountPayload(payload) {
   return {
     parent_account_id: payload.parentAccountId || '',
     account_type: payload.accountType || '',
@@ -45,7 +44,7 @@ function tranformNewChildAccountPayload(account, payload) {
 /**
  * Payload transformer in new account with defined type.
  */
-function transformNewDefinedTypePayload(account, payload) {
+function transformNewDefinedTypePayload(payload) {
   return {
     account_type: payload.accountType || '',
   };
@@ -64,9 +63,7 @@ const mergeWithAccount = R.curry((transformed, account) => {
 /**
  * Default account payload transformer.
  */
-const defaultPayloadTransform = (account, payload) => ({
+const defaultPayloadTransform = () => ({});
-  subaccount: !!account.parent_account_id,
-});
 
 /**
  * Defined payload transformers.
@@ -92,7 +89,7 @@ export const transformAccountToForm = (account, payload) => {
 
     return [
       condition[0] === payload.action ? R.T : R.F,
-      mergeWithAccount(transformer(account, payload)),
+      mergeWithAccount(transformer(payload)),
     ];
   });
   return R.cond(results)(account);
@@ -109,29 +106,3 @@ export const getDisabledFormFields = (account, payload) => {
       payload.action === AccountDialogAction.NewDefinedType,
   };
 };
-
-/**
- * Detarmines whether should update the parent account field.
- * @param newProps
- * @param oldProps
- * @returns {boolean}
- */
-export const parentAccountShouldUpdate = (newProps, oldProps) => {
-  return (
-    newProps.formik.values.subaccount !== oldProps.formik.values.subaccount ||
-    defaultFastFieldShouldUpdate(newProps, oldProps)
-  );
-};
-
-/**
- * Transformes the form values to the request.
- */
-export const transformFormToReq = (form) => {
-  return R.compose(
-    R.omit(['subaccount']),
-    R.when(
-      R.propSatisfies(R.equals(R.__, false), 'subaccount'),
-      R.assoc(['parent_account_id'], ''),
-    ),
-  )(form);
-};

packages/webapp/src/containers/Items/components.tsx

@@ -105,7 +105,7 @@ export function ItemsActionMenuList({
       </Can>
       <Can I={ItemAction.Create} a={AbilitySubject.Item}>
         <MenuItem
-          icon={<Icon icon="content-copy" iconSize={16} />}
+          icon={<Icon icon="duplicate-16" />}
           text={intl.get('duplicate')}
           onClick={safeCallback(onDuplicate, original)}
         />

packages/webapp/src/static/json/icons.tsx

@@ -559,10 +559,4 @@ export default {
     ],
     viewBox: '0 0 24 24',
   },
-  'content-copy': {
-    path: [
-      'M15 0H5c-.55 0-1 .45-1 1v2h2V2h8v7h-1v2h2c.55 0 1-.45 1-1V1c0-.55-.45-1-1-1zm-4 4H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zm-1 10H2V6h8v8z'
-    ],
-    viewBox: '0 0 16 16'
-  }
 };

packages/webapp/src/style/components/DataTable/DataTable.scss

@@ -10,7 +10,7 @@
     display: block;
 
     .thead .thead-inner,
-    .tbody .tbody-inner {
+    .tbody .tbody-inner{
       min-width: fit-content;
     }
 
@@ -25,7 +25,7 @@
         font-weight: 400;
         border-bottom: 1px solid #d2dde2;
 
-        > div {
+        >div {
           overflow: hidden;
           white-space: nowrap;
           text-overflow: ellipsis;
@@ -208,10 +208,6 @@
             width: 100%;
           }
         }
-        &:focus {
-          outline: 1px solid rgba(0, 82, 204, 0.7);
-          outline-offset: -1px;
-        }
       }
 
       .tr:hover .td {
@@ -361,9 +357,13 @@
       position: sticky;
     }
 
-    [data-sticky-last-left-td] {}
+    [data-sticky-last-left-td] {
 
-    [data-sticky-first-right-td] {}
+    }
+
+    [data-sticky-first-right-td] {
+
+    }
   }
 
   &.has-virtualized-rows {