@zeniai/client-epic-state 5.2.22-betaAM4 → 5.2.22-betaMM1

package/lib/esm/view/expenseAutomationView/epics/actualMatching/fetchActualMatchingEpic.js

@@ -1,6 +1,6 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
-import { updateJEOneTimeAccruals } from '../../../../entity/jeSchedules/jeSchedulesReducer';
+import { updateActualMatchingMatches } from '../../../../entity/actualMatching/actualMatchingReducer';
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { clearAll } from '../../../../rootActions';
@@ -17,16 +17,16 @@ export const fetchActualMatchingEpic = (actions$, state$, zeniAPI) => actions$.p
     };
     const serviceMonth = toServiceMonthFromPeriod(period);
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals?service_month=${encodeURIComponent(serviceMonth)}&view=actual_matching`)
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching?service_month=${encodeURIComponent(serviceMonth)}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
-            const accruals = response.data.accruals ?? [];
+            const matches = response.data.matches ?? [];
             const updateActions = [];
-            if (accruals.length > 0) {
-                updateActions.push(updateJEOneTimeAccruals(accruals));
+            if (matches.length > 0) {
+                updateActions.push(updateActualMatchingMatches(matches));
             }
             updateActions.push(fetchActualMatchingSuccess({
-                accruals,
+                matchIds: matches.map((match) => match.match_id),
                 selectedPeriod,
                 refreshViewInBackground,
             }));

package/lib/esm/view/expenseAutomationView/epics/actualMatching/fetchActualMatchingMatchEpic.js

@@ -0,0 +1,35 @@
+import { from } from 'rxjs';
+import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
+import { updateActualMatchingMatches } from '../../../../entity/actualMatching/actualMatchingReducer';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { clearAll } from '../../../../rootActions';
+import { fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, } from '../../reducers/actualMatchingViewReducer';
+export const fetchActualMatchingMatchEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchActualMatchingMatch.match), mergeMap((action) => {
+    const { matchId, refreshViewInBackground } = action.payload;
+    return zeniAPI
+        .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}`)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            return from([
+                updateActualMatchingMatches([response.data]),
+                fetchActualMatchingMatchSuccess({
+                    matchId,
+                    refreshViewInBackground,
+                }),
+            ]);
+        }
+        return from([
+            fetchActualMatchingMatchFailure({
+                matchId,
+                refreshViewInBackground,
+                status: response.status,
+            }),
+        ]);
+    }), catchError((error) => from([
+        fetchActualMatchingMatchFailure({
+            matchId,
+            refreshViewInBackground,
+            status: createZeniAPIStatus('Unexpected Error', `Fetch actual matching match REST API call errored out ${JSON.stringify(error)}`),
+        }),
+    ])), takeUntil(actions$.pipe(filter(clearAll.match))));
+}));

package/lib/esm/view/expenseAutomationView/epics/actualMatching/matchAndReverseAccrualsEpic.js

