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

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

@@ -53,6 +53,82 @@ 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 = (0, orderBy_1.default)(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 = (0, orderBy_1.default)(resolvedFiles?.filter((f) => f.status === 'matched') ?? [], getSortValue, bulkUploadSortDirection);
+    const unmatchedFiles = (0, orderBy_1.default)(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 = (0, transactionSelector_1.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,
@@ -61,5 +137,62 @@ 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
+        ? (0, transactionSelector_1.getSupportedTransactionById)(transactionState, file.matchedTransactionId)
+        : undefined;
+    const candidates = file.candidates
+        ?.map((ref) => {
+        const transaction = (0, transactionSelector_1.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/view/expenseAutomationView/types/missingReceiptsViewState.d.ts

@@ -3,6 +3,7 @@ import { SortOrder } from '../../../commonStateTypes/selectorTypes/sortOrderType
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 export declare const toMissingReceiptsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class";
 export type MissingReceiptsSortKey = ReturnType<typeof toMissingReceiptsSortKey>;
+export type BulkUploadSortKey = 'amount' | 'category' | 'class' | 'date' | 'vendor';
 export interface MissingReceiptsViewUIState {
     scrollPosition: {
         scrollTop: number;
@@ -12,7 +13,112 @@ export interface MissingReceiptsViewUIState {
     sortKey: MissingReceiptsSortKey;
     sortOrder: SortOrder;
 }
+export type BatchStatusValue = 'pending' | 'processing' | 'completed';
+export type BatchFileStatus = 'matched' | 'un_matched' | 'no_match' | 'failed';
+export type BulkUploadPhase = 'idle' | 'uploading' | 'matching' | 'completed';
+export type BulkUploadResultsTab = 'completed' | 'unmatched';
+export type MissingReceiptsTab = 'missing' | BulkUploadResultsTab;
+export type CompletedSubTab = 'all' | 'ai_accountant' | 'manual';
+export type MatchSource = 'ai' | 'manual';
+export interface CandidateRef {
+    matchScore: number;
+    transactionId: ID;
+}
+export interface MatchCandidate {
+    amount: number;
+    currencyCode: string;
+    matchScore: number;
+    transactionDate: string;
+    transactionId: ID;
+    transactionType: string;
+    vendorName: string;
+    vendorLogo?: string;
+}
+export interface BatchFile {
+    attachmentId: ID;
+    fileDownloadUrl: string | null;
+    fileId: ID;
+    filename: string;
+    filePreviewUrl: string | null;
+    status: BatchFileStatus;
+    candidates?: CandidateRef[];
+    matchedTransactionId?: ID;
+    matchSource?: MatchSource;
+}
+export interface BatchSummary {
+    failed: number;
+    matched: number;
+    noMatch: number;
+    possibleMatches: number;
+    total: number;
+}
+export interface BatchStatus {
+    batchId: ID;
+    progress: {
+        processed: number;
+        total: number;
+    };
+    status: BatchStatusValue;
+}
+export interface BatchDetails {
+    batchId: ID;
+    createdAt: string;
+    files: BatchFile[];
+    status: BatchStatusValue;
+    summary: BatchSummary;
+}
+export interface BatchListItem {
+    batchId: ID;
+    createdAt: string;
+    failedCount: number;
+    matchedCount: number;
+    noMatchCount: number;
+    possibleMatchesCount: number;
+    status: string;
+    totalFiles: number;
+}
+export interface ManualSearchResult {
+    amount: number;
+    currencyCode: string;
+    entityId: string;
+    memo: string;
+    transactionDate: string;
+    transactionId: ID;
+    transactionType: string;
+    vendorName: string;
+}
+export interface ManualSearchState {
+    fetchState: FetchStateAndError;
+    results: ManualSearchResult[];
+    searchQuery: string;
+}
+export type CompletedTransactionsMatchType = 'all' | 'ai_accountant' | 'manual';
+export interface CompletedTransactionsState {
+    fetchState: FetchStateAndError;
+    nextPageToken: string | null;
+    totalCount: number;
+    transactionIds: ID[];
+}
+export interface BulkUploadState {
+    batchDetailsById: Record<ID, BatchDetails>;
+    batchDetailsPaginationState: FetchStateAndError;
+    batchListByPeriod: Record<MonthYearPeriodId, BatchListItem[]>;
+    batchListFetchState: FetchStateAndError;
+    batchStatusById: Record<ID, BatchStatus>;
+    completedSubTab: CompletedSubTab;
+    completedTransactionsByPeriod: Record<MonthYearPeriodId, CompletedTransactionsState>;
+    confirmMatchStatus: FetchStateAndError;
+    currentResultsTab: BulkUploadResultsTab;
+    manualSearch: ManualSearchState;
+    phase: BulkUploadPhase;
+    sortKey: BulkUploadSortKey;
+    sortOrder: SortOrder;
+    uploadProgress: number;
+    uploadStatus: FetchStateAndError;
+    currentBatchId?: ID;
+}
 export interface MissingReceiptsViewState extends FetchedState {
+    bulkUpload: BulkUploadState;
     refreshStatus: FetchStateAndError;
     transactionIdsBySelectedPeriod: Record<MonthYearPeriodId, ID[]>;
     uiState: MissingReceiptsViewUIState;

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewReducer.d.ts

@@ -34,6 +34,6 @@ export declare const fetchBillPaySetupApproverView: import("@reduxjs/toolkit").A
     approvalRuleId: string | undefined;
 }, "billPaySetupApproverView/initializeBillPaySetupApproverViewUpdateData", never, never>, saveBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[billPaySetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>], {
     billPaySetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>;
-}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdateData", never, never>, clearBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverViewUpdateData">, setListeningToPusherEvent: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "billPaySetupApproverView/setListeningToPusherEvent">, clearBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverView">;
+}, "billPaySetupApproverView/saveBillPaySetupApproverViewUpdateData", never, never>, clearBillPaySetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverViewUpdateData">, clearBillPaySetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"billPaySetupApproverView/clearBillPaySetupApproverView">;
 declare const _default: import("redux").Reducer<BillPaySetupApproverViewState>;
 export default _default;

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

@@ -1,12 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearBillPaySetupApproverView = exports.setListeningToPusherEvent = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
+exports.clearBillPaySetupApproverView = exports.clearBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdateData = exports.initializeBillPaySetupApproverViewUpdateData = exports.saveBillPaySetupApproverViewUpdatesFailure = exports.saveBillPaySetupApproverViewUpdatesSuccess = exports.saveBillPaySetupApproverViewUpdates = exports.deleteBillPayApprovalRuleFailure = exports.deleteBillPayApprovalRuleSuccess = exports.deleteBillPayApprovalRule = exports.fetchBillPayApproversListFailure = exports.fetchBillPayApproversListSuccess = exports.fetchBillPayApproversList = exports.fetchBillPayApproversDetails = exports.fetchBillPaySetupApproverViewFailure = exports.fetchBillPaySetupApproverViewSuccess = exports.fetchBillPaySetupApproverView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 exports.initialState = {
     fetchState: 'Not-Started',
     error: undefined,
-    listeningToPusherEvent: false,
     approverListState: {
         approverIds: [],
         attributes: [],
@@ -159,11 +158,6 @@ const billPaySetupApproverView = (0, toolkit_1.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,
@@ -224,9 +218,6 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
                 return { payload: { billPaySetupApproverViewUpdateData } };
             },
         },
-        setListeningToPusherEvent(draft, action) {
-            draft.listeningToPusherEvent = action.payload;
-        },
         clearBillPaySetupApproverViewUpdateData(draft) {
             if (draft.billPaySetupApproverViewUpdateData != null) {
                 draft.billPaySetupApproverViewUpdateData.data = undefined;
@@ -237,5 +228,5 @@ const billPaySetupApproverView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
+_a = billPaySetupApproverView.actions, exports.fetchBillPaySetupApproverView = _a.fetchBillPaySetupApproverView, exports.fetchBillPaySetupApproverViewSuccess = _a.fetchBillPaySetupApproverViewSuccess, exports.fetchBillPaySetupApproverViewFailure = _a.fetchBillPaySetupApproverViewFailure, exports.fetchBillPayApproversDetails = _a.fetchBillPayApproversDetails, exports.fetchBillPayApproversList = _a.fetchBillPayApproversList, exports.fetchBillPayApproversListSuccess = _a.fetchBillPayApproversListSuccess, exports.fetchBillPayApproversListFailure = _a.fetchBillPayApproversListFailure, exports.deleteBillPayApprovalRule = _a.deleteBillPayApprovalRule, exports.deleteBillPayApprovalRuleSuccess = _a.deleteBillPayApprovalRuleSuccess, exports.deleteBillPayApprovalRuleFailure = _a.deleteBillPayApprovalRuleFailure, exports.saveBillPaySetupApproverViewUpdates = _a.saveBillPaySetupApproverViewUpdates, exports.saveBillPaySetupApproverViewUpdatesSuccess = _a.saveBillPaySetupApproverViewUpdatesSuccess, exports.saveBillPaySetupApproverViewUpdatesFailure = _a.saveBillPaySetupApproverViewUpdatesFailure, exports.initializeBillPaySetupApproverViewUpdateData = _a.initializeBillPaySetupApproverViewUpdateData, exports.saveBillPaySetupApproverViewUpdateData = _a.saveBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverViewUpdateData = _a.clearBillPaySetupApproverViewUpdateData, exports.clearBillPaySetupApproverView = _a.clearBillPaySetupApproverView;
 exports.default = billPaySetupApproverView.reducer;

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

@@ -12,7 +12,7 @@ const classSelector_1 = require("../../../../entity/class/classSelector");
 const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 exports.getBillPaySetupApproverView = (0, toolkit_1.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 = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -46,11 +46,10 @@ exports.getBillPaySetupApproverView = (0, toolkit_1.createSelector)((state) => s
         approvalRulesStatus,
         fetchState,
         error,
-        listeningToPusherEvent,
     };
 });
 exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.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 = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovers = approverIds
@@ -103,6 +102,5 @@ exports.getBillPaySetupApproverUpdateDataView = (0, toolkit_1.createSelector)((s
         fetchState,
         allAccountingClasses,
         error,
-        listeningToPusherEvent,
     };
 });

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewSelectorTypes.d.ts

@@ -17,7 +17,6 @@ export interface BillPaySetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
     deleteStatus: FetchStateAndError;
-    listeningToPusherEvent?: boolean;
 }
 export interface BillPaySetupApproverUpdateDataView extends SelectorView {
     allAccountingClasses: Class[];
@@ -28,5 +27,4 @@ export interface BillPaySetupApproverUpdateDataView extends SelectorView {
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
-    listeningToPusherEvent?: boolean;
 }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/billPaySetupApproverViewState.d.ts

@@ -10,5 +10,4 @@ export interface BillPaySetupApproverViewState extends FetchedState {
         fetchStatus: FetchStateAndError;
     };
     billPaySetupApproverViewUpdateData?: ApproverViewUpdateData;
-    listeningToPusherEvent?: boolean;
 }

package/lib/view/spendManagement/billPay/billPaySetupApproverView/types/commonPayload.d.ts

@@ -13,7 +13,6 @@ interface ApproverViewStepPayload extends Omit<StepPayload, 'actors'> {
 interface ApprovalUpdatableInfoPayload {
     approval_rule_id: ID;
     criteria: CriteriaPayload[];
-    is_applicable_on_pending_approval_entity: boolean;
     steps: ApproverViewStepPayload[];
 }
 export declare const toApprovalChangableInfoPayload: (approverViewUpdateData: ApprovalRuleUpdateData | ApprovalRuleCreateData) => Partial<ApprovalUpdatableInfoPayload>;

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

@@ -36,15 +36,12 @@ 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/view/spendManagement/billPay/billPaySetupApproverView/types/commonState.d.ts

@@ -10,10 +10,8 @@ export interface ApprovalRuleUpdateData {
     approvalRuleId: ID;
     criteria: Criteria;
     steps: Step[];
-    isApplicableOnPendingApprovalEntity?: boolean;
 }
 export interface ApprovalRuleCreateData {
     criteria: Criteria;
     steps: Step[];
-    isApplicableOnPendingApprovalEntity?: boolean;
 }

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewReducer.d.ts

@@ -40,6 +40,6 @@ export declare const fetchRemiSetupApproverView: import("@reduxjs/toolkit").Acti
     approvalRuleId: string | undefined;
 }, "remiSetupApproverView/initializeRemiSetupApproverViewUpdateData", never, never>, saveRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[remiSetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>], {
     remiSetupApproverViewUpdateData: Partial<ApprovalRuleUpdateData | ApprovalRuleCreateData>;
-}, "remiSetupApproverView/saveRemiSetupApproverViewUpdateData", never, never>, setListeningToPusherEvent: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "remiSetupApproverView/setListeningToPusherEvent">, clearRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverViewUpdateData">, clearRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverView">;
+}, "remiSetupApproverView/saveRemiSetupApproverViewUpdateData", never, never>, clearRemiSetupApproverViewUpdateData: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverViewUpdateData">, clearRemiSetupApproverView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"remiSetupApproverView/clearRemiSetupApproverView">;
 declare const _default: import("redux").Reducer<RemiSetupApproverViewState>;
 export default _default;

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

@@ -1,12 +1,11 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.setListeningToPusherEvent = exports.saveRemiSetupApproverViewUpdateData = exports.initializeRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdatesFailure = exports.saveRemiSetupApproverViewUpdatesSuccess = exports.saveRemiSetupApproverViewUpdates = exports.deleteRemiApprovalRuleFailure = exports.deleteRemiApprovalRuleSuccess = exports.deleteRemiApprovalRule = exports.fetchRemiApproversListFailure = exports.fetchRemiApproversListSuccess = exports.fetchRemiApproversList = exports.fetchRemiApproversDetails = exports.fetchRemiSetupApproverViewFailure = exports.fetchRemiSetupApproverViewSuccess = exports.fetchRemiSetupApproverView = exports.initialState = void 0;
+exports.clearRemiSetupApproverView = exports.clearRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdateData = exports.initializeRemiSetupApproverViewUpdateData = exports.saveRemiSetupApproverViewUpdatesFailure = exports.saveRemiSetupApproverViewUpdatesSuccess = exports.saveRemiSetupApproverViewUpdates = exports.deleteRemiApprovalRuleFailure = exports.deleteRemiApprovalRuleSuccess = exports.deleteRemiApprovalRule = exports.fetchRemiApproversListFailure = exports.fetchRemiApproversListSuccess = exports.fetchRemiApproversList = exports.fetchRemiApproversDetails = exports.fetchRemiSetupApproverViewFailure = exports.fetchRemiSetupApproverViewSuccess = exports.fetchRemiSetupApproverView = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 exports.initialState = {
     fetchState: 'Not-Started',
     error: undefined,
-    listeningToPusherEvent: false,
     approverListState: {
         approverIds: [],
         attributes: [],
@@ -181,11 +180,6 @@ const remiSetupApproverView = (0, toolkit_1.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,
@@ -246,9 +240,6 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
                 return { payload: { remiSetupApproverViewUpdateData } };
             },
         },
-        setListeningToPusherEvent(draft, action) {
-            draft.listeningToPusherEvent = action.payload;
-        },
         clearRemiSetupApproverViewUpdateData(draft) {
             if (draft.remiSetupApproverViewUpdateData != null) {
                 draft.remiSetupApproverViewUpdateData.data = undefined;
@@ -259,5 +250,5 @@ const remiSetupApproverView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.setListeningToPusherEvent = _a.setListeningToPusherEvent, exports.clearRemiSetupApproverViewUpdateData = _a.clearRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverView = _a.clearRemiSetupApproverView;
+_a = remiSetupApproverView.actions, exports.fetchRemiSetupApproverView = _a.fetchRemiSetupApproverView, exports.fetchRemiSetupApproverViewSuccess = _a.fetchRemiSetupApproverViewSuccess, exports.fetchRemiSetupApproverViewFailure = _a.fetchRemiSetupApproverViewFailure, exports.fetchRemiApproversDetails = _a.fetchRemiApproversDetails, exports.fetchRemiApproversList = _a.fetchRemiApproversList, exports.fetchRemiApproversListSuccess = _a.fetchRemiApproversListSuccess, exports.fetchRemiApproversListFailure = _a.fetchRemiApproversListFailure, exports.deleteRemiApprovalRule = _a.deleteRemiApprovalRule, exports.deleteRemiApprovalRuleSuccess = _a.deleteRemiApprovalRuleSuccess, exports.deleteRemiApprovalRuleFailure = _a.deleteRemiApprovalRuleFailure, exports.saveRemiSetupApproverViewUpdates = _a.saveRemiSetupApproverViewUpdates, exports.saveRemiSetupApproverViewUpdatesSuccess = _a.saveRemiSetupApproverViewUpdatesSuccess, exports.saveRemiSetupApproverViewUpdatesFailure = _a.saveRemiSetupApproverViewUpdatesFailure, exports.initializeRemiSetupApproverViewUpdateData = _a.initializeRemiSetupApproverViewUpdateData, exports.saveRemiSetupApproverViewUpdateData = _a.saveRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverViewUpdateData = _a.clearRemiSetupApproverViewUpdateData, exports.clearRemiSetupApproverView = _a.clearRemiSetupApproverView;
 exports.default = remiSetupApproverView.reducer;

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

@@ -13,7 +13,7 @@ const userSelector_1 = require("../../../../entity/user/userSelector");
 const userRoleSelector_1 = require("../../../../entity/userRole/userRoleSelector");
 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 = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds);
     const allApprovalRules = approvalRules.map((approvalRule) => {
@@ -48,12 +48,11 @@ const getRemiSetupApproverView = (state, filterAdmins = true) => {
         approvalRulesStatus,
         fetchState,
         error,
-        listeningToPusherEvent,
     };
 };
 exports.getRemiSetupApproverView = getRemiSetupApproverView;
 exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.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 = (0, approvalRuleSelector_1.getApprovalRulesByIds)(approvalRuleState, approvalRuleIds).map((approvalRule) => {
@@ -121,6 +120,5 @@ exports.getRemiSetupApproverUpdateDataView = (0, toolkit_1.createSelector)((stat
         ]),
         fetchState,
         error,
-        listeningToPusherEvent,
     };
 });

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewSelectorTypes.d.ts

@@ -17,7 +17,6 @@ export interface RemiSetupApproverView extends SelectorView {
     allApprovalRules: ApprovalRuleWithUser[];
     approvalRulesStatus: AllowedValueWithCode;
     deleteStatus: FetchStateAndError;
-    listeningToPusherEvent?: boolean;
 }
 export interface RemiSetupApproverUpdateDataView extends SelectorView {
     allAccountingClasses: Class[];
@@ -27,6 +26,5 @@ export interface RemiSetupApproverUpdateDataView extends SelectorView {
     approversDetailsFetchStatus: FetchStateAndError;
     filteredApprovers: UserAndRole[];
     filteredAttributes: AttributeType[];
-    listeningToPusherEvent?: boolean;
     remiSetupApproverViewUpdateData?: ApproverViewUpdateData;
 }

package/lib/view/spendManagement/reimbursement/remiSetupApproverView/remiSetupApproverViewState.d.ts

@@ -10,6 +10,5 @@ export interface RemiSetupApproverViewState extends FetchedState {
         fetchStatus: FetchStateAndError;
         attributeSubTypeToUserIdMapping?: Record<AttributeType, ID>;
     };
-    listeningToPusherEvent?: boolean;
     remiSetupApproverViewUpdateData?: ApproverViewUpdateData;
 }

package/lib/zeniAPI.d.ts

@@ -1,5 +1,12 @@
 import { fetch } from 'cross-fetch';
 import { Observable } from 'rxjs';
+export type FormDataUploadEvent<T> = {
+    percentage: number;
+    type: 'progress';
+} | {
+    data: T;
+    type: 'response';
+};
 type ThenArgRecursive<T> = T extends PromiseLike<infer U> ? ThenArgRecursive<U> : T;
 export type FetchResponse = ThenArgRecursive<ReturnType<typeof fetch>>;
 export interface RESTAPIEndpoints {
@@ -34,6 +41,7 @@ export interface ZeniAPI<ResponseType = FetchResponse> {
     patchAndGetJSON<T>(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<T>;
     postAndGetJSON<T>(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<T>;
     postFormData<T>(restEndPoint: string, formData: FormData, signal?: AbortSignal): Observable<T>;
+    postFormDataWithProgress<T>(restEndPoint: string, formData: FormData, signal?: AbortSignal): Observable<FormDataUploadEvent<T>>;
     postJSON(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<ResponseType>;
     putAndGetJSON<T>(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<T>;
     update(userId?: string, sessionId?: string, tenantId?: string): void;
@@ -61,6 +69,7 @@ export declare class ZeniAPIClient implements ZeniAPI {
     postJSON(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<FetchResponse>;
     postAndGetJSON<T>(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<T>;
     postFormData<T>(restEndPoint: string, formData: FormData, signal?: AbortSignal): Observable<T>;
+    postFormDataWithProgress<T>(restEndPoint: string, formData: FormData, signal?: AbortSignal): Observable<FormDataUploadEvent<T>>;
     deleteAndGetJSON<T>(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<T>;
     putAndGetJSON<T>(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<T>;
     patchAndGetJSON<T>(restEndPoint: string, body?: Record<string, unknown>, headers?: Record<string, unknown>, signal?: AbortSignal): Observable<T>;

package/lib/zeniAPI.js

@@ -82,8 +82,6 @@ class ZeniAPIClient {
         return (0, rxjs_1.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 = (0, cross_fetch_1.fetch)(restEndPoint, {
@@ -94,6 +92,46 @@ class ZeniAPIClient {
         }).then((response) => this.processJsonResponse(response));
         return (0, rxjs_1.from)(promise);
     }
+    postFormDataWithProgress(restEndPoint, formData, signal) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { 'Content-Type': _ct, ...headers } = this.apiHeaders();
+        return new rxjs_1.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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.37-betaAS2",
+  "version": "4.19.37-betaVR10",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",
@@ -111,7 +111,7 @@
     "find-dead-code": "ts-prune | grep -v '(used in module)'",
     "find-unused-exports": "ts-unused-exports ./tsconfig.json",
     "circular-dependency": "npx madge --circular --extensions ts ./src",
-    "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint...' && eslint . --ext .js,.jsx,.ts,.tsx\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\" \"echo 'Running tests and typecheck...' && pnpm test\" && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
+    "build": "concurrently --kill-others-on-fail --handle-input \"echo 'Running ESLint...' && eslint . --ext .js,.jsx,.ts,.tsx\" \"echo 'TypeScript build in progress...' && time tsc && echo 'ESM build...' && tsc -p tsconfig.esm.json\"",
     "only-build": "eslint . --ext .js,.jsx,.ts,.tsx && time tsc && tsc -p tsconfig.esm.json && rimraf \"lib/**/__mocks__\" \"lib/**/__testHelpers__\"",
     "format": "prettier --write --ignore-unknown \"src/**/*\" && pnpm lint",
     "format-watch": "(git diff --name-only --diff-filter=ACM && git ls-files --others --exclude-standard) | grep -E '\\.(ts|tsx)$' | xargs prettier --write",