@zeniai/client-epic-state 4.11.51 → 4.11.52

package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.js

@@ -57,9 +57,8 @@ const getScheduleDetailsView = (state, scheduleType) => {
     });
     const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
         scheduleDetailAccountIds.includes(account.accountId[0]));
-    const depAccountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
-        depreciationCategoryIds.includes(account.accountId[0]) &&
-        !fixedAssetLabelAccountIds.includes(account.accountId[0]));
+    const depAccountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, accountTypes.accountListKey);
+    const filteredDepAccountListNestedAccountHierarchy = filterNestedAccountHierarchyById(depAccountListNestedAccountHierarchy, filteredDepAccounts.map((account) => account.accountId));
     const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
     const selectedJeScheduleDetailId = jeScheduleTransactionState.jeScheduleId;
     const scheduleDetailsLocalData = Object.assign({}, scheduleDetailReducer_1.initialScheduleDetailsLocalData);
@@ -85,7 +84,7 @@ const getScheduleDetailsView = (state, scheduleType) => {
         allAccountList: filteredAccounts,
         allClassList: allClasses,
         allDepreciationAccountList: filteredDepAccounts,
-        allDepreciationAccountListNestedAccountHierarchy: depAccountListNestedAccountHierarchy,
+        allDepreciationAccountListNestedAccountHierarchy: filteredDepAccountListNestedAccountHierarchy,
         uncategorizedAccounts,
         accountListNestedAccountHierarchy,
         classListNestedAccountHierarchy,
@@ -99,3 +98,23 @@ const getScheduleDetailsView = (state, scheduleType) => {
     };
 };
 exports.getScheduleDetailsView = getScheduleDetailsView;
+// TODO: Optimize this function as the accountlist is very huge
+const filterNestedAccountHierarchyById = (accountList, targetIds) => {
+    const result = [];
+    for (const account of accountList) {
+        const presentInTargetIds = targetIds.includes(account.accountId[0]);
+        // Recursively filter the children
+        const filteredChildren = filterNestedAccountHierarchyById(account.children, targetIds);
+        // Include the current account if:
+        // - It matches the targetIds, OR
+        // - It has children that match targetIds
+        if (presentInTargetIds) {
+            result.push(Object.assign(Object.assign({}, account), { children: filteredChildren }));
+        }
+        else if (filteredChildren.length > 0) {
+            // If the current account does not match but has matching children, include the children only
+            result.push(...filteredChildren);
+        }
+    }
+    return result;
+};

package/package.json

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