Merge pull request #1421 from NicoPennec/fix/task-type

Improve data loading of Task Type page
cgwire · Apr 22, 2024 · e9471ff · e9471ff
2 parents 555616d + 3e075dd
commit e9471ff
Showing 1 changed file with 31 additions and 26 deletions.
diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue
@@ -719,11 +719,11 @@ export default {
       )
     },
 
-    scheduleTeam() {
+    team() {
       return sortPeople(
-        this.currentProduction.team.map(personId =>
-          this.personMap.get(personId)
-        )
+        this.currentProduction.team
+          .map(personId => this.personMap.get(personId))
+          .filter(person => !person.is_bot)
       )
     },
 
@@ -753,10 +753,9 @@ export default {
       'uploadTaskTypeEstimations'
     ]),
 
-    async initData(force) {
+    initData(force) {
       this.resetTasks()
       this.focusSearchField({ preventScroll: true })
-      await this.loadDaysOff()
       if (this.tasks.length < 2) {
         this.loading.entities = true
         this.errors.entities = false
@@ -807,19 +806,6 @@ export default {
       }
     },
 
-    async loadDaysOff() {
-      this.daysOffByPerson = []
-      for (const person of this.scheduleTeam) {
-        // load sequentially to avoid too many requests
-        const daysOff = await this.loadAggregatedPersonDaysOff({
-          personId: person.id
-        }).catch(
-          () => [] // fallback if not allowed to fetch days off
-        )
-        this.daysOffByPerson[person.id] = daysOff
-      }
-    },
-
     setCurrentScheduleItem() {
       const isShots = this.$route.path.includes('shots')
       if (this.isTVShow && isShots) {
@@ -1088,24 +1074,30 @@ export default {
 
     // Schedule
 
-    resetScheduleItems() {
+    async resetScheduleItems() {
       const taskAssignationMap = this.buildAssignationMap()
-      let scheduleItems = this.scheduleTeam
+
+      const assignees = Object.keys(taskAssignationMap).filter(
+        id => id !== 'unassigned' && taskAssignationMap[id].length > 0
+      )
+      await this.loadDaysOff(assignees)
+
+      const scheduleItems = this.team
         .map(person => this.buildPersonElement(person, taskAssignationMap))
-        .filter(item => item)
+        .filter(Boolean)
         .filter(item => item.children.length > 0)
 
-      if (taskAssignationMap.unassigned.length !== 0) {
-        scheduleItems = scheduleItems.concat([
+      if (taskAssignationMap.unassigned.length > 0) {
+        scheduleItems.push(
           this.buildPersonElement({ id: 'unassigned' }, taskAssignationMap)
-        ])
+        )
       }
       this.schedule.scheduleItems = scheduleItems
     },
 
     buildAssignationMap() {
       const taskAssignationMap = { unassigned: [] }
-      this.scheduleTeam.forEach(person => {
+      this.team.forEach(person => {
         if (person) taskAssignationMap[person.id] = []
       })
       this.tasks.forEach(task => {
@@ -1123,6 +1115,19 @@ export default {
       return taskAssignationMap
     },
 
+    async loadDaysOff(personIds) {
+      this.daysOffByPerson = []
+      for (const personId of personIds) {
+        // load sequentially to avoid too many requests
+        const daysOff = await this.loadAggregatedPersonDaysOff({
+          personId: personId
+        }).catch(
+          () => [] // fallback if not allowed to fetch days off
+        )
+        this.daysOffByPerson[personId] = daysOff
+      }
+    },
+
     buildPersonElement(person, taskAssignationMap) {
       if (!person) return null