npm - @zeniai/client-epic-state - Versions diffs - 4.19.96-betaJK7 → 4.19.96-betaJK8 - Mend

@zeniai/client-epic-state 4.19.96-betaJK7 → 4.19.96-betaJK8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/esm/view/expenseAutomationView/epics/accountRecon/fetchReconciliationViewEpic.js CHANGED Viewed

@@ -53,23 +53,17 @@ export const fetchReconciliationViewEpic = (actions$, state$, zeniAPI) => action
         return zeniAPI.getJSON(apiUrl).pipe(mergeMap((response) => {
             if (isSuccessResponse(response) && response.data != null) {
                 const updateActions = [];
-                updateActions.push(updateAccounts(response.data.accounts, 'account_reconciliation'));
-                updateActions.push(updateAccounts(response.data.excluded_accounts, 'excluded_account_reconciliation'));
-                updateActions.push(updateAllUsers({
+                const allTransactionsPerRecon = getAllReviewTransactionsFromReconcilePayload(response.data.reconciliation);
+                updateActions.push(updateAccounts(response.data.accounts, 'account_reconciliation'), updateAccounts(response.data.excluded_accounts, 'excluded_account_reconciliation'), updateAllUsers({
                     users: response.data.users ?? [],
                     updateType: 'merge',
-                }));
-                updateActions.push(updateFiles({ files: response.data.files ?? [] }));
-                const allTransactionsPerRecon = getAllReviewTransactionsFromReconcilePayload(response.data.reconciliation);
-                updateActions.push(updateMultipleReconcileTransactions(allTransactionsPerRecon, 'merge'));
-                updateActions.push(updateAccountRecon(selectedPeriod, response.data.reconciliation));
+                }), updateFiles({ files: response.data.files ?? [] }), updateMultipleReconcileTransactions(allTransactionsPerRecon, 'merge'), updateAccountRecon(selectedPeriod, response.data.reconciliation));
                 const reviewTabLocalData = prepareReviewTabLocalData(response.data.reconciliation[0]?.transactions?.review ?? []);
                 if (accountId != null) {
                     const selectedTransactionIds = getTransactionIdFromCheckedMatchedTransactionPayload(response.data.reconciliation[0].transactions.reconcile);
                     updateActions.push(updateReconcileTabLocalData({
                         selectedTransactionIds: selectedTransactionIds,
-                    }));
-                    updateActions.push(initializeReconciliationReviewTabLocalData(reviewTabLocalData));
+                    }), initializeReconciliationReviewTabLocalData(reviewTabLocalData));
                 }
                 updateActions.push(fetchReconciliationSuccess(selectedPeriod, response.data, refreshViewInBackground, accountId));
                 return from(updateActions);

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

@@ -60,6 +60,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             reconciliationTabsState: initialReconciliationTabsState,
             actionFetchStates: initialActionFetchState,
             reviewTabSelectedVendorByTransactionId: {},
+            excludedAccountReconciliationByAccountID: {},
             accountReconciliationBySectionID: {
                 assets: {
                     sectionId: 'assets',
@@ -259,6 +260,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             totalVariancePercentage: liabilityTotals.variancePercentage,
         },
     };
+    const excludedReconList = {};
     const excludedAssetAccountIDs = [];
     const excludedLiabilityAccountIDs = [];
     const excludedAssetTotals = {};
@@ -315,8 +317,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         if (accountRecon?.clearedBalance != null && clearedTotal != null) {
             clearedTotal = clearedTotal.plus(accountRecon.clearedBalance.amount);
         }
-        else if (accountRecon?.clearedBalance != null &&
-            clearedTotal == null) {
+        else if (accountRecon?.clearedBalance != null && clearedTotal == null) {
             clearedTotal = Big(accountRecon.clearedBalance.amount);
         }
         const currency = accountRecon?.currency;
@@ -367,6 +368,31 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             excludedLiabilityTotals.varianceTotal = total.varianceTotal;
             excludedLiabilityTotals.variancePercentage = total.variancePercentage;
         }
+        if (accountRecon != null) {
+            const excludedAccountConnectionStatus = reconciliationViewState.accountConnectionStatusByAccountID[accountID];
+            const excludedReconciliationRecord = accountReconForMonthYearPeriod?.reconciliationByAccountID[accountID];
+            const defaultFetchState = {
+                error: undefined,
+                fetchState: 'Not-Started',
+            };
+            excludedReconList[accountID] = {
+                accountConnectionStatus: excludedAccountConnectionStatus?.status ?? 'not_connected',
+                paymentAccountId: excludedAccountConnectionStatus?.paymentAccountId,
+                connectionInProgress: excludedAccountConnectionStatus?.connectionInProgress ?? false,
+                accountReconEntity: accountRecon,
+                refreshStatus: excludedReconciliationRecord?.refreshStatus ?? defaultFetchState,
+                statementDeleteStatus: excludedReconciliationRecord?.statementDeleteStatus ??
+                    defaultFetchState,
+                statementUpdateStatus: excludedReconciliationRecord?.statementUpdateStatus ??
+                    defaultFetchState,
+                statementUploadStatus: excludedReconciliationRecord?.statementUploadStatus ??
+                    defaultFetchState,
+                localData: excludedReconciliationRecord?.localData ?? {},
+                statementParseInProgress: excludedReconciliationRecord?.statementParseInProgress ?? false,
+                transactionFetchState: excludedReconciliationRecord?.transactionFetchState ??
+                    defaultFetchState,
+            };
+        }
     });
     const excludedAccountReconciliationBySectionID = {
         assets: {
@@ -433,6 +459,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         statementUploadChosen: reconciliationViewState.statementUploadChosen,
         monthYearPeriod: selectedPeriod,
         accountReconciliationBySectionID,
+        excludedAccountReconciliationByAccountID: excludedReconList,
         excludedAccountReconciliationBySectionID,
         selectedAccountId: reconciliationViewState.selectedAccountId,
         selectedReconAccount: reconciliationViewState.selectedAccountId != null &&

package/lib/view/expenseAutomationView/epics/accountRecon/fetchReconciliationViewEpic.js CHANGED Viewed

@@ -56,23 +56,17 @@ const fetchReconciliationViewEpic = (actions$, state$, zeniAPI) => actions$.pipe
         return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.mergeMap)((response) => {
             if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
                 const updateActions = [];
-                updateActions.push((0, accountReducer_1.updateAccounts)(response.data.accounts, 'account_reconciliation'));
-                updateActions.push((0, accountReducer_1.updateAccounts)(response.data.excluded_accounts, 'excluded_account_reconciliation'));
-                updateActions.push((0, userReducer_1.updateAllUsers)({
+                const allTransactionsPerRecon = (0, reconciliationHelpers_1.getAllReviewTransactionsFromReconcilePayload)(response.data.reconciliation);
+                updateActions.push((0, accountReducer_1.updateAccounts)(response.data.accounts, 'account_reconciliation'), (0, accountReducer_1.updateAccounts)(response.data.excluded_accounts, 'excluded_account_reconciliation'), (0, userReducer_1.updateAllUsers)({
                     users: response.data.users ?? [],
                     updateType: 'merge',
-                }));
-                updateActions.push((0, fileReducer_1.updateFiles)({ files: response.data.files ?? [] }));
-                const allTransactionsPerRecon = (0, reconciliationHelpers_1.getAllReviewTransactionsFromReconcilePayload)(response.data.reconciliation);
-                updateActions.push((0, transactionReducer_1.updateMultipleReconcileTransactions)(allTransactionsPerRecon, 'merge'));
-                updateActions.push((0, accountReconReducer_1.updateAccountRecon)(selectedPeriod, response.data.reconciliation));
+                }), (0, fileReducer_1.updateFiles)({ files: response.data.files ?? [] }), (0, transactionReducer_1.updateMultipleReconcileTransactions)(allTransactionsPerRecon, 'merge'), (0, accountReconReducer_1.updateAccountRecon)(selectedPeriod, response.data.reconciliation));
                 const reviewTabLocalData = (0, exports.prepareReviewTabLocalData)(response.data.reconciliation[0]?.transactions?.review ?? []);
                 if (accountId != null) {
                     const selectedTransactionIds = (0, saveReconciliationDetailEpic_1.getTransactionIdFromCheckedMatchedTransactionPayload)(response.data.reconciliation[0].transactions.reconcile);
                     updateActions.push((0, reconciliationViewReducer_1.updateReconcileTabLocalData)({
                         selectedTransactionIds: selectedTransactionIds,
-                    }));
-                    updateActions.push((0, reconciliationViewReducer_1.initializeReconciliationReviewTabLocalData)(reviewTabLocalData));
+                    }), (0, reconciliationViewReducer_1.initializeReconciliationReviewTabLocalData)(reviewTabLocalData));
                 }
                 updateActions.push((0, reconciliationViewReducer_1.fetchReconciliationSuccess)(selectedPeriod, response.data, refreshViewInBackground, accountId));
                 return (0, rxjs_1.from)(updateActions);

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

