Fixing instance create -> updating instance list

Author: Nathan219

client/controllers/abstractLayouts/controllerInstanceLayout.js

@@ -33,9 +33,10 @@ function ControllerInstanceLayout(
             githubUsername: account
           })
           .cacheFetch(function (instances, cached, cb) {
-            if (account === keypather.get($rootScope, 'dataApp.data.activeAccount.oauthName()') &&
-                $rootScope.dataApp.data.instances !== instances) {
-              $rootScope.dataApp.data.instances = instances;
+            if (account === keypather.get($rootScope, 'dataApp.data.activeAccount.oauthName()')) {
+              if ($rootScope.dataApp.data.instances !== instances) {
+                $rootScope.dataApp.data.instances = instances;
+              }
               $scope.dataInstanceLayout.state.loadingInstances = false;
               $rootScope.safeApply(cb);
             } else {
@@ -51,18 +52,23 @@ function ControllerInstanceLayout(
       if (err) { throw err; }
     });
   }
-
   var dataInstanceLayout = $scope.dataInstanceLayout = {
     data: {},
     state: {},
     actions: {}
   };
   dataInstanceLayout.data.logoutURL = configLogoutURL();
 
-  $rootScope.$watch('dataApp.data.activeAccount.oauthName()', function (n) {
-    if (n) {
-      fetchInstances(n);
-    }
+  var instanceListUnwatcher = $scope.$on('INSTANCE_LIST_FETCH', function(event, org) {
+    fetchInstances(org.oauthName());
+  });
+
+  $scope.$on('$destroy', function () {
+    instanceListUnwatcher();
   });
 
+  if (keypather.get($rootScope, 'dataApp.data.activeAccount.oauthName()')) {
+    fetchInstances(keypather.get($rootScope, 'dataApp.data.activeAccount.oauthName()'));
+  }
+
 }

client/controllers/controllerApp.js

@@ -57,6 +57,7 @@ function ControllerApp(
         if (!dataApp.data.activeAccount) {
           dataApp.data.activeAccount = thisUser;
         }
+        $scope.$broadcast('INSTANCE_LIST_FETCH', dataApp.data.activeAccount);
         $rootScope.safeApply();
       }
     });

client/controllers/instance/controllerInstance.js

@@ -5,7 +5,7 @@ require('app')
  */
 function ControllerInstance(
   async,
-  determineActiveAccount,
+  $filter,
   errs,
   keypather,
   OpenItems,
@@ -43,8 +43,9 @@ function ControllerInstance(
       if (n !== p && n) {
         unwatch();
         if (n.models.length) {
+          var models = $filter('orderBy')(n.models, 'attrs.name');
           $state.go('instance.instance', {
-            instanceName: n.models[0].attrs.name,
+            instanceName: models[0].attrs.name,
             userName: $stateParams.userName
           }, {location: 'replace'});
         } else {

client/controllers/setup/controllerNew.js

@@ -6,13 +6,12 @@ require('app')
 function ControllerNew(
   async,
   hasKeypaths,
-  QueryAssist,
   errs,
   fetchUser,
   $scope,
   $state,
   uuid,
-  user
+  $stateParams
 ) {
 
   var thisUser;

client/directives/accountsSelect/directiveAccountsSelect.js

@@ -33,6 +33,7 @@ function accountsSelect (
         var username = userOrOrg.oauthName();
         //
         $scope.data.activeAccount = userOrOrg;
+        $scope.$emit('INSTANCE_LIST_FETCH', userOrOrg);
         $state.go('^.instance', {
           userName: username,
           instanceName: ''

client/directives/setupPrimaryActions/directiveSetupPrimaryActions.js

@@ -6,7 +6,8 @@ require('app')
 function setupPrimaryActions(
   async,
   $state,
-  $stateParams
+  $stateParams,
+  $rootScope
 ) {
   return {
     restrict: 'E',
@@ -50,7 +51,7 @@ function setupPrimaryActions(
           };
           $scope.instanceOpts.build = $scope.data.build.id();
           $scope.instanceOpts.name = $scope.name;
-          $scope.instance = $scope.data.user.createInstance($scope.instanceOpts, cb);
+          $scope.instance = $rootScope.dataApp.data.instances.create($scope.instanceOpts, cb);
         }
         async.series([
           build,

client/templates/setup/viewSetup.jade

@@ -7,7 +7,7 @@ header.box-header
   )
 
   setup-primary-actions(
-    active-account = "activeAccount"
+    active-account = "dataApp.data.activeAccount"
     instance-opts = "dataSetup.data.instanceOpts"
     loading = "dataApp.data.loading"
     name = "dataSetup.data.newInstanceName"