Hook state for branches to new branch selector

Author: thejsj

client/directives/components/mirrorDockerfile/addDockerfileDirective.js

@@ -46,13 +46,21 @@ function addDockerfile(
         MDC.loadDefaultDockerfile($scope.fullRepo, $scope.branchName, path, $scope.fileType);
       }
 
-      fetchRepoDockerfile($scope.fullRepo, $scope.branchName, path)
-        .then(doesDockerfileExist)
-        .then(function (file) {
-          if (file) {
-            $scope.newDockerfile = $scope.fileName;
-          }
-        });
+
+      function populateNewDockerfile () {
+        return fetchRepoDockerfile($scope.fullRepo, $scope.branchName, path)
+          .then(doesDockerfileExist)
+          .then(function (file) {
+            if (file) {
+              $scope.newDockerfile = $scope.fileName;
+            } else {
+              // Account for files not found
+              $scope.newDockerfile = undefined;
+            }
+          });
+      }
+      $scope.$watch('branchName', populateNewDockerfile);
+      populateNewDockerfile();
 
       $scope.$on('dockerfileExistsValidator', function ($event, path, fileType, dockerfile) {
         if (fileType === 'Dockerfile') {
@@ -67,7 +75,7 @@ function addDockerfile(
           $scope.dockerfile = dockerfile;
           MDC.state.dockerfile = dockerfile;
           return;
-        } 
+        }
       });
 
       $scope.closeDockerFileInput = function () {

client/directives/components/newContainer/forms/configureNewServiceView.jade

@@ -55,7 +55,7 @@ section.grid-block.vertical.modal-body(
       name = "NCC.nameForm"
       ng-include = "'nameNewServiceView'"
     )
-    
+
     //- default branch selector
     label.grid-block.vertical.label(
       ng-if = "NCC.state.dockerFileTab === 'compose' && $root.featureFlags.composeDefaultBranch"
@@ -78,7 +78,7 @@ section.grid-block.vertical.modal-body(
 
     //- form for dockerfile setup
     .grid-block.vertical.label.views-dockerfile-setup(
-      branch-name = "NCC.state.repo.attrs.default_branch"
+      branch-name = "NCC.state.branch.attrs.name"
       mirror-dockerfile
       name = "'newContainer'"
       ng-if = "NCC.state.dockerFileTab !== 'kubernetes'"

client/directives/components/newContainer/forms/defaultBranchView.jade

@@ -3,6 +3,6 @@
   auto-update = "true"
   branch-selector
   loading-promises-target = "editServerModal"
-  state = "state"
+  state = "NCC.state"
 )
 small.padding-xxs.small Select the first branch you want to add.