Refactoring

Author: Yadro

src/base/TreeModelStoreHelper.ts

@@ -20,6 +20,17 @@ export default abstract class TreeModelStoreHelper {
   }
 
   static getFlatItemsRecursive<T extends ITreeItem<any>>(
+    tree: T[],
+    condition: (task: T) => boolean
+  ): T[] {
+    const result: T[] = [];
+
+    this.getFlatItemsRecursiveBase(tree, condition, result);
+
+    return result;
+  }
+
+  static getFlatItemsRecursiveBase<T extends ITreeItem<any>>(
     tasks: T[],
     condition: (task: T) => boolean,
     result: T[]
@@ -29,7 +40,7 @@ export default abstract class TreeModelStoreHelper {
         result.push(task);
       }
       if (Array.isArray(task.children)) {
-        this.getFlatItemsRecursive(task.children, condition, result);
+        this.getFlatItemsRecursiveBase(task.children, condition, result);
       }
     }
     return result;

src/modules/tasks/TaskStore.ts

@@ -60,7 +60,7 @@ export default class TaskStore {
     }
 
     for (const tasks of Object.values(this.tasks)) {
-      TreeModelStoreHelper.getFlatItemsRecursive(tasks, condition, result);
+      TreeModelStoreHelper.getFlatItemsRecursiveBase(tasks, condition, result);
     }
     return result;
   }
@@ -129,13 +129,10 @@ export default class TaskStore {
     }
 
     if (Array.isArray(this.tasks[projectId])) {
-      const found: TaskModel[] = [];
-      TreeModelStoreHelper.getFlatItemsRecursive(
+      return TreeModelStoreHelper.getFlatItemsRecursive(
         this.tasks[projectId],
-        condition,
-        found
-      );
-      return found.map((f) => f.key);
+        condition
+      ).map((task) => task.key);
     }
     return [];
   }