@@ -24,6 +24,7 @@ export interface ExpenseAutomationReconciliationViewSelector {
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
     completionStatus: CompletionStatusType;
     creditCards: AccountBase[];
+    excludedAccountReconciliationByAccountID: Record<ID, AccountReconciliationByAccount>;
     excludedAccountReconciliationBySectionID: Record<AccountReconSectionID, AccountReconciliationBySection>;
     fetchStatus: FetchStateAndError;
     monthYearPeriod: MonthYearPeriod;

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

@@ -66,6 +66,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             reconciliationTabsState: reconciliationViewReducer_1.initialReconciliationTabsState,
             actionFetchStates: reconciliationViewReducer_1.initialActionFetchState,
             reviewTabSelectedVendorByTransactionId: {},
+            excludedAccountReconciliationByAccountID: {},
             accountReconciliationBySectionID: {
                 assets: {
                     sectionId: 'assets',
@@ -265,6 +266,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             totalVariancePercentage: liabilityTotals.variancePercentage,
         },
     };
+    const excludedReconList = {};
     const excludedAssetAccountIDs = [];
     const excludedLiabilityAccountIDs = [];
     const excludedAssetTotals = {};
@@ -321,8 +323,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         if (accountRecon?.clearedBalance != null && clearedTotal != null) {
             clearedTotal = clearedTotal.plus(accountRecon.clearedBalance.amount);
         }
-        else if (accountRecon?.clearedBalance != null &&
-            clearedTotal == null) {
+        else if (accountRecon?.clearedBalance != null && clearedTotal == null) {
             clearedTotal = (0, big_js_1.default)(accountRecon.clearedBalance.amount);
         }
         const currency = accountRecon?.currency;
@@ -373,6 +374,31 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             excludedLiabilityTotals.varianceTotal = total.varianceTotal;
             excludedLiabilityTotals.variancePercentage = total.variancePercentage;
         }
+        if (accountRecon != null) {
+            const excludedAccountConnectionStatus = reconciliationViewState.accountConnectionStatusByAccountID[accountID];
+            const excludedReconciliationRecord = accountReconForMonthYearPeriod?.reconciliationByAccountID[accountID];
+            const defaultFetchState = {
+                error: undefined,
+                fetchState: 'Not-Started',
+            };
+            excludedReconList[accountID] = {
+                accountConnectionStatus: excludedAccountConnectionStatus?.status ?? 'not_connected',
+                paymentAccountId: excludedAccountConnectionStatus?.paymentAccountId,
+                connectionInProgress: excludedAccountConnectionStatus?.connectionInProgress ?? false,
+                accountReconEntity: accountRecon,
+                refreshStatus: excludedReconciliationRecord?.refreshStatus ?? defaultFetchState,
+                statementDeleteStatus: excludedReconciliationRecord?.statementDeleteStatus ??
+                    defaultFetchState,
+                statementUpdateStatus: excludedReconciliationRecord?.statementUpdateStatus ??
+                    defaultFetchState,
+                statementUploadStatus: excludedReconciliationRecord?.statementUploadStatus ??
+                    defaultFetchState,
+                localData: excludedReconciliationRecord?.localData ?? {},
+                statementParseInProgress: excludedReconciliationRecord?.statementParseInProgress ?? false,
+                transactionFetchState: excludedReconciliationRecord?.transactionFetchState ??
+                    defaultFetchState,
+            };
+        }
     });
     const excludedAccountReconciliationBySectionID = {
         assets: {
@@ -439,6 +465,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         statementUploadChosen: reconciliationViewState.statementUploadChosen,
         monthYearPeriod: selectedPeriod,
         accountReconciliationBySectionID,
+        excludedAccountReconciliationByAccountID: excludedReconList,
         excludedAccountReconciliationBySectionID,
         selectedAccountId: reconciliationViewState.selectedAccountId,
         selectedReconAccount: reconciliationViewState.selectedAccountId != null &&

package/package.json CHANGED Viewed

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