fix(clusters): preserve filters when clicking active item

spinnaker · Apr 6, 2017 · 1fc14d8 · 1fc14d8
1 parent d045ee4
commit 1fc14d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/scripts/modules/core/cluster/filter/multiselect.model.js b/app/scripts/modules/core/cluster/filter/multiselect.model.js
@@ -130,6 +130,9 @@ module.exports = angular
           job: serverGroup.name,
         };
         if (isClusterChildState()) {
+          if ($state.includes('**.serverGroup', params)) {
+            return;
+          }
           $state.go('^.' + serverGroup.category, params);
         } else {
           $state.go('.' + serverGroup.category, params);

diff --git a/app/scripts/modules/core/instance/instances.directive.js b/app/scripts/modules/core/instance/instances.directive.js
@@ -68,7 +68,9 @@ module.exports = angular.module('spinnaker.core.instance.instances.directive', [
               };
               scope.activeInstance = params;
               // also stolen from uiSref directive
-              $state.go('.instanceDetails', params, {relative: base, inherit: true});
+              if (!$state.includes('**.instanceDetails', params)) {
+                $state.go('.instanceDetails', params, {relative: base, inherit: true});
+              }
               event.target.className += ' active';
               event.preventDefault();
             }