From 0f2cc8a1f59823335552ffb129ddd8eb69b94d39 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 7 Sep 2017 11:25:53 +0100
Subject: [PATCH] Fix incorrect caching and reset behaviour of app wall filters
 - Ensure that when we reset dodgy cluster/org values we also reset org/space
 - Previously we were showing filter by 'all' for org/space but still applying
 filter containing valid org/space guid - Reset fixed by not entering dodgy
 state

---
 .../src/view/applications/list/list.module.js | 10 +++++++--
 .../applications/list/list.module.spec.js     | 22 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/components/cloud-foundry/frontend/src/view/applications/list/list.module.js b/components/cloud-foundry/frontend/src/view/applications/list/list.module.js
index 565b4e57dd..f0c14f02fa 100644
--- a/components/cloud-foundry/frontend/src/view/applications/list/list.module.js
+++ b/components/cloud-foundry/frontend/src/view/applications/list/list.module.js
@@ -276,6 +276,9 @@
             }
           });
       } else {
+        // Cluster is set to all, so should org
+        vm.model.filterParams.orgGuid = 'all';
+        vm.filter.orgGuid = 'all';
         return $q.resolve();
       }
     }
@@ -313,6 +316,9 @@
             }
           });
       } else {
+        // Cluster & org are set to all, so should space
+        vm.model.filterParams.spaceGuid = 'all';
+        vm.filter.spaceGuid = 'all';
         return $q.resolve();
       }
     }
@@ -407,8 +413,8 @@
     }
 
     /**
-     * @function getClusterOrganizations
-     * @description Get organizations for selected cluster
+     * @function setCluster
+     * @description
      * @returns {void}
      * @public
      */
diff --git a/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js b/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js
index 2185e5a9a5..efe18f2326 100644
--- a/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js
+++ b/components/cloud-foundry/frontend/test/unit/view/applications/list/list.module.spec.js
@@ -439,7 +439,7 @@
           appModel.filterParams.spaceGuid = 'junk3';
 
           setUp();
-          $httpBackend.flush();
+          $scope.$digest();
 
           check(allFilterValue, 3, allFilterValue, 1, allFilterValue, 1);
         });
@@ -465,6 +465,16 @@
           check(cnsiGuid, 3, allFilterValue, 3, allFilterValue, 1);
         });
 
+        it('avoids bad value - org only', function () {
+          var appModel = modelManager.retrieve('cloud-foundry.model.application');
+          appModel.filterParams.orgGuid = 'junk2';
+
+          setUp();
+          $scope.$digest();
+
+          check(allFilterValue, 3, allFilterValue, 1, allFilterValue, 1);
+        });
+
         it('avoids bad value - space', function () {
           var appModel = modelManager.retrieve('cloud-foundry.model.application');
           appModel.filterParams.cnsiGuid = cnsiGuid;
@@ -477,6 +487,16 @@
           check(cnsiGuid, 3, orgGuid, 3, allFilterValue, 3);
         });
 
+        it('avoids bad value - space only', function () {
+          var appModel = modelManager.retrieve('cloud-foundry.model.application');
+          appModel.filterParams.spaceGuid = 'junk3';
+
+          setUp();
+          $scope.$digest();
+
+          check(allFilterValue, 3, allFilterValue, 1, allFilterValue, 1);
+        });
+
       });
 
     });