From 0d760c7c9fa71d1b1f16c4f558500e7a1bc0a5d5 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Wed, 4 Nov 2020 19:03:01 +0100
Subject: [PATCH] #1612 Fix the default filter used in my tasks page

---
 .../app/scripts/controllers/MainPageCtrl.js   | 22 ++++++++++++-------
 frontend/app/scripts/controllers/RootCtrl.js  | 13 ++++++++++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/frontend/app/scripts/controllers/MainPageCtrl.js b/frontend/app/scripts/controllers/MainPageCtrl.js
index 9d293eafde..116f9e1579 100644
--- a/frontend/app/scripts/controllers/MainPageCtrl.js
+++ b/frontend/app/scripts/controllers/MainPageCtrl.js
@@ -9,17 +9,23 @@
                 self.view = {};
 
                 self.defaultFilter = {
-                    '_ne': {
-                        '_field': 'status',
-                        '_value': 'Completed'
-                    }
+                    _or: [
+                        {
+                            _field: 'status',
+                            _value: 'Waiting'
+                        },
+                        {
+                            _field: 'status',
+                            _value: 'InProgress'
+                        }
+                    ]
                 };
 
                 self.queryOperations = view === 'mytasks' ? [
-                    {"_name": "currentUser"},
-                    {"_name": "tasks"}
+                    {_name: 'currentUser'},
+                    {_name: 'tasks'}
                 ] : [
-                    {"_name": "waitingTask"}
+                    {_name: 'waitingTask'}
                 ];
 
                 if ($stateParams.viewId === 'mytasks') {
@@ -61,7 +67,7 @@
                     loadAll: false,
                     pageSize: self.filtering.context.pageSize,
                     filter: self.filtering.buildQuery(),
-                    baseFilter: self.defaultFilter,
+                    baseFilter: view === 'mytasks' ? self.defaultFilter : [],
                     operations: self.queryOperations,
                     extraData: ['case'],
                     name: $stateParams.viewId
diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
index 93057a7b06..26e6982dc3 100644
--- a/frontend/app/scripts/controllers/RootCtrl.js
+++ b/frontend/app/scripts/controllers/RootCtrl.js
@@ -57,7 +57,18 @@ angular.module('theHiveControllers').controller('RootCtrl',
         StreamQuerySrv('v1', [
             {_name: 'currentUser'},
             {_name: 'tasks'},
-            {_name: 'filter', _ne: {_field: 'status', _value: 'Completed'}},
+            {_name: 'filter',
+                _or: [
+                    {
+                        _field: 'status',
+                        _value: 'Waiting'
+                    },
+                    {
+                        _field: 'status',
+                        _value: 'InProgress'
+                    }
+                ]
+            },
             {_name: 'count'}
         ], {
             scope: $scope,