@zeniai/client-epic-state 5.2.11-betaAM6 → 5.2.11-betaAM7

package/lib/entity/jeSchedules/jeSchedulesPayload.d.ts

@@ -128,7 +128,9 @@ export interface JEOneTimeAccrualAiSuggestionPayload {
     memo?: string | null;
 }
 export interface JEOneTimeAccrualClearedPayload {
+    accrual_ids?: string[] | null;
     consumed_line_ids?: string[] | null;
+    group_sum?: number | null;
     match_shape?: string | null;
     match_tier?: string | null;
     matched_amount?: number | null;

package/lib/entity/jeSchedules/jeSchedulesPayload.js

@@ -465,6 +465,10 @@ function toJEOneTimeAccrualCleared(payload, currencyCode) {
         matchedAmount: payload.matched_amount != null
             ? toOneTimeAccrualAmount(payload.matched_amount, currencyCode)
             : undefined,
+        groupSum: payload.group_sum != null
+            ? toOneTimeAccrualAmount(payload.group_sum, currencyCode)
+            : undefined,
+        accrualIds: payload.accrual_ids ?? undefined,
         reversedAt: payload.reversed_at != null ? (0, zeniDayJS_1.date)(payload.reversed_at) : undefined,
         matchTier: payload.match_tier ?? undefined,
         matchShape: payload.match_shape ?? undefined,

package/lib/entity/jeSchedules/jeSchedulesState.d.ts

@@ -199,7 +199,9 @@ export interface JEOneTimeAccrualAiSuggestion {
 }
 /** Cleared-bill stamp written when an accrual is matched and reversed. */
 export interface JEOneTimeAccrualCleared {
+    accrualIds?: ID[];
     consumedLineIds?: string[];
+    groupSum?: Amount;
     matchedAmount?: Amount;
     matchedLineId?: string;
     matchedTransactionId?: string;

package/lib/esm/entity/jeSchedules/jeSchedulesPayload.js

@@ -454,6 +454,10 @@ function toJEOneTimeAccrualCleared(payload, currencyCode) {
         matchedAmount: payload.matched_amount != null
             ? toOneTimeAccrualAmount(payload.matched_amount, currencyCode)
             : undefined,
+        groupSum: payload.group_sum != null
+            ? toOneTimeAccrualAmount(payload.group_sum, currencyCode)
+            : undefined,
+        accrualIds: payload.accrual_ids ?? undefined,
         reversedAt: payload.reversed_at != null ? date(payload.reversed_at) : undefined,
         matchTier: payload.match_tier ?? undefined,
         matchShape: payload.match_shape ?? undefined,

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

@@ -17,10 +17,38 @@ export function isPendingReviewAccrual(accrual) {
     const resolution = accrual.matchSuggestion.resolution;
     return resolution == null || resolution.length === 0;
 }
+function isGroupedClearedMatch(accrual) {
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return false;
+    }
+    const matchShape = accrual.cleared?.matchShape;
+    const accrualIdsLength = accrual.cleared?.accrualIds?.length ?? 0;
+    return matchShape === '1:N' || matchShape === 'N:1' || accrualIdsLength > 1;
+}
+export function getClearedAllocatedActualAmount(accrual) {
+    const matchedAmount = accrual.cleared?.matchedAmount?.amount;
+    if (matchedAmount == null) {
+        return undefined;
+    }
+    if (!isGroupedClearedMatch(accrual)) {
+        return matchedAmount;
+    }
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return matchedAmount;
+    }
+    return matchedAmount * (accrual.estimatedAmount.amount / groupSum);
+}
 export function getActualMatchingAmount(accrual) {
-    return (accrual.cleared?.matchedAmount?.amount ??
-        accrual.matchSuggestion?.matchedAmount?.amount ??
-        accrual.estimatedAmount.amount);
+    if (isPendingReviewAccrual(accrual)) {
+        return (accrual.matchSuggestion?.matchedAmount?.amount ??
+            accrual.estimatedAmount.amount);
+    }
+    if (isAutoReversedAccrual(accrual) || isManuallyReversedAccrual(accrual)) {
+        return (getClearedAllocatedActualAmount(accrual) ?? accrual.estimatedAmount.amount);
+    }
+    return accrual.estimatedAmount.amount;
 }
 export function getActualMatchingReversalDate(accrual) {
     if (!isAutoReversedAccrual(accrual) && !isManuallyReversedAccrual(accrual)) {
@@ -124,12 +152,10 @@ export function getExpenseAutomationActualMatchingView(state) {
                 amount: listedAccruals.reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
             },
             ai: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'agent')
-                    .length,
+                count: listedAccruals.filter((accrual) => accrual.origin === 'agent').length,
             },
             manual: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'human')
-                    .length,
+                count: listedAccruals.filter((accrual) => accrual.origin === 'human').length,
             },
         };
     const accrualSearchResults = matchModal.accrualSearch.results

package/lib/esm/view/expenseAutomationView/types/actualMatchingViewState.js

@@ -9,7 +9,7 @@ const ACTUAL_MATCHING_SORT_KEYS = [
     'lifecycle',
 ];
 export const toActualMatchingSortKey = (v) => stringToUnion(v, ACTUAL_MATCHING_SORT_KEYS);
