@zeniai/client-epic-state 4.13.78 → 4.13.80

package/lib/view/commonVendorView/vendorView/epics/saveVendorEpic.js

@@ -85,6 +85,10 @@ const saveVendorEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operator
                             amount: 0,
                             currencyCode: vendorCurrencyCode,
                             currencySymbol: vendorCurrencySymbol,
+                        }, recipientAmount: {
+                            amount: 0,
+                            currencyCode: vendorCurrencyCode,
+                            currencySymbol: vendorCurrencySymbol,
                         }, id: '1', lineDescription: '', platformLineDetailType: 'account_based_expense_line_detail', type: 'transaction_with_account_and_class_line', billable: 'not_billable', isCategoryMiscategorized: false, isClassMiscategorized: false }, editBillViewState_1.defaultRecommendationStateObj);
                 }
             }

package/lib/view/expenseAutomationView/epics/transactionCategorization/fetchTransactionCategorizationViewEpic.js

@@ -9,7 +9,7 @@ const classListReducer_1 = require("../../../classList/classListReducer");
 const timePeriod_1 = require("../../../../commonStateTypes/timePeriod");
 const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.fetchTransactionCategorizationView.match), (0, operators_1.mergeMap)((action) => {
     var _a;
-    const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, } = action.payload;
+    const { selectedTab, cacheOverride, keepExistingListItems, pageToken, period, refreshViewInBackground, searchString, resetListItems, } = action.payload;
     const updateActions = [];
     const { expenseAutomationTransactionsViewState } = state$.value;
     const { fetchState, transactionIdsBySelectedPeriod } = expenseAutomationTransactionsViewState[selectedTab];
@@ -31,7 +31,7 @@ const fetchTransactionCategorizationViewEpic = (actions$, state$) => actions$.pi
     if (cacheOverride === true ||
         fetchState === 'Not-Started' ||
         transactionIds.length === 0) {
-        updateActions.push((0, transactionsViewReducer_1.fetchTransactionCategorization)(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground));
+        updateActions.push((0, transactionsViewReducer_1.fetchTransactionCategorization)(selectedTab, period, cacheOverride, keepExistingListItems, searchString, pageToken, refreshViewInBackground, resetListItems));
     }
     return (0, rxjs_1.from)(updateActions);
 }));

package/lib/view/expenseAutomationView/epics/transactionCategorization/initializeTransactionCategorizationLocalDataEpic.js

@@ -10,18 +10,23 @@ const transactionCategorizationLocalDataHelper_1 = require("../../helpers/transa
 const initializeTransactionCategorizationViewLocalDataEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.initializeTransactionCategorizationViewLocalData.match), (0, operators_1.mergeMap)((action) => {
     const { transactionIds, selectedPeriod, keepExistingListItems, selectedTab, pageToken, totalCount, refreshViewInBackground, } = action.payload;
     const fetchActions = [];
-    const { transactionState } = state$.value;
-    const transactionLocalData = {};
+    const { transactionState, expenseAutomationTransactionsViewState, expenseAutomationViewState, } = state$.value;
+    const { selectedTransactionCategorizationTab } = expenseAutomationViewState;
+    const { transactionReviewLocalDataById } = expenseAutomationTransactionsViewState[selectedTransactionCategorizationTab];
+    const transactionLocalData = Object.assign({}, transactionReviewLocalDataById);
     const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
     transactions.forEach((transaction) => {
+        var _a, _b, _c, _d;
+        const newTransactionsLocalData = (0, transactionCategorizationLocalDataHelper_1.toTransactionDetailLocalData)(transaction);
         if (transactionLocalData[transaction.id] == null) {
-            transactionLocalData[transaction.id] = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization), { transactionId: transaction.id, transactionReviewLocalData: Object.assign({}, (0, transactionCategorizationLocalDataHelper_1.toTransactionDetailLocalData)(transaction)) });
+            transactionLocalData[transaction.id] = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization), { transactionId: transaction.id, transactionReviewLocalData: Object.assign(Object.assign({}, newTransactionsLocalData), { sortedLineItems: (_b = (_a = transaction.lines) === null || _a === void 0 ? void 0 : _a.map((line) => line.id)) !== null && _b !== void 0 ? _b : [] }) });
         }
         else {
             transactionLocalData[transaction.id] = {
                 transactionId: transaction.id,
                 transactionReviewLocalData: Object.assign(Object.assign({}, transactionLocalData[transaction.id]
-                    .transactionReviewLocalData), (0, transactionCategorizationLocalDataHelper_1.toTransactionDetailLocalData)(transaction)),
+                    .transactionReviewLocalData), Object.assign(Object.assign({}, newTransactionsLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData[transaction.id]
+                        .transactionReviewLocalData.lineItemById), newTransactionsLocalData.lineItemById), sortedLineItems: transactionLocalData[transaction.id].transactionReviewLocalData.sortedLineItems.concat((_d = (_c = transaction.lines) === null || _c === void 0 ? void 0 : _c.map((line) => line.id)) !== null && _d !== void 0 ? _d : []) })),
             };
         }
     });

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

