@zeniai/client-epic-state 4.19.96-betaJK15 → 4.19.96-betaJK17

package/lib/entity/account/accountSelector.d.ts

@@ -6,6 +6,7 @@ import { ID } from '../../commonStateTypes/common';
 import { EntityOrder } from '../../commonStateTypes/selectorTypes/selectorTypes';
 import { ReportIDPlusForecastID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { Account, AccountBase, AccountState, AccountType } from './accountState';
+export declare const getAccountByAccountId: (accountState: AccountState, accountId: ID) => Account | undefined;
 export declare const getAccountBase: (accountState: AccountState, accountId: ID, reportId: ReportIDPlusForecastID) => AccountBase | undefined;
 export declare function getAccount(accountState: AccountState, id: {
     accountId: ID;

package/lib/entity/account/accountSelector.js

@@ -3,13 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountIdsForLabels = exports.getAccountIdsForTypes = exports.getAccountsByType = exports.getAccountsOrdered = exports.getAccountBase = void 0;
+exports.getAccountIdsForLabels = exports.getAccountIdsForTypes = exports.getAccountsByType = exports.getAccountsOrdered = exports.getAccountBase = exports.getAccountByAccountId = void 0;
 exports.getAccount = getAccount;
 exports.getAccountWithBalance = getAccountWithBalance;
 const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const coaBalance_1 = require("../../commonStateTypes/coaBalance/coaBalance");
 const sortBalancesByFreeRangeTotal_1 = require("../../commonStateTypes/coaBalance/sortBalancesByFreeRangeTotal");
 const accountState_1 = require("./accountState");
+// create a selector to get the account by accountId
+const getAccountByAccountId = (accountState, accountId) => {
+    const accounts = Object.values(accountState.accountsByKey);
+    const account = accounts.find((account) => account.accountId === accountId);
+    return account;
+};
+exports.getAccountByAccountId = getAccountByAccountId;
 function getCommonAccountFields(accountState, id) {
     const key = (0, accountState_1.getAccountKey)(id.reportId, id.accountId, id.classesViewParentId, id.accountsViewParentId);
     const account = accountState.accountsByKey[key];

package/lib/esm/entity/account/accountSelector.js

@@ -2,6 +2,12 @@ import flatMap from 'lodash/flatMap';
 import { getCOABalances } from '../../commonStateTypes/coaBalance/coaBalance';
 import { sortComparator } from '../../commonStateTypes/coaBalance/sortBalancesByFreeRangeTotal';
 import { getAccountKey, } from './accountState';
+// create a selector to get the account by accountId
+export const getAccountByAccountId = (accountState, accountId) => {
+    const accounts = Object.values(accountState.accountsByKey);
+    const account = accounts.find((account) => account.accountId === accountId);
+    return account;
+};
 function getCommonAccountFields(accountState, id) {
     const key = getAccountKey(id.reportId, id.accountId, id.classesViewParentId, id.accountsViewParentId);
     const account = accountState.accountsByKey[key];

package/lib/esm/view/expenseAutomationView/epics/accountRecon/excludeAccountFromReconciliationEpic.js

@@ -3,7 +3,7 @@ import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { getAccountReconByAccountIdAndSelectedPeriod } from '../../../../entity/accountRecon/accountReconSelector';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { excludeAccountFromReconciliation, excludeAccountFromReconciliationFailure, excludeAccountFromReconciliationSuccess, fetchReconciliation, } from '../../reducers/reconciliationViewReducer';
+import { excludeAccountFromReconciliation, excludeAccountFromReconciliationFailure, excludeAccountFromReconciliationSuccess, } from '../../reducers/reconciliationViewReducer';
 export const excludeAccountFromReconciliationEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(excludeAccountFromReconciliation.match), mergeMap((action) => {
     const { accountId } = action.payload;
     const state = state$.value;
@@ -21,7 +21,10 @@ export const excludeAccountFromReconciliationEpic = (actions$, state$, zeniAPI)
         .postAndGetJSON(apiUrl, payload)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response)) {
-            return of(excludeAccountFromReconciliationSuccess({ accountId }), fetchReconciliation(selectedPeriod, undefined, true, true));
+            return of(excludeAccountFromReconciliationSuccess({
+                account: response.data?.excluded_account ?? undefined,
+                selectedPeriod,
+            }));
         }
         else {
             return of(excludeAccountFromReconciliationFailure({

package/lib/esm/view/expenseAutomationView/reducers/reconciliationViewReducer.js

@@ -443,8 +443,36 @@ const expenseAutomationReconciliationView = createSlice({
                 fetchState: 'Completed',
                 error: undefined,
             };
-            if (!draft.excludedAccountIDs.includes(action.payload.accountId)) {
-                draft.excludedAccountIDs.push(action.payload.accountId);
+            const { account, selectedPeriod } = action.payload;
+            if (account != null) {
+                if (!draft.excludedAccountIDs.includes(account.account_id)) {
+                    draft.excludedAccountIDs.push(account.account_id);
+                }
+                draft.excludedAccountExclusionInfo[account.account_id] = {
+                    bankBalance: account.bank_balance != null
+                        ? {
+                            amount: account.bank_balance,
+                            currencyCode: account.currency_code ?? 'USD',
+                            currencySymbol: account.currency_symbol ?? '$',
+                        }
+                        : undefined,
+                    clearedBalance: account.cleared_balance != null
+                        ? {
+                            amount: account.cleared_balance,
+                            currencyCode: account.currency_code ?? 'USD',
+                            currencySymbol: account.currency_symbol ?? '$',
+                        }
+                        : undefined,
+                    variance: account.variance != null
+                        ? {
+                            amount: account.variance,
+                            currencyCode: account.currency_code ?? 'USD',
+                            currencySymbol: account.currency_symbol ?? '$',
+                        }
+                        : undefined,
+                };
+                const monthYearPeriodId = toMonthYearPeriodId(selectedPeriod);
+                draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs = draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs.filter((id) => id !== account.account_id);
             }
         },
         excludeAccountFromReconciliationFailure: (draft, action) => {

package/lib/esm/view/expenseAutomationView/selectors/reconciliationViewSelector.js

@@ -5,7 +5,7 @@ import omit from 'lodash/omit';
 import orderBy from 'lodash/orderBy';
 import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
-import { getAccountWithBalance, getAccountsByType, } from '../../../entity/account/accountSelector';
+import { getAccountByAccountId, getAccountsByType, } from '../../../entity/account/accountSelector';
 import { getAccountReconByAccountIdAndSelectedPeriod } from '../../../entity/accountRecon/accountReconSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getVendorByVendorId } from '../../../entity/vendor/vendorSelector';
@@ -101,6 +101,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
                     totalVariancePercentage: undefined,
                 },
             },
+            excludeAccountFetchState: reconciliationViewState.actionFetchState.excludeAccountFetch,
         };
     }
     const allAccountIDs = accountReconForMonthYearPeriod.accountIDs;
@@ -289,15 +290,14 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
     };
     const excludedAccountReconciliationByAccountID = {};
     reconciliationViewState.excludedAccountIDs.forEach((excludedAccountID) => {
-        const account = getAccountWithBalance(accountState, {
-            accountId: excludedAccountID,
-            reportId: 'excluded_account_reconciliation',
-        });
+        const account = getAccountByAccountId(accountState, excludedAccountID);
         const exclusionInfo = reconciliationViewState.excludedAccountExclusionInfo[excludedAccountID];
-        excludedAccountReconciliationByAccountID[excludedAccountID] = {
-            ...account,
-            ...exclusionInfo,
-        };
+        if (account != null) {
+            excludedAccountReconciliationByAccountID[excludedAccountID] = {
+                ...account,
+                ...exclusionInfo,
+            };
+        }
     });
     const accountListNestedAccountHierarchy = getNestedAccountListHierarchy(accountListState, 'accountList');
     const classListNestedAccountHierarchy = getNestedClassListHierarchy(classListState);
@@ -358,6 +358,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         reconListUIState: reconciliationViewState.reconListUIState,
         excludedAccountReconciliationBySectionID,
         excludedAccountReconciliationByAccountID,
+        excludeAccountFetchState: reconciliationViewState.actionFetchState.excludeAccountFetch,
     };
 });
 export const isAccountReconReport = (reportId) => {

package/lib/view/expenseAutomationView/epics/accountRecon/excludeAccountFromReconciliationEpic.d.ts

@@ -2,6 +2,6 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../reducer';
 import { ZeniAPI } from '../../../../zeniAPI';
-import { excludeAccountFromReconciliation, excludeAccountFromReconciliationFailure, excludeAccountFromReconciliationSuccess, fetchReconciliation } from '../../reducers/reconciliationViewReducer';
-export type ActionType = ReturnType<typeof excludeAccountFromReconciliation> | ReturnType<typeof excludeAccountFromReconciliationSuccess> | ReturnType<typeof excludeAccountFromReconciliationFailure> | ReturnType<typeof fetchReconciliation>;
+import { excludeAccountFromReconciliation, excludeAccountFromReconciliationFailure, excludeAccountFromReconciliationSuccess } from '../../reducers/reconciliationViewReducer';
+export type ActionType = ReturnType<typeof excludeAccountFromReconciliation> | ReturnType<typeof excludeAccountFromReconciliationSuccess> | ReturnType<typeof excludeAccountFromReconciliationFailure>;
 export declare const excludeAccountFromReconciliationEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/expenseAutomationView/epics/accountRecon/excludeAccountFromReconciliationEpic.js

@@ -24,7 +24,10 @@ const excludeAccountFromReconciliationEpic = (actions$, state$, zeniAPI) => acti
         .postAndGetJSON(apiUrl, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            return (0, rxjs_1.of)((0, reconciliationViewReducer_1.excludeAccountFromReconciliationSuccess)({ accountId }), (0, reconciliationViewReducer_1.fetchReconciliation)(selectedPeriod, undefined, true, true));
+            return (0, rxjs_1.of)((0, reconciliationViewReducer_1.excludeAccountFromReconciliationSuccess)({
+                account: response.data?.excluded_account ?? undefined,
+                selectedPeriod,
+            }));
         }
         else {
             return (0, rxjs_1.of)((0, reconciliationViewReducer_1.excludeAccountFromReconciliationFailure)({

package/lib/view/expenseAutomationView/payload/reconciliationPayload.d.ts

@@ -45,7 +45,18 @@ export interface ExcludeAccountFromReconciliationRequestPayload {
     cleared_balance: number;
     variance: number;
 }
-export type ExcludeAccountFromReconciliationResponse = ZeniAPIResponse<unknown>;
+export interface ExcludedAccountFromReconciliationPayload {
+    account_id: ID;
+    bank_balance: number | null;
+    cleared_balance: number | null;
+    variance: number | null;
+    currency_code?: string;
+    currency_symbol?: string;
+}
+export interface ExcludeAccountFromReconciliationResponsePayload {
+    excluded_account: ExcludedAccountFromReconciliationPayload;
+}
+export type ExcludeAccountFromReconciliationResponse = ZeniAPIResponse<ExcludeAccountFromReconciliationResponsePayload>;
 export interface DeleteStatementResponsePayload {
     statement_upload: {
         statement_data_status: StatusCodeWithLabelPayload;

package/lib/view/expenseAutomationView/reducers/reconciliationViewReducer.d.ts

@@ -3,7 +3,7 @@ import { FetchState, ID } from '../../../commonStateTypes/common';
 import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderTypes';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
 import { ZeniAPIStatus } from '../../../responsePayload';
-import { ReconciliationPayload, UploadStatementDocumentAIPayload } from '../payload/reconciliationPayload';
+import { ExcludedAccountFromReconciliationPayload, ReconciliationPayload, UploadStatementDocumentAIPayload } from '../payload/reconciliationPayload';
 import { AccountReconciliationLocalData, ActionFetchStates, ExcludeAccountFromReconciliationPayload, ReconReconcileSortKey, ReconReviewSortKey, ReconciliationReviewTabLocalData, ReconciliationTabsState, ReconciliationViewState, ReconciliationViewTabType, SaveReconcileDetailActionPayload, SaveReconciliationDetailFailurePayload, TransactionSummary } from '../types/reconciliationViewState';
 export declare const initialReconciliationTabsState: ReconciliationTabsState;
 export declare const initialActionFetchState: ActionFetchStates;
@@ -87,7 +87,8 @@ export declare const fetchReconciliation: import("@reduxjs/toolkit").ActionCreat
     error: ZeniAPIStatus;
     selectedPeriod: MonthYearPeriod;
 }, "expenseAutomationReconciliationView/deleteAccountStatementFailure">, excludeAccountFromReconciliation: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[payload: ExcludeAccountFromReconciliationPayload], ExcludeAccountFromReconciliationPayload, "expenseAutomationReconciliationView/excludeAccountFromReconciliation", never, never>, excludeAccountFromReconciliationSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    accountId: ID;
+    selectedPeriod: MonthYearPeriod;
+    account?: ExcludedAccountFromReconciliationPayload;
 }, "expenseAutomationReconciliationView/excludeAccountFromReconciliationSuccess">, excludeAccountFromReconciliationFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
 }, "expenseAutomationReconciliationView/excludeAccountFromReconciliationFailure">, uploadAccountStatement: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/expenseAutomationView/reducers/reconciliationViewReducer.js

@@ -447,8 +447,36 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
                 fetchState: 'Completed',
                 error: undefined,
             };
-            if (!draft.excludedAccountIDs.includes(action.payload.accountId)) {
-                draft.excludedAccountIDs.push(action.payload.accountId);
+            const { account, selectedPeriod } = action.payload;
+            if (account != null) {
+                if (!draft.excludedAccountIDs.includes(account.account_id)) {
+                    draft.excludedAccountIDs.push(account.account_id);
+                }
+                draft.excludedAccountExclusionInfo[account.account_id] = {
+                    bankBalance: account.bank_balance != null
+                        ? {
+                            amount: account.bank_balance,
+                            currencyCode: account.currency_code ?? 'USD',
+                            currencySymbol: account.currency_symbol ?? '$',
+                        }
+                        : undefined,
+                    clearedBalance: account.cleared_balance != null
+                        ? {
+                            amount: account.cleared_balance,
+                            currencyCode: account.currency_code ?? 'USD',
+                            currencySymbol: account.currency_symbol ?? '$',
+                        }
+                        : undefined,
+                    variance: account.variance != null
+                        ? {
+                            amount: account.variance,
+                            currencyCode: account.currency_code ?? 'USD',
+                            currencySymbol: account.currency_symbol ?? '$',
+                        }
+                        : undefined,
+                };
+                const monthYearPeriodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
+                draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs = draft.accountReconciliationRecordsBySelectedPeriod[monthYearPeriodId].accountIDs.filter((id) => id !== account.account_id);
             }
         },
         excludeAccountFromReconciliationFailure: (draft, action) => {

package/lib/view/expenseAutomationView/selectorTypes/reconciliationViewSelectorTypes.d.ts

@@ -3,8 +3,7 @@ import { Amount } from '../../../commonStateTypes/amount';
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { CompletionStatusType, FetchStateAndError, ID } from '../../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
-import { AccountWithBalanceReport } from '../../../entity/account/accountSelector';
-import { AccountBase } from '../../../entity/account/accountState';
+import { Account, AccountBase } from '../../../entity/account/accountState';
 import { AccountReconciliationEntity } from '../../../entity/accountRecon/accountReconSelector';
 import { BankStatusCodeType } from '../../../entity/accountRecon/accountReconState';
 import { ClassBase } from '../../../entity/class/classState';
@@ -14,7 +13,7 @@ import { AccountReconciliationLocalData, ActionFetchStates, ReconListUIState, Re
 export declare const ALL_ACCOUNT_RECON_SECTION_IDS: readonly ["assets", "liabilities"];
 declare const toAccountReconSectionID: (v: string) => "assets" | "liabilities";
 export type AccountReconSectionID = ReturnType<typeof toAccountReconSectionID>;
-export interface ExcludedAccountReconciliation extends AccountWithBalanceReport {
+export interface ExcludedAccountReconciliation extends Account {
     bankBalance?: Amount;
     clearedBalance?: Amount;
     variance?: Amount;
@@ -30,6 +29,7 @@ export interface ExpenseAutomationReconciliationViewSelector {
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
     completionStatus: CompletionStatusType;
     creditCards: AccountBase[];
+    excludeAccountFetchState: FetchStateAndError;
     excludedAccountReconciliationByAccountID: Record<ID, ExcludedAccountReconciliation>;
     excludedAccountReconciliationBySectionID: Record<AccountReconSectionID, AccountReconciliationBySection>;
     fetchStatus: FetchStateAndError;

package/lib/view/expenseAutomationView/selectors/reconciliationViewSelector.js

@@ -107,6 +107,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
                     totalVariancePercentage: undefined,
                 },
             },
+            excludeAccountFetchState: reconciliationViewState.actionFetchState.excludeAccountFetch,
         };
     }
     const allAccountIDs = accountReconForMonthYearPeriod.accountIDs;
@@ -295,15 +296,14 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
     };
     const excludedAccountReconciliationByAccountID = {};
     reconciliationViewState.excludedAccountIDs.forEach((excludedAccountID) => {
-        const account = (0, accountSelector_1.getAccountWithBalance)(accountState, {
-            accountId: excludedAccountID,
-            reportId: 'excluded_account_reconciliation',
-        });
+        const account = (0, accountSelector_1.getAccountByAccountId)(accountState, excludedAccountID);
         const exclusionInfo = reconciliationViewState.excludedAccountExclusionInfo[excludedAccountID];
-        excludedAccountReconciliationByAccountID[excludedAccountID] = {
-            ...account,
-            ...exclusionInfo,
-        };
+        if (account != null) {
+            excludedAccountReconciliationByAccountID[excludedAccountID] = {
+                ...account,
+                ...exclusionInfo,
+            };
+        }
     });
     const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList');
     const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
@@ -364,6 +364,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         reconListUIState: reconciliationViewState.reconListUIState,
         excludedAccountReconciliationBySectionID,
         excludedAccountReconciliationByAccountID,
+        excludeAccountFetchState: reconciliationViewState.actionFetchState.excludeAccountFetch,
     };
 });
 const isAccountReconReport = (reportId) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.96-betaJK15",
+  "version": "4.19.96-betaJK17",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",