Refactored & replaced Object.entries method (#20)

Author: klaudiosinani

lib/render.js

@@ -134,12 +134,12 @@ class Render {
   }
 
   displayByBoard(data) {
-    Object.entries(data).forEach(([board, items]) => {
-      if (this._isBoardComplete(items) && !this._configuration.displayCompleteTasks) {
+    Object.keys(data).forEach(board => {
+      if (this._isBoardComplete(data[board]) && !this._configuration.displayCompleteTasks) {
         return;
       }
-      this._displayTitle(board, items);
-      items.forEach(item => {
+      this._displayTitle(board, data[board]);
+      data[board].forEach(item => {
         if (item._isTask && item.isComplete && !this._configuration.displayCompleteTasks) {
           return;
         }
@@ -149,12 +149,12 @@ class Render {
   }
 
   displayByDate(data) {
-    Object.entries(data).forEach(([date, items]) => {
-      if (this._isBoardComplete(items) && !this._configuration.displayCompleteTasks) {
+    Object.keys(data).forEach(date => {
+      if (this._isBoardComplete(data[date]) && !this._configuration.displayCompleteTasks) {
         return;
       }
-      this._displayTitle(date, items);
-      items.forEach(item => {
+      this._displayTitle(date, data[date]);
+      data[date].forEach(item => {
         if (item._isTask && item.isComplete && !this._configuration.displayCompleteTasks) {
           return;
         }

lib/taskbook.js

@@ -63,10 +63,11 @@ class Taskbook {
   }
 
   _getBoards() {
+    const {_data} = this;
     const boards = ['My Board'];
 
-    Object.entries(this._data).forEach(([_, item]) => {
-      boards.push(...item.boards.filter(x => boards.indexOf(x) === -1));
+    Object.keys(_data).forEach(id => {
+      boards.push(..._data[id].boards.filter(x => boards.indexOf(x) === -1));
     });
 
     return boards;
@@ -75,9 +76,9 @@ class Taskbook {
   _getDates(data = this._data) {
     const dates = [];
 
-    Object.entries(data).forEach(([_, item]) => {
-      if (dates.indexOf(item._date) === -1) {
-        dates.push(item._date);
+    Object.keys(data).forEach(id => {
+      if (dates.indexOf(data[id]._date) === -1) {
+        dates.push(data[id]._date);
       }
     });
 
@@ -120,11 +121,12 @@ class Taskbook {
   }
 
   _getStats() {
+    const {_data} = this;
     let [complete, pending, notes] = [0, 0, 0];
 
-    Object.entries(this._data).forEach(([_, item]) => {
-      if (item._isTask) {
-        return item.isComplete ? complete++ : pending++;
+    Object.keys(_data).forEach(id => {
+      if (_data[id]._isTask) {
+        return _data[id].isComplete ? complete++ : pending++;
       }
       return notes++;
     });
@@ -148,44 +150,44 @@ class Taskbook {
   }
 
   _filterTask(data) {
-    Object.entries(data).forEach(([id, item]) => {
-      if (!item._isTask) {
+    Object.keys(data).forEach(id => {
+      if (!data[id]._isTask) {
         delete data[id];
       }
     });
     return data;
   }
 
   _filterStarred(data) {
-    Object.entries(data).forEach(([id, item]) => {
-      if (!item.isStarred) {
+    Object.keys(data).forEach(id => {
+      if (!data[id].isStarred) {
         delete data[id];
       }
     });
     return data;
   }
 
   _filterComplete(data) {
-    Object.entries(data).forEach(([id, item]) => {
-      if (!item._isTask || !item.isComplete) {
+    Object.keys(data).forEach(id => {
+      if (!data[id]._isTask || !data[id].isComplete) {
         delete data[id];
       }
     });
     return data;
   }
 
   _filterPending(data) {
-    Object.entries(data).forEach(([id, item]) => {
-      if (!item._isTask || item.isComplete) {
+    Object.keys(data).forEach(id => {
+      if (!data[id]._isTask || data[id].isComplete) {
         delete data[id];
       }
     });
     return data;
   }
 
   _filterNote(data) {
-    Object.entries(data).forEach(([id, item]) => {
-      if (item._isTask) {
+    Object.keys(data).forEach(id => {
+      if (data[id]._isTask) {
         delete data[id];
       }
     });
@@ -242,13 +244,13 @@ class Taskbook {
       boards = this._getBoards();
     }
 
-    Object.entries(data).forEach(([_, item]) => {
+    Object.keys(data).forEach(id => {
       boards.forEach(board => {
-        if (item.boards.includes(board)) {
+        if (data[id].boards.includes(board)) {
           if (Array.isArray(grouped[board])) {
-            return grouped[board].push(item);
+            return grouped[board].push(data[id]);
           }
-          grouped[board] = [item];
+          grouped[board] = [data[id]];
           return grouped[board];
         }
       });
@@ -260,14 +262,14 @@ class Taskbook {
   _groupByDate(data = this._data, dates = this._getDates()) {
     const grouped = {};
 
-    Object.entries(data).forEach(([_, item]) => {
+    Object.keys(data).forEach(id => {
       dates.forEach(date => {
-        if (item._date === date) {
+        if (data[id]._date === date) {
           if (Array.isArray(grouped[date])) {
-            return grouped[date].push(item);
+            return grouped[date].push(data[id]);
           }
-          grouped[date] = [item];
-          return grouped[item];
+          grouped[date] = [data[id]];
+          return grouped[date];
         }
       });
     });
@@ -384,12 +386,13 @@ class Taskbook {
 
   findItems(terms) {
     const result = {};
+    const {_data} = this;
 
-    Object.entries(this._data).forEach(([id, item]) => {
-      if (!this._hasTerms(item.description, terms)) {
+    Object.keys(_data).forEach(id => {
+      if (!this._hasTerms(_data[id].description, terms)) {
         return;
       }
-      result[id] = item;
+      result[id] = _data[id];
     });
 
     render.displayByBoard(this._groupByBoard(result));