@@ -49,6 +49,7 @@ const expenseAutomationFluxAnalysisView = (0, toolkit_1.createSlice)({
                     draft.fetchState = 'In-Progress';
                     draft.error = undefined;
                 }
+                // Reset list when we change the sort order and fetch list again
                 if (resetListItems === true) {
                     draft.operatingExpenseIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(monthAndYear)] = [];
                     draft.reviewOperatingExpensesIds = [];

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

@@ -13,7 +13,7 @@ import { UpdateTransactionCategorization } from '../payload/transactionCategoriz
 import { RecommendationByLineId, TransactionID } from '../../../entity/transaction/stateTypes/transaction';
 export declare const initialTransactionTabViewState: TransactionsTabViewState;
 export declare const initialState: TransactionsViewState;
-export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any], {
+export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: boolean | undefined], {
     selectedTab: "review" | "autoCategorized";
     period: TimePeriod;
     searchString: string | undefined;
@@ -21,6 +21,7 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     pageToken: PageToken | undefined;
     cacheOverride: any;
     refreshViewInBackground: any;
+    resetListItems: boolean | undefined;
 }, string, never, never>, updateTransactionCategorizationUIState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedTab: TransactionsTab;
     uiState: Partial<TransactionsViewUIState>;
@@ -89,7 +90,7 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     status: ZeniAPIStatus;
     selectedTab: TransactionsTab;
     refreshViewInBackground?: boolean | undefined;
-}, string>, fetchTransactionCategorizationView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any], {
+}, string>, fetchTransactionCategorizationView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", period: TimePeriod, cacheOverride?: any, keepExistingListItems?: any, searchString?: string | undefined, pageToken?: PageToken | undefined, refreshViewInBackground?: any, resetListItems?: any], {
     selectedTab: "review" | "autoCategorized";
     period: TimePeriod;
     searchString: string | undefined;
@@ -97,6 +98,7 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
     pageToken: PageToken | undefined;
     cacheOverride: any;
     refreshViewInBackground: any;
+    resetListItems: any;
 }, string, never, never>, updateSelectedCheckboxTransactionIds: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     selectedTab: TransactionsTab;
     transactionIds: ID[];

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

