@zeniai/client-epic-state 5.2.22-betaAK0 → 5.2.22-betaAM1

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

@@ -0,0 +1,260 @@
+import { createSlice } from '@reduxjs/toolkit';
+import { toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
+import { generateJEOneTimeAccrualKey } from '../../../entity/jeSchedules/jeScheduleHelper';
+import { clearAll } from '../../../rootActions';
+export const initialTransactionSearchState = {
+    query: '',
+    results: [],
+    fetchState: 'Not-Started',
+    error: undefined,
+    nextPageToken: null,
+    isLoadingMore: false,
+};
+export const initialAccrualSearchState = {
+    query: '',
+    results: [],
+    fetchState: 'Not-Started',
+    error: undefined,
+    nextPageToken: null,
+    isLoadingMore: false,
+};
+export const initialMatchModalState = {
+    isOpen: false,
+    transactionSearch: initialTransactionSearchState,
+    accrualSearch: initialAccrualSearchState,
+    confirmStatus: { fetchState: 'Not-Started', error: undefined },
+};
+export const initialState = {
+    accrualKeysByPeriod: {},
+    fetchState: 'Not-Started',
+    error: undefined,
+    refreshStatus: {
+        fetchState: 'Not-Started',
+        error: undefined,
+    },
+    uiState: {
+        sortKey: 'date',
+        sortOrder: 'descending',
+        searchString: '',
+        scrollPosition: { scrollTop: 0, scrollLeft: undefined },
+    },
+    matchModal: initialMatchModalState,
+    hasValidState() {
+        return this.fetchState == 'Completed';
+    },
+};
+function resetMatchModalSearches(draft) {
+    draft.matchModal.transactionSearch = initialTransactionSearchState;
+    draft.matchModal.accrualSearch = initialAccrualSearchState;
+    draft.matchModal.confirmStatus = {
+        fetchState: 'Not-Started',
+        error: undefined,
+    };
+    draft.matchModal.lastBatchResults = undefined;
+}
+const expenseAutomationActualMatchingView = createSlice({
+    name: 'expenseAutomationActualMatchingView',
+    initialState,
+    reducers: {
+        fetchActualMatchingPage: {
+            prepare(period, refreshViewInBackground = false) {
+                return {
+                    payload: {
+                        period,
+                        refreshViewInBackground,
+                    },
+                };
+            },
+            reducer() {
+                // Epic-only fan-out.
+            },
+        },
+        fetchActualMatching: {
+            reducer(draft, action) {
+                const { refreshViewInBackground } = action.payload;
+                if (refreshViewInBackground) {
+                    draft.refreshStatus = { fetchState: 'In-Progress', error: undefined };
+                }
+                else {
+                    draft.fetchState = 'In-Progress';
+                    draft.error = undefined;
+                }
+            },
+            prepare(period, refreshViewInBackground = false) {
+                return {
+                    payload: {
+                        period,
+                        refreshViewInBackground,
+                    },
+                };
+            },
+        },
+        fetchActualMatchingSuccess(draft, action) {
+            const { accruals, selectedPeriod, refreshViewInBackground } = action.payload;
+            const periodId = toMonthYearPeriodId(selectedPeriod);
+            draft.accrualKeysByPeriod[periodId] = accruals.map((accrual) => generateJEOneTimeAccrualKey(accrual._id));
+            if (refreshViewInBackground) {
+                draft.refreshStatus = { fetchState: 'Completed', error: undefined };
+            }
+            else {
+                draft.fetchState = 'Completed';
+                draft.error = undefined;
+            }
+        },
+        fetchActualMatchingFailure(draft, action) {
+            const { status, refreshViewInBackground } = action.payload;
+            if (refreshViewInBackground) {
+                draft.refreshStatus = { fetchState: 'Error', error: status };
+            }
+            else {
+                draft.fetchState = 'Error';
+                draft.error = status;
+            }
+        },
+        updateActualMatchingUIState(draft, action) {
+            if (action.payload.sortKey != null) {
+                draft.uiState.sortKey = action.payload.sortKey;
+            }
+            if (action.payload.sortOrder != null) {
+                draft.uiState.sortOrder = action.payload.sortOrder;
+            }
+            if (action.payload.searchString != null) {
+                draft.uiState.searchString = action.payload.searchString;
+            }
+            if (action.payload.scrollPosition != null) {
+                draft.uiState.scrollPosition = action.payload.scrollPosition;
+            }
+        },
+        openMatchNewModal(draft) {
+            draft.matchModal.isOpen = true;
+        },
+        closeMatchNewModal(draft) {
+            draft.matchModal.isOpen = false;
+            resetMatchModalSearches(draft);
+        },
+        clearMatchNewModal(draft) {
+            draft.matchModal.isOpen = false;
+            resetMatchModalSearches(draft);
+        },
+        searchMatchTransactions: {
+            reducer(draft, action) {
+                const { query, pageToken } = action.payload;
+                const isLoadMore = pageToken != null;
+                draft.matchModal.transactionSearch.query = query;
+                if (isLoadMore) {
+                    draft.matchModal.transactionSearch.isLoadingMore = true;
+                }
+                else {
+                    draft.matchModal.transactionSearch.isLoadingMore = false;
+                    draft.matchModal.transactionSearch.results = [];
+                    draft.matchModal.transactionSearch.nextPageToken = null;
+                    draft.matchModal.transactionSearch.fetchState = 'In-Progress';
+                    draft.matchModal.transactionSearch.error = undefined;
+                }
+            },
+            prepare({ query, pageToken }) {
+                return { payload: { query, pageToken: pageToken ?? undefined } };
+            },
+        },
+        searchMatchTransactionsSuccess(draft, action) {
+            const { append, nextPageToken, results } = action.payload;
+            if (append) {
+                const merged = [
+                    ...draft.matchModal.transactionSearch.results,
+                    ...results,
+                ];
+                const byKey = new Map(merged.map((result) => [
+                    `${result.transactionId}:${result.lineId}`,
+                    result,
+                ]));
+                draft.matchModal.transactionSearch.results = Array.from(byKey.values());
+            }
+            else {
+                draft.matchModal.transactionSearch.results = results;
+            }
+            draft.matchModal.transactionSearch.nextPageToken = nextPageToken;
+            draft.matchModal.transactionSearch.isLoadingMore = false;
+            draft.matchModal.transactionSearch.fetchState = 'Completed';
+            draft.matchModal.transactionSearch.error = undefined;
+        },
+        searchMatchTransactionsFailure(draft, action) {
+            draft.matchModal.transactionSearch.isLoadingMore = false;
+            draft.matchModal.transactionSearch.fetchState = 'Error';
+            draft.matchModal.transactionSearch.error = action.payload.error;
+        },
+        searchMatchAccruals: {
+            reducer(draft, action) {
+                const { query, pageToken } = action.payload;
+                const isLoadMore = pageToken != null;
+                draft.matchModal.accrualSearch.query = query;
+                if (isLoadMore) {
+                    draft.matchModal.accrualSearch.isLoadingMore = true;
+                }
+                else {
+                    draft.matchModal.accrualSearch.isLoadingMore = false;
+                    draft.matchModal.accrualSearch.results = [];
+                    draft.matchModal.accrualSearch.nextPageToken = null;
+                    draft.matchModal.accrualSearch.fetchState = 'In-Progress';
+                    draft.matchModal.accrualSearch.error = undefined;
+                }
+            },
+            prepare({ query, pageToken }) {
+                return { payload: { query, pageToken: pageToken ?? undefined } };
+            },
+        },
+        searchMatchAccrualsSuccess(draft, action) {
+            const { append, nextPageToken, results } = action.payload;
+            const keys = results.map((accrual) => generateJEOneTimeAccrualKey(accrual._id));
+            if (append) {
+                const merged = [...draft.matchModal.accrualSearch.results, ...keys];
+                draft.matchModal.accrualSearch.results = Array.from(new Set(merged));
+            }
+            else {
+                draft.matchModal.accrualSearch.results = keys;
+            }
+            draft.matchModal.accrualSearch.nextPageToken = nextPageToken;
+            draft.matchModal.accrualSearch.isLoadingMore = false;
+            draft.matchModal.accrualSearch.fetchState = 'Completed';
+            draft.matchModal.accrualSearch.error = undefined;
+        },
+        searchMatchAccrualsFailure(draft, action) {
+            draft.matchModal.accrualSearch.isLoadingMore = false;
+            draft.matchModal.accrualSearch.fetchState = 'Error';
+            draft.matchModal.accrualSearch.error = action.payload.error;
+        },
+        matchAndReverseAccruals: {
+            reducer(draft) {
+                draft.matchModal.confirmStatus = {
+                    fetchState: 'In-Progress',
+                    error: undefined,
+                };
+            },
+            prepare(params) {
+                return { payload: params };
+            },
+        },
+        matchAndReverseAccrualsSuccess(draft, action) {
+            draft.matchModal.confirmStatus = {
+                fetchState: 'Completed',
+                error: undefined,
+            };
+            draft.matchModal.lastBatchResults = action.payload.results;
+        },
+        matchAndReverseAccrualsFailure(draft, action) {
+            draft.matchModal.confirmStatus = {
+                fetchState: 'Error',
+                error: action.payload.status,
+            };
+        },
+        clearActualMatchingView(draft) {
+            Object.assign(draft, initialState);
+        },
+    },
+    extraReducers: (builder) => {
+        builder.addCase(clearAll, (draft) => {
+            Object.assign(draft, initialState);
+        });
+    },
+});
+export const { clearActualMatchingView, clearMatchNewModal, closeMatchNewModal, fetchActualMatching, fetchActualMatchingFailure, fetchActualMatchingPage, fetchActualMatchingSuccess, matchAndReverseAccruals, matchAndReverseAccrualsFailure, matchAndReverseAccrualsSuccess, openMatchNewModal, searchMatchAccruals, searchMatchAccrualsFailure, searchMatchAccrualsSuccess, searchMatchTransactions, searchMatchTransactionsFailure, searchMatchTransactionsSuccess, updateActualMatchingUIState, } = expenseAutomationActualMatchingView.actions;
+export default expenseAutomationActualMatchingView.reducer;

package/lib/esm/view/expenseAutomationView/selectorTypes/actualMatchingViewSelectorTypes.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,200 @@
+import orderBy from 'lodash/orderBy';
+import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { getJEOneTimeAccrualByKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
+import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
+export function isAutoReversedAccrual(accrual) {
+    return (accrual.accrualStatus === 'reversed' &&
+        accrual.reversalTrigger === 'bill_match');
+}
+export function isManuallyReversedAccrual(accrual) {
+    return (accrual.accrualStatus === 'reversed' &&
+        accrual.reversalTrigger === 'manual_reverse');
+}
+export function isPendingReviewAccrual(accrual) {
+    if (accrual.accrualStatus !== 'posted' || accrual.matchSuggestion == null) {
+        return false;
+    }
+    const resolution = accrual.matchSuggestion.resolution;
+    return resolution == null || resolution.length === 0;
+}
+function isGroupedClearedMatch(accrual) {
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return false;
+    }
+    const matchShape = accrual.cleared?.matchShape;
+    const accrualIdsLength = accrual.cleared?.accrualIds?.length ?? 0;
+    return matchShape === '1:N' || matchShape === 'N:1' || accrualIdsLength > 1;
+}
+export function getClearedAllocatedActualAmount(accrual) {
+    const matchedAmount = accrual.cleared?.matchedAmount?.amount;
+    if (matchedAmount == null) {
+        return undefined;
+    }
+    if (!isGroupedClearedMatch(accrual)) {
+        return matchedAmount;
+    }
+    const groupSum = accrual.cleared?.groupSum?.amount;
+    if (groupSum == null || groupSum <= 0) {
+        return matchedAmount;
+    }
+    return matchedAmount * (accrual.estimatedAmount.amount / groupSum);
+}
+export function getActualMatchingAmount(accrual) {
+    if (isPendingReviewAccrual(accrual)) {
+        return (accrual.matchSuggestion?.matchedAmount?.amount ??
+            accrual.estimatedAmount.amount);
+    }
+    if (isAutoReversedAccrual(accrual) || isManuallyReversedAccrual(accrual)) {
+        return (getClearedAllocatedActualAmount(accrual) ?? accrual.estimatedAmount.amount);
+    }
+    return accrual.estimatedAmount.amount;
+}
+export function getActualMatchingReversalDate(accrual) {
+    if (!isAutoReversedAccrual(accrual) && !isManuallyReversedAccrual(accrual)) {
+        return undefined;
+    }
+    return accrual.actualReversalPostDate ?? accrual.cleared?.reversedAt;
+}
+function toActualMatchingRow(accrual, kind) {
+    return {
+        ...accrual,
+        kind,
+        reversalDate: kind === 'pending_review'
+            ? undefined
+            : getActualMatchingReversalDate(accrual),
+    };
+}
+function matchesSearch(accrual, searchString) {
+    const trimmed = searchString.trim().toLowerCase();
+    if (trimmed.length === 0) {
+        return true;
+    }
+    return (accrual.vendorName.toLowerCase().includes(trimmed) ||
+        accrual.memo.toLowerCase().includes(trimmed));
+}
+function getActualMatchingSortValue(row, sortKey) {
+    switch (sortKey) {
+        case 'vendor':
+            return row.vendorName.toLowerCase();
+        case 'date':
+            return row.reversalDate?.valueOf();
+        case 'amount':
+            return getActualMatchingAmount(row);
+        case 'category':
+            return row.jeDebitAccountName?.toLowerCase();
+        case 'class':
+            return row.jeDebitAccountingClassName?.toLowerCase();
+        case 'type':
+            return (row.cleared?.matchedTransactionType ??
+                row.matchSuggestion?.matchedTransactionType)?.toLowerCase();
+        case 'lifecycle':
+            return row.kind;
+        default:
+            return undefined;
+    }
+}
+function sortActualMatchingRows(rows, uiState) {
+    const lodashOrder = uiState.sortOrder === 'ascending' ? 'asc' : 'desc';
+    return orderBy(rows, [(row) => getActualMatchingSortValue(row, uiState.sortKey)], [lodashOrder]);
+}
+function emptyKpiSummary() {
+    return {
+        autoReversed: { count: 0, amount: 0 },
+        pendingReview: { count: 0, amount: 0 },
+        totalThisClose: { count: 0, amount: 0 },
+        ai: { count: 0 },
+        manual: { count: 0 },
+    };
+}
+export function getExpenseAutomationActualMatchingView(state) {
+    const { expenseAutomationActualMatchingViewState, expenseAutomationViewState } = state;
+    const { accrualKeysByPeriod, fetchState, error, refreshStatus, uiState, matchModal, } = expenseAutomationActualMatchingViewState;
+    const currentTenant = getCurrentTenant(state);
+    const selectedPeriod = expenseAutomationViewState.selectedPeriodByTenantId[currentTenant.tenantId];
+    const monthYearPeriodId = selectedPeriod != null ? toMonthYearPeriodId(selectedPeriod) : undefined;
+    const accrualKeys = monthYearPeriodId != null
+        ? accrualKeysByPeriod[monthYearPeriodId]
+        : undefined;
+    const accruals = (accrualKeys ?? [])
+        .map((key) => getJEOneTimeAccrualByKey(key, state.jeSchedulesState))
+        .filter((accrual) => accrual != null);
+    const filtered = accruals.filter((accrual) => matchesSearch(accrual, uiState.searchString));
+    const autoReversed = sortActualMatchingRows(filtered
+        .filter(isAutoReversedAccrual)
+        .map((accrual) => toActualMatchingRow(accrual, 'auto_reversed')), uiState);
+    const pendingReview = sortActualMatchingRows(filtered
+        .filter(isPendingReviewAccrual)
+        .map((accrual) => toActualMatchingRow(accrual, 'pending_review')), uiState);
+    const manuallyReversed = sortActualMatchingRows(filtered
+        .filter(isManuallyReversedAccrual)
+        .map((accrual) => toActualMatchingRow(accrual, 'manually_reversed')), uiState);
+    const listedAccruals = accruals.filter((accrual) => isAutoReversedAccrual(accrual) ||
+        isPendingReviewAccrual(accrual) ||
+        isManuallyReversedAccrual(accrual));
+    const kpiSummary = listedAccruals.length === 0
+        ? emptyKpiSummary()
+        : {
+            autoReversed: {
+                count: listedAccruals.filter(isAutoReversedAccrual).length,
+                amount: listedAccruals
+                    .filter(isAutoReversedAccrual)
+                    .reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
+            },
+            pendingReview: {
+                count: listedAccruals.filter(isPendingReviewAccrual).length,
+                amount: listedAccruals
+                    .filter(isPendingReviewAccrual)
+                    .reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
+            },
+            totalThisClose: {
+                count: listedAccruals.length,
+                amount: listedAccruals.reduce((sum, accrual) => sum + getActualMatchingAmount(accrual), 0),
+            },
+            ai: {
+                count: listedAccruals.filter((accrual) => accrual.origin === 'agent').length,
+            },
+            manual: {
+                count: listedAccruals.filter((accrual) => accrual.origin === 'human').length,
+            },
+        };
+    const accrualSearchResults = matchModal.accrualSearch.results
+        .map((key) => getJEOneTimeAccrualByKey(key, state.jeSchedulesState))
+        .filter((accrual) => accrual != null);
+    return {
+        fetchState,
+        error,
+        autoReversed,
+        pendingReview,
+        manuallyReversed,
+        kpiSummary,
+        uiState,
+        refreshStatus,
+        hasLoadedForSelectedPeriod: accrualKeys != null,
+        matchModal: {
+            isOpen: matchModal.isOpen,
+            confirmStatus: matchModal.confirmStatus,
+            lastBatchResults: matchModal.lastBatchResults,
+            transactionSearch: {
+                query: matchModal.transactionSearch.query,
+                results: matchModal.transactionSearch.results,
+                fetchState: {
+                    fetchState: matchModal.transactionSearch.fetchState,
+                    error: matchModal.transactionSearch.error,
+                },
+                nextPageToken: matchModal.transactionSearch.nextPageToken,
+                isLoadingMore: matchModal.transactionSearch.isLoadingMore,
+            },
+            accrualSearch: {
+                query: matchModal.accrualSearch.query,
+                results: accrualSearchResults,
+                fetchState: {
+                    fetchState: matchModal.accrualSearch.fetchState,
+                    error: matchModal.accrualSearch.error,
+                },
+                nextPageToken: matchModal.accrualSearch.nextPageToken,
+                isLoadingMore: matchModal.accrualSearch.isLoadingMore,
+            },
+        },
+    };
+}

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

@@ -367,6 +367,9 @@ export function getExpenseAutomationJESchedulesView(state) {
     // reports undefined rather than 0, so the UI can hide the badge instead of asserting "none".
     const scheduleCountsByTab = {};
     ALL_JE_PAGE_TABS.forEach((pageTab) => {
+        if (pageTab === 'actual_matching') {
+            return;
+        }
         const periodTabKey = monthYearPeriodId != null
             ? getJESchedulePeriodTabKey(pageTab, monthYearPeriodId)
             : null;

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

@@ -0,0 +1,22 @@
+import { stringToUnion } from '../../../commonStateTypes/stringToUnion';
+const ACTUAL_MATCHING_SORT_KEYS = [
+    'vendor',
+    'date',
+    'amount',
+    'category',
+    'class',
+    'type',
+    'lifecycle',
+];
+export const toActualMatchingSortKey = (v) => stringToUnion(v, ACTUAL_MATCHING_SORT_KEYS);
+export const MATCH_TRANSACTION_SEARCH_PAGE_SIZE = 50;
+export const MATCH_ACCRUAL_SEARCH_LIMIT = 50;
+export const MATCH_SEARCH_DEBOUNCE_MS = 300;
+const MATCH_AND_REVERSE_RESULT_STATUSES = [
+    'reversed',
+    'noop',
+    'conflict',
+    'claim_lost',
+    'error',
+];
+export const toMatchAndReverseResultStatus = (v) => stringToUnion(v, MATCH_AND_REVERSE_RESULT_STATUSES);

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

@@ -16,7 +16,11 @@ const JE_SCHEDULE_SORT_KEYS = [
     'memo',
 ];
 export const toJEScheduleSortKey = (v) => stringToUnion(v, JE_SCHEDULE_SORT_KEYS);
-const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+const JE_PAGE_TABS = [
+    'schedules',
+    'actual_matching',
+    'existing_schedules',
+];
 export const toJEPageTab = (v) => stringToUnion(v, JE_PAGE_TABS);
 export const ALL_JE_PAGE_TABS = JE_PAGE_TABS;
 export const getJESchedulePeriodTabKey = (selectedPageTab, monthYearPeriodId) => `${selectedPageTab}_${monthYearPeriodId}`;

package/lib/esm/view/invoicing/invoicingConfigView/invoicingConfigViewReducer.js

@@ -34,7 +34,6 @@ export const initialState = {
     discountStatusOptions: [],
     dunningCaseStatusOptions: [],
     invoiceStatusOptions: [],
-    subscriptionCancelReasonCodeOptions: [],
     subscriptionStatusOptions: [],
     transactionStatusOptions: [],
     transactionTypeOptions: [],
@@ -104,7 +103,6 @@ export function mapInvoicingConfigPayloadToState(payload) {
         discountStatusOptions: (payload.discount_status_options ?? []).map(toInvoicingNamedOption),
         dunningCaseStatusOptions: (payload.dunning_case_status_options ?? []).map(toInvoicingNamedOption),
         invoiceStatusOptions: (payload.invoice_status_options ?? []).map(toInvoicingNamedOption),
-        subscriptionCancelReasonCodeOptions: (payload.subscription_cancel_reason_code_options ?? []).map(toInvoicingNamedOption),
         subscriptionStatusOptions: (payload.subscription_status_options ?? []).map(toInvoicingNamedOption),
         transactionStatusOptions: (payload.transaction_status_options ?? []).map(toInvoicingNamedOption),
         transactionTypeOptions: (payload.transaction_type_options ?? []).map(toInvoicingNamedOption),

package/lib/esm/view/invoicing/invoicingOverview/invoicingOverviewPayload.js

@@ -37,6 +37,7 @@ export const mapInvoicingPlanRevenuePointPayloadToState = (payload) => ({
     mrr: toAmount(payload.mrr, 'USD', '$'),
     pct: payload.pct,
     planID: payload.plan,
+    productCode: payload.product_code,
 });
 export const mapInvoicingDashboardSummaryPayloadToState = (payload) => ({
     customerMovement: {

package/lib/esm/view/invoicing/invoicingSubscriptionDetailView/invoicingSubscriptionDetailViewSelector.js

@@ -1,12 +1,11 @@
 import { getInvoicingSubscriptionById as getInvoicingSubscriptionByIdFromState } from '../../../entity/invoicing/invoicingSubscription/invoicingSubscriptionSelector';
-import { getInvoicingConfigView, invoicingFieldHelpForGroup, } from '../invoicingConfigView/invoicingConfigViewSelector';
+import { invoicingFieldHelpForGroup } from '../invoicingConfigView/invoicingConfigViewSelector';
 import { getInvoicingSubscriptionActionState } from '../subscriptionAction/subscriptionActionSelector';
 export const getInvoicingSubscriptionById = (state, id) => getInvoicingSubscriptionByIdFromState(state.invoicingSubscriptionState, id);
 export const getInvoicingSubscriptionDetail = (state, invoicingSubscriptionID) => {
     const { error, fetchState } = state.invoicingSubscriptionDetailViewState;
     return {
         fieldHelp: invoicingFieldHelpForGroup(state, 'subscription'),
-        cancelReasonCodeOptions: getInvoicingConfigView(state).subscriptionCancelReasonCodeOptions,
         actionState: getInvoicingSubscriptionActionState(invoicingSubscriptionID)(state),
         subscription: getInvoicingSubscriptionById(state, invoicingSubscriptionID),
         fetchState,

package/lib/esm/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewSelector.js

@@ -28,7 +28,6 @@ export const getInvoicingSubscriptionListView = createSelector((state) => state.
         count: listViewState.counts,
         countsFetchState: listViewState.countsFetchState,
         subscriptionCommercialEditAllowedFromStatuses: configState.subscriptionCommercialEditAllowedFromStatuses,
-        cancelReasonCodeOptions: configState.subscriptionCancelReasonCodeOptions,
         subscriptionLifecycleActionOptions: configState.subscriptionLifecycleActionOptions,
         subscriptionMetadataEditAllowedFromStatuses: configState.subscriptionMetadataEditAllowedFromStatuses,
         statusOptions,

package/lib/esm/view/invoicing/invoicingSubscriptionListView/invoicingSubscriptionListViewState.js

@@ -3,6 +3,7 @@ export const ALL_INVOICING_SUBSCRIPTION_SORT_KEYS = [
     'subscription',
     'customer',
     'plan',
+    'product_code',
     'term_end',
     'next_billing',
     'auto_collect',
@@ -14,6 +15,7 @@ export const INVOICING_SUBSCRIPTION_COLUMNS = [
     { key: 'subscription', sortable: true },
     { key: 'customer', sortable: false },
     { key: 'plan', sortable: true },
+    { key: 'product_code', sortable: true },
     { key: 'term_end', sortable: true },
     { key: 'next_billing', sortable: true },
     { key: 'auto_collect', sortable: true },

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/fetchBillPaySetupApproverViewEpic.js

@@ -2,13 +2,20 @@ import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { updateApprovalRules } from '../../../../../entity/approvalRule/approvalRuleReducer';
 import { getApprovalRulesByIds } from '../../../../../entity/approvalRule/approvalRuleSelector';
+import { getIsAccountingClassesEnabled } from '../../../../../entity/tenant/tenantSelector';
 import { updateAllUsers } from '../../../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
+import { fetchClassList } from '../../../../classList/classListReducer';
 import { fetchBillPaySetupApproverView, fetchBillPaySetupApproverViewFailure, fetchBillPaySetupApproverViewSuccess, } from '../billPaySetupApproverViewReducer';
 export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchBillPaySetupApproverView.match), switchMap((action) => {
     const { cacheOverride, useV3 } = action.payload;
-    const { billPaySetupApproverViewState, approvalRuleState } = state$.value;
+    const { billPaySetupApproverViewState, approvalRuleState, classListState } = state$.value;
+    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state$.value);
     const approvalRules = getApprovalRulesByIds(approvalRuleState, billPaySetupApproverViewState.approvalRuleIds);
+    const shouldFetchClassList = isAccountingClassesEnabled &&
+        (cacheOverride === true ||
+            (classListState.hasValidState() === false &&
+                classListState.fetchState !== 'In-Progress'));
     if (cacheOverride === true ||
         approvalRules.length !==
             billPaySetupApproverViewState.approvalRuleIds.length ||
@@ -28,6 +35,9 @@ export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) =>
                     updateApprovalRules(response.data.approval_rules),
                     fetchBillPaySetupApproverViewSuccess(approvalRuleIds),
                 ];
+                if (shouldFetchClassList) {
+                    actions.push(fetchClassList());
+                }
                 return from(actions);
             }
             else {
@@ -37,6 +47,12 @@ export const fetchBillPaySetupApproverViewEpic = (actions$, state$, zeniAPI) =>
     }
     else {
         const { approvalRuleIds } = billPaySetupApproverViewState;
-        return of(fetchBillPaySetupApproverViewSuccess(approvalRuleIds));
+        const actions = [
+            fetchBillPaySetupApproverViewSuccess(approvalRuleIds),
+        ];
+        if (shouldFetchClassList) {
+            actions.push(fetchClassList());
+        }
+        return from(actions);
     }
 }));

package/lib/esm/view/spendManagement/billPay/billPaySetupApproverView/epic/initializeBillPaySetupApproverViewUpdateDataEpic.js

@@ -21,7 +21,6 @@ export const initializeBillPaySetupApproverViewUpdateDataEpic = (actions$, state
                 name: approvalRule.name,
                 description: approvalRule.description,
                 separationOfDuties: approvalRule.separationOfDuties,
-                isFallback: approvalRule.isFallback,
             };
             fetchActions.push(clearBillPaySetupApproverViewUpdateData(), saveBillPaySetupApproverViewUpdateData(billPaySetupApproverViewUpdateData));
         }

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

@@ -86,9 +86,6 @@ export const toApprovalChangableInfoPayload = (approverViewUpdateData) => {
         payload.is_separation_of_duty_enabled =
             approverViewUpdateData.separationOfDuties;
     }
-    if (approverViewUpdateData.isFallback != null) {
-        payload.is_fallback = approverViewUpdateData.isFallback;
-    }
     if (isUpdate) {
         payload.approval_rule_id = approverViewUpdateData.approvalRuleId;
     }