Merge branch 'master' into SAN-6186

* master: (33 commits)
  5.20.1
  SAN-6094 Code review comment
  5.20.0
  use shortnames
  add ;
  Fixed left-nav issues with compose parents already existing and clobbering each other.
  SAN-6097 Code review change
  5.19.18
  SAN-6097 Code review change
  Typo fix
  5.19.17
  Updated navigation logic for branch syncing.
  add events for all settings tabs
  add events for all settings buttons
  fix button width in safari
  fix PR bot button alignment
  add event for private registry "back" button
  add events for accounts popover buttons
  add events for settings modal tabs
  update adding private registry event
  ...

Author: damienrunnable

client/assets/styles/scss/modals/modals-empty.scss

@@ -64,7 +64,6 @@
 
   // submit buttons (like for api token)
   .green {
-    display: table;
     margin-left: auto;
     margin-right: auto;
   }

client/directives/accountsSelect/popoverAccountMenu/viewPopoverAccountMenu.jade

@@ -23,8 +23,9 @@
           )
             li.list-item.popover-list-item.small.disabled {{data.currentOrg.github.oauthName()}} Settings
             li.list-item.popover-list-item(
-              ng-if = "data.currentOrg.isBillingVisible()"
+              data-event-name = "Clicked to Open Billing Settings"
               ng-click = "actions.openSettingsModal('billing')"
+              ng-if = "data.currentOrg.isBillingVisible()"
             )
               svg.iconnables
                 use(
@@ -37,6 +38,7 @@
               )
                 | {{data.currentOrg.poppa.trialDaysRemaining() + ' days left'}}
             li.list-item.popover-list-item(
+              data-event-name = "Clicked to Open PR Bot Settings"
               ng-click = "actions.openSettingsModal('githubIntegration')"
             )
               svg.iconnables
@@ -45,6 +47,7 @@
                 )
               | PR Bot
             li.list-item.popover-list-item(
+              data-event-name = "Clicked to Open Private Registry Settings"
               ng-click = "actions.openSettingsModal('privateRegistry')"
               ng-if = "$root.featureFlags.privateRegistry"
             )
@@ -54,6 +57,7 @@
                 )
               | Private Registry
             li.list-item.popover-list-item(
+              data-event-name = "Clicked to Open Slack Integration Settings"
               ng-click = "actions.openSettingsModal('slackIntegration')"
             )
               img.iconnables(
@@ -63,6 +67,7 @@
               )
               | Slack Integration
             li.list-item.popover-list-item(
+              data-event-name = "Clicked to Open SSH Keys Settings"
               ng-click = "actions.openSettingsModal('SSHKeys')"
               ng-if = "$root.featureFlags.composeSSHKeys"
             )
@@ -72,6 +77,7 @@
                 )
               | SSH Keys
             li.list-item.popover-list-item(
+              data-event-name = "Clicked to Open Teammates Settings"
               ng-click = "actions.openSettingsModal('teamManagement')"
             )
               svg.iconnables

client/directives/components/lists/branchTestList/branchTestListController.js

