feat: wip bank transaction matching

packages/server/src/api/controllers/Banking/ReconcileBankController.ts

@@ -1,30 +0,0 @@
-import { body } from 'express-validator';
-import BaseController from '../BaseController';
-import { Router } from 'express';
-import { Service } from 'typedi';
-
-@Service()
-export class BankReconcileController extends BaseController {
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/',
-      [
-        body('amount').exists(),
-        body('date').exists(),
-        body('fromAccountId').exists(),
-        body('toAccountId').exists(),
-        body('reference').optional({ nullable: true }),
-      ],
-      this.validationResult,
-      this.createBankReconcileTransaction.bind(this)
-    );
-    return router;
-  }
-
-  createBankReconcileTransaction() {}
-}

packages/server/src/services/Banking/BankAccounts/GetBankAccountSummary.ts

@@ -24,12 +24,14 @@ export class GetBankAccountSummary {
       .findById(bankAccountId)
       .throwIfNotFound();
 
+    // Retrieves the uncategorized transactions count of the given bank account.
     const uncategorizedTranasctionsCount =
       await UncategorizedCashflowTransaction.query()
         .where('accountId', bankAccountId)
         .count('id as total')
         .first();
 
+    // Retrieves the recognized transactions count of the given bank account.
     const recognizedTransactionsCount = await RecognizedBankTransaction.query()
       .whereExists(
         UncategorizedCashflowTransaction.query().where(

packages/server/src/services/Banking/Matching/GetMatchedTransactions.ts

@@ -100,7 +100,6 @@ export class GetMatchedTransactions {
         moment(match.date).isSame(uncategorizedTransaction.date, 'day'),
       closestResullts
     );
-
     const possibleMatches = R.difference(closestResullts, perfectMatches);
 
     return { perfectMatches, possibleMatches };

packages/server/src/services/Banking/Matching/GetMatchedTransactionsByType.ts

@@ -8,7 +8,6 @@ import {
 } from './types';
 import { Inject, Service } from 'typedi';
 
-// @Service()
 export abstract class GetMatchedTransactionsByType {
   @Inject()
   protected tenancy: HasTenancyService;
@@ -17,6 +16,7 @@ export abstract class GetMatchedTransactionsByType {
    * Retrieves the matched transactions.
    * @param {number} tenantId -
    * @param {GetMatchedTransactionsFilter} filter -
+   * @returns {Promise<MatchedTransactionsPOJO>}
    */
   public async getMatchedTransactions(
     tenantId: number,
@@ -31,6 +31,7 @@ export abstract class GetMatchedTransactionsByType {
    * Retrieves the matched transaction details.
    * @param {number} tenantId -
    * @param {number} transactionId -
+   * @returns {Promise<MatchedTransactionPOJO>}
    */
   public async getMatchedTransaction(
     tenantId: number,

packages/webapp/src/components/AppShell/AppContentShell/AppContentShell.tsx

@@ -1,25 +1,25 @@
 import React from 'react';
-import { AppShellProvider, useAppShellContext } from './AppShellProvider';
+import { AppShellProvider, useAppShellContext } from './AppContentShellProvider';
-import { Box } from '../Layout';
+import { Box, BoxProps } from '../../Layout';
 import styles from './AppShell.module.scss';
 
-interface AppShellProps {
+interface AppContentShellProps {
   topbarOffset?: number;
-  mainProps: any;
+  mainProps?: BoxProps;
-  asideProps: any;
+  asideProps?: BoxProps;
   children: React.ReactNode;
   hideAside?: boolean;
   hideMain?: boolean;
 }
 
-export function AppShell({
+export function AppContentShell({
   asideProps,
   mainProps,
   topbarOffset = 0,
   hideAside = false,
   hideMain = false,
   ...restProps
-}: AppShellProps) {
+}: AppContentShellProps) {
   return (
     <AppShellProvider
       mainProps={mainProps}
@@ -33,29 +33,29 @@ export function AppShell({
   );
 }
 
-AppShell.Main = AppShellMain;
+interface AppContentShellMainProps extends BoxProps {}
-AppShell.Aside = AppShellAside;
 
-function AppShellMain({ ...props }) {
+function AppContentShellMain({ ...props }: AppContentShellMainProps) {
   const { hideMain } = useAppShellContext();
 
   if (hideMain === true) {
     return null;
   }
-
   return <Box {...props} className={styles.main} />;
 }
 
-interface AppShellAsideProps {
+interface AppContentShellAsideProps extends BoxProps {
   children: React.ReactNode;
 }
 
-function AppShellAside({ ...props }: AppShellAsideProps) {
+function AppContentShellAside({ ...props }: AppContentShellAsideProps) {
   const { hideAside } = useAppShellContext();
 
-  console.log(hideAside, 'hideAsidehideAsidehideAsidehideAside');
   if (hideAside === true) {
     return null;
   }
   return <Box {...props} className={styles.aside} />;
 }
+
+AppContentShell.Main = AppContentShellMain;
+AppContentShell.Aside = AppContentShellAside;

packages/webapp/src/components/AppShell/AppContentShell/index.ts

@@ -0,0 +1 @@
+export * from './AppContentShell';

packages/webapp/src/components/AppShell/index.ts

@@ -0,0 +1 @@
+export * from './AppContentShell';

packages/webapp/src/containers/Banking/Rules/RulesList/RulesListActionsBar.tsx

@@ -3,7 +3,6 @@ import { Button, Classes, NavbarGroup } from '@blueprintjs/core';
 import * as R from 'ramda';
 import { Can, DashboardActionsBar, Icon } from '@/components';
 import { AbilitySubject, BankRuleAction } from '@/constants/abilityOption';
-import withAlertActions from '@/containers/Alert/withAlertActions';
 import withDialogActions from '@/containers/Dialog/withDialogActions';
 import { DialogsName } from '@/constants/dialogs';
 
@@ -31,7 +30,6 @@ function RulesListActionsBarRoot({
   );
 }
 
-export const RulesListActionsBar = R.compose(
+export const RulesListActionsBar = R.compose(withDialogActions)(
-  withDialogActions,
+  RulesListActionsBarRoot,
-  withAlertActions,
+);
-)(RulesListActionsBarRoot);

packages/webapp/src/containers/Banking/Rules/RulesList/RulesTable.tsx

@@ -8,9 +8,7 @@ import {
 } from '@/components';
 
 import withAlertsActions from '@/containers/Alert/withAlertActions';
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 import withDialogActions from '@/containers/Dialog/withDialogActions';
-import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
 
 import { useBankRulesTableColumns } from './hooks';
 import { BankRulesTableActionsMenu } from './_components';
@@ -25,9 +23,6 @@ function RulesTable({
   // #withAlertsActions
   openAlert,
 
-  // #withDrawerActions
-  openDrawer,
-
   // #withDialogAction
   openDialog,
 }) {
@@ -81,8 +76,6 @@ function RulesTable({
 }
 
 export const BankRulesTable = R.compose(
-  withDashboardActions,
   withAlertsActions,
-  withDrawerActions,
   withDialogActions,
 )(RulesTable);

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsList.tsx

@@ -15,7 +15,7 @@ import {
 import { AccountTransactionsDetailsBar } from './AccountTransactionsDetailsBar';
 import { AccountTransactionsProgressBar } from './components';
 import { AccountTransactionsFilterTabs } from './AccountTransactionsFilterTabs';
-import { AppShell } from '@/components/AppShell/AppShell';
+import { AppContentShell } from '@/components/AppShell';
 import { CategorizeTransactionAside } from '../CategorizeTransactionAside/CategorizeTransactionAside';
 import { withBanking } from '../withBanking';
 
@@ -28,8 +28,8 @@ function AccountTransactionsListRoot({
 }) {
   return (
     <AccountTransactionsProvider>
-      <AppShell hideAside={!openMatchingTransactionAside}>
+      <AppContentShell hideAside={!openMatchingTransactionAside}>
-        <AppShell.Main>
+        <AppContentShell.Main>
           <AccountTransactionsActionsBar />
           <AccountTransactionsDetailsBar />
           <AccountTransactionsProgressBar />
@@ -41,12 +41,12 @@ function AccountTransactionsListRoot({
               <AccountTransactionsContent />
             </Suspense>
           </DashboardPageContent>
-        </AppShell.Main>
+        </AppContentShell.Main>
 
-        <AppShell.Aside>
+        <AppContentShell.Aside>
           <CategorizeTransactionAside />
-        </AppShell.Aside>
+        </AppContentShell.Aside>
-      </AppShell>
+      </AppContentShell>
     </AccountTransactionsProvider>
   );
 }

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsUncategorizedTable.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import styled from 'styled-components';
-
+import { Intent } from '@blueprintjs/core';
 import {
   DataTable,
   TableFastCell,
@@ -14,7 +14,6 @@ import {
 import { TABLES } from '@/constants/tables';
 
 import withSettings from '@/containers/Settings/withSettings';
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 import { withBankingActions } from '../withBankingActions';
 
 import { useMemorizedColumnsWidths } from '@/hooks';
@@ -26,7 +25,6 @@ import { useAccountUncategorizedTransactionsContext } from './AllTransactionsUnc
 
 import { compose } from '@/utils';
 import { useExcludeUncategorizedTransaction } from '@/hooks/query/bank-rules';
-import { Intent } from '@blueprintjs/core';
 
 /**
  * Account transactions data table.
@@ -37,9 +35,6 @@ function AccountTransactionsDataTable({
 
   // #withBankingActions
   setUncategorizedTransactionIdForMatching,
-
-  // #withDrawerActions
-  openDrawer,
 }) {
   // Retrieve table columns.
   const columns = useAccountUncategorizedTransactionsColumns();
@@ -102,7 +97,9 @@ function AccountTransactionsDataTable({
       vListOverscanRowCount={0}
       initialColumnsWidths={initialColumnsWidths}
       onColumnResizing={handleColumnResizing}
-      noResults={'There is no uncategorized transactions in the current account.'}
+      noResults={
+        'There is no uncategorized transactions in the current account.'
+      }
       className="table-constrant"
       payload={{
         onExclude: handleExcludeTransaction,
@@ -116,7 +113,6 @@ export default compose(
   withSettings(({ cashflowTransactionsSettings }) => ({
     cashflowTansactionsTableSize: cashflowTransactionsSettings?.tableSize,
   })),
-  withDrawerActions,
   withBankingActions,
 )(AccountTransactionsDataTable);
 

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountUncategorizedTransactionsFilterProvider.tsx

@@ -1,37 +0,0 @@
-import React from 'react';
-
-interface UncategorizedTransactionsFilterValue {}
-
-const UncategorizedTransactionsFilterContext =
-  React.createContext<UncategorizedTransactionsFilterValue>(
-    {} as UncategorizedTransactionsFilterValue,
-  );
-
-interface UncategorizedTransactionsFilterProviderProps {
-  children: React.ReactNode;
-}
-
-/**
- *
- */
-function UncategorizedTransactionsFilterProvider({
-  ...props
-}: UncategorizedTransactionsFilterProviderProps) {
-  // Provider payload.
-  const provider = {};
-
-  return (
-    <UncategorizedTransactionsFilterContext.Provider
-      value={provider}
-      {...props}
-    />
-  );
-}
-
-const useUncategorizedTransactionsFilter = () =>
-  React.useContext(UncategorizedTransactionsFilterContext);
-
-export {
-  UncategorizedTransactionsFilterProvider,
-  useUncategorizedTransactionsFilter,
-};

packages/webapp/src/containers/CashFlow/AccountTransactions/AllTransactionsUncategorized.tsx

@@ -6,7 +6,6 @@ import * as R from 'ramda';
 import '@/style/pages/CashFlow/AccountTransactions/List.scss';
 
 import { AccountTransactionsUncategorizeFilter } from './AccountTransactionsUncategorizeFilter';
-import { UncategorizedTransactionsFilterProvider } from './AccountUncategorizedTransactionsFilterProvider';
 import {
   WithBankingActionsProps,
   withBankingActions,
@@ -23,6 +22,7 @@ function AllTransactionsUncategorizedRoot({
   // #withBankingActions
   closeMatchingTransactionAside,
 }: AllTransactionsUncategorizedProps) {
+  // Close the match aside once leaving the page.
   useEffect(
     () => () => {
       closeMatchingTransactionAside();
@@ -31,12 +31,10 @@ function AllTransactionsUncategorizedRoot({
   );
 
   return (
-    <UncategorizedTransactionsFilterProvider>
+    <Box>
-      <Box>
+      <AccountTransactionsUncategorizeFilter />
-        <AccountTransactionsUncategorizeFilter />
+      <AccountTransactionsSwitcher />
-        <AccountTransactionsSwitcher />
+    </Box>
-      </Box>
-    </UncategorizedTransactionsFilterProvider>
   );
 }
 

packages/webapp/src/containers/CashFlow/AccountTransactions/RecognizedTransactions/RecognizedTransactionsTable.tsx

@@ -14,7 +14,6 @@ import {
 } from '@/components';
 import { TABLES } from '@/constants/tables';
 
-import withSettings from '@/containers/Settings/withSettings';
 import withAlertsActions from '@/containers/Alert/withAlertActions';
 import withDrawerActions from '@/containers/Drawer/withDrawerActions';