Merge branch 'master' of https://github.com/CodeNow/runnable-angular into add-events-to-new-auth

Author: runnabro

client/controllers/controllerInstances.js

@@ -18,6 +18,7 @@ function ControllerInstances(
   demoRepos,
   errs,
   eventTracking,
+  fetchGitHubRepoBranches,
   fetchInstances,
   fetchInstancesByPod,
   fetchRepoBranches,
@@ -268,7 +269,7 @@ function ControllerInstances(
     var branchName;
     var searchQuery = CIS.branchQuery.toLowerCase();
     return CIS.instanceBranches.filter(function (branch) {
-      branchName = branch.attrs.name.toLowerCase();
+      branchName = branch.name.toLowerCase();
       return branchName.includes(searchQuery);
     });
   };
@@ -300,8 +301,8 @@ function ControllerInstances(
     }, {});
     var instanceBranchName = instance.getBranchName();
     childInstances[instanceBranchName] = instanceBranchName;
-    var unbuiltBranches = branches.models.filter(function (branch) {
-      branchName = keypather.get(branch, 'attrs.name');
+    var unbuiltBranches = branches.filter(function (branch) {
+      branchName = keypather.get(branch, 'name');
       return !childInstances[branchName];
     });
     return unbuiltBranches;
@@ -311,9 +312,13 @@ function ControllerInstances(
     CIS.instanceBranches = null;
     CIS.poppedInstance = instance;
     loading('fetchingBranches', true);
-    return CIS.getAllBranches(instance)
+    var acv = instance.contextVersion.getMainAppCodeVersion();
+    var fullReponame = acv.attrs.repo.split('/');
+    var orgName = fullReponame[0];
+    var repoName = fullReponame[1];
+    return fetchGitHubRepoBranches(orgName, repoName)
       .then(function (branches) {
-        CIS.totalInstanceBranches = branches.models.length;
+        CIS.totalInstanceBranches = branches.length;
         CIS.instanceBranches = CIS.getUnbuiltBranches(instance, branches);
         loading('fetchingBranches', false);
       });
@@ -327,8 +332,8 @@ function ControllerInstances(
   };
 
   this.forkBranchFromInstance = function (branch, closePopover) {
-    var sha = branch.attrs.commit.sha;
-    var branchName = branch.attrs.name;
+    var sha = branch.commit.sha;
+    var branchName = branch.name;
     loading(branchName, true);
     loading('buildingForkedBranch', true);
     promisify(CIS.poppedInstance, 'fork')(branchName, sha)

client/directives/components/buildLogs/buildLogsDirective.js

@@ -4,6 +4,7 @@ require('app').directive('buildLogs', buildLogs);
 function buildLogs(
   $timeout,
   debounce,
+  featureFlags,
   moment,
   $interval,
   keypather
@@ -187,7 +188,8 @@ function buildLogs(
           $scope.timerExpired &&
           $scope.BLC.buildLogs.length === 0 &&
           !$scope.BLC.buildLogsRunning &&
-          $scope.BLC.buildStatus === 'failed'
+          $scope.BLC.buildStatus === 'failed' &&
+          featureFlags.flags.internalDebugging !== true
         );
       };
 

client/directives/components/newContainer/newContainerController.js

@@ -84,7 +84,6 @@ function NewContainerController(
     // Fetch all non-repo containres
     return fetchInstances({ githubUsername: 'HelloRunnable' })
       .then(function (servers) {
-        console.log('Fetched template servers', servers);
         NCC.templateServers = servers;
         loading('newContainerTemplates', false);
         return servers;

client/directives/instances/instance/branchMenuPopover/branchMenuPopoverView.jade

@@ -132,8 +132,8 @@
           )
             li.grid-block.align-center.list-item.popover-list-item(
               ng-class = "{\
-                'disabled': $root.isLoading['buildingForkedBranch'] && !$root.isLoading[branch.attrs.name],\
-                'active': $root.isLoading['buildingForkedBranch'] && $root.isLoading[branch.attrs.name]\
+                'disabled': $root.isLoading['buildingForkedBranch'] && !$root.isLoading[branch.name],\
+                'active': $root.isLoading['buildingForkedBranch'] && $root.isLoading[branch.name]\
               }"
               ng-repeat = "branch in CIS.getFilteredBranches()"
               ng-click = "CIS.forkBranchFromInstance(branch, POC.closePopover);"
@@ -143,13 +143,13 @@
                   xlink:href = "#icons-branch-alt"
                 )
               .grid-content.text-overflow(
-                title = "{{ branch.attrs.name }}"
-              ) {{ branch.attrs.name }}
+                title = "{{ branch.name }}"
+              ) {{ branch.name }}
               button.grid-content.shrink.btn.btn-xs.btn-icon.btn-add(
-                ng-if = "!$root.isLoading[branch.attrs.name]"
+                ng-if = "!$root.isLoading[branch.name]"
               ) Add
               .grid-content.shrink.spinner-wrapper.spinner-sm.spinner-green(
-                ng-if = "$root.isLoading[branch.attrs.name]"
+                ng-if = "$root.isLoading[branch.name]"
                 ng-include = "'spinner'"
               )
 

client/directives/instances/instanceList/DemoAddBranchController.js

@@ -21,15 +21,16 @@ function DemoAddBranchController(
 ) {
   var DBC = this;
 
-  function getBranchForPR () {
-    return promisify(currentOrg.github, 'fetchRepo')(DBC.instance.getRepoName())
+  function getBranchForPR (instance) {
+    var githubId = keypather.get(instance, 'attrs.contextVersion.owner.github') || currentOrg.github;
+    return promisify(githubId, 'fetchRepo')(instance.getRepoName())
       .then(function (repo) {
         return promisify(repo, 'fetchBranch')('dark-theme');
       })
       .then(function (branch) {
         var sha = branch.attrs.commit.sha;
         var branchName = branch.attrs.name;
-        return promisify(DBC.instance, 'fork')(branchName, sha);
+        return promisify(instance, 'fork')(branchName, sha);
       });
   }
 

client/services/demoFlowService.js

@@ -12,6 +12,7 @@ function demoFlowService(
   defaultContainerUrl,
   errs,
   featureFlags,
+  fetchGitHubRepoBranch,
   github,
   keypather,
   patchOrgMetadata,
@@ -133,14 +134,15 @@ function demoFlowService(
   }
 
   function forkNewInstance (instance) {
+    var acv = instance.contextVersion.getMainAppCodeVersion();
+    var fullReponame = acv.attrs.repo.split('/');
+    var orgName = fullReponame[0];
+    var repoName = fullReponame[1];
     addBranchListener();
-    return promisify(currentOrg.github, 'fetchRepo')(instance.getRepoName())
-      .then(function (repo) {
-        return promisify(repo, 'fetchBranch')('dark-theme');
-      })
+    return fetchGitHubRepoBranch(orgName, repoName, 'dark-theme')
       .then(function (branch) {
-        var sha = branch.attrs.commit.sha;
-        var branchName = branch.attrs.name;
+        var sha = branch.commit.sha;
+        var branchName = branch.name;
         return promisify(instance, 'fork')(branchName, sha);
       });
   }