@zeniai/client-epic-state 4.19.37-betaAS2 → 4.19.37-betaVR10

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

@@ -1,6 +1,29 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+export const initialBulkUploadState = {
+    batchDetailsById: {},
+    batchDetailsPaginationState: { fetchState: 'Not-Started', error: undefined },
+    batchListByPeriod: {},
+    batchListFetchState: { fetchState: 'Not-Started', error: undefined },
+    batchStatusById: {},
+    completedSubTab: 'all',
+    completedTransactionsByPeriod: {},
+    confirmMatchStatus: { fetchState: 'Not-Started', error: undefined },
+    currentBatchId: undefined,
+    currentResultsTab: 'unmatched',
+    manualSearch: {
+        fetchState: { fetchState: 'Not-Started', error: undefined },
+        results: [],
+        searchQuery: '',
+    },
+    phase: 'idle',
+    sortKey: 'date',
+    sortOrder: 'descending',
+    uploadProgress: 0,
+    uploadStatus: { fetchState: 'Not-Started', error: undefined },
+};
 export const initialState = {
+    bulkUpload: initialBulkUploadState,
     uploadReceiptStatusById: {},
     refreshStatus: {
         fetchState: 'Not-Started',
@@ -120,7 +143,263 @@ const expenseAutomationMissingReceiptsView = createSlice({
         clearExpenseAutomationMissingReceiptsView(draft) {
             Object.assign(draft, initialState);
         },
+        // -- Bulk Upload Actions --
+        bulkUploadReceipts: {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            reducer(draft, _action) {
+                draft.bulkUpload.phase = 'uploading';
+                draft.bulkUpload.uploadProgress = 0;
+                draft.bulkUpload.uploadStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(files) {
+                return { payload: { files } };
+            },
+        },
+        updateBulkUploadProgress(draft, action) {
+            draft.bulkUpload.uploadProgress = action.payload;
+        },
+        bulkUploadReceiptsSuccess(draft, action) {
+            draft.bulkUpload.currentBatchId = action.payload.batchId;
+            draft.bulkUpload.uploadStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            draft.bulkUpload.phase = 'matching';
+        },
+        bulkUploadReceiptsFailure(draft, action) {
+            draft.bulkUpload.uploadStatus = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+            draft.bulkUpload.phase = 'idle';
+        },
+        pusherBatchStatusUpdate(draft, action) {
+            const batchStatus = action.payload;
+            draft.bulkUpload.batchStatusById[batchStatus.batchId] = batchStatus;
+        },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        fetchBulkUploadBatchDetails(_draft) {
+            // trigger epic, no state change needed
+        },
+        fetchBulkUploadBatchDetailsSuccess(draft, action) {
+            const details = action.payload;
+            draft.bulkUpload.batchDetailsById[details.batchId] = details;
+            draft.bulkUpload.phase = 'completed';
+        },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        fetchBulkUploadBatchDetailsFailure(draft, _action) {
+            draft.bulkUpload.phase = 'completed';
+        },
+        storeBatchDetails(draft, action) {
+            const details = action.payload;
+            draft.bulkUpload.batchDetailsById[details.batchId] = details;
+        },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        fetchMoreBatchDetails(_draft) {
+            _draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'In-Progress',
+                error: undefined,
+            };
+        },
+        fetchMoreBatchDetailsComplete(draft) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        fetchMoreBatchDetailsFailure(draft, action) {
+            draft.bulkUpload.batchDetailsPaginationState = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
+        fetchBulkUploadBatches: {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            reducer(draft, _action) {
+                draft.bulkUpload.batchListFetchState = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(cacheOverride = false) {
+                return { payload: { cacheOverride } };
+            },
+        },
+        fetchBulkUploadBatchesSuccess(draft, action) {
+            const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
+            draft.bulkUpload.batchListByPeriod[periodId] = action.payload.batchList;
+            draft.bulkUpload.batchListFetchState = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        fetchBulkUploadBatchesFailure(draft, action) {
+            draft.bulkUpload.batchListFetchState = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
+        confirmBulkUploadMatch: {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            reducer(draft, _action) {
+                draft.bulkUpload.confirmMatchStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(batchId, attachmentId, transactionId, transactionType, fileName) {
+                return { payload: { batchId, attachmentId, transactionId, transactionType, fileName } };
+            },
+        },
+        confirmBulkUploadMatchSuccess(draft, action) {
+            const { batchId, attachmentId, transactionId } = action.payload;
+            draft.bulkUpload.confirmMatchStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            const details = draft.bulkUpload.batchDetailsById[batchId];
+            if (details != null) {
+                const file = details.files.find((f) => f.attachmentId === attachmentId);
+                if (file != null) {
+                    const originalStatus = file.status;
+                    file.status = 'matched';
+                    file.matchedTransactionId = transactionId;
+                    file.candidates = undefined;
+                    details.summary.matched += 1;
+                    if (originalStatus === 'no_match') {
+                        details.summary.noMatch = Math.max(0, details.summary.noMatch - 1);
+                    }
+                    else {
+                        details.summary.possibleMatches = Math.max(0, details.summary.possibleMatches - 1);
+                    }
+                }
+            }
+        },
+        confirmBulkUploadMatchFailure(draft, action) {
+            draft.bulkUpload.confirmMatchStatus = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
+        setBulkUploadResultsTab(draft, action) {
+            draft.bulkUpload.currentResultsTab = action.payload;
+        },
+        setBulkUploadCompletedSubTab(draft, action) {
+            draft.bulkUpload.completedSubTab = action.payload;
+            draft.bulkUpload.completedTransactionsByPeriod = {};
+        },
+        setBulkUploadSortConfig(draft, action) {
+            draft.bulkUpload.sortKey = action.payload.sortKey;
+            draft.bulkUpload.sortOrder = action.payload.sortOrder;
+        },
+        clearBulkUpload(draft) {
+            Object.assign(draft.bulkUpload, initialBulkUploadState);
+        },
+        searchTransactionsForManualMatch: {
+            reducer(draft, action) {
+                draft.bulkUpload.manualSearch.searchQuery = action.payload.query;
+                draft.bulkUpload.manualSearch.fetchState = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+                draft.bulkUpload.manualSearch.results = [];
+            },
+            prepare(query) {
+                return { payload: { query } };
+            },
+        },
+        searchTransactionsForManualMatchSuccess(draft, action) {
+            draft.bulkUpload.manualSearch.results = action.payload;
+            draft.bulkUpload.manualSearch.fetchState = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+        },
+        searchTransactionsForManualMatchFailure(draft, action) {
+            draft.bulkUpload.manualSearch.fetchState = {
+                fetchState: 'Error',
+                error: action.payload.error,
+            };
+        },
+        clearManualSearchResults(draft) {
+            draft.bulkUpload.manualSearch = initialBulkUploadState.manualSearch;
+        },
+        // -- Completed Transactions Actions --
+        fetchCompletedTransactions: {
+            reducer(draft, action) {
+                const { pageToken } = action.payload;
+                if (pageToken != null) {
+                    const periods = draft.bulkUpload.completedTransactionsByPeriod;
+                    for (const entry of Object.values(periods)) {
+                        if (entry.nextPageToken === pageToken) {
+                            entry.fetchState = {
+                                fetchState: 'In-Progress',
+                                error: undefined,
+                            };
+                            break;
+                        }
+                    }
+                }
+            },
+            prepare(pageToken) {
+                return { payload: { pageToken } };
+            },
+        },
+        fetchCompletedTransactionsSuccess(draft, action) {
+            const { transactionIds, nextPageToken, totalCount, selectedPeriod, isInitialLoad } = action.payload;
+            const periodId = toMonthYearPeriodId(selectedPeriod);
+            if (isInitialLoad) {
+                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                    transactionIds,
+                    nextPageToken,
+                    totalCount,
+                    fetchState: { fetchState: 'Completed', error: undefined },
+                };
+            }
+            else {
+                const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+                if (existing != null) {
+                    existing.transactionIds.push(...transactionIds);
+                    existing.nextPageToken = nextPageToken;
+                    existing.totalCount = totalCount;
+                    existing.fetchState = { fetchState: 'Completed', error: undefined };
+                }
+                else {
+                    draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                        transactionIds,
+                        nextPageToken,
+                        totalCount,
+                        fetchState: { fetchState: 'Completed', error: undefined },
+                    };
+                }
+            }
+        },
+        fetchCompletedTransactionsFailure(draft, action) {
+            const periodId = toMonthYearPeriodId(action.payload.selectedPeriod);
+            const existing = draft.bulkUpload.completedTransactionsByPeriod[periodId];
+            if (existing != null) {
+                existing.fetchState = {
+                    fetchState: 'Error',
+                    error: action.payload.error,
+                };
+            }
+            else {
+                draft.bulkUpload.completedTransactionsByPeriod[periodId] = {
+                    fetchState: { fetchState: 'Error', error: action.payload.error },
+                    nextPageToken: null,
+                    totalCount: 0,
+                    transactionIds: [],
+                };
+            }
+        },
     },
 });
-export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, } = expenseAutomationMissingReceiptsView.actions;
+export const { fetchMissingReceipts, fetchMissingReceiptsSuccess, fetchMissingReceiptsFailure, uploadMissingReceiptSuccess, updateMissingReceiptUploadState, updateMissingReceiptsUIState, markMissingReceiptAsDone, clearExpenseAutomationMissingReceiptsView, 
+// Bulk Upload
+bulkUploadReceipts, updateBulkUploadProgress, bulkUploadReceiptsSuccess, bulkUploadReceiptsFailure, pusherBatchStatusUpdate, fetchBulkUploadBatchDetails, fetchBulkUploadBatchDetailsSuccess, fetchBulkUploadBatchDetailsFailure, storeBatchDetails, fetchMoreBatchDetails, fetchMoreBatchDetailsComplete, fetchMoreBatchDetailsFailure, fetchBulkUploadBatches, fetchBulkUploadBatchesSuccess, fetchBulkUploadBatchesFailure, confirmBulkUploadMatch, confirmBulkUploadMatchSuccess, confirmBulkUploadMatchFailure, setBulkUploadResultsTab, setBulkUploadCompletedSubTab, setBulkUploadSortConfig, clearBulkUpload, searchTransactionsForManualMatch, searchTransactionsForManualMatchSuccess, searchTransactionsForManualMatchFailure, clearManualSearchResults, 
+// Completed Transactions
+fetchCompletedTransactions, fetchCompletedTransactionsSuccess, fetchCompletedTransactionsFailure, } = expenseAutomationMissingReceiptsView.actions;
 export default expenseAutomationMissingReceiptsView.reducer;

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

@@ -1,7 +1,7 @@
 import orderBy from 'lodash/orderBy';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
-import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
+import { getSupportedTransactionById, getSupportedTransactionsByIds, } from '../../../entity/transaction/transactionSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
 export function getExpenseAutomationMissingReceiptsView(state) {
     const { expenseAutomationMissingReceiptsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
@@ -47,6 +47,82 @@ export function getExpenseAutomationMissingReceiptsView(state) {
     const completionStatus = missingReceiptsCompletionStatus != null
         ? missingReceiptsCompletionStatus
         : 'incomplete';
+    const { bulkUpload } = expenseAutomationMissingReceiptsViewState;
+    const currentBatchStatus = bulkUpload.currentBatchId != null
+        ? bulkUpload.batchStatusById[bulkUpload.currentBatchId]
+        : undefined;
+    const batchList = monthYearPeriodId != null
+        ? bulkUpload.batchListByPeriod[monthYearPeriodId] ?? []
+        : [];
+    const completedBatchesSorted = orderBy(batchList.filter((b) => b.status === 'completed'), (b) => b.createdAt, 'desc');
+    const effectiveCurrentBatchId = bulkUpload.currentBatchId ?? completedBatchesSorted[0]?.batchId;
+    const currentBatchDetails = effectiveCurrentBatchId != null
+        ? bulkUpload.batchDetailsById[effectiveCurrentBatchId]
+        : undefined;
+    const resolvedFiles = currentBatchDetails?.files.map((file) => resolveBatchFile(file, transactionState));
+    const hasMoreBatchDetails = completedBatchesSorted.some((b) => bulkUpload.batchDetailsById[b.batchId] == null);
+    const getSortValue = (file) => {
+        const t = file.matchedTransaction;
+        if (t == null) {
+            return null;
+        }
+        switch (bulkUpload.sortKey) {
+            case 'vendor':
+                return (t.vendorName ?? t.description)?.toLowerCase() ?? null;
+            case 'category': {
+                const line = t.lines?.[0];
+                return line?.account?.accountName?.toLowerCase() ?? null;
+            }
+            case 'class': {
+                const line = t.lines?.[0];
+                return line?.class?.className?.toLowerCase() ?? null;
+            }
+            case 'date':
+                return t.date.valueOf();
+            case 'amount':
+                return t.amount.amount;
+            default:
+                return null;
+        }
+    };
+    const bulkUploadSortDirection = bulkUpload.sortOrder === 'ascending' ? 'asc' : 'desc';
+    const matchedFiles = orderBy(resolvedFiles?.filter((f) => f.status === 'matched') ?? [], getSortValue, bulkUploadSortDirection);
+    const unmatchedFiles = orderBy(resolvedFiles?.filter((f) => f.status === 'un_matched' || f.status === 'no_match') ?? [], getSortValue, bulkUploadSortDirection);
+    const progress = currentBatchStatus != null
+        ? {
+            ...currentBatchStatus.progress,
+            percentage: currentBatchStatus.progress.total > 0
+                ? Math.round((currentBatchStatus.progress.processed /
+                    currentBatchStatus.progress.total) *
+                    100)
+                : 0,
+        }
+        : { total: 0, processed: 0, percentage: 0 };
+    const batchListFetchState = bulkUpload.batchListFetchState;
+    const pastBatches = batchList.filter((b) => b.batchId !== effectiveCurrentBatchId);
+    const pastUnmatchedFiles = pastBatches.flatMap((b) => {
+        const details = bulkUpload.batchDetailsById[b.batchId];
+        if (details == null) {
+            return [];
+        }
+        return details.files
+            .filter((f) => f.status === 'un_matched' || f.status === 'no_match')
+            .map((f) => resolveBatchFile(f, transactionState));
+    });
+    const completedTransactionsForPeriod = monthYearPeriodId != null
+        ? bulkUpload.completedTransactionsByPeriod[monthYearPeriodId]
+        : undefined;
+    const completedTransactionIds = completedTransactionsForPeriod?.transactionIds ?? [];
+    const resolvedCompletedTransactions = getSupportedTransactionsByIds(transactionState, completedTransactionIds);
+    const resolvedBatchDetails = currentBatchDetails != null && resolvedFiles != null
+        ? {
+            batchId: currentBatchDetails.batchId,
+            createdAt: currentBatchDetails.createdAt,
+            files: resolvedFiles,
+            status: currentBatchDetails.status,
+            summary: currentBatchDetails.summary,
+        }
+        : undefined;
     return {
         fetchState,
         error,
@@ -55,5 +131,62 @@ export function getExpenseAutomationMissingReceiptsView(state) {
         refreshStatus,
         transactions: sortedTransactions,
         completionStatus,
+        bulkUpload: {
+            phase: bulkUpload.phase,
+            uploadStatus: bulkUpload.uploadStatus,
+            batchStatus: currentBatchStatus,
+            batchDetails: resolvedBatchDetails,
+            completedSubTab: bulkUpload.completedSubTab,
+            completedTransactions: {
+                fetchState: completedTransactionsForPeriod?.fetchState ?? {
+                    fetchState: 'Not-Started',
+                    error: undefined,
+                },
+                nextPageToken: completedTransactionsForPeriod?.nextPageToken ?? null,
+                totalCount: completedTransactionsForPeriod?.totalCount ?? 0,
+                transactions: resolvedCompletedTransactions,
+            },
+            matchedFiles,
+            unmatchedFiles,
+            progress,
+            currentResultsTab: bulkUpload.currentResultsTab,
+            sortKey: bulkUpload.sortKey,
+            sortOrder: bulkUpload.sortOrder,
+            batchList,
+            batchListFetchState,
+            pastBatches,
+            pastUnmatchedFiles,
+            confirmMatchStatus: bulkUpload.confirmMatchStatus,
+            hasMoreBatchDetails,
+            batchDetailsPaginationState: bulkUpload.batchDetailsPaginationState,
+            manualSearch: bulkUpload.manualSearch,
+            uploadProgress: bulkUpload.uploadProgress,
+        },
+    };
+}
+function resolveBatchFile(file, transactionState) {
+    const matchedTransaction = file.matchedTransactionId != null
+        ? getSupportedTransactionById(transactionState, file.matchedTransactionId)
+        : undefined;
+    const candidates = file.candidates
+        ?.map((ref) => {
+        const transaction = getSupportedTransactionById(transactionState, ref.transactionId);
+        return transaction != null
+            ? { transaction, matchScore: ref.matchScore }
+            : undefined;
+    })
+        .filter((c) => c != null);
+    return {
+        attachmentId: file.attachmentId,
+        fileDownloadUrl: file.fileDownloadUrl,
+        fileId: file.fileId,
+        filename: file.filename,
+        filePreviewUrl: file.filePreviewUrl,
+        status: file.status,
+        matchedTransaction,
+        candidates: candidates != null && candidates.length > 0
+            ? candidates
+            : undefined,
+        matchSource: file.matchSource,
     };
 }

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.js

@@ -2,7 +2,6 @@ import { createSlice } from '@reduxjs/toolkit';
 export const initialState = {
     fetchState: 'Not-Started',
     error: undefined,
-    listeningToPusherEvent: false,
     approverListState: {
         approverIds: [],
         attributes: [],
@@ -155,11 +154,6 @@ const billPaySetupApproverView = createSlice({
             reducer(draft, action) {
                 const { approvalRuleIds } = action.payload;
                 if (draft.billPaySetupApproverViewUpdateData != null) {
-                    if (draft.billPaySetupApproverViewUpdateData.type === 'approval_update' &&
-                        draft.billPaySetupApproverViewUpdateData.data
-                            ?.isApplicableOnPendingApprovalEntity === true) {
-                        draft.listeningToPusherEvent = true;
-                    }
                     draft.billPaySetupApproverViewUpdateData.updateStatus = {
                         fetchState: 'Completed',
                         error: undefined,
@@ -220,9 +214,6 @@ const billPaySetupApproverView = createSlice({
                 return { payload: { billPaySetupApproverViewUpdateData } };
             },
         },
-        setListeningToPusherEvent(draft, action) {
-            draft.listeningToPusherEvent = action.payload;
-        },
         clearBillPaySetupApproverViewUpdateData(draft) {
             if (draft.billPaySetupApproverViewUpdateData != null) {
                 draft.billPaySetupApproverViewUpdateData.data = undefined;
@@ -233,5 +224,5 @@ const billPaySetupApproverView = createSlice({
         },
     },
 });
-export const { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewSuccess, fetchBillPaySetupApproverViewFailure, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPayApproversListSuccess, fetchBillPayApproversListFailure, deleteBillPayApprovalRule, deleteBillPayApprovalRuleSuccess, deleteBillPayApprovalRuleFailure, saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesSuccess, saveBillPaySetupApproverViewUpdatesFailure, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, setListeningToPusherEvent, clearBillPaySetupApproverView, } = billPaySetupApproverView.actions;
+export const { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewSuccess, fetchBillPaySetupApproverViewFailure, fetchBillPayApproversDetails, fetchBillPayApproversList, fetchBillPayApproversListSuccess, fetchBillPayApproversListFailure, deleteBillPayApprovalRule, deleteBillPayApprovalRuleSuccess, deleteBillPayApprovalRuleFailure, saveBillPaySetupApproverViewUpdates, saveBillPaySetupApproverViewUpdatesSuccess, saveBillPaySetupApproverViewUpdatesFailure, initializeBillPaySetupApproverViewUpdateData, saveBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverViewUpdateData, clearBillPaySetupApproverView, } = billPaySetupApproverView.actions;
 export default billPaySetupApproverView.reducer;

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelector.js

@@ -6,7 +6,7 @@ import { getClassesByIds } from '../../../../entity/class/classSelector';
 import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getBillPaySetupApproverView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (billPaySetupApproverViewState, approvalRuleState, userState) => {
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error } = billPaySetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -40,11 +40,10 @@ export const getBillPaySetupApproverView = createSelector((state) => state.billP
         approvalRulesStatus,
         fetchState,
         error,
-        listeningToPusherEvent,
     };
 });
 export const getBillPaySetupApproverUpdateDataView = createSelector((state) => state.billPaySetupApproverViewState, (state) => state.approvalRuleState, (state) => state.userState, (state) => state.classState, (state) => state.classListState, (state) => state.userRoleState, (billPaySetupApproverViewState, approvalRuleState, userState, classState, classListState, userRoleState) => {
-    const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = billPaySetupApproverViewState;
+    const { approvalRuleIds, approverListState, billPaySetupApproverViewUpdateData, fetchState, error, } = billPaySetupApproverViewState;
     const { approverIds, attributes } = approverListState;
     const allApprovalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
     const allApprovers = approverIds
@@ -97,6 +96,5 @@ export const getBillPaySetupApproverUpdateDataView = createSelector((state) => s
         fetchState,
         allAccountingClasses,
         error,
-        listeningToPusherEvent,
     };
 });

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.js

@@ -33,15 +33,12 @@ export const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
             }),
         };
     });
-    const isUpdate = approverViewUpdateData.approvalRuleId != null;
     const payload = {
         criteria: criteriaPayload,
         steps,
     };
-    if (isUpdate) {
-        payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
-        payload.is_applicable_on_pending_approval_entity =
-            approverViewUpdateData.isApplicableOnPendingApprovalEntity ?? false;
+    if (approverViewUpdateData.approvalRuleId != null) {
+        payload['approval_rule_id'] = approverViewUpdateData.approvalRuleId;
     }
     return payload;
 };

package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.js

@@ -2,7 +2,6 @@ import { createSlice } from '@reduxjs/toolkit';
 export const initialState = {
     fetchState: 'Not-Started',
     error: undefined,
-    listeningToPusherEvent: false,
     approverListState: {
         approverIds: [],
         attributes: [],
@@ -177,11 +176,6 @@ const remiSetupApproverView = createSlice({
             reducer(draft, action) {
                 const { approvalRuleIds } = action.payload;
                 if (draft.remiSetupApproverViewUpdateData != null) {
-                    if (draft.remiSetupApproverViewUpdateData.type === 'approval_update' &&
-                        draft.remiSetupApproverViewUpdateData.data
-                            ?.isApplicableOnPendingApprovalEntity === true) {
-                        draft.listeningToPusherEvent = true;
-                    }
                     draft.remiSetupApproverViewUpdateData.updateStatus = {
                         fetchState: 'Completed',
                         error: undefined,
@@ -242,9 +236,6 @@ const remiSetupApproverView = createSlice({
                 return { payload: { remiSetupApproverViewUpdateData } };
             },
         },
-        setListeningToPusherEvent(draft, action) {
-            draft.listeningToPusherEvent = action.payload;
-        },
         clearRemiSetupApproverViewUpdateData(draft) {
             if (draft.remiSetupApproverViewUpdateData != null) {
                 draft.remiSetupApproverViewUpdateData.data = undefined;
@@ -255,5 +246,5 @@ const remiSetupApproverView = createSlice({
         },
     },
 });
-export const { fetchRemiSetupApproverView, fetchRemiSetupApproverViewSuccess, fetchRemiSetupApproverViewFailure, fetchRemiApproversDetails, fetchRemiApproversList, fetchRemiApproversListSuccess, fetchRemiApproversListFailure, deleteRemiApprovalRule, deleteRemiApprovalRuleSuccess, deleteRemiApprovalRuleFailure, saveRemiSetupApproverViewUpdates, saveRemiSetupApproverViewUpdatesSuccess, saveRemiSetupApproverViewUpdatesFailure, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, setListeningToPusherEvent, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, } = remiSetupApproverView.actions;
+export const { fetchRemiSetupApproverView, fetchRemiSetupApproverViewSuccess, fetchRemiSetupApproverViewFailure, fetchRemiApproversDetails, fetchRemiApproversList, fetchRemiApproversListSuccess, fetchRemiApproversListFailure, deleteRemiApprovalRule, deleteRemiApprovalRuleSuccess, deleteRemiApprovalRuleFailure, saveRemiSetupApproverViewUpdates, saveRemiSetupApproverViewUpdatesSuccess, saveRemiSetupApproverViewUpdatesFailure, initializeRemiSetupApproverViewUpdateData, saveRemiSetupApproverViewUpdateData, clearRemiSetupApproverViewUpdateData, clearRemiSetupApproverView, } = remiSetupApproverView.actions;
 export default remiSetupApproverView.reducer;

package/lib/esm/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelector.js

@@ -7,7 +7,7 @@ import { getUserByUserId } from '../../../../entity/user/userSelector';
 import { getUserRoleByUserId } from '../../../../entity/userRole/userRoleSelector';
 export const getRemiSetupApproverView = (state, filterAdmins = true) => {
     const { remiSetupApproverViewState, approvalRuleState, userState } = state;
-    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error, listeningToPusherEvent, } = remiSetupApproverViewState;
+    const { approvalRulesDeleteStatusById, approvalRuleIds, fetchState, error } = remiSetupApproverViewState;
     const deleteStateList = Object.values(approvalRulesDeleteStatusById);
     const approvalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -42,11 +42,10 @@ export const getRemiSetupApproverView = (state, filterAdmins = true) => {
         approvalRulesStatus,
         fetchState,
         error,
-        listeningToPusherEvent,
     };
 };
 export const getRemiSetupApproverUpdateDataView = createSelector((state) => state.remiSetupApproverViewState, (state) => state.approvalRuleState, (state) => state.classState, (state) => state.classListState, (state) => state.userState, (state) => state.userRoleState, (remiSetupApproverViewState, approvalRuleState, classState, classListState, userState, userRoleState) => {
-    const { approvalRuleIds, approverListState, remiSetupApproverViewUpdateData, fetchState, error, listeningToPusherEvent, } = remiSetupApproverViewState;
+    const { approvalRuleIds, approverListState, remiSetupApproverViewUpdateData, fetchState, error, } = remiSetupApproverViewState;
     const { approverIds, attributes, fetchStatus } = approverListState;
     const { fetchState: classListFetchState, error: classListFetchStateError, classIds, } = classListState;
     const allApprovalRules = getApprovalRulesByIds(approvalRuleState, approvalRuleIds).map((approvalRule) => {
@@ -114,6 +113,5 @@ export const getRemiSetupApproverUpdateDataView = createSelector((state) => stat
         ]),
         fetchState,
         error,
-        listeningToPusherEvent,
     };
 });

package/lib/esm/zeniAPI.js

@@ -1,5 +1,5 @@
 import { fetch } from 'cross-fetch';
-import { from } from 'rxjs';
+import { Observable, from } from 'rxjs';
 import { isInvalidSessionError } from './responsePayload';
 export class ZeniAPIClient {
     constructor(apiEndPoints, userId, sessionId, tenantId, onSessionInvalidated) {
@@ -79,8 +79,6 @@ export class ZeniAPIClient {
         return from(promise);
     }
     postFormData(restEndPoint, formData, signal) {
-        // Use apiHeaders for auth headers, then remove Content-Type
-        // so the browser sets multipart/form-data with the correct boundary
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { 'Content-Type': _contentType, ...headers } = this.apiHeaders();
         const promise = fetch(restEndPoint, {
@@ -91,6 +89,46 @@ export class ZeniAPIClient {
         }).then((response) => this.processJsonResponse(response));
         return from(promise);
     }
+    postFormDataWithProgress(restEndPoint, formData, signal) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { 'Content-Type': _ct, ...headers } = this.apiHeaders();
+        return new Observable((subscriber) => {
+            const xhr = new XMLHttpRequest();
+            xhr.upload.onprogress = (event) => {
+                if (event.lengthComputable) {
+                    const percentage = Math.round((event.loaded / event.total) * 100);
+                    subscriber.next({ type: 'progress', percentage });
+                }
+            };
+            xhr.onload = () => {
+                try {
+                    const json = JSON.parse(xhr.responseText);
+                    this.checkSessionValidity(json);
+                    subscriber.next({ type: 'response', data: json });
+                    subscriber.complete();
+                }
+                catch (e) {
+                    subscriber.error(e);
+                }
+            };
+            xhr.onerror = () => {
+                subscriber.error(new Error('Upload failed'));
+            };
+            xhr.open('POST', restEndPoint);
+            Object.entries(headers).forEach(([key, value]) => {
+                xhr.setRequestHeader(key, String(value));
+            });
+            xhr.send(formData);
+            if (signal != null) {
+                signal.addEventListener('abort', () => xhr.abort());
+            }
+            return () => {
+                if (xhr.readyState !== XMLHttpRequest.DONE) {
+                    xhr.abort();
+                }
+            };
+        });
+    }
     deleteAndGetJSON(restEndPoint, body, headers, signal) {
         let apiHeaders = this.apiHeaders(headers);
         if (body != null) {