@zeniai/client-epic-state 4.13.86 → 4.13.88

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

@@ -16,7 +16,7 @@ const initializeTransactionCategorizationViewLocalDataEpic = (actions$, state$)
     const transactionLocalData = Object.assign({}, transactionReviewLocalDataById);
     const transactions = (0, transactionSelector_1.getSupportedTransactionsByIds)(transactionState, transactionIds);
     transactions.forEach((transaction) => {
-        var _a, _b, _c, _d;
+        var _a, _b;
         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(Object.assign({}, newTransactionsLocalData), { sortedLineItems: (_b = (_a = transaction.lines) === null || _a === void 0 ? void 0 : _a.map((line) => line.id)) !== null && _b !== void 0 ? _b : [] }) });
@@ -25,8 +25,8 @@ const initializeTransactionCategorizationViewLocalDataEpic = (actions$, state$)
             transactionLocalData[transaction.id] = {
                 transactionId: transaction.id,
                 transactionReviewLocalData: Object.assign(Object.assign({}, transactionLocalData[transaction.id]
-                    .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 : []) })),
+                    .transactionReviewLocalData), Object.assign(Object.assign({}, newTransactionsLocalData), { lineItemById: Object.assign({}, mergeTransactionLineItems(transactionLocalData[transaction.id]
+                        .transactionReviewLocalData.lineItemById, newTransactionsLocalData.lineItemById)), sortedLineItems: transactionLocalData[transaction.id].transactionReviewLocalData.sortedLineItems.concat(newTransactionsLocalData.sortedLineItems) })),
             };
         }
     });
@@ -43,3 +43,12 @@ const initializeTransactionCategorizationViewLocalDataEpic = (actions$, state$)
     return (0, rxjs_1.from)(fetchActions);
 }));
 exports.initializeTransactionCategorizationViewLocalDataEpic = initializeTransactionCategorizationViewLocalDataEpic;
+// Better option to merge line items using this helper than merging inline to avoid overwriting the line items in future
+// This function is used to merge the line items of a transaction so that the line items are not overwritten
+function mergeTransactionLineItems(existingLineItems, newLineItems) {
+    const mergedLineItems = Object.assign({}, existingLineItems);
+    for (const id of Object.keys(newLineItems)) {
+        mergedLineItems[id] = Object.assign(Object.assign({}, existingLineItems[id]), newLineItems[id]);
+    }
+    return mergedLineItems;
+}

package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.js

@@ -26,6 +26,10 @@ const toTransactionDetailLocalData = (transaction) => {
         transaction.lines != null && transaction.lines.length > 0
             ? buildLineItemById(transaction, transaction.recommendations)
             : {};
+    transactionLocal.sortedLineItems =
+        transaction.lines != null && transaction.lines.length > 0
+            ? transaction.lines.map((line) => line.id)
+            : [];
     return transactionLocal;
 };
 exports.toTransactionDetailLocalData = toTransactionDetailLocalData;
@@ -168,7 +172,7 @@ const toSetAllLineItemsToCategoryClass = (draft, transaction, transactionId, tra
             }
         });
     }
-    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendor: transactionDetailLocalData.vendor, vendorUpdates: transactionDetailLocalData.vendorUpdates, vendorDetails: transactionDetailLocalData.vendorDetails });
+    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { sortedLineItems: transactionDetailLocalData.sortedLineItems, memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendor: transactionDetailLocalData.vendor, vendorUpdates: transactionDetailLocalData.vendorUpdates, vendorDetails: transactionDetailLocalData.vendorDetails });
     if (!(0, exports.checkIfAllLineItemsAreCategoryClassFilled)(transaction, newLocalData)) {
         selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
     }
@@ -232,7 +236,7 @@ const setEntityRecommendationForLineIdInLocalData = (draft, transaction, transac
         const newLineItem = newLineItems[matchingEntityLineId];
         newLineItems[matchingEntityLineId] = Object.assign(Object.assign({}, newLineItem), { class: matchingRecord.class, account: matchingRecord.account, lineEntity: matchingRecord.lineEntity });
     }