@@ -53,7 +53,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
     reducers: {
         fetchTransactionCategorizationView: {
             prepare(selectedTab, period, cacheOverride = false, keepExistingListItems = false, searchString, // when this is defined the output should go to search result IDs
-            pageToken, refreshViewInBackground = false) {
+            pageToken, refreshViewInBackground = false, resetListItems = false) {
                 return {
                     payload: {
                         selectedTab,
@@ -63,6 +63,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                         pageToken,
                         cacheOverride,
                         refreshViewInBackground,
+                        resetListItems,
                     },
                 };
             },
@@ -72,9 +73,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         },
         fetchTransactionCategorization: {
             reducer(draft, action) {
-                var _a, _b;
-                const { refreshViewInBackground } = action.payload;
-                const selectedTab = action.payload.selectedTab;
+                const { refreshViewInBackground, resetListItems, selectedTab, pageToken, searchString, period, } = action.payload;
                 if (refreshViewInBackground === true) {
                     draft[selectedTab].refreshStatus = {
                         fetchState: 'In-Progress',
@@ -86,20 +85,36 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                     draft[selectedTab].error = undefined;
                 }
                 // Note: Need to reset scroll position whenever a new fetch happens, except when fetching through scroll
-                if (action.payload.pageToken == null) {
+                if (pageToken == null) {
                     // Page Token is null in each fetch except when fetching through scroll
                     draft[selectedTab].uiState.scrollPosition = {
                         scrollTop: 0,
                         scrollLeft: undefined,
                     };
                 }
-                draft[selectedTab].uiState.pageToken = (_a = action.payload.pageToken) !== null && _a !== void 0 ? _a : null;
-                draft[selectedTab].uiState.searchString =
-                    (_b = action.payload.searchString) !== null && _b !== void 0 ? _b : '';
+                draft[selectedTab].uiState.pageToken = pageToken !== null && pageToken !== void 0 ? pageToken : null;
+                draft[selectedTab].uiState.searchString = searchString !== null && searchString !== void 0 ? searchString : '';
                 draft[selectedTab].error = undefined;
+                // Reset list when we change the sort order and fetch list again
+                if (resetListItems === true) {
+                    const monthYearPeriod = {
+                        month: period.start.month,
+                        year: period.start.year,
+                    };
+                    const transactionIdsBySelectedPeriod = draft[selectedTab].transactionIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(monthYearPeriod)];
+                    transactionIdsBySelectedPeriod.forEach((transactionId) => {
+                        delete draft[selectedTab].transactionReviewLocalDataById[transactionId];
+                    });
+                    draft[selectedTab].selectedCheckBoxTransactionIds = draft[selectedTab].selectedCheckBoxTransactionIds.filter((selectedCheckBoxTransactionId) => transactionIdsBySelectedPeriod.includes(selectedCheckBoxTransactionId));
+                    draft[selectedTab].transactionIdsBySelectedPeriod[(0, timePeriod_1.toMonthYearPeriodId)(monthYearPeriod)] = [];
+                    draft[selectedTab].refreshStatus = {
+                        fetchState: 'Not-Started',
+                        error: undefined,
+                    };
+                }
             },
             prepare(selectedTab, period, cacheOverride = false, keepExistingListItems = false, searchString, // when this is defined the output should go to search result IDs
-            pageToken, refreshViewInBackground = false) {
+            pageToken, refreshViewInBackground = false, resetListItems) {
                 return {
                     payload: {
                         selectedTab,
@@ -109,6 +124,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                         pageToken,
                         cacheOverride,
                         refreshViewInBackground,
+                        resetListItems,
                     },
                 };
             },
@@ -219,13 +235,7 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
                 const { vendorId, selectedAccount, selectedClassBase, transactions, transactionId, lineId, selectedTab, } = action.payload;
                 const transactionLocalData = (0, get_1.default)(draft[selectedTab].transactionReviewLocalDataById, transactionId, undefined);
                 if (transactionLocalData != null) {
-                    const newTransactionLocalData = Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById), { [lineId]: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById[lineId]), { account: selectedAccount != null
-                                    ? selectedAccount
-                                    : transactionLocalData.transactionReviewLocalData
-                                        .lineItemById[lineId].account, class: selectedClassBase != null
-                                    ? selectedClassBase
-                                    : transactionLocalData.transactionReviewLocalData
-                                        .lineItemById[lineId].class }) }) });
+                    const newTransactionLocalData = Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData), { lineItemById: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById), { [lineId]: Object.assign(Object.assign({}, transactionLocalData.transactionReviewLocalData.lineItemById[lineId]), { account: selectedAccount, class: selectedClassBase }) }) });
                     draft[selectedTab].transactionReviewLocalDataById[transactionId] = {
                         transactionReviewLocalData: newTransactionLocalData,
                         transactionId,

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

@@ -57,6 +57,8 @@ function getExpenseAutomationFluxAnalysisView(state) {
             });
         }
     });
+    const isReviewCompleted = fetchStateAndError.fetchState === 'Completed' &&
+        operatingExpensesView.filter((operatingExpense) => operatingExpense.status === 'Pending Review').length === 0;
     return {
         fetchStatus: fetchStateAndError,
         operatingExpensesView,
@@ -64,8 +66,9 @@ function getExpenseAutomationFluxAnalysisView(state) {
         reviewOperatingExpensesIds,
         uiState,
         refreshStatus,
-        completionStatus: operatingExpensesView.length === 0 &&
-            fetchStateAndError.fetchState === 'Completed'
+        completionStatus: (fetchStateAndError.fetchState === 'Completed' &&
+            operatingExpensesView.length === 0) ||
+            isReviewCompleted
             ? 'complete'
             : 'incomplete',
     };

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

@@ -58,6 +58,7 @@ export interface TransactionCategorizationLineItemData extends TransactionLineBa
 }
 export interface TransactionReviewLocalData {
     lineItemById: Record<ID, TransactionCategorizationLineItemData>;
+    sortedLineItems: ID[];
     vendor?: VendorBase;
     memo?: string;
     vendorDetails?: {

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

@@ -24,5 +24,6 @@ exports.initialSupportedTransactionCategorization = {
     transactionId: undefined,
     transactionReviewLocalData: {
         lineItemById: {},
+        sortedLineItems: [],
     },
 };

package/package.json

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