-export const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 10;
+export const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 export const MATCH_SEARCH_DEBOUNCE_MS = 300;
 const MATCH_AND_REVERSE_RESULT_STATUSES = [

package/lib/view/expenseAutomationView/selectors/actualMatchingViewSelector.d.ts

@@ -5,6 +5,7 @@ import { ExpenseAutomationActualMatchingViewSelector } from '../selectorTypes/ac
 export declare function isAutoReversedAccrual(accrual: JEOneTimeAccrual): boolean;
 export declare function isManuallyReversedAccrual(accrual: JEOneTimeAccrual): boolean;
 export declare function isPendingReviewAccrual(accrual: JEOneTimeAccrual): boolean;
+export declare function getClearedAllocatedActualAmount(accrual: JEOneTimeAccrual): number | undefined;
 export declare function getActualMatchingAmount(accrual: JEOneTimeAccrual): number;
 export declare function getActualMatchingReversalDate(accrual: JEOneTimeAccrual): ZeniDate | undefined;
 export declare function getExpenseAutomationActualMatchingView(state: RootState): ExpenseAutomationActualMatchingViewSelector;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAutoReversedAccrual = isAutoReversedAccrual;
 exports.isManuallyReversedAccrual = isManuallyReversedAccrual;
 exports.isPendingReviewAccrual = isPendingReviewAccrual;
+exports.getClearedAllocatedActualAmount = getClearedAllocatedActualAmount;
 exports.getActualMatchingAmount = getActualMatchingAmount;
 exports.getActualMatchingReversalDate = getActualMatchingReversalDate;
 exports.getExpenseAutomationActualMatchingView = getExpenseAutomationActualMatchingView;
@@ -28,10 +29,38 @@ function isPendingReviewAccrual(accrual) {
     const resolution = accrual.matchSuggestion.resolution;
     return resolution == null || resolution.length === 0;
 }
+function isGroupedClearedMatch(accrual) {
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return false;
+    }
+    const matchShape = accrual.cleared?.matchShape;
+    const accrualIdsLength = accrual.cleared?.accrualIds?.length ?? 0;
+    return matchShape === '1:N' || matchShape === 'N:1' || accrualIdsLength > 1;
+}
+function getClearedAllocatedActualAmount(accrual) {
+    const matchedAmount = accrual.cleared?.matchedAmount?.amount;
+    if (matchedAmount == null) {
+        return undefined;
+    }
+    if (!isGroupedClearedMatch(accrual)) {
+        return matchedAmount;
+    }
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return matchedAmount;
+    }
+    return matchedAmount * (accrual.estimatedAmount.amount / groupSum);
+}
 function getActualMatchingAmount(accrual) {
-    return (accrual.cleared?.matchedAmount?.amount ??
-        accrual.matchSuggestion?.matchedAmount?.amount ??
-        accrual.estimatedAmount.amount);
+    if (isPendingReviewAccrual(accrual)) {
+        return (accrual.matchSuggestion?.matchedAmount?.amount ??
+            accrual.estimatedAmount.amount);
+    }
+    if (isAutoReversedAccrual(accrual) || isManuallyReversedAccrual(accrual)) {
+        return (getClearedAllocatedActualAmount(accrual) ?? accrual.estimatedAmount.amount);
+    }
+    return accrual.estimatedAmount.amount;
 }
 function getActualMatchingReversalDate(accrual) {
     if (!isAutoReversedAccrual(accrual) && !isManuallyReversedAccrual(accrual)) {
@@ -135,12 +164,10 @@ function getExpenseAutomationActualMatchingView(state) {
                 amount: listedAccruals.reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
             },
             ai: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'agent')
-                    .length,
+                count: listedAccruals.filter((accrual) => accrual.origin === 'agent').length,
             },
             manual: {
-                count: listedAccruals.filter((accrual) => accrual.origin === 'human')
-                    .length,
+                count: listedAccruals.filter((accrual) => accrual.origin === 'human').length,
             },
         };
     const accrualSearchResults = matchModal.accrualSearch.results

package/lib/view/expenseAutomationView/types/actualMatchingViewState.d.ts

@@ -4,7 +4,7 @@ import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { JEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeSchedulesTypes';
 export declare const toActualMatchingSortKey: (v: string) => "type" | "date" | "vendor" | "category" | "class" | "amount" | "lifecycle";
 export type ActualMatchingSortKey = ReturnType<typeof toActualMatchingSortKey>;
-export declare const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 10;
+export declare const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 export declare const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 export declare const MATCH_SEARCH_DEBOUNCE_MS = 300;
 export declare const toMatchAndReverseResultStatus: (v: string) => "error" | "reversed" | "noop" | "conflict" | "claim_lost";

package/lib/view/expenseAutomationView/types/actualMatchingViewState.js

@@ -13,7 +13,7 @@ const ACTUAL_MATCHING_SORT_KEYS = [
 ];
 const toActualMatchingSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, ACTUAL_MATCHING_SORT_KEYS);
 exports.toActualMatchingSortKey = toActualMatchingSortKey;
-exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 10;
+exports.MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
 exports.MATCH_ACCRUAL_SEARCH_LIMIT = 50;
 exports.MATCH_SEARCH_DEBOUNCE_MS = 300;
 const MATCH_AND_REVERSE_RESULT_STATUSES = [

package/package.json

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