@zeniai/client-epic-state 4.19.81-betaSS4 → 4.19.82-beta0ND

package/lib/view/expenseAutomationView/epics/transactionCategorization/uploadTransactionReceiptSuccessEpic.d.ts

@@ -0,0 +1,7 @@
+import { ActionsObservable, StateObservable } from 'redux-observable';
+import { updateTransaction } from '../../../../entity/transaction/transactionReducer';
+import { RootState } from '../../../../reducer';
+import { fetchMonthEndCloseChecks } from '../../../monthEndCloseChecksView/monthEndCloseChecksViewReducer';
+import { uploadTransactionCategorizationReceiptSuccess } from '../../reducers/transactionsViewReducer';
+export type ActionType = ReturnType<typeof uploadTransactionCategorizationReceiptSuccess> | ReturnType<typeof fetchMonthEndCloseChecks> | ReturnType<typeof updateTransaction>;
+export declare const uploadTransactionReceiptSuccessEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => import("rxjs").Observable<ActionType>;

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadTransactionReceiptSuccessEpic = void 0;
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const tenantSelector_1 = require("../../../../entity/tenant/tenantSelector");
+const transactionReducer_1 = require("../../../../entity/transaction/transactionReducer");
+const monthEndCloseChecksViewReducer_1 = require("../../../monthEndCloseChecksView/monthEndCloseChecksViewReducer");
+const transactionsViewReducer_1 = require("../../reducers/transactionsViewReducer");
+const uploadTransactionReceiptSuccessEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(transactionsViewReducer_1.uploadTransactionCategorizationReceiptSuccess.match), (0, operators_1.mergeMap)((action) => {
+    const { transactionPayload, updateType } = action.payload;
+    const updateActions = [];
+    const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state$.value);
+    const selectedPeriodByTenantId = state$.value.expenseAutomationViewState.selectedPeriodByTenantId;
+    updateActions.push((0, transactionReducer_1.updateTransaction)(transactionPayload.transaction_id, transactionPayload, updateType));
+    if (currentTenant != null) {
+        const monthEndChecksPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
+        updateActions.push((0, monthEndCloseChecksViewReducer_1.fetchMonthEndCloseChecks)({
+            tenantId: currentTenant.tenantId,
+            period: monthEndChecksPeriod,
+            refreshViewInBackground: true,
+        }));
+    }
+    return (0, rxjs_1.from)(updateActions);
+}));
+exports.uploadTransactionReceiptSuccessEpic = uploadTransactionReceiptSuccessEpic;

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

@@ -1,4 +1,4 @@
-import { FetchState, ID } from '../../../commonStateTypes/common';
+import { FetchState, FetchStateAndError, ID, UpdateType } from '../../../commonStateTypes/common';
 import { COTTransactionTrackingByTransactionId, RecommendationWithCOT } from '../../../commonStateTypes/recommendationBase';
 import { MonthYearPeriod, TimePeriod } from '../../../commonStateTypes/timePeriod';
 import { PageToken } from '../../../commonStateTypes/viewAndReport/viewAndReport';
@@ -7,7 +7,7 @@ import { ClassBase } from '../../../entity/class/classState';
 import { CustomerBase } from '../../../entity/customer/customerState';
 import { Entity } from '../../../entity/genericEntity/entity';
 import { RecommendationWithCOTByLineId, TransactionID } from '../../../entity/transaction/stateTypes/transaction';
-import { SupportedTransaction, SupportedTransactionWithCOT } from '../../../entity/transaction/transactionState';
+import { SupportedTransaction, SupportedTransactionPayload, SupportedTransactionWithCOT } from '../../../entity/transaction/transactionState';
 import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniAPIStatus } from '../../../responsePayload';
 import { UncategorizedAccounts } from '../../accountList/accountListSelector';