-    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendorUpdates: transactionDetailLocalData.vendorUpdates, vendorDetails: transactionDetailLocalData.vendorDetails, vendor: transactionDetailLocalData.vendor });
+    const newLocalData = Object.assign(Object.assign({}, transactionsViewState_1.initialSupportedTransactionCategorization.transactionReviewLocalData), { sortedLineItems: transactionDetailLocalData.sortedLineItems, memo: transactionDetailLocalData.memo, lineItemById: newLineItems, transactionDate: transactionDetailLocalData.transactionDate, transactionType: transactionDetailLocalData.transactionType, transactionTypeName: transactionDetailLocalData.transactionTypeName, vendorUpdates: transactionDetailLocalData.vendorUpdates, vendorDetails: transactionDetailLocalData.vendorDetails, vendor: transactionDetailLocalData.vendor });
     if (!(0, exports.checkIfAllLineItemsAreCategoryClassFilled)(transaction, newLocalData)) {
         selectedCheckBoxTransactionIds = selectedCheckBoxTransactionIds.filter((id) => id !== transaction.id);
     }

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

@@ -15,7 +15,7 @@ import { BillableStatus, CategorizationStatusType, PlatformLineDetailType, Produ
 import { Entity, EntityType } from '../../../entity/genericEntity/entity';
 import { TransactionType, TransactionCategory } from '../../../entity/transaction/stateTypes/transactionType';
 import { MonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
-export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "transactionType" | "category" | "class";
+export declare const toTransactionsSortKey: (v: string) => "date" | "amount" | "vendor" | "transaction_type" | "category" | "class";
 export declare type TransactionsSortKey = ReturnType<typeof toTransactionsSortKey>;
 export declare const toTransactionsTabKey: (v: string) => "review" | "autoCategorized";
 export declare type TransactionsTab = ReturnType<typeof toTransactionsTabKey>;

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

@@ -6,7 +6,7 @@ const transactionDetailState_1 = require("../../transactionDetail/transactionDet
 const TRANSACTIONS_SORT_KEYS = [
     'vendor',
     'amount',
-    'transactionType',
+    'transaction_type',
     'date',
     'category',
     'class',

package/lib/view/recommendation/recommendationReducer.js

@@ -17,9 +17,9 @@ const recommendation = (0, toolkit_1.createSlice)({
             action) {
                 const { entity } = action.payload;
                 const key = (0, recommendationState_1.getEntityRecommendationKey)(entity.type, entity.id);
-                const existingRecommmendation = draft.recommendationByEntity[key];
-                if (existingRecommmendation == null) {
-                    draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.intialEntityRecommendationState), { fetchState: 'In-Progress' });
+                const existingRecommendation = draft.recommendationByEntity[key];
+                if (existingRecommendation == null) {
+                    draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.initialEntityRecommendationState), { fetchState: 'In-Progress' });
                 }
             },
             prepare(entity, amount, transactionDetails, isBulkFetch, isTransactionCategorizationFlow = false) {
@@ -38,10 +38,10 @@ const recommendation = (0, toolkit_1.createSlice)({
             reducer(draft, action) {
                 const { entityName, entityType } = action.payload;
                 const key = (0, recommendationState_1.getEntityRecommendationKey)(entityType, entityName);
-                const existingRecommmendation = draft.recommendationByEntity[key];
-                if (existingRecommmendation == null ||
-                    existingRecommmendation.fetchState !== 'Completed') {
-                    draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.intialEntityRecommendationState), { fetchState: 'In-Progress' });
+                const existingRecommendation = draft.recommendationByEntity[key];
+                if (existingRecommendation == null ||
+                    existingRecommendation.fetchState !== 'Completed') {
+                    draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.initialEntityRecommendationState), { fetchState: 'In-Progress' });
                 }
             },
             prepare(entityName, entityType) {
@@ -57,10 +57,10 @@ const recommendation = (0, toolkit_1.createSlice)({
             reducer(draft, action) {
                 const { entityId, entityType } = action.payload;
                 const key = (0, recommendationState_1.getEntityRecommendationKey)(entityType, entityId);
-                const existingRecommmendation = draft.recommendationByEntity[key];
-                if (existingRecommmendation == null ||
-                    existingRecommmendation.fetchState !== 'Completed') {
-                    draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.intialEntityRecommendationState), { fetchState: 'In-Progress' });
+                const existingRecommendation = draft.recommendationByEntity[key];
+                if (existingRecommendation == null ||
+                    existingRecommendation.fetchState !== 'Completed') {
+                    draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.initialEntityRecommendationState), { fetchState: 'In-Progress' });
                 }
             },
             prepare(entityId, entityType) {
@@ -79,7 +79,7 @@ const recommendation = (0, toolkit_1.createSlice)({
         updateRecommendationForEntityFailure(draft, action) {
             const { entityId, entityType, status } = action.payload;
             const key = (0, recommendationState_1.getEntityRecommendationKey)(entityType, entityId);
-            draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.intialEntityRecommendationState), { fetchState: 'Error', error: status });
+            draft.recommendationByEntity[key] = Object.assign(Object.assign({}, recommendationState_1.initialEntityRecommendationState), { fetchState: 'Error', error: status });
         },
         indicateReadyToInitializeRecommendation: {
             reducer(
@@ -107,5 +107,5 @@ _a = recommendation.actions, exports.fetchEntityRecommendationsByTransactionId =
 exports.default = recommendation.reducer;
 const doUpdateRecommendationForEntity = (draft, entityId, entityType, payload) => {
     const key = (0, recommendationState_1.getEntityRecommendationKey)(entityType, entityId);
-    draft[key] = Object.assign(Object.assign({}, recommendationState_1.intialEntityRecommendationState), { fetchState: 'Completed', recommendations: payload });
+    draft[key] = Object.assign(Object.assign({}, recommendationState_1.initialEntityRecommendationState), { fetchState: 'Completed', recommendations: payload });
 };

package/lib/view/recommendation/recommendationState.d.ts

@@ -6,7 +6,7 @@ export declare type EntityRecommendationKey = ReturnType<typeof getEntityRecomme
 export interface EntityRecommendationsStatus extends FetchedState {
     recommendations?: Recommendation[];
 }
-export declare const intialEntityRecommendationState: EntityRecommendationsStatus;
+export declare const initialEntityRecommendationState: EntityRecommendationsStatus;
 export interface EntityRecommendationState {
     recommendationByEntity: Record<EntityRecommendationKey, EntityRecommendationsStatus>;
 }

package/lib/view/recommendation/recommendationState.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.intialEntityRecommendationState = exports.getEntityRecommendationKey = void 0;
+exports.initialEntityRecommendationState = exports.getEntityRecommendationKey = void 0;
 const getEntityRecommendationKey = (entityType, entityIdOrName) => `${entityType}_${entityIdOrName}`;
 exports.getEntityRecommendationKey = getEntityRecommendationKey;
-exports.intialEntityRecommendationState = {
+exports.initialEntityRecommendationState = {
     fetchState: 'Not-Started',
     error: undefined,
     hasValidState() {

package/lib/view/scheduleView/scheduleAccruedDetailView/LinkBillExpenseView/linkBillExpense.d.ts

@@ -1,3 +1,3 @@
-declare const toLinkBillExpenseKeysType: (v: string) => "attachment" | "name" | "amount" | "transactionType" | "memo" | "creationDate";
+declare const toLinkBillExpenseKeysType: (v: string) => "attachment" | "name" | "amount" | "memo" | "transactionType" | "creationDate";
 export declare type LinkBillExpenseKey = ReturnType<typeof toLinkBillExpenseKeysType>;
 export {};

package/lib/view/scheduleView/scheduleListView/scheduleListTypes.d.ts

@@ -7,7 +7,7 @@ export declare const getScheduleListKey: (selectedCategory: ID, selectedTimefram
 export declare type ScheduleListKey = ReturnType<typeof getScheduleListKey>;
 export declare const toScheduleSubTabType: (v: string) => "all" | "new" | "completed" | "ongoing";
 export declare type ScheduleSubTabType = ReturnType<typeof toScheduleSubTabType>;
-declare const toScheduleSortKeyType: (v: string) => "status" | "user" | "months" | "amount" | "vendor" | "transactionType" | "class" | "memo" | "transactionDate" | "balanceAsOfToday" | "createTime" | "assetId" | "accruedExpenseCategory" | "scheduleCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "startMonth" | "endMonth";
+declare const toScheduleSortKeyType: (v: string) => "status" | "user" | "months" | "amount" | "vendor" | "class" | "memo" | "transactionDate" | "transactionType" | "balanceAsOfToday" | "createTime" | "assetId" | "accruedExpenseCategory" | "scheduleCategory" | "expenseCategory" | "accumulatedDepreciationCategory" | "startMonth" | "endMonth";
 export declare type ScheduleListSortKey = ReturnType<typeof toScheduleSortKeyType>;
 export interface DownloadJEScheduleTabOptions {
     timezone: string;

package/package.json

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