@zeniai/client-epic-state 5.3.14-beta0MM → 5.3.14-beta1MM

package/lib/entity/actualMatching/actualMatchingPayload.d.ts

@@ -20,6 +20,7 @@ export interface ActualMatchingMatchPayload {
     match_batch_id?: string | null;
     match_shape?: string | null;
     match_tier?: string | null;
+    suggestion_key?: string | null;
     transaction_date?: string | null;
     vendor_id?: ID | null;
     vendor_name?: string | null;

package/lib/entity/actualMatching/actualMatchingPayload.js

@@ -37,6 +37,9 @@ function toActualMatchingMatch(payload, fallbackCurrency) {
         matchBatchId: payload.match_batch_id != null && payload.match_batch_id !== ''
             ? payload.match_batch_id
             : undefined,
+        suggestionKey: payload.suggestion_key != null && payload.suggestion_key !== ''
+            ? payload.suggestion_key
+            : undefined,
         transactionType: (payload.transaction_type || '').toLowerCase(),
         transactionIntegrationId: payload.transaction_integration_id,
         transactionDate: payload.transaction_date ?? undefined,

package/lib/entity/actualMatching/actualMatchingReducer.js

@@ -20,7 +20,7 @@ const actualMatching = (0, toolkit_1.createSlice)({
             reducer(draft, action) {
                 action.payload.matches.forEach((payload) => {
                     const match = (0, actualMatchingPayload_1.toActualMatchingMatch)(payload, action.payload.fallbackCurrency);
-                    draft.byMatchId[(0, actualMatchingTypes_1.actualMatchingRowKey)(match.matchId, match.matchBatchId)] = match;
+                    draft.byMatchId[(0, actualMatchingTypes_1.actualMatchingRowKey)(match.matchId, match.matchBatchId, match.suggestionKey)] = match;
                 });
             },
         },

package/lib/entity/actualMatching/actualMatchingState.d.ts

@@ -15,6 +15,7 @@ export interface ActualMatchingMatch {
     matchBatchId?: string;
     matchShape?: string;
     matchTier?: string;
+    suggestionKey?: string;
     transactionDate?: string;
     vendorId?: ID;
     vendorName?: string;

package/lib/entity/actualMatching/actualMatchingTypes.d.ts

@@ -1,3 +1,7 @@
 export type ActualMatchingMatchId = string;
-/** Store and status key. The route match id stays ``type:id``; the batch is separate. */
-export declare function actualMatchingRowKey(matchId: string, matchBatchId?: string | null): string;
+/** Store and status key. The route match id stays ``type:id``.
+
+The second part is the cleared ``match_batch_id`` when one exists, otherwise the
+pending suggestion's ``suggestion_key``.
+*/
+export declare function actualMatchingRowKey(matchId: string, matchBatchId?: string | null, suggestionKey?: string | null): string;

package/lib/entity/actualMatching/actualMatchingTypes.js

@@ -1,11 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.actualMatchingRowKey = actualMatchingRowKey;
-/** Store and status key. The route match id stays ``type:id``; the batch is separate. */
-function actualMatchingRowKey(matchId, matchBatchId) {
+/** Store and status key. The route match id stays ``type:id``.
+
+The second part is the cleared ``match_batch_id`` when one exists, otherwise the
+pending suggestion's ``suggestion_key``.
+*/
+function actualMatchingRowKey(matchId, matchBatchId, suggestionKey) {
     const batch = (matchBatchId ?? '').trim();
-    if (batch === '') {
+    if (batch !== '') {
+        return `${matchId}\u0000${batch}`;
+    }
+    const suggestion = (suggestionKey ?? '').trim();
+    if (suggestion === '') {
         return matchId;
     }
-    return `${matchId}\u0000${batch}`;
+    return `${matchId}\u0000${suggestion}`;
 }

package/lib/esm/entity/actualMatching/actualMatchingPayload.js

@@ -33,6 +33,9 @@ export function toActualMatchingMatch(payload, fallbackCurrency) {
         matchBatchId: payload.match_batch_id != null && payload.match_batch_id !== ''
             ? payload.match_batch_id
             : undefined,
+        suggestionKey: payload.suggestion_key != null && payload.suggestion_key !== ''
+            ? payload.suggestion_key
+            : undefined,
         transactionType: (payload.transaction_type || '').toLowerCase(),
         transactionIntegrationId: payload.transaction_integration_id,
         transactionDate: payload.transaction_date ?? undefined,

package/lib/esm/entity/actualMatching/actualMatchingReducer.js

@@ -16,7 +16,7 @@ const actualMatching = createSlice({
             reducer(draft, action) {
                 action.payload.matches.forEach((payload) => {
                     const match = toActualMatchingMatch(payload, action.payload.fallbackCurrency);
-                    draft.byMatchId[actualMatchingRowKey(match.matchId, match.matchBatchId)] = match;
+                    draft.byMatchId[actualMatchingRowKey(match.matchId, match.matchBatchId, match.suggestionKey)] = match;
                 });
             },
         },

package/lib/esm/entity/actualMatching/actualMatchingTypes.js

@@ -1,8 +1,16 @@
-/** Store and status key. The route match id stays ``type:id``; the batch is separate. */
-export function actualMatchingRowKey(matchId, matchBatchId) {
+/** Store and status key. The route match id stays ``type:id``.
+
+The second part is the cleared ``match_batch_id`` when one exists, otherwise the
+pending suggestion's ``suggestion_key``.
+*/
+export function actualMatchingRowKey(matchId, matchBatchId, suggestionKey) {
     const batch = (matchBatchId ?? '').trim();
-    if (batch === '') {
+    if (batch !== '') {
+        return `${matchId}\u0000${batch}`;
+    }
+    const suggestion = (suggestionKey ?? '').trim();
+    if (suggestion === '') {
         return matchId;
     }
-    return `${matchId}\u0000${batch}`;
+    return `${matchId}\u0000${suggestion}`;
 }

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

@@ -27,7 +27,7 @@ export const fetchActualMatchingEpic = (actions$, state$, zeniAPI) => actions$.p
                 updateActions.push(updateActualMatchingMatches(matches, getTenantDisplayCurrency(state)));
             }
             updateActions.push(fetchActualMatchingSuccess({
-                matchIds: matches.map((match) => actualMatchingRowKey(match.match_id, match.match_batch_id)),
+                matchIds: matches.map((match) => actualMatchingRowKey(match.match_id, match.match_batch_id, match.suggestion_key)),
                 selectedPeriod: requestPeriod,
                 refreshViewInBackground,
             }));

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

@@ -6,10 +6,16 @@ import { clearAll } from '../../../../../rootActions';
 import { fetchActualMatchingMatch, fetchActualMatchingMatchFailure, fetchActualMatchingMatchSuccess, } from '../../../reducers/actualMatchingViewReducer';
 import { getTenantDisplayCurrency } from '../../../selectors/actualMatchingViewSelector';
 export const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchActualMatchingMatch.match), mergeMap((action) => {
-    const { matchId, matchBatchId, refreshViewInBackground } = action.payload;
-    const batchQuery = matchBatchId != null && matchBatchId !== ''
-        ? `?batch_id=${encodeURIComponent(matchBatchId)}`
-        : '';
+    const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+    const detailQuery = new URLSearchParams();
+    if (matchBatchId != null && matchBatchId !== '') {
+        detailQuery.set('batch_id', matchBatchId);
+    }
+    else if (suggestionKey != null && suggestionKey !== '') {
+        detailQuery.set('suggestion_key', suggestionKey);
+    }
+    const encodedQuery = detailQuery.toString();
+    const batchQuery = encodedQuery === '' ? '' : `?${encodedQuery}`;
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}${batchQuery}`)
         .pipe(mergeMap((response) => {
@@ -17,6 +23,7 @@ export const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actio
             return from([
                 updateActualMatchingMatches([response.data], getTenantDisplayCurrency(state$.value)),
                 fetchActualMatchingMatchSuccess({
+                    suggestionKey,
                     matchId,
                     matchBatchId,
                     refreshViewInBackground,
@@ -25,6 +32,7 @@ export const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actio
         }
         return from([
             fetchActualMatchingMatchFailure({
+                suggestionKey,
                 matchId,
                 matchBatchId,
                 refreshViewInBackground,
@@ -33,6 +41,7 @@ export const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actio
         ]);
     }), catchError((error) => from([
         fetchActualMatchingMatchFailure({
+            suggestionKey,
             matchId,
             matchBatchId,
             refreshViewInBackground,

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

@@ -184,12 +184,14 @@ const expenseAutomationActualMatchingView = createSlice({
             }
         },
         fetchActualMatchingMatch: {
-            prepare(matchId, refreshViewInBackground = false, matchBatchId) {
-                return { payload: { matchId, matchBatchId, refreshViewInBackground } };
+            prepare(matchId, refreshViewInBackground = false, matchBatchId, suggestionKey) {
+                return {
+                    payload: { suggestionKey, matchBatchId, matchId, refreshViewInBackground },
+                };
             },
             reducer(draft, action) {
-                const { matchId, matchBatchId, refreshViewInBackground } = action.payload;
-                const rowKey = actualMatchingRowKey(matchId, matchBatchId);
+                const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+                const rowKey = actualMatchingRowKey(matchId, matchBatchId, suggestionKey);
                 if (refreshViewInBackground) {
                     draft.detailRefreshStatusByMatchId[rowKey] = {
                         fetchState: 'In-Progress',
@@ -205,8 +207,8 @@ const expenseAutomationActualMatchingView = createSlice({
             },
         },
         fetchActualMatchingMatchSuccess(draft, action) {
-            const { matchId, matchBatchId, refreshViewInBackground } = action.payload;
-            const rowKey = actualMatchingRowKey(matchId, matchBatchId);
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+            const rowKey = actualMatchingRowKey(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
                 draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Completed',
@@ -221,8 +223,8 @@ const expenseAutomationActualMatchingView = createSlice({
             }
         },
         fetchActualMatchingMatchFailure(draft, action) {
-            const { matchId, matchBatchId, refreshViewInBackground, status } = action.payload;
-            const rowKey = actualMatchingRowKey(matchId, matchBatchId);
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground, status } = action.payload;
+            const rowKey = actualMatchingRowKey(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
                 draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Error',

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

@@ -130,6 +130,7 @@ function toActualMatchingRow(match) {
         ];
     return {
         ...first,
+        suggestionKey: match.suggestionKey,
         matchId: match.matchId,
         matchBatchId: match.matchBatchId,
         kind: match.kind,

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

@@ -30,7 +30,7 @@ const fetchActualMatchingEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
                 updateActions.push((0, actualMatchingReducer_1.updateActualMatchingMatches)(matches, (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state)));
             }
             updateActions.push((0, actualMatchingViewReducer_1.fetchActualMatchingSuccess)({
-                matchIds: matches.map((match) => (0, actualMatchingTypes_1.actualMatchingRowKey)(match.match_id, match.match_batch_id)),
+                matchIds: matches.map((match) => (0, actualMatchingTypes_1.actualMatchingRowKey)(match.match_id, match.match_batch_id, match.suggestion_key)),
                 selectedPeriod: requestPeriod,
                 refreshViewInBackground,
             }));

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

@@ -9,10 +9,16 @@ const rootActions_1 = require("../../../../../rootActions");
 const actualMatchingViewReducer_1 = require("../../../reducers/actualMatchingViewReducer");
 const actualMatchingViewSelector_1 = require("../../../selectors/actualMatchingViewSelector");
 const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(actualMatchingViewReducer_1.fetchActualMatchingMatch.match), (0, operators_1.mergeMap)((action) => {
-    const { matchId, matchBatchId, refreshViewInBackground } = action.payload;
-    const batchQuery = matchBatchId != null && matchBatchId !== ''
-        ? `?batch_id=${encodeURIComponent(matchBatchId)}`
-        : '';
+    const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+    const detailQuery = new URLSearchParams();
+    if (matchBatchId != null && matchBatchId !== '') {
+        detailQuery.set('batch_id', matchBatchId);
+    }
+    else if (suggestionKey != null && suggestionKey !== '') {
+        detailQuery.set('suggestion_key', suggestionKey);
+    }
+    const encodedQuery = detailQuery.toString();
+    const batchQuery = encodedQuery === '' ? '' : `?${encodedQuery}`;
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accruals/actual-matching/${encodeURIComponent(matchId)}${batchQuery}`)
         .pipe((0, operators_1.mergeMap)((response) => {
@@ -20,6 +26,7 @@ const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pip
             return (0, rxjs_1.from)([
                 (0, actualMatchingReducer_1.updateActualMatchingMatches)([response.data], (0, actualMatchingViewSelector_1.getTenantDisplayCurrency)(state$.value)),
                 (0, actualMatchingViewReducer_1.fetchActualMatchingMatchSuccess)({
+                    suggestionKey,
                     matchId,
                     matchBatchId,
                     refreshViewInBackground,
@@ -28,6 +35,7 @@ const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pip
         }
         return (0, rxjs_1.from)([
             (0, actualMatchingViewReducer_1.fetchActualMatchingMatchFailure)({
+                suggestionKey,
                 matchId,
                 matchBatchId,
                 refreshViewInBackground,
@@ -36,6 +44,7 @@ const fetchActualMatchingMatchEpic = (actions$, state$, zeniAPI) => actions$.pip
         ]);
     }), (0, operators_1.catchError)((error) => (0, rxjs_1.from)([
         (0, actualMatchingViewReducer_1.fetchActualMatchingMatchFailure)({
+            suggestionKey,
             matchId,
             matchBatchId,
             refreshViewInBackground,

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

@@ -14,19 +14,22 @@ export declare const ackCloseMatchAfterIgnore: import("@reduxjs/toolkit").Action
     refreshViewInBackground: boolean;
     selectedPeriod: MonthYearPeriod;
     status: ZeniAPIStatus;
-}, "expenseAutomationActualMatchingView/fetchActualMatchingFailure">, fetchActualMatchingMatch: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, refreshViewInBackground?: any, matchBatchId?: string | undefined], {
-    matchId: string;
+}, "expenseAutomationActualMatchingView/fetchActualMatchingFailure">, fetchActualMatchingMatch: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[matchId: string, refreshViewInBackground?: any, matchBatchId?: string | undefined, suggestionKey?: string | undefined], {
+    suggestionKey: string | undefined;
     matchBatchId: string | undefined;
+    matchId: string;
     refreshViewInBackground: any;
 }, "expenseAutomationActualMatchingView/fetchActualMatchingMatch", never, never>, fetchActualMatchingMatchFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     matchId: ActualMatchingMatchId;
     refreshViewInBackground: boolean;
     status: ZeniAPIStatus;
     matchBatchId?: string;
+    suggestionKey?: string;
 }, "expenseAutomationActualMatchingView/fetchActualMatchingMatchFailure">, fetchActualMatchingMatchSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     matchId: ActualMatchingMatchId;
     refreshViewInBackground: boolean;
     matchBatchId?: string;
+    suggestionKey?: string;
 }, "expenseAutomationActualMatchingView/fetchActualMatchingMatchSuccess">, fetchActualMatchingPage: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, refreshViewInBackground?: any], {
     period: TimePeriod;
     refreshViewInBackground: any;

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

@@ -188,12 +188,14 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             }
         },
         fetchActualMatchingMatch: {
-            prepare(matchId, refreshViewInBackground = false, matchBatchId) {
-                return { payload: { matchId, matchBatchId, refreshViewInBackground } };
+            prepare(matchId, refreshViewInBackground = false, matchBatchId, suggestionKey) {
+                return {
+                    payload: { suggestionKey, matchBatchId, matchId, refreshViewInBackground },
+                };
             },
             reducer(draft, action) {
-                const { matchId, matchBatchId, refreshViewInBackground } = action.payload;
-                const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId);
+                const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+                const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId, suggestionKey);
                 if (refreshViewInBackground) {
                     draft.detailRefreshStatusByMatchId[rowKey] = {
                         fetchState: 'In-Progress',
@@ -209,8 +211,8 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             },
         },
         fetchActualMatchingMatchSuccess(draft, action) {
-            const { matchId, matchBatchId, refreshViewInBackground } = action.payload;
-            const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId);
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground } = action.payload;
+            const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
                 draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Completed',
@@ -225,8 +227,8 @@ const expenseAutomationActualMatchingView = (0, toolkit_1.createSlice)({
             }
         },
         fetchActualMatchingMatchFailure(draft, action) {
-            const { matchId, matchBatchId, refreshViewInBackground, status } = action.payload;
-            const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId);
+            const { suggestionKey, matchBatchId, matchId, refreshViewInBackground, status } = action.payload;
+            const rowKey = (0, actualMatchingTypes_1.actualMatchingRowKey)(matchId, matchBatchId, suggestionKey);
             if (refreshViewInBackground) {
                 draft.detailRefreshStatusByMatchId[rowKey] = {
                     fetchState: 'Error',

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

@@ -27,6 +27,7 @@ export interface ActualMatchingRow extends JEOneTimeAccrual {
     matchShape?: string;
     matchTier?: string;
     reversalDate?: ZeniDate;
+    suggestionKey?: string;
     transactionDate?: string;
     transactionType?: string;
 }

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

@@ -152,6 +152,7 @@ function toActualMatchingRow(match) {
         ];
     return {
         ...first,
+        suggestionKey: match.suggestionKey,
         matchId: match.matchId,
         matchBatchId: match.matchBatchId,
         kind: match.kind,

package/package.json

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