@@ -158,6 +158,14 @@ export declare const fetchTransactionCategorization: import("@reduxjs/toolkit").
 }, "expenseAutomationTransactionsView/syncTransactionCategorizationFromDetailSave", never, never>, backgroundRefetchReviewTab: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[period: TimePeriod, isUncategorizedExpenseCategoryEnabled?: boolean | undefined], {
     period: TimePeriod;
     isUncategorizedExpenseCategoryEnabled: boolean | undefined;
-}, "expenseAutomationTransactionsView/backgroundRefetchReviewTab", never, never>;
+}, "expenseAutomationTransactionsView/backgroundRefetchReviewTab", never, never>, updateTransactionCategorizationUploadReceiptState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionId: string, fetchStatus: FetchStateAndError], {
+    selectedTab: "review" | "autoCategorized";
+    transactionId: string;
+    fetchStatus: FetchStateAndError;
+}, "expenseAutomationTransactionsView/updateTransactionCategorizationUploadReceiptState", never, never>, uploadTransactionCategorizationReceiptSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[selectedTab: "review" | "autoCategorized", transactionPayload: SupportedTransactionPayload, updateType?: UpdateType | undefined], {
+    selectedTab: "review" | "autoCategorized";
+    transactionPayload: SupportedTransactionPayload;
+    updateType: UpdateType;
+}, "expenseAutomationTransactionsView/uploadTransactionCategorizationReceiptSuccess", never, never>;
 declare const _default: import("redux").Reducer<TransactionsViewState>;
 export default _default;

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

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
+exports.uploadTransactionCategorizationReceiptSuccess = exports.updateTransactionCategorizationUploadReceiptState = exports.backgroundRefetchReviewTab = exports.syncTransactionCategorizationFromDetailSave = exports.updateSelectedTransactionId = exports.setEntityRecommendationForLineIdsForCategorization = exports.clearExpenseAutomationTransactionsView = exports.clearExpenseAutomationTransactionsViewPerTabView = exports.updateSelectedCheckboxTransactionIds = exports.fetchTransactionCategorizationView = exports.resetOtherTabsFetchState = exports.fetchTransactionCategorizationSuccess = exports.updateTotalCountForTransactionCategorization = exports.setAllItemsToCategoryClassInLocalDataForCategorization = exports.updateSelectedCustomerForTransaction = exports.updateSelectedVendorForTransaction = exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = exports.markTransactionAsNotMiscategorized = exports.updateTransactionCategorizationSaveStatus = exports.updateCurrentSelectedTransactionCategorizationTab = exports.updateTransactionCategorization = exports.saveTransactionCategorization = exports.fetchTransactionCategorizationFailure = exports.saveTransactionCategorizationLocalData = exports.initializeTransactionCategorizationViewLocalData = exports.updateTransactionCategorizationUIState = exports.fetchTransactionCategorization = exports.initialState = exports.initialTransactionTabViewState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const get_1 = __importDefault(require("lodash/get"));
 const uniq_1 = __importDefault(require("lodash/uniq"));
@@ -43,6 +43,7 @@ exports.initialTransactionTabViewState = {
     transactionIdsBySelectedPeriod: {},
     selectedCheckBoxTransactionIds: [],
     transactionIdsWithUnsavedData: [],
+    uploadReceiptStatusById: {},
     selectedTransactionId: undefined,
     selectedTransactionLineId: undefined,
 };
@@ -706,6 +707,24 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         clearExpenseAutomationTransactionsView(draft) {
             Object.assign(draft, exports.initialState);
         },
