Merge pull request #1434 from frankrousseau/master

[people] Do not separate pending tasks in the person page
cgwire · May 13, 2024 · 30a8b12 · 30a8b12
2 parents 643ced9 + cde79e9
commit 30a8b12
Showing 1 changed file with 1 addition and 30 deletions.
diff --git a/src/components/pages/Person.vue b/src/components/pages/Person.vue
@@ -71,23 +71,11 @@
             :is-loading="isTasksLoading"
             :is-error="isTasksLoadingError"
             :selection-grid="personTaskSelectionGrid"
-            :tasks="notPendingTasks"
+            :tasks="sortedTasks"
             @scroll="setPersonTasksScrollPosition"
             v-if="isActiveTab('todos')"
           />
 
-          <div v-if="isActiveTab('pending')">&nbsp;</div>
-          <todos-list
-            ref="pending-list"
-            :empty-text="$t('people.no_task_assigned')"
-            :is-loading="isTasksLoading"
-            :is-error="isTasksLoadingError"
-            :selection-grid="personTaskSelectionGrid"
-            :tasks="pendingTasks"
-            @scroll="setPersonTasksScrollPosition"
-            v-if="isActiveTab('pending')"
-          />
-
           <todos-list
             ref="done-list"
             :tasks="displayedPersonDoneTasks"
@@ -389,18 +377,6 @@ export default {
       }
     },
 
-    pendingTasks() {
-      return this.sortedTasks.filter(
-        task => task.taskStatus.is_feedback_request
-      )
-    },
-
-    notPendingTasks() {
-      return this.sortedTasks.filter(
-        task => !task.taskStatus.is_feedback_request
-      )
-    },
-
     tasksStartDate() {
       if (this.scheduleTasks.length) {
         return getFirstStartDate(this.scheduleTasks)
@@ -533,10 +509,6 @@ export default {
           label: this.$t('schedule.title'),
           name: 'schedule'
         },
-        {
-          label: `${this.$t('tasks.pending')} (${this.pendingTasks.length})`,
-          name: 'pending'
-        },
         {
           label: `${this.$t('tasks.validated')} (${
             this.displayedPersonDoneTasks.length
@@ -733,7 +705,6 @@ export default {
         'board',
         'calendar',
         'done',
-        'pending',
         'schedule',
         'timesheets'
       ]