titus - clean up account and region changed subjects for load balance…

…r selector
spinnaker · Mar 16, 2018 · cab49f7 · cab49f7
1 parent f59bd2f
commit cab49f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/loadBalancers/loadBalancerSelector.component.ts b/loadBalancers/loadBalancerSelector.component.ts
@@ -45,8 +45,8 @@ class LoadBalancerSelectorController implements IController {
     });
     this.$q.all([credentialLoader, loadBalancerLoader]).then(() => this.configureLoadBalancerOptions());
     this.subscriptions = [
-      this.accountChanged.subscribe(() => this.configureLoadBalancerOptions()),
-      this.regionChanged.subscribe(() => this.configureLoadBalancerOptions())
+      this.command.viewState.accountChangedStream.subscribe(() => this.configureLoadBalancerOptions()),
+      this.command.viewState.regionChangedStream.subscribe(() => this.configureLoadBalancerOptions())
     ];
   }
 

diff --git a/serverGroup/configure/serverGroupConfiguration.service.js b/serverGroup/configure/serverGroupConfiguration.service.js
@@ -12,6 +12,9 @@ module.exports = angular.module('spinnaker.serverGroup.configure.titus.configura
 
 
     function configureCommand(command) {
+      command.viewState.accountChangedStream = new Subject();
+      command.viewState.regionChangedStream = new Subject();
+      command.viewState.groupsRemovedStream = new Subject();
       command.onStrategyChange = function (strategy) {
         // Any strategy other than None or Custom should force traffic to be enabled
         if (strategy.key !== '' && strategy.key !== 'custom') {
@@ -39,9 +42,6 @@ module.exports = angular.module('spinnaker.serverGroup.configure.titus.configura
     }
 
     function attachEventHandlers(command) {
-      command.viewState.accountChangedStream = new Subject();
-      command.viewState.regionChangedStream = new Subject();
-      command.viewState.groupsRemovedStream = new Subject();
       command.viewState.removedGroups = [];
       command.credentialsChanged = function credentialsChanged() {
         var result = { dirty: {} };

diff --git a/serverGroup/configure/wizard/loadBalancers.html b/serverGroup/configure/wizard/loadBalancers.html
@@ -1,3 +1 @@
-<titus-load-balancer-selector command="command"
-                              account-changed="command.viewState.accountChangedStream"
-                              region-changed="command.viewState.regionChangedStream"></titus-load-balancer-selector>
+<titus-load-balancer-selector command="command"></titus-load-balancer-selector>