+        updateTransactionCategorizationUploadReceiptState: {
+            reducer(draft, action) {
+                const { transactionId, fetchStatus, selectedTab } = action.payload;
+                draft.transactionCategorizationView[selectedTab].uploadReceiptStatusById[transactionId] = fetchStatus;
+            },
+            prepare(selectedTab, transactionId, fetchStatus) {
+                return { payload: { selectedTab, transactionId, fetchStatus } };
+            },
+        },
+        uploadTransactionCategorizationReceiptSuccess: {
+            reducer(draft, action) {
+                const { transactionPayload, selectedTab } = action.payload;
+                draft.transactionCategorizationView[selectedTab].uploadReceiptStatusById[transactionPayload.transaction_id] = { fetchState: 'Completed', error: undefined };
+            },
+            prepare(selectedTab, transactionPayload, updateType = 'merge') {
+                return { payload: { selectedTab, transactionPayload, updateType } };
+            },
+        },
         syncTransactionCategorizationFromDetailSave: {
             prepare(transactionId, updatedTransaction, pendingReviewLineIds, uncategorizedIncomeExpense, isUncategorizedExpenseCategoryEnabled) {
                 return {
@@ -777,5 +796,5 @@ const expenseAutomationTransactionsView = (0, toolkit_1.createSlice)({
         },
     },
 });
-_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab;
+_a = expenseAutomationTransactionsView.actions, exports.fetchTransactionCategorization = _a.fetchTransactionCategorization, exports.updateTransactionCategorizationUIState = _a.updateTransactionCategorizationUIState, exports.initializeTransactionCategorizationViewLocalData = _a.initializeTransactionCategorizationViewLocalData, exports.saveTransactionCategorizationLocalData = _a.saveTransactionCategorizationLocalData, exports.fetchTransactionCategorizationFailure = _a.fetchTransactionCategorizationFailure, exports.saveTransactionCategorization = _a.saveTransactionCategorization, exports.updateTransactionCategorization = _a.updateTransactionCategorization, exports.updateCurrentSelectedTransactionCategorizationTab = _a.updateCurrentSelectedTransactionCategorizationTab, exports.updateTransactionCategorizationSaveStatus = _a.updateTransactionCategorizationSaveStatus, exports.markTransactionAsNotMiscategorized = _a.markTransactionAsNotMiscategorized, exports.updateStatusForTransactionNotMiscategorizedUpdateForCategorization = _a.updateStatusForTransactionNotMiscategorizedUpdateForCategorization, exports.updateSelectedVendorForTransaction = _a.updateSelectedVendorForTransaction, exports.updateSelectedCustomerForTransaction = _a.updateSelectedCustomerForTransaction, exports.setAllItemsToCategoryClassInLocalDataForCategorization = _a.setAllItemsToCategoryClassInLocalDataForCategorization, exports.updateTotalCountForTransactionCategorization = _a.updateTotalCountForTransactionCategorization, exports.fetchTransactionCategorizationSuccess = _a.fetchTransactionCategorizationSuccess, exports.resetOtherTabsFetchState = _a.resetOtherTabsFetchState, exports.fetchTransactionCategorizationView = _a.fetchTransactionCategorizationView, exports.updateSelectedCheckboxTransactionIds = _a.updateSelectedCheckboxTransactionIds, exports.clearExpenseAutomationTransactionsViewPerTabView = _a.clearExpenseAutomationTransactionsViewPerTabView, exports.clearExpenseAutomationTransactionsView = _a.clearExpenseAutomationTransactionsView, exports.setEntityRecommendationForLineIdsForCategorization = _a.setEntityRecommendationForLineIdsForCategorization, exports.updateSelectedTransactionId = _a.updateSelectedTransactionId, exports.syncTransactionCategorizationFromDetailSave = _a.syncTransactionCategorizationFromDetailSave, exports.backgroundRefetchReviewTab = _a.backgroundRefetchReviewTab, exports.updateTransactionCategorizationUploadReceiptState = _a.updateTransactionCategorizationUploadReceiptState, exports.uploadTransactionCategorizationReceiptSuccess = _a.uploadTransactionCategorizationReceiptSuccess;
 exports.default = expenseAutomationTransactionsView.reducer;

package/lib/view/expenseAutomationView/selectorTypes/jeSchedulesSelectorTypes.d.ts

@@ -18,12 +18,10 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     allDepreciationAccountList: AccountBase[];
     allDepreciationAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
-    completedSchedules: JEScheduledTransaction[];
     completionStatus: CompletionStatusType;
     draftSchedules: JEScheduledTransaction[];
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
-    ongoingSchedules: JEScheduledTransaction[];
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     resolveSchedules: JEScheduledTransactionWithFailedEntries[];

package/lib/view/expenseAutomationView/selectorTypes/transactionsViewSelectorTypes.d.ts

@@ -28,6 +28,7 @@ export interface ExpenseAutomationTransactionViewSelector extends SelectorView {
     transactions: SupportedTransactionWithCOT[];
     uiState: TransactionsViewUIState;
     uncategorizedAccounts: UncategorizedAccounts;
+    uploadReceiptStatusById: Record<ID, FetchStateAndError>;
     selectedTransactionId?: ID;
     selectedTransactionLineId?: ID;
 }

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

@@ -66,9 +66,6 @@ function getExpenseAutomationJESchedulesView(state) {
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
     const draftSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft');
-    const ongoingSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing');
-    const completedSchedules = jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
-        schedule.status.code === 'marked_as_completed');
     const resolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
@@ -88,9 +85,7 @@ function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
         draftSchedules,
-        ongoingSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

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

@@ -16,7 +16,7 @@ const expenseAutomationViewSelectorTypes_1 = require("../selectorTypes/expenseAu
 function getExpenseAutomationTransactionView(state) {
     const { accountState, classState, classListState, accountListState, expenseAutomationTransactionsViewState, expenseAutomationViewState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationTab } = expenseAutomationTransactionsViewState;
-    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
     const accountList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
     const classList = (0, classListSelector_1.getClassList)(classState, classListState);
@@ -100,6 +100,7 @@ function getExpenseAutomationTransactionView(state) {
         completionStatus,
         totalCountByTab,
         fetchStateByTransactionTabs: fetchStateByTab,
+        uploadReceiptStatusById,
         selectedTransactionId,
         selectedTransactionLineId,
     };

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

@@ -15,7 +15,7 @@ import { VendorBase } from '../../../entity/vendor/vendorState';
 import { ZeniDate } from '../../../zeniDayJS';
 import { EntityRecommendationKey } from '../../recommendation/recommendationState';
 import { TransactionDetailKey } from '../../transactionDetail/transactionDetailState';
-export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "memo" | "transaction_type";
+export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "category" | "class" | "payment_account" | "transaction_type" | "memo_and_receipt";
 export type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
 export declare const TRANSACTIONS_TABS: readonly ["review", "autoCategorized"];
 export declare const toTransactionsTabKey: (v: string) => "review" | "autoCategorized";
@@ -97,6 +97,7 @@ export interface TransactionsTabViewState extends FetchedState {
     transactionIdsWithUnsavedData: ID[];
     transactionReviewLocalDataById: Record<ID | TransactionDetailKey, SupportedTransactionCategorization>;
     uiState: TransactionsViewUIState;
+    uploadReceiptStatusById: Record<ID, FetchStateAndError>;
     selectedTransactionId?: ID;
     selectedTransactionLineId?: ID;
 }

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

@@ -7,10 +7,11 @@ const TRANSACTIONS_SORT_KEYS = [
     'vendor',
     'amount',
     'transaction_type',
+    'payment_account',
     'date',
     'category',
     'class',
-    'memo',
+    'memo_and_receipt',
 ];
 const toTransactionsSortKey = (v) => (0, stringToUnion_1.stringToUnion)(v, TRANSACTIONS_SORT_KEYS);
 exports.toTransactionsSortKey = toTransactionsSortKey;

package/lib/view/taskManager/taskDetailView/taskDetailSelector.js

@@ -98,11 +98,11 @@ exports.allTaskStatus = [
     },
     {
         code: 'done',
-        name: 'In Review',
+        name: 'Done',
     },
     {
         code: 'resolved',
-        name: 'Complete',
+        name: 'Resolved',
     },
 ];
 exports.allTaskPriority = [

package/package.json

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