@@ -20,12 +20,13 @@ function refreshActualMatchingList(state) {
     return [fetchActualMatching({ start, end }, true)];
 }
 export const matchAndReverseAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(matchAndReverseAccruals.match), mergeMap((action) => {
-    const { transactionId, transactionIntegrationId, transactionType, lineId, accrualIds, } = action.payload;
+    const { transactionId, transactionIntegrationId, transactionType, lineId, accrualIds, transactionSyncToken, } = action.payload;
     const body = {
         transaction_id: transactionId,
         transaction_integration_id: transactionIntegrationId,
         transaction_type: transactionType,
         line_id: lineId,
+        transaction_sync_token: transactionSyncToken,
         accrual_ids: accrualIds,
     };
     return zeniAPI

package/lib/esm/view/expenseAutomationView/epics/actualMatching/searchMatchTransactionsEpic.js

@@ -1,23 +1,52 @@
 import { from, merge, of } from 'rxjs';
 import { catchError, debounceTime, filter, mergeMap, switchMap, } from 'rxjs/operators';
+import { getActualMatchingMatchById } from '../../../../entity/actualMatching/actualMatchingSelector';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { toActualMatchingTransactionSearchResult, } from '../../payload/actualMatchingPayload';
 import { openMatchNewModal, searchMatchAccruals, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, } from '../../reducers/actualMatchingViewReducer';
+import { parseActualMatchingMatchId } from '../../selectors/actualMatchingViewSelector';
 import { MATCH_SEARCH_DEBOUNCE_MS, MATCH_TRANSACTION_SEARCH_PAGE_SIZE, } from '../../types/actualMatchingViewState';
-export const searchMatchTransactionsEpic = (actions$, _state$, zeniAPI) => {
-    const openModal$ = actions$.pipe(filter(openMatchNewModal.match), mergeMap(() => from([
-        searchMatchTransactions({ query: '' }),
-        searchMatchAccruals({ query: '' }),
-    ])));
+export const searchMatchTransactionsEpic = (actions$, state$, zeniAPI) => {
+    const openModal$ = actions$.pipe(filter(openMatchNewModal.match), mergeMap((action) => {
+        const matchId = action.payload.matchId;
+        if (matchId == null || matchId === '') {
+            return from([
+                searchMatchTransactions({ query: '' }),
+                searchMatchAccruals({ query: '' }),
+            ]);
+        }
+        const match = getActualMatchingMatchById(matchId, state$.value.actualMatchingState);
+        const parsed = parseActualMatchingMatchId(matchId);
+        const transactionType = match?.transactionType != null && match.transactionType !== ''
+            ? match.transactionType
+            : parsed?.transactionType;
+        const transactionIntegrationId = match?.transactionIntegrationId != null &&
+            match.transactionIntegrationId !== ''
+            ? match.transactionIntegrationId
+            : parsed?.transactionIntegrationId;
+        return from([
+            searchMatchTransactions({
+                query: '',
+                transactionType,
+                transactionIntegrationId,
+            }),
+        ]);
+    }));
     const searchActions$ = actions$.pipe(filter(searchMatchTransactions.match));
     const pagination$ = searchActions$.pipe(filter((action) => action.payload.pageToken != null));
     const newSearchDebounced$ = searchActions$.pipe(filter((action) => action.payload.pageToken == null), debounceTime(MATCH_SEARCH_DEBOUNCE_MS));
     const search$ = merge(pagination$, newSearchDebounced$).pipe(switchMap((action) => {
-        const { query, pageToken } = action.payload;
+        const { query, pageToken, transactionType, transactionIntegrationId } = action.payload;
         const queryParam = {
             search_text: query,
             page_size: MATCH_TRANSACTION_SEARCH_PAGE_SIZE,
             ...(pageToken != null ? { page_token: pageToken } : {}),
+            ...(transactionType != null && transactionType !== ''
+                ? { transaction_type: transactionType }
+                : {}),
+            ...(transactionIntegrationId != null && transactionIntegrationId !== ''
+                ? { transaction_integration_id: transactionIntegrationId }
+                : {}),
         };
         return zeniAPI
             .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/match-transaction-search?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/esm/view/expenseAutomationView/epics/actualMatching/undoReversalAccrualsEpic.js

@@ -0,0 +1,51 @@
+import { from, of } from 'rxjs';
+import { catchError, filter, mergeMap, takeUntil } from 'rxjs/operators';
+import { convertToPeriod, toAbsoluteDay, } from '../../../../commonStateTypes/timePeriod';
+import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
+import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
+import { clearAll } from '../../../../rootActions';
+import { toUndoReversalResult, } from '../../payload/actualMatchingPayload';
+import { fetchActualMatching, fetchActualMatchingMatch, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, } from '../../reducers/actualMatchingViewReducer';
+function refreshActualMatchingList(state) {
+    const selectedMonthYear = state.expenseAutomationViewState.selectedPeriodByTenantId[getCurrentTenant(state).tenantId];
+    if (selectedMonthYear == null) {
+        return [];
+    }
+    const period = convertToPeriod(selectedMonthYear);
+    const start = toAbsoluteDay(period.start);
+    const end = toAbsoluteDay(period.end);
+    if (start == null || end == null) {
+        return [];
+    }
+    return [fetchActualMatching({ start, end }, true)];
+}
+function refreshOpenMatchDetails(state) {
+    const detailState = state.expenseAutomationActualMatchingViewState.detailFetchStateByMatchId;
+    return Object.keys(detailState)
+        .filter((matchId) => detailState[matchId]?.fetchState !== 'Not-Started')
+        .map((matchId) => fetchActualMatchingMatch(matchId, true));
+}
+export const undoReversalAccrualsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(undoReversalAccruals.match), mergeMap((action) => {
+    const body = {
+        accrual_ids: action.payload.accrualIds,
+    };
+    return zeniAPI
+        .postAndGetJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/undo-reversal`, body)
+        .pipe(mergeMap((response) => {
+        if (isSuccessResponse(response) && response.data != null) {
+            const results = (response.data.results ?? []).map(toUndoReversalResult);
+            const successActions = [
+                undoReversalAccrualsSuccess({ results }),
+            ];
+            const anyUndone = results.some((result) => result.status === 'undone');
+            if (anyUndone) {
+                successActions.push(...refreshActualMatchingList(state$.value), ...refreshOpenMatchDetails(state$.value));
+            }
+            return from(successActions);
+        }
+        return of(undoReversalAccrualsFailure({ status: response.status }));
+    }), catchError((error) => of(undoReversalAccrualsFailure({
+        status: createZeniAPIStatus('Unexpected Error', 'Undo reversal accruals REST API call errored out' +
+            JSON.stringify(error)),
+    }))), takeUntil(actions$.pipe(filter(clearAll.match))));
+}));

package/lib/esm/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js

@@ -69,7 +69,7 @@ export const fetchAllExpenseAutomationTabsEpic = (actions$, state$) => actions$.
         // endpoint and cache slot.
         const selectedPageTab = state.expenseAutomationJESchedulesViewState.uiState.selectedPageTab;
         if (selectedPageTab === 'actual_matching') {
-            const actualMatchingPeriodKeys = state.expenseAutomationActualMatchingViewState.accrualKeysByPeriod[monthYearPeriodId];
+            const actualMatchingPeriodKeys = state.expenseAutomationActualMatchingViewState.matchIdsByPeriod[monthYearPeriodId];
             if (state.expenseAutomationActualMatchingViewState.fetchState !==
                 'In-Progress' &&
                 (!state.expenseAutomationActualMatchingViewState.hasValidState() ||

package/lib/esm/view/expenseAutomationView/payload/actualMatchingPayload.js

@@ -1,5 +1,5 @@
 import { toString } from '../../../commonStateTypes/timePeriod';
-import { toMatchAndReverseResultStatus, } from '../types/actualMatchingViewState';
+import { toMatchAndReverseResultStatus, toUndoReversalResultStatus, } from '../types/actualMatchingViewState';
 export function toServiceMonthFromPeriod(period) {
     return toString(period.start).slice(0, 7);
 }
@@ -49,6 +49,7 @@ export function toActualMatchingTransactionSearchResult(payload) {
         transactionMemo: payload.transaction_memo ?? undefined,
         transactionDescription: payload.transaction_description ?? undefined,
         transactionTypeName: payload.transaction_type_name ?? undefined,
+        syncToken: payload.sync_token == null ? '' : String(payload.sync_token),
     };
 }
 export function toMatchAndReverseResult(payload) {
@@ -58,3 +59,10 @@ export function toMatchAndReverseResult(payload) {
         reason: payload.reason ?? undefined,
     };
 }
+export function toUndoReversalResult(payload) {
+    return {
+        accrualId: payload.accrual_id,
+        status: toUndoReversalResultStatus(payload.status),
+        reason: payload.reason ?? undefined,
+    };
+}

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

@@ -20,18 +20,22 @@ export const initialAccrualSearchState = {
 };
 export const initialMatchModalState = {
     isOpen: false,
+    openedFromMatchId: undefined,
+    pinnedTransactionResults: [],
     transactionSearch: initialTransactionSearchState,
     accrualSearch: initialAccrualSearchState,
     confirmStatus: { fetchState: 'Not-Started', error: undefined },
 };
 export const initialState = {
-    accrualKeysByPeriod: {},
+    matchIdsByPeriod: {},
     fetchState: 'Not-Started',
     error: undefined,
     refreshStatus: {
         fetchState: 'Not-Started',
         error: undefined,
     },
+    detailFetchStateByMatchId: {},
+    detailRefreshStatusByMatchId: {},
     uiState: {
         sortKey: 'date',
         sortOrder: 'descending',
@@ -39,6 +43,7 @@ export const initialState = {
         scrollPosition: { scrollTop: 0, scrollLeft: undefined },
     },
     matchModal: initialMatchModalState,
+    undoReversalStatus: { fetchState: 'Not-Started', error: undefined },
     hasValidState() {
         return this.fetchState == 'Completed';
     },
@@ -51,6 +56,8 @@ function resetMatchModalSearches(draft) {
         error: undefined,
     };
     draft.matchModal.lastBatchResults = undefined;
+    draft.matchModal.openedFromMatchId = undefined;
+    draft.matchModal.pinnedTransactionResults = [];
 }
 const expenseAutomationActualMatchingView = createSlice({
     name: 'expenseAutomationActualMatchingView',
@@ -90,9 +97,9 @@ const expenseAutomationActualMatchingView = createSlice({
             },
         },
         fetchActualMatchingSuccess(draft, action) {
-            const { accruals, selectedPeriod, refreshViewInBackground } = action.payload;
+            const { matchIds, selectedPeriod, refreshViewInBackground } = action.payload;
             const periodId = toMonthYearPeriodId(selectedPeriod);
-            draft.accrualKeysByPeriod[periodId] = accruals.map((accrual) => generateJEOneTimeAccrualKey(accrual._id));
+            draft.matchIdsByPeriod[periodId] = matchIds;
             if (refreshViewInBackground) {
                 draft.refreshStatus = { fetchState: 'Completed', error: undefined };
             }
@@ -111,6 +118,56 @@ const expenseAutomationActualMatchingView = createSlice({
                 draft.error = status;
             }
         },
+        fetchActualMatchingMatch: {
+            prepare(matchId, refreshViewInBackground = false) {
+                return { payload: { matchId, refreshViewInBackground } };
+            },
+            reducer(draft, action) {
+                const { matchId, refreshViewInBackground } = action.payload;
+                if (refreshViewInBackground) {
+                    draft.detailRefreshStatusByMatchId[matchId] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                }
+                else {
+                    draft.detailFetchStateByMatchId[matchId] = {
+                        fetchState: 'In-Progress',
+                        error: undefined,
+                    };
+                }
+            },
+        },
+        fetchActualMatchingMatchSuccess(draft, action) {
+            const { matchId, refreshViewInBackground } = action.payload;
+            if (refreshViewInBackground) {
+                draft.detailRefreshStatusByMatchId[matchId] = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+            }
+            else {
+                draft.detailFetchStateByMatchId[matchId] = {
+                    fetchState: 'Completed',
+                    error: undefined,
+                };
+            }
+        },
+        fetchActualMatchingMatchFailure(draft, action) {
+            const { matchId, refreshViewInBackground, status } = action.payload;
+            if (refreshViewInBackground) {
+                draft.detailRefreshStatusByMatchId[matchId] = {
+                    fetchState: 'Error',
+                    error: status,
+                };
+            }
+            else {
+                draft.detailFetchStateByMatchId[matchId] = {
+                    fetchState: 'Error',
+                    error: status,
+                };
+            }
+        },
         updateActualMatchingUIState(draft, action) {
             if (action.payload.sortKey != null) {
                 draft.uiState.sortKey = action.payload.sortKey;
@@ -125,8 +182,20 @@ const expenseAutomationActualMatchingView = createSlice({
                 draft.uiState.scrollPosition = action.payload.scrollPosition;
             }
         },
-        openMatchNewModal(draft) {
-            draft.matchModal.isOpen = true;
+        openMatchNewModal: {
+            prepare(matchId) {
+                return { payload: { matchId } };
+            },
+            reducer(draft, action) {
+                resetMatchModalSearches(draft);
+                draft.matchModal.isOpen = true;
+                const matchId = action.payload.matchId;
+                draft.matchModal.openedFromMatchId =
+                    matchId != null && matchId !== '' ? matchId : undefined;
+                if (draft.matchModal.openedFromMatchId != null) {
+                    draft.matchModal.accrualSearch.fetchState = 'Completed';
+                }
+            },
         },
         closeMatchNewModal(draft) {
             draft.matchModal.isOpen = false;
@@ -152,8 +221,15 @@ const expenseAutomationActualMatchingView = createSlice({
                     draft.matchModal.transactionSearch.error = undefined;
                 }
             },
-            prepare({ query, pageToken }) {
-                return { payload: { query, pageToken: pageToken ?? undefined } };
+            prepare({ query, pageToken, transactionType, transactionIntegrationId, }) {
+                return {
+                    payload: {
+                        query,
+                        pageToken: pageToken ?? undefined,
+                        transactionType,
+                        transactionIntegrationId,
+                    },
+                };
             },
         },
         searchMatchTransactionsSuccess(draft, action) {
@@ -171,6 +247,10 @@ const expenseAutomationActualMatchingView = createSlice({
             }
             else {
                 draft.matchModal.transactionSearch.results = results;
+                if (draft.matchModal.openedFromMatchId != null &&
+                    draft.matchModal.pinnedTransactionResults.length === 0) {
+                    draft.matchModal.pinnedTransactionResults = results;
+                }
             }
             draft.matchModal.transactionSearch.nextPageToken = nextPageToken;
             draft.matchModal.transactionSearch.isLoadingMore = false;
@@ -246,6 +326,30 @@ const expenseAutomationActualMatchingView = createSlice({
                 error: action.payload.status,
             };
         },
+        undoReversalAccruals: {
+            reducer(draft) {
+                draft.undoReversalStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(params) {
+                return { payload: params };
+            },
+        },
+        undoReversalAccrualsSuccess(draft, action) {
+            draft.undoReversalStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            void action;
+        },
+        undoReversalAccrualsFailure(draft, action) {
+            draft.undoReversalStatus = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
         clearActualMatchingView(draft) {
             Object.assign(draft, initialState);
         },
@@ -256,5 +360,5 @@ const expenseAutomationActualMatchingView = createSlice({
         });
     },
 });
-export const { clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingPage, fetchActualMatchingSuccess, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, openMatchNewModal, searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, updateActualMatchingUIState, } = expenseAutomationActualMatchingView.actions;
+export const { clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, fetchActualMatchingPage, fetchActualMatchingSuccess, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, openMatchNewModal, searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, undoReversalAccruals, undoReversalAccrualsFailure, undoReversalAccrualsSuccess, updateActualMatchingUIState, } = expenseAutomationActualMatchingView.actions;
 export default expenseAutomationActualMatchingView.reducer;