@zeniai/client-epic-state 4.19.96-betaJK4 → 4.19.96-betaJK6

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

@@ -2,18 +2,13 @@ import { of } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { fetchReconExcludedAccounts, fetchReconExcludedAccountsFailure, fetchReconExcludedAccountsSuccess, } from '../../reducers/reconciliationViewReducer';
-export const fetchReconExcludedAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchReconExcludedAccounts.match), mergeMap((action) => {
-    const { accountId, exclusionReason } = action.payload;
-    const requestPayload = {
-        account_id: accountId,
-        exclusion_reason: exclusionReason,
-    };
+export const fetchReconExcludedAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchReconExcludedAccounts.match), mergeMap(() => {
     return zeniAPI
-        .postAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/excluded-accounts`, requestPayload)
+        .getJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/excluded-accounts`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
             return of(fetchReconExcludedAccountsSuccess({
-                excludedAccounts: response.data.excluded_account,
+                excludedAccounts: response.data.excluded_accounts,
             }));
         }
         else {

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

@@ -427,18 +427,11 @@ const expenseAutomationReconciliationView = createSlice({
         updateStatementUploadChosen: (draft, action) => {
             draft.statementUploadChosen = action.payload.statementUploadChosen;
         },
-        fetchReconExcludedAccounts: {
-            reducer(draft) {
-                draft.excludedAccountsFetchState = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(accountId, exclusionReason) {
-                return {
-                    payload: { accountId, exclusionReason },
-                };
-            },
+        fetchReconExcludedAccounts: (draft) => {
+            draft.excludedAccountsFetchState = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
         },
         fetchReconExcludedAccountsSuccess: (draft, action) => {
             draft.excludedAccountsFetchState = {

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

@@ -366,8 +366,7 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
             excludedLiabilityTotals.balanceTotal = total.balanceTotal;
             excludedLiabilityTotals.clearedTotal = total.clearedTotal;
             excludedLiabilityTotals.varianceTotal = total.varianceTotal;
-            excludedLiabilityTotals.variancePercentage =
-                total.variancePercentage;
+            excludedLiabilityTotals.variancePercentage = total.variancePercentage;
         }
     });
     const excludedAccountReconciliationBySectionID = {
@@ -421,10 +420,10 @@ export const getExpenseAutomationReconciliationView = createSelector((state) =>
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: {
-            fetchState: reconciliationViewState.fetchState,
-            error: reconciliationViewState.error,
-        },
+        fetchStatus: reduceAnyFetchState([
+            reconciliationViewState,
+            reconciliationViewState.excludedAccountsFetchState,
+        ]),
         plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
             .plaidConnectionDetails,
         reconciliationTabsState: reconciliationViewState.reconTabsState,

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

@@ -5,18 +5,13 @@ const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../../responsePayload");
 const reconciliationViewReducer_1 = require("../../reducers/reconciliationViewReducer");
-const fetchReconExcludedAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(reconciliationViewReducer_1.fetchReconExcludedAccounts.match), (0, operators_1.mergeMap)((action) => {
-    const { accountId, exclusionReason } = action.payload;
-    const requestPayload = {
-        account_id: accountId,
-        exclusion_reason: exclusionReason,
-    };
+const fetchReconExcludedAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(reconciliationViewReducer_1.fetchReconExcludedAccounts.match), (0, operators_1.mergeMap)(() => {
     return zeniAPI
-        .postAndGetJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/excluded-accounts`, requestPayload)
+        .getJSON(`${zeniAPI.apiEndPoints.reconciliationMicroServiceBaseUrl}/1.0/reconciliation/excluded-accounts`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
             return (0, rxjs_1.of)((0, reconciliationViewReducer_1.fetchReconExcludedAccountsSuccess)({
-                excludedAccounts: response.data.excluded_account,
+                excludedAccounts: response.data.excluded_accounts,
             }));
         }
         else {

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

@@ -72,7 +72,7 @@ export interface ExcludedAccountPayload {
     update_time: string;
 }
 export interface ExcludedAccountsResponsePayload {
-    excluded_account: ExcludedAccountPayload[];
+    excluded_accounts: ExcludedAccountPayload[];
 }
 export type ExcludedAccountsResponse = ZeniAPIResponse<ExcludedAccountsResponsePayload>;
 export declare const toExcludedAccount: (payload: ExcludedAccountPayload) => ExcludedAccount;

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

@@ -99,10 +99,7 @@ export declare const fetchReconciliation: import("@reduxjs/toolkit").ActionCreat
     selectedPeriod: MonthYearPeriod;
 }, "expenseAutomationReconciliationView/uploadAccountStatementFailure">, updateStatementUploadChosen: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     statementUploadChosen: boolean;
-}, "expenseAutomationReconciliationView/updateStatementUploadChosen">, fetchReconExcludedAccounts: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accountId: string, exclusionReason: string], {
-    accountId: string;
-    exclusionReason: string;
-}, "expenseAutomationReconciliationView/fetchReconExcludedAccounts", never, never>, fetchReconExcludedAccountsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "expenseAutomationReconciliationView/updateStatementUploadChosen">, fetchReconExcludedAccounts: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationReconciliationView/fetchReconExcludedAccounts">, fetchReconExcludedAccountsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     excludedAccounts: ExcludedAccountPayload[];
 }, "expenseAutomationReconciliationView/fetchReconExcludedAccountsSuccess">, fetchReconExcludedAccountsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;

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

@@ -431,18 +431,11 @@ const expenseAutomationReconciliationView = (0, toolkit_1.createSlice)({
         updateStatementUploadChosen: (draft, action) => {
             draft.statementUploadChosen = action.payload.statementUploadChosen;
         },
-        fetchReconExcludedAccounts: {
-            reducer(draft) {
-                draft.excludedAccountsFetchState = {
-                    fetchState: 'In-Progress',
-                    error: undefined,
-                };
-            },
-            prepare(accountId, exclusionReason) {
-                return {
-                    payload: { accountId, exclusionReason },
-                };
-            },
+        fetchReconExcludedAccounts: (draft) => {
+            draft.excludedAccountsFetchState = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
         },
         fetchReconExcludedAccountsSuccess: (draft, action) => {
             draft.excludedAccountsFetchState = {

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

@@ -372,8 +372,7 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
             excludedLiabilityTotals.balanceTotal = total.balanceTotal;
             excludedLiabilityTotals.clearedTotal = total.clearedTotal;
             excludedLiabilityTotals.varianceTotal = total.varianceTotal;
-            excludedLiabilityTotals.variancePercentage =
-                total.variancePercentage;
+            excludedLiabilityTotals.variancePercentage = total.variancePercentage;
         }
     });
     const excludedAccountReconciliationBySectionID = {
@@ -427,10 +426,10 @@ exports.getExpenseAutomationReconciliationView = (0, toolkit_1.createSelector)((
         bankAccounts: uniqueBankAccounts,
         creditCards: uniqueCreditCards,
         accountReconciliationsByAccountID: reconList,
-        fetchStatus: {
-            fetchState: reconciliationViewState.fetchState,
-            error: reconciliationViewState.error,
-        },
+        fetchStatus: (0, reduceFetchState_1.reduceAnyFetchState)([
+            reconciliationViewState,
+            reconciliationViewState.excludedAccountsFetchState,
+        ]),
         plaidConnectionDetails: plaidAccountViewState['expense_automation_reconcile']
             .plaidConnectionDetails,
         reconciliationTabsState: reconciliationViewState.reconTabsState,

package/package.json

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