@zeniai/client-epic-state 4.20.2 → 4.20.3-beta20ND

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardList.js

@@ -78,6 +78,7 @@ const ALL_CHARGE_CARD_SORT_KEYS = [
     'cardName',
     'department',
     'cardType',
+    'accountType',
     'status',
     'utilisation',
     'limit',

package/lib/view/spendManagement/chargeCards/chargeCardList/chargeCardListSelector.js

@@ -233,6 +233,8 @@ const getCardsBySortKey = (card, sortKey) => {
             return card.cardName.toLowerCase();
         case 'cardType':
             return card.type.code;
+        case 'accountType':
+            return card.type.code.includes('credit') ? 'credit' : 'debit';
         case 'status':
             return card.status.code;
         case 'utilisation':

package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.js

@@ -69,13 +69,16 @@ const getEditRemiDetail = (state, reimbursementId) => {
             paymentTo: reimbursementInfo?.toAccount.billAccountId,
         };
         if (sourceRemiDetail != null) {
-            fetchState = (0, reduceFetchState_1.reduceFetchState)([
+            const fetchStateList = [
                 sourceRemiDetail.fetchStatus,
                 accountListState.byReportId.reimbursementAccountList,
-                classListState,
                 merchantListState,
                 reimbursementConfigState,
-            ]).fetchState;
+            ];
+            if ((0, tenantSelector_1.getIsAccountingClassesEnabled)(state)) {
+                fetchStateList.push(classListState);
+            }
+            fetchState = (0, reduceFetchState_1.reduceFetchState)(fetchStateList).fetchState;
             remiStage = reimbursementInfo?.stage.code ?? 'draft';
             createdBy = (0, userSelector_1.getUserByUserId)(userState, reimbursement?.createdBy ?? '');
             createTime = reimbursement?.createTime;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.d.ts

@@ -42,6 +42,7 @@ export interface ReimbursementView extends Reimbursement {
     approvers: Approvers;
     submittedBy: User | undefined;
     bulkSelectInfo?: RemiBulkSelectInfo;
+    createdByUser?: User;
 }
 export declare const getRemiList: (state: RootState, currentTimePeriod: TimePeriod, isBulkActionFeatureEnabled: boolean) => RemiListReport;
 export declare const getApproversOrRejectors: (reimbursement: Reimbursement, entityApprovalStatusState: EntityApprovalStatusState, userState: UserState) => Approvers;

package/lib/view/spendManagement/reimbursement/remiListView/remiListSelector.js

@@ -51,6 +51,7 @@ const getRemiList = (state, currentTimePeriod, isBulkActionFeatureEnabled) => {
         return {
             ...reimbursement,
             submittedBy: (0, userSelector_1.getUserByUserId)(userState, reimbursement.reimburseeUserId),
+            createdByUser: (0, userSelector_1.getUserByUserId)(userState, reimbursement.createdBy),
             approvers: approvers,
         };
     });
@@ -423,6 +424,14 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                     reimbursementsWithNoSortKeyValue.push(reimbursement);
                 }
                 break;
+            case 'createdBy':
+                if (reimbursement.createdByUser != null) {
+                    reimbursementsWithSortKeyValue.push(reimbursement);
+                }
+                else {
+                    reimbursementsWithNoSortKeyValue.push(reimbursement);
+                }
+                break;
         }
     });
     const getColumnWiseSortOrder = (sortOrder) => {
@@ -430,6 +439,7 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
             case 'reportName':
             case 'type':
             case 'status':
+            case 'createdBy':
                 return sortOrder === 'ascending' ? 'asc' : 'desc';
             default:
                 return sortOrder === 'ascending' ? 'desc' : 'asc';
@@ -449,6 +459,8 @@ const getRemiListOnSort = (sortKey, sortOrder, currentTab, reimbursements) => {
                 return getStatusPerTab(reimbursement);
             case 'amount':
                 return reimbursement.amount.amount ?? 0;
+            case 'createdBy':
+                return `${reimbursement.createdByUser?.firstName ?? ''} ${reimbursement.createdByUser?.lastName ?? ''}`.toLowerCase();
         }
     }, getColumnWiseSortOrder(sortOrder));
     return [

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.d.ts

@@ -38,7 +38,7 @@ export declare const toRemiSubTabTypeStrict: (v: string) => "rejected" | "failed
 export type RemiSubTabType = ReturnType<typeof toRemiSubTabType>;
 export declare const toRemiSubTabUnderScoreType: (v: string) => "rejected" | "failed" | "ach" | "wire" | "cancelled" | "deleted" | "overdue" | "all" | "awaiting_approval" | "awaiting_my_approval" | "my_drafts" | "awaiting_all_approval";
 export type RemiSubTabUnderScoreType = ReturnType<typeof toRemiSubTabUnderScoreType>;
-declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "submittedOn" | "reportName";
+declare const toReimbursementSortKeyType: (v: string) => "amount" | "status" | "type" | "createdBy" | "submittedOn" | "reportName";
 export type ReimbursementViewSortKey = ReturnType<typeof toReimbursementSortKeyType>;
 export interface ReimbursementFilters {
     categories: ReimbursementFilterCategory[];

package/lib/view/spendManagement/reimbursement/remiListView/remiListState.js

@@ -64,6 +64,7 @@ exports.toRemiSubTabUnderScoreType = toRemiSubTabUnderScoreType;
 const ALL_REIMBURSEMENT_SORT_KEYS = [
     'reportName',
     'submittedOn',
+    'createdBy',
     'type',
     'status',
     'amount',

package/lib/view/spendManagement/treasury/treasuryList/epics/fetchTreasuryDetailEpic.js

@@ -9,7 +9,7 @@ const treasuryStatementListReducer_1 = require("../../treasuryStatementList/trea
 const treasuryTaxLetterListReducer_1 = require("../../treasuryTaxLetterList/treasuryTaxLetterListReducer");
 const treasuryDetailReducer_1 = require("../treasuryDetailReducer");
 const fetchTreasuryDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(treasuryDetailReducer_1.fetchTreasuryOverviewDetail.match), (0, operators_1.switchMap)((action) => {
-    const { cacheOverride } = action.payload;
+    const { cacheOverride, fetchOnlySummary } = action.payload;
     const state = state$.value;
     const treasuryActions = [];
     if (cacheOverride === true) {
@@ -20,7 +20,7 @@ const fetchTreasuryDetailEpic = (actions$, state$, zeniAPI) => actions$.pipe((0,
         treasuryActions.push((0, treasuryDetailReducer_1.fetchTreasuryHistory)());
         treasuryActions.push((0, treasuryDetailReducer_1.fetchTreasuryTransactionList)(true));
     }
-    else {
+    else if (fetchOnlySummary !== true) {
         // Check treasury statement list state
         const treasuryStatementListState = state.treasuryStatementListState;
         if (treasuryStatementListState.hasValidState() === false &&

package/lib/view/spendManagement/treasury/treasuryList/treasuryDetailReducer.d.ts

@@ -4,8 +4,9 @@ import { TreasuryTransferMoneyResponsePayload } from '../treasuryTransferMoney/t
 import { FetchTreasuryAccountHistoryResponse, FetchTreasuryDetailResponse, TreasuryTransactionPayload } from './treasuryDetailPayload';
 import { TreasuryDetailState, TreasuryListUIState } from './treasuryDetailState';
 export declare const initialState: TreasuryDetailState;
-export declare const fetchTreasuryOverviewDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean], {
+export declare const fetchTreasuryOverviewDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[cacheOverride: boolean, fetchOnlySummary?: boolean | undefined], {
     cacheOverride: boolean;
+    fetchOnlySummary: boolean | undefined;
 }, "treasuryDetail/fetchTreasuryOverviewDetail", never, never>, fetchTreasuryHistory: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"treasuryDetail/fetchTreasuryHistory">, fetchTreasuryHistorySuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     data: FetchTreasuryAccountHistoryResponse;
 }, "treasuryDetail/fetchTreasuryHistorySuccess">, fetchTreasuryHistoryFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{

package/lib/view/spendManagement/treasury/treasuryList/treasuryDetailReducer.js

@@ -34,10 +34,11 @@ const treasuryDetail = (0, toolkit_1.createSlice)({
             reducer(draft) {
                 draft.fetchState = 'In-Progress';
             },
-            prepare(cacheOverride) {
+            prepare(cacheOverride, fetchOnlySummary) {
                 return {
                     payload: {
                         cacheOverride,
+                        fetchOnlySummary,
                     },
                 };
             },

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

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

package/lib/view/transactionDetail/epics/saveTransactionHelper.js

@@ -78,8 +78,8 @@ const toTransactionUpdatesFromTransactionDetailLocalData = (transactionDetailLoc
                 lineItem.account?.qboId !== accountLine.account.qboId &&
                     Boolean(lineItem.account?.qboId);
             hasClassChanged =
-                Boolean(lineItem.class?.qboId) &&
-                    lineItem.class?.qboId !== accountLine.class.qboId;
+                (lineItem.class?.qboId != null || accountLine.class?.qboId != null) &&
+                    lineItem.class?.qboId !== accountLine.class?.qboId;
             const recommendedAccountBase = (0, exports.toRecommendedAccountBase)(lineItem.amount.amount, lineItem.account);
             const recommendedClassBase = (0, exports.toRecommendedClassBase)(lineItem.amount.amount, lineItem.class);
             const latestRecommendedCategory = lineItem.recommendedAccount;

package/lib/view/transactionDetail/transactionDetailLocalDataHelper.js

@@ -144,13 +144,13 @@ const buildLineItemById = (transaction, uncategorizedIncomeExpense, recommendati
                     record.isRetainedCategorySelected = false;
                 }
                 if (Boolean(recommendedClass?.qboId) &&
-                    recommendedClass?.qboId !== accountLine.class.qboId) {
+                    recommendedClass?.qboId !== accountLine.class?.qboId) {
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
                 }
                 if (accountLine.isClassMiscategorized &&
-                    Boolean(accountLine.class.qboId) &&
+                    Boolean(accountLine.class?.qboId) &&
                     Boolean(isVendorOrCustomerPresent)) {
                     record.retainedClass = accountLine.class;
                     record.isRetainedClassSelected = false;
@@ -342,14 +342,14 @@ const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionDetailLo
                         }
                     };
                     const updateClass = () => {
-                        if (recommendedClass?.qboId !== accountLine.class.qboId &&
+                        if (recommendedClass?.qboId !== accountLine.class?.qboId &&
                             Boolean(recommendedClass?.qboId)) {
                             record.class = accountLine.class;
                             record.isRecommendedClassSelected = false;
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class.qboId) &&
+                                Boolean(accountLine.class?.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = accountLine.class;
                                 record.isRetainedClassSelected = false;
@@ -362,7 +362,7 @@ const toUpdateLineItemsOriginalCategoryClass = (transaction, transactionDetailLo
                             record.recommendedClass = recommendedClass;
                             record.isClassUpdateSelected = false;
                             if (accountLine.isClassMiscategorized &&
-                                Boolean(accountLine.class.qboId) &&
+                                Boolean(accountLine.class?.qboId) &&
                                 Boolean(isVendorOrCustomerPresent)) {
                                 record.retainedClass = recommendedClass;
                                 record.isRetainedClassSelected = false;
@@ -659,13 +659,13 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                             record.isRetainedCategorySelected = false;
                         }
                     }
-                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId)) {
+                            Boolean(accountLine.class?.qboId)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
                         }
@@ -673,12 +673,12 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                     else {
                         record.isRecommendedClassSelected = false;
                         record.recommendedClass = recommendedClass;
-                        if (recommendedClass?.qboId === accountLine.class.qboId) {
+                        if (recommendedClass?.qboId === accountLine.class?.qboId) {
                             record.recommendedClass = undefined;
                         }
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId)) {
+                            Boolean(accountLine.class?.qboId)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;
                         }
@@ -694,7 +694,7 @@ const setEntityRecommendationForLineIdInLocalData = (transaction, transactionDet
                         Boolean(recommendedAccount?.qboId) !== false) {
                         record.account = recommendedAccount;
                     }
-                    if (Boolean(record.class.qboId) === false &&
+                    if (Boolean(record.class?.qboId) === false &&
                         Boolean(recommendedClass?.qboId) !== false) {
                         record.class = recommendedClass;
                     }
@@ -817,7 +817,9 @@ const getChangedLineItemCountFromLocalData = (transaction, transactionLocalData)
                     accountLineLocal.account?.qboId !== accountLine.account.qboId &&
                         accountLineLocal.account?.accountId !== accountLine.account.accountId;
                 hasClassChanged =
-                    accountLineLocal.class?.qboId !== accountLine.class.qboId;
+                    (accountLineLocal.class?.qboId != null ||
+                        accountLine.class?.qboId != null) &&
+                        accountLineLocal.class?.qboId !== accountLine.class?.qboId;
             }
             hasDescriptionChanged =
                 transactionLocalData.lineItemById[lineId] != null
@@ -957,10 +959,10 @@ const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetailLocalDa
                     record.isRecommendedClassSelected = false;
                     record.recommendedClass = recommendedClass;
                     record.isClassUpdateSelected = false;
-                    if (recommendedClass?.qboId !== accountLine.class.qboId &&
+                    if (recommendedClass?.qboId !== accountLine.class?.qboId &&
                         Boolean(recommendedClass?.qboId)) {
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId) &&
+                            Boolean(accountLine.class?.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = accountLine.class;
                             record.isRetainedClassSelected = false;
@@ -973,7 +975,7 @@ const toUpdateLineItemsToOriginalVendor = (transaction, transactionDetailLocalDa
                         record.recommendedClass = recommendedClass;
                         record.isClassUpdateSelected = false;
                         if (accountLine.isClassMiscategorized &&
-                            Boolean(accountLine.class.qboId) &&
+                            Boolean(accountLine.class?.qboId) &&
                             Boolean(isVendorOrCustomerPresent)) {
                             record.retainedClass = recommendedClass;
                             record.isRetainedClassSelected = false;

package/lib/view/transactionDetail/transactionDetailSelector.d.ts

@@ -17,6 +17,7 @@ export interface TransactionDetailReport extends SelectorView {
     classHierarchyList: NestedClassHierarchyForReport[];
     classList: ClassListSelectorView;
     deleteStatusByAttachmentName: Record<string, FetchStateAndError>;
+    isAccountingClassesEnabled: boolean;
     linkedTransactions: SupportedTransactionWithCOT[];
     transactionDetailLocalData: TransactionDetailLocalData;
     transactionDetailUpdateStatus: FetchStateAndError;

package/lib/view/transactionDetail/transactionDetailSelector.js

@@ -7,6 +7,7 @@ exports.getInitialUpdatablePeriodsForTransactionRecommendations = exports.getTra
 exports.getTransactionDetailForTransaction = getTransactionDetailForTransaction;
 const get_1 = __importDefault(require("lodash/get"));
 const reduceFetchState_1 = require("../../commonStateTypes/reduceFetchState");
+const tenantSelector_1 = require("../../entity/tenant/tenantSelector");
 const transactionType_1 = require("../../entity/transaction/stateTypes/transactionType");
 const transactionHelper_1 = require("../../entity/transaction/transactionHelper");
 const transactionSelector_1 = require("../../entity/transaction/transactionSelector");
@@ -58,9 +59,14 @@ const getTransactionDetail = (state, transactionId, fetchLinkedTransactions = tr
         }
     }
     const accountsList = (0, accountListSelector_1.getAccountList)(accountState, accountListState, 'accountList');
-    const classList = (0, classListSelector_1.getClassList)(classState, classListState);
+    const isAccountingClassesEnabled = (0, tenantSelector_1.getIsAccountingClassesEnabled)(state);
+    const classList = isAccountingClassesEnabled
+        ? (0, classListSelector_1.getClassList)(classState, classListState)
+        : { classes: [], nestedClassHierarchy: [], fetchState: 'Completed', error: undefined, version: 0 };
     const accountsHierarchyList = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList');
-    const classHierarchyList = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
+    const classHierarchyList = isAccountingClassesEnabled
+        ? (0, classListSelector_1.getNestedClassListHierarchy)(classListState)
+        : [];
     const transactionDetailAnyUpdateStatus = reduceUpdateFetchStates(transactionDetail);
     const vendors = (0, vendorSelector_1.getVendorsByVendorIds)(vendorState, vendorListState.vendorIds);
     return {
@@ -78,6 +84,7 @@ const getTransactionDetail = (state, transactionId, fetchLinkedTransactions = tr
         classHierarchyList,
         accountsHierarchyList,
         classList: classList,
+        isAccountingClassesEnabled,
         isUpdateNotAllowed: transactionDetail?.isUpdateNotAllowed,
         transactionDetailLocalData: transactionDetail?.transactionDetailLocalData ??
             transactionDetailState_1.initialSupportedTransactionDetail.transactionDetailLocalData,

package/package.json

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