@zeniai/client-epic-state 4.19.37-betaVR13 → 4.19.37-betaVR14

package/lib/esm/view/expenseAutomationView/epics/missingReceipts/fetchCompletedTransactionsEpic.js

@@ -4,7 +4,7 @@ import { convertToPeriod, toMonthYearPeriodId, } from '../../../../commonStateTy
 import { getCurrentTenant } from '../../../../entity/tenant/tenantSelector';
 import { updateTransactions } from '../../../../entity/transaction/transactionReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { fetchCompletedTransactions, fetchCompletedTransactionsFailure, fetchCompletedTransactionsSuccess, } from '../../reducers/missingReceiptsViewReducer';
+import { fetchCompletedTransactions, fetchCompletedTransactionsFailure, fetchCompletedTransactionsSuccess, getCompletedTransactionsCacheKey, } from '../../reducers/missingReceiptsViewReducer';
 export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchCompletedTransactions.match), switchMap((action) => {
     const state = state$.value;
     const { expenseAutomationViewState: { selectedPeriodByTenantId }, expenseAutomationMissingReceiptsViewState: { bulkUpload }, } = state;
@@ -12,8 +12,12 @@ export const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => act
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = toMonthYearPeriodId(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    const existingData = bulkUpload.completedTransactionsByPeriod[periodId];
-    if (isInitialLoad && existingData != null && existingData.transactionIds.length > 0) {
+    const cacheKey = getCompletedTransactionsCacheKey(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
+    const existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
+    if (isInitialLoad &&
+        action.payload.cacheOverride !== true &&
+        existingData != null &&
+        existingData.transactionIds.length > 0) {
         return from([]);
     }
     const period = convertToPeriod(selectedPeriod);

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

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+export const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => `completed-${subTab}-${sortKey}-${sortOrder === 'ascending' ? 'asc' : 'desc'}-${periodId}`;
 export const initialBulkUploadState = {
     batchDetailsById: {},
     batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
@@ -210,7 +211,6 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 error: undefined,
             };
         },
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         fetchMoreBatchDetails(_draft) {
             _draft.bulkUpload.batchDetailsPaginationState = {
                 fetchState: 'In-Progress',
@@ -302,7 +302,6 @@ const expenseAutomationMissingReceiptsView = createSlice({
         },
         setBulkUploadCompletedSubTab(draft, action) {
             draft.bulkUpload.completedSubTab = action.payload;
-            draft.bulkUpload.completedTransactionsByPeriod = {};
         },
         setBulkUploadSortConfig(draft, action) {
             draft.bulkUpload.sortKey = action.payload.sortKey;
@@ -357,15 +356,16 @@ const expenseAutomationMissingReceiptsView = createSlice({
                     }
                 }
             },
-            prepare(pageToken) {
-                return { payload: { pageToken } };
+            prepare(pageToken, cacheOverride) {
+                return { payload: { pageToken, cacheOverride } };
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
             const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad } = action.payload;
             const periodId = toMonthYearPeriodId(selectedPeriod);
+            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
             if (isInitialLoad) {
-                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     transactionIds,
                     nextPageToken,
                     totalCount,
@@ -373,7 +373,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 };
             }
             else {
-                const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+                const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
                 if (existing != null) {
                     existing.transactionIds.push(...transactionIds);
                     existing.nextPageToken = nextPageToken;
@@ -381,7 +381,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
                     existing.fetchState = { fetchState: 'Completed', error: undefined };
                 }
                 else {
-                    draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                    draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                         transactionIds,
                         nextPageToken,
                         totalCount,
@@ -392,7 +392,8 @@ const expenseAutomationMissingReceiptsView = createSlice({
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
-            const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+            const cacheKey = getCompletedTransactionsCacheKey(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
             if (existing != null) {
                 existing.fetchState = {
                     fetchState: 'Error',
@@ -400,7 +401,7 @@ const expenseAutomationMissingReceiptsView = createSlice({
                 };
             }
             else {
-                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     fetchState: { fetchState: 'Error', error: action.payload.error },
                     nextPageToken: null,
                     totalCount: 0,

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

@@ -3,6 +3,7 @@ import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getSupportedTransactionById, getSupportedTransactionsByIds, } from '../../../entity/transaction/transactionSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
+import { getCompletedTransactionsCacheKey } from '../reducers/missingReceiptsViewReducer';
 export function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = getCurrentTenant(state);
@@ -111,8 +112,11 @@ export function getExpenseAutomationMissingReceiptsView(state) {
             .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
             .map((f) => resolveBatchFile(f, b.batchId, transactionState));
     });
-    const completedTransactionsForPeriod = monthYearPeriodId != null
-        ? bulkUpload.completedTransactionsByPeriod[monthYearPeriodId]
+    const completedTransactionsCacheKey = monthYearPeriodId != null
+        ? getCompletedTransactionsCacheKey(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
+        : undefined;
+    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
+        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
         : undefined;
     const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
     const resolvedCompletedTransactions = getSupportedTransactionsByIds(transactionState, completedTransactionIds);

package/lib/view/expenseAutomationView/epics/missingReceipts/fetchCompletedTransactionsEpic.js

@@ -15,8 +15,12 @@ const fetchCompletedTransactionsEpic = (actions$, state$, zeniAPI) => actions$.p
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
     const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
     const isInitialLoad = action.payload.pageToken == null;
-    const existingData = bulkUpload.completedTransactionsByPeriod[periodId];
-    if (isInitialLoad && existingData != null && existingData.transactionIds.length > 0) {
+    const cacheKey = (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(periodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab);
+    const existingData = bulkUpload.completedTransactionsByPeriod[cacheKey];
+    if (isInitialLoad &&
+        action.payload.cacheOverride !== true &&
+        existingData != null &&
+        existingData.transactionIds.length > 0) {
         return (0, rxjs_1.from)([]);
     }
     const period = (0, timePeriod_1.convertToPeriod)(selectedPeriod);

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

@@ -6,6 +6,8 @@ import { TransactionPayload } from '../../../entity/transaction/payloadTypes/tra
 import { SupportedTransactionPayload } from '../../../entity/transaction/transactionState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import type { BatchDetails, BatchListItem, BatchStatus, BulkUploadResultsTab, BulkUploadSortKey, BulkUploadState, CompletedSubTab, ManualSearchResult, MissingReceiptsViewState, MissingReceiptsViewUIState } from '../types/missingReceiptsViewState';
+import type { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+export declare const getCompletedTransactionsCacheKey: (periodId: MonthYearPeriodId, sortKey: BulkUploadSortKey, sortOrder: SortOrder, subTab: CompletedSubTab) => string;
 export declare const initialBulkUploadState: BulkUploadState;
 export declare const initialState: MissingReceiptsViewState;
 export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, minimumTransactionAmount: Amount, cacheOverride?: any, refreshViewInBackground?: any], {
@@ -67,8 +69,9 @@ export declare const fetchMissingReceipts: import("@reduxjs/toolkit").ActionCrea
     query: string;
 }, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatch", never, never>, searchTransactionsForManualMatchSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<ManualSearchResult[], "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatchSuccess">, searchTransactionsForManualMatchFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     error: ZeniAPIStatus;
-}, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatchFailure">, clearManualSearchResults: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearManualSearchResults">, fetchCompletedTransactions: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[pageToken?: string | undefined], {
+}, "expenseAutomationMissingReceiptsView/searchTransactionsForManualMatchFailure">, clearManualSearchResults: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"expenseAutomationMissingReceiptsView/clearManualSearchResults">, fetchCompletedTransactions: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[pageToken?: string | undefined, cacheOverride?: boolean | undefined], {
     pageToken: string | undefined;
+    cacheOverride: boolean | undefined;
 }, "expenseAutomationMissingReceiptsView/fetchCompletedTransactions", never, never>, fetchCompletedTransactionsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     isInitialLoad: boolean;
     nextPageToken: string | null;

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

@@ -1,9 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchCompletedTransactionsFailure = exports.fetchCompletedTransactionsSuccess = exports.fetchCompletedTransactions = exports.clearManualSearchResults = exports.searchTransactionsForManualMatchFailure = exports.searchTransactionsForManualMatchSuccess = exports.searchTransactionsForManualMatch = exports.clearBulkUpload = exports.setBulkUploadSortConfig = exports.setBulkUploadCompletedSubTab = exports.setBulkUploadResultsTab = exports.confirmBulkUploadMatchFailure = exports.confirmBulkUploadMatchSuccess = exports.confirmBulkUploadMatch = exports.fetchBulkUploadBatchesFailure = exports.fetchBulkUploadBatchesSuccess = exports.fetchBulkUploadBatches = exports.fetchMoreBatchDetailsFailure = exports.fetchMoreBatchDetailsComplete = exports.fetchMoreBatchDetails = exports.setInitialBatchDetailsLoading = exports.batchDetailFetchFailed = exports.storeBatchDetails = exports.fetchBulkUploadBatchDetailsFailure = exports.fetchBulkUploadBatchDetailsSuccess = exports.fetchBulkUploadBatchDetails = exports.pusherBatchStatusUpdate = exports.bulkUploadReceiptsFailure = exports.bulkUploadReceiptsSuccess = exports.updateBulkUploadProgress = exports.bulkUploadReceipts = exports.clearExpenseAutomationMissingReceiptsView = exports.markMissingReceiptAsDone = exports.updateMissingReceiptsUIState = exports.updateMissingReceiptUploadState = exports.uploadMissingReceiptSuccess = exports.fetchMissingReceiptsFailure = exports.fetchMissingReceiptsSuccess = exports.fetchMissingReceipts = exports.initialState = exports.initialBulkUploadState = void 0;
+exports.fetchCompletedTransactionsFailure = exports.fetchCompletedTransactionsSuccess = exports.fetchCompletedTransactions = exports.clearManualSearchResults = exports.searchTransactionsForManualMatchFailure = exports.searchTransactionsForManualMatchSuccess = exports.searchTransactionsForManualMatch = exports.clearBulkUpload = exports.setBulkUploadSortConfig = exports.setBulkUploadCompletedSubTab = exports.setBulkUploadResultsTab = exports.confirmBulkUploadMatchFailure = exports.confirmBulkUploadMatchSuccess = exports.confirmBulkUploadMatch = exports.fetchBulkUploadBatchesFailure = exports.fetchBulkUploadBatchesSuccess = exports.fetchBulkUploadBatches = exports.fetchMoreBatchDetailsFailure = exports.fetchMoreBatchDetailsComplete = exports.fetchMoreBatchDetails = exports.setInitialBatchDetailsLoading = exports.batchDetailFetchFailed = exports.storeBatchDetails = exports.fetchBulkUploadBatchDetailsFailure = exports.fetchBulkUploadBatchDetailsSuccess = exports.fetchBulkUploadBatchDetails = exports.pusherBatchStatusUpdate = exports.bulkUploadReceiptsFailure = exports.bulkUploadReceiptsSuccess = exports.updateBulkUploadProgress = exports.bulkUploadReceipts = exports.clearExpenseAutomationMissingReceiptsView = exports.markMissingReceiptAsDone = exports.updateMissingReceiptsUIState = exports.updateMissingReceiptUploadState = exports.uploadMissingReceiptSuccess = exports.fetchMissingReceiptsFailure = exports.fetchMissingReceiptsSuccess = exports.fetchMissingReceipts = exports.initialState = exports.initialBulkUploadState = exports.getCompletedTransactionsCacheKey = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
+const getCompletedTransactionsCacheKey = (periodId, sortKey, sortOrder, subTab) => `completed-${subTab}-${sortKey}-${sortOrder === 'ascending' ? 'asc' : 'desc'}-${periodId}`;
+exports.getCompletedTransactionsCacheKey = getCompletedTransactionsCacheKey;
 exports.initialBulkUploadState = {
     batchDetailsById: {},
     batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
@@ -214,7 +216,6 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                 error: undefined,
             };
         },
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         fetchMoreBatchDetails(_draft) {
             _draft.bulkUpload.batchDetailsPaginationState = {
                 fetchState: 'In-Progress',
@@ -306,7 +307,6 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         },
         setBulkUploadCompletedSubTab(draft, action) {
             draft.bulkUpload.completedSubTab = action.payload;
-            draft.bulkUpload.completedTransactionsByPeriod = {};
         },
         setBulkUploadSortConfig(draft, action) {
             draft.bulkUpload.sortKey = action.payload.sortKey;
@@ -361,15 +361,16 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                     }
                 }
             },
-            prepare(pageToken) {
-                return { payload: { pageToken } };
+            prepare(pageToken, cacheOverride) {
+                return { payload: { pageToken, cacheOverride } };
             },
         },
         fetchCompletedTransactionsSuccess(draft, action) {
             const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad } = action.payload;
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(selectedPeriod);
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
             if (isInitialLoad) {
-                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     transactionIds,
                     nextPageToken,
                     totalCount,
@@ -377,7 +378,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                 };
             }
             else {
-                const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+                const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
                 if (existing != null) {
                     existing.transactionIds.push(...transactionIds);
                     existing.nextPageToken = nextPageToken;
@@ -385,7 +386,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                     existing.fetchState = { fetchState: 'Completed', error: undefined };
                 }
                 else {
-                    draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                    draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                         transactionIds,
                         nextPageToken,
                         totalCount,
@@ -396,7 +397,8 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
         },
         fetchCompletedTransactionsFailure(draft, action) {
             const periodId = (0, timePeriod_1.toMonthYearPeriodId)(action.payload.selectedPeriod);
-            const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+            const cacheKey = (0, exports.getCompletedTransactionsCacheKey)(periodId, draft.bulkUpload.sortKey, draft.bulkUpload.sortOrder, draft.bulkUpload.completedSubTab);
+            const existing = draft.bulkUpload.completedTransactionsByPeriod[cacheKey];
             if (existing != null) {
                 existing.fetchState = {
                     fetchState: 'Error',
@@ -404,7 +406,7 @@ const expenseAutomationMissingReceiptsView = (0, toolkit_1.createSlice)({
                 };
             }
             else {
-                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                draft.bulkUpload.completedTransactionsByPeriod[cacheKey] = {
                     fetchState: { fetchState: 'Error', error: action.payload.error },
                     nextPageToken: null,
                     totalCount: 0,

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

@@ -9,6 +9,7 @@ const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionSelector_1 = require("../../../entity/transaction/transactionSelector");
 const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAutomationViewSelectorTypes");
+const missingReceiptsViewReducer_1 = require("../reducers/missingReceiptsViewReducer");
 function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
@@ -117,8 +118,11 @@ function getExpenseAutomationMissingReceiptsView(state) {
             .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
             .map((f) => resolveBatchFile(f, b.batchId, transactionState));
     });
-    const completedTransactionsForPeriod = monthYearPeriodId != null
-        ? bulkUpload.completedTransactionsByPeriod[monthYearPeriodId]
+    const completedTransactionsCacheKey = monthYearPeriodId != null
+        ? (0, missingReceiptsViewReducer_1.getCompletedTransactionsCacheKey)(monthYearPeriodId, bulkUpload.sortKey, bulkUpload.sortOrder, bulkUpload.completedSubTab)
+        : undefined;
+    const completedTransactionsForPeriod = completedTransactionsCacheKey != null
+        ? bulkUpload.completedTransactionsByPeriod[completedTransactionsCacheKey]
         : undefined;
     const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
     const resolvedCompletedTransactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, completedTransactionIds);

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

@@ -106,7 +106,7 @@ export interface BulkUploadState {
     batchListFetchState: FetchStateAndError;
     batchStatusById: Record<ID, BatchStatus>;
     completedSubTab: CompletedSubTab;
-    completedTransactionsByPeriod: Record<MonthYearPeriodId, CompletedTransactionsState>;
+    completedTransactionsByPeriod: Record<string, CompletedTransactionsState>;
     confirmMatchStatus: FetchStateAndError;
     currentResultsTab: BulkUploadResultsTab;
     failedBatchDetailIds: ID[];

package/package.json

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