imdone-core 1.53.16 → 1.53.18

package/lib/project.js

@@ -98,6 +98,14 @@ module.exports = class WorkerProject extends Project {
 
     if (!cb) return promise
   }
+
+  initIndexes(allLists) {
+    allLists.forEach((list) => {
+      list.tasks.filter(list => !list.filter).forEach((task, index) => {
+        task.index = index
+      })
+    })
+  }
   
   // HACK To handle circular dependency issue with file
   // <!--
@@ -107,17 +115,23 @@ module.exports = class WorkerProject extends Project {
     return { path: this.path }
   }
 
-  getListsForImdoneJSON(totals) {
-    return this.allLists.map((list) => {
+  getListsForImdoneJSON() {
+    this.initIndexes(this.repo.getTasksByList())
+    let allLists = this.getLists({
+      populateFiltered: true,
+    })
+    const totals = calculateTotals(allLists)
+    allLists = allLists.map((list) => {
       list = { ...list }
       list.tasks = list.tasks.map((card, index) => {
         card.interpretedContent = ''
         card.totals = totals
-        card.index = index
         return card
       })
       return list
     })
+
+    return { allLists, totals }
   }
 
   getInitializedCards(allLists, totals) {
@@ -133,36 +147,38 @@ module.exports = class WorkerProject extends Project {
     this.pluginManager.initDevMode()
     console.time('toJSON time')
     this._updatedAt = new Date()
-    const totals = calculateTotals(
-      this.getLists({
-        populateFiltered: true,
-      })
-    )
-    const allLists = this.getListsForImdoneJSON(totals)
+    const { allLists , totals } = this.getListsForImdoneJSON()
 
-    console.time('plugin onBeforeBoardUpdate')
+    console.time('plugin onBeforeBoardUpdate time')
     await this.pluginManager.onBeforeBoardUpdate()
-    console.timeEnd('plugin onBeforeBoardUpdate')
+    console.timeEnd('plugin onBeforeBoardUpdate time')
 
+    console.time('getBoardProperties time')
     const data = this.data = this.pluginManager.getBoardProperties()
+    console.timeEnd('getBoardProperties time')
+    
+    console.time('getDataKeys time')
     const dataKeys = this.dataKays = this.getDataKeys(data)
+    console.timeEnd('getDataKeys time')
 
-    console.time('card init')
+    console.time('card init time')
     const cards = this.getInitializedCards(allLists, totals)
-    console.timeEnd('card init')
+    console.timeEnd('card init time')
 
-    console.time('plugin onBoardUpdate')
-    await this.pluginManager.onBoardUpdate(
-      this.getLists({
-        tasks: cards,
-      })
-    )
-    console.timeEnd('plugin onBoardUpdate')
+    console.time('plugin onBoardUpdate time')
+    await this.pluginManager.onBoardUpdate(allLists)
+    console.timeEnd('plugin onBoardUpdate time')
+
+    console.time('getTags time')
+    const tags = this.getTags(cards)
+    console.timeEnd('getTags time')
 
-    const lists = this.getLists({
+    console.time('getLists time')
+    const lists = this.filter ? this.getLists({
       tasks: this.getCards(this.filter, cards),
       populateFiltered: true,
-    })
+    }) : allLists
+    console.timeEnd('getLists time')
 
     console.timeEnd('toJSON time')
     return {
@@ -172,7 +188,7 @@ module.exports = class WorkerProject extends Project {
       files: this.files,
       totals,
       totalCards: this.repo.getTasks().length,
-      tags: this.getTags(),
+      tags,
       allMeta: this.allMeta,
       allContexts: this.allContexts,
       allTags: this.allTags,
@@ -186,7 +202,7 @@ module.exports = class WorkerProject extends Project {
     }
   }
 
-  emit() {}
+  emit() {} // This is implemented in imdone UI worker
 
   emitUpdate() {
     this.emit('file.update')
@@ -263,8 +279,8 @@ module.exports = class WorkerProject extends Project {
   getLists(opts) {
     const {tasks = this.getDefaultFilteredCards(), populateFiltered = false} = opts || {}
     return Repository.getTasksByList(this.repo, tasks, true, populateFiltered)
-  } 
-  
+  }
+
   getTaskQueryProps(props) {
     const queryProps = []
     if (props) {
@@ -328,15 +344,15 @@ module.exports = class WorkerProject extends Project {
     return this.getCards(filter, allTasks)
   }
 
-  getCards(filter, tasks = this.getDefaultFilteredCards()) {
-    tasks = filter ? this.filterCards(tasks, filter) : tasks
-    return tasks
+  getCards(filter, cards = this.getDefaultFilteredCards()) {
+    cards = filter ? this.filterCards(cards, filter) : cards
+    return cards
   }
 
-  filterCards(tasks, filter) {
+  filterCards(cards, filter) {
     const {
       result,
-    } = Repository.filterCards(tasks, filter)
+    } = Repository.filterCards(cards, filter)
     return result
   }
 

package/lib/task.js

@@ -70,7 +70,7 @@ class Task {
     this.content = obj.content
     this.lastLine = this.getLastLine()
     this.orderModified = obj.orderModified
-    this.index = undefined
+    this.index = obj.index
     if (dontParse || !this.text) return
     this.parse()
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imdone-core",
-  "version": "1.53.16",
+  "version": "1.53.18",
   "description": "imdone-core",
   "main": "index.js",
   "scripts": {