@@ -24,7 +24,7 @@ function BranchTestListController(
 
   fetchInstanceTestHistory(BTLC.instance.attrs.id)
     .then(function(tests) {
-      return calculateHistoricalTestResult(tests);
+      return calculateHistoricalTestResult.addResults(tests);
     })
     .then(function(tests) {
       var testHash = {};

client/directives/components/lists/branchTestSelector/branchTestSelectorController.js

@@ -10,7 +10,8 @@ function BranchTestSelectorController(
   keypather,
   loading,
   fetchCommitData,
-  updateInstanceWithNewAcvData
+  updateInstanceWithNewAcvData,
+  calculateHistoricalTestResult
 ) {
   var BTSC = this;
   BTSC.appCodeVersion = BTSC.instance.contextVersion.getMainAppCodeVersion();
@@ -37,7 +38,11 @@ function BranchTestSelectorController(
 
   BTSC.selectCommit = function (commit) {
     BTSC.commit = commit;
-    BTSC.updateInstance();
+
+    if (!calculateHistoricalTestResult.isValidState(BTSC.commit.test)) {
+      BTSC.updateInstance();
+    }
+
     $scope.$emit('test-commit::selected', commit);
     $rootScope.$broadcast('close-popovers');
   };
@@ -58,6 +63,7 @@ function BranchTestSelectorController(
   };
 
   BTSC.hasTest = function(commit) {
-    return commit.test === 'passed' || commit.test === 'failed';
+    return calculateHistoricalTestResult.isPassed(commit.test) ||
+      calculateHistoricalTestResult.isFailed(commit.test);
   };
 }

client/directives/components/mirrorDockerfile/addDockerfileDirective.js

@@ -4,8 +4,6 @@ require('app')
   .directive('addDockerfile', addDockerfile);
 
 function addDockerfile(
-  $q,
-  $timeout,
   fetchRepoDockerfile,
   doesDockerfileExist
 ) {
@@ -20,6 +18,8 @@ function addDockerfile(
       fileType: '@'
     },
     link: function ($scope, elem, attrs, MDC) {
+      $scope.MDC = MDC;
+
       var COMPOSE_DEFAULT = 'docker-compose.yml';
       var COMPOSE_TEST_DEFAULT = 'docker-compose.test.yml';
       var DOCKER_DEFAULT = 'Dockerfile';

client/directives/components/mirrorDockerfile/addDockerfileView.jade

@@ -15,7 +15,7 @@ form(
         dockerfile-exists-validator = "{{fileType}}"
         full-repo = "fullRepo"
         id = "add-dockerfile-input"
-        ng-disabled = "state.dockerFileAdded || $root.featureFlags.composeEditing"
+        ng-disabled = "state.dockerFileAdded || $root.featureFlags.composeEditing || MDC.isSaving()"
         ng-model = "newDockerfile"
         ng-model-options = "{ debounce: { 'default': 100, 'blur': 0 } }"
         placeholder = "{{ fileName }}"

client/directives/components/mirrorDockerfile/composeFilePath.js

@@ -21,6 +21,8 @@ function composeFilePath(
       fullRepo: '='
     },
     link: function ($scope, elem, attr, MDC) {
+      $scope.MDC = MDC;
+
       MDC.state.configurationMethod = 'dockerComposeFile';
       $scope.dockerComposeState = MDC.state;
       $scope.dockerfile = {};

client/directives/components/mirrorDockerfile/mirrorDockerfileController.js

@@ -6,7 +6,6 @@ require('app')
 function MirrorDockerfileController(
   $q,
   $rootScope,
-  $timeout,
   errs,
   doesDockerfileExist,
   fetchRepoDockerfile,
@@ -74,5 +73,9 @@ function MirrorDockerfileController(
         }
       });
   };
+
+  MDC.isSaving = function () {
+    return $rootScope.isLoading.newContainerSingleRepo || $rootScope.isLoading.creatingDockerCompose;
+  };
 }
 

client/directives/components/newContainer/forms/compose/composeFilePathView.jade

@@ -6,6 +6,7 @@
         ng-disabled = "$root.featureFlags.composeEditing"
         ng-model = "pathEnabled"
         type = "checkbox"
+        ng-disabled = "MDC.isSaving()"
       )
       .toggle-group.toggle-sm
 
@@ -41,7 +42,7 @@
       - Copy: "Select a Container"
     fancy-select.btn-md.white(
       disabled
-      ng-disabled = "loadingFile || !dockerComposeTestServices.length"
+      ng-disabled = "loadingFile || !dockerComposeTestServices.length || MDC.isSaving()"
       ng-required = "true"
       spinner-flag = "loadingFile"
       value = "dockerComposeState.testReporter"

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

@@ -101,7 +101,7 @@ footer.modal-footer.clearfix
     )
     span(
       ng-if = "$root.featureFlags.composeNewService && NCC.state.repo"
-    ) {{$root.featureFlags.composeEditing ? 'Save Changes' : 'NCC.getNextStepText()'}}
+    ) {{$root.featureFlags.composeEditing ? 'Save Changes' : NCC.getNextStepText()}}
     span(
       ng-if = "NCC.state.templateSource"
     ) Add Service