Merge remote-tracking branch 'origin/master' into hotfix-nav-branch-sync

Nathan219 · Nathan219 · commit 26a2108104ae · 2017-04-28T14:21:58.000-07:00
diff --git a/client/assets/styles/scss/modals/modals-empty.scss b/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;
   }
diff --git a/client/directives/accountsSelect/popoverAccountMenu/viewPopoverAccountMenu.jade b/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
diff --git a/client/directives/components/mirrorDockerfile/addDockerfileDirective.js b/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';
diff --git a/client/directives/components/mirrorDockerfile/addDockerfileView.jade b/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 }}"
diff --git a/client/directives/components/mirrorDockerfile/composeFilePath.js b/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 = {};
diff --git a/client/directives/components/mirrorDockerfile/mirrorDockerfileController.js b/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;
+  };
 }
 
diff --git a/client/directives/components/newContainer/forms/compose/composeFilePathView.jade b/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"
diff --git a/client/directives/components/newContainer/forms/configureNewServiceView.jade b/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
diff --git a/client/directives/components/newContainer/forms/nameNewServiceView.jade b/client/directives/components/newContainer/forms/nameNewServiceView.jade
@@ -13,6 +13,7 @@ label
       required
       spellcheck = "false"
       unique-validator = "NCC.state.namesForAllInstances"
+      ng-disabled = "NCC.isSaving()"
     )
     svg.iconnables.icons-check(
       ng-if = "NCC.nameForm.$valid"
diff --git a/client/directives/components/newContainer/forms/setupMethodView.jade b/client/directives/components/newContainer/forms/setupMethodView.jade
@@ -17,7 +17,7 @@ label.grid-block.align-center.btn.btn-radio(
 label.grid-block.align-center.btn.btn-radio(
   data-event-name = "Selected Compose Setup"
   ng-class = "{'active': NCC.state.dockerFileTab === 'compose'}"
-  ng-click = "NCC.state.dockerFileTab = 'compose'; NCC.state.configurationMethod = 'dockerComposeFile'"
+  ng-click = "NCC.setToComposeTab()"
 )
   svg.grid-block.shrink.btn.btn-xs.btn-icon.btn-add.iconnables.icons-check
     use(
@@ -30,7 +30,7 @@ label.grid-block.align-center.btn.btn-radio(
 label.grid-block.align-center.btn.btn-radio(
   data-event-name = "Selected Dockerfile Setup"
   ng-class = "{'active': NCC.state.dockerFileTab === 'dockerfile'}"
-  ng-click = "NCC.state.dockerFileTab = 'dockerfile'; NCC.state.configurationMethod = 'dockerfile'"
+  ng-click = "NCC.setToDockerTab()"
   ng-if = "!$root.featureFlags.kubernetes"
 )
   svg.grid-block.shrink.btn.btn-xs.btn-icon.btn-add.iconnables.icons-check
diff --git a/client/directives/components/newContainer/newContainerController.js b/client/directives/components/newContainer/newContainerController.js
@@ -396,6 +396,24 @@ function NewContainerController(
             (NCC.state.types.stage ? NCC.state.dockerComposeFile : NCC.state.types.test))));
   };
 
+  NCC.isSaving = function () {
+    return $rootScope.isLoading.newContainerSingleRepo || $rootScope.isLoading.creatingDockerCompose;
+  };
+
+  NCC.setToComposeTab = function () {
+    if (!NCC.isSaving()) {
+      NCC.state.dockerFileTab = 'compose';
+      NCC.state.configurationMethod = 'dockerComposeFile';
+    }
+  };
+
+  NCC.setToDockerTab = function () {
+    if (!NCC.isSaving()) {
+      NCC.state.dockerFileTab = 'dockerfile';
+      NCC.state.configurationMethod = 'dockerfile';
+    }
+  };
+
   NCC.populateComposeErrorMessage = function (errorMsg) {
     var err = /ValidationError(.*)/.exec(errorMsg);
     if (err) {
diff --git a/client/directives/modals/settingsModal/forms/SSHKeysForm/SSHKeysFormView.jade b/client/directives/modals/settingsModal/forms/SSHKeysForm/SSHKeysFormView.jade
@@ -46,11 +46,13 @@ ol.list-bordered(
       span.weight-strong runnabro
       | &#32;so your project can access private dependencies.
     a.grid-block.shrink.noscroll.align-center.btn.gray.btn-xs(
+      data-event-name = "Clicked to Authorize SSH with GitHub"
       ng-click = "state.listening = !state.listening"
       ng-if = "!state.everAuthorized"
       ng-include = "'SSHAuthorizeButton'"
     )
     a.grid-block.shrink.noscroll.align-center.btn.gray.btn-xs.btn-create-key(
+      data-event-name = "Clicked to Create SSH Key"
       ng-click = "state.creatingKey = !state.creatingKey"
       ng-disabled = "state.creatingKey"
       ng-if = "state.everAuthorized && !state.authorized"
diff --git a/client/directives/modals/settingsModal/forms/billingForm/planStatus/planStatusFormController.js b/client/directives/modals/settingsModal/forms/billingForm/planStatus/planStatusFormController.js
@@ -29,7 +29,10 @@ function PlanStatusFormController(
       var plan = results[0];
       var instances = results[1];
       PSFC.plan = plan.next;
-      PSFC.configurations = instances.models.length;
+      PSFC.configurations = instances.models.filter(
+        function(instance) {
+          return !keypather.get(instance, 'attrs.isTesting');
+        }).length;
       PSFC.discount = plan.discount;
     })
     .finally(function () {
diff --git a/client/directives/modals/settingsModal/forms/privateRegistryForm/privateRegistryFormView.jade b/client/directives/modals/settingsModal/forms/privateRegistryForm/privateRegistryFormView.jade
@@ -57,9 +57,11 @@ form.grid-block.vertical.well.gray.ignore-margin(
     }"
   )
     button.btn.btn-md.gray.btn-cancel(
+      data-event-name = "Clicked 'Back' in Private Registry Settings"
       ng-if = "state.authorized"
     ) Back
     button.grid-block.shrink.align-center.btn.btn-md.green(
+      data-event-name = "Clicked to Add Private Registry"
       ng-click = "state.saving = true"
       ng-disabled = "state.saving || privateRegistryForm.$invalid"
       ng-init = "state.saving = null"
@@ -83,4 +85,6 @@ section.padding-sm.grid-block.align-center.well.white.ignore-margin(
   .grid-block.vertical
     p.small.weight-strong.text-overflow Authorized {{registryCredentials[0].username}}
     small.small.text-gray.text-overflow {{registryCredentials[0].url}}
-  button.btn.btn-xs.gray.margin-left-xxs Change
+  button.btn.btn-xs.gray.margin-left-xxs(
+    data-event-name = "Clicked to Change Private Registry"
+  ) Change
diff --git a/client/directives/modals/settingsModal/forms/slackIntegrationForm/slackIntegrationFormView.jade b/client/directives/modals/settingsModal/forms/slackIntegrationForm/slackIntegrationFormView.jade
@@ -6,7 +6,7 @@
   )
 
 //- integrations form empty state
-.modal-form.empty(
+.modal-form.empty.grid-block.vertical.align-center(
   ng-form = "SIFC.slackApiTokenForm"
   ng-if = "SIFC.state === 'not-verified' || SIFC.state === 'verifying'"
 )
diff --git a/client/directives/modals/settingsModal/settingsModalView.jade b/client/directives/modals/settingsModal/settingsModalView.jade
@@ -18,21 +18,23 @@
 
       .row.modal-tabs.tabs-all.grid-block.clearfix
         button.btn.btn-radio.grid-block.vertical(
+          data-event-name = "Clicked Billing Tab"
           ng-attr-data-badge-count = "{{SEMC.currentOrg.poppa.isInTrial() && !SEMC.currentOrg.poppa.attrs.hasPaymentMethod ? SEMC.currentOrg.poppa.trialDaysRemaining() : ''}}"
-          ng-if = "SEMC.currentOrg.isBillingVisible()"
           ng-class = "{\
             'active': SEMC.currentTab === 'billing',\
             'badge': SEMC.currentOrg.poppa.isInTrial() && !SEMC.currentOrg.poppa.attrs.hasPaymentMethod,\
             'badge-orange': SEMC.currentOrg.poppa.isInTrial() && !SEMC.currentOrg.poppa.attrs.hasPaymentMethod,\
           }"
           ng-click = "SEMC.currentTab = 'billing'"
+          ng-if = "SEMC.currentOrg.isBillingVisible()"
         )
           svg.iconnables.grid-content
             use(
               xlink:href = "#icons-billing"
             )
           .btn-text.grid-content Billing
         button.btn.btn-radio.grid-block.vertical(
+          data-event-name = "Clicked PR Bot Tab"
           ng-class = "{'active': SEMC.currentTab === 'githubIntegration'}"
           ng-click = "SEMC.currentTab = 'githubIntegration'"
         )
@@ -42,6 +44,7 @@
             )
           .btn-text.grid-content PR Bot
         button.btn.btn-radio.grid-block.vertical(
+          data-event-name = "Clicked Private Registry Tab"
           ng-class = "{'active': SEMC.currentTab === 'privateRegistry'}"
           ng-click = "SEMC.currentTab = 'privateRegistry'"
           ng-if = "$root.featureFlags.privateRegistry"
@@ -52,6 +55,7 @@
             )
           .btn-text.grid-content Private Registry
         button.btn.btn-radio.grid-block.vertical(
+          data-event-name = "Clicked Slack Integration Tab"
           ng-class = "{'active': SEMC.currentTab === 'slackIntegration'}"
           ng-click = "SEMC.currentTab = 'slackIntegration'"
         )
@@ -62,6 +66,7 @@
           )
           .btn-text.grid-content Slack Integration
         button.btn.btn-radio.grid-block.vertical(
+          data-event-name = "Clicked SSH Keys Tab"
           ng-class = "{'active': SEMC.currentTab === 'SSHKeys'}"
           ng-click = "SEMC.currentTab = 'SSHKeys'"
           ng-if = "$root.featureFlags.composeSSHKeys"
@@ -72,6 +77,7 @@
             )
           .btn-text.grid-content SSH Keys
         button.btn.btn-radio.grid-block.vertical(
+          data-event-name = "Clicked Teammates Tab"
           ng-class = "{'active': SEMC.currentTab === 'teamManagement'}"
           ng-click = "SEMC.currentTab = 'teamManagement'"
         )
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "runnable-angular",
-  "version": "5.19.16",
+  "version": "5.19.18",
   "private": true,
   "description": "Frontend for Runnable.io",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@`
`64`	`64`
`65`	`65`	`// submit buttons (like for api token)`
`66`	`66`	`.green {`
`67`		`- display: table;`
`68`	`67`	`margin-left: auto;`
`69`	`68`	`margin-right: auto;`
`70`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,9 @@`
`23`	`23`	`)`
`24`	`24`	`li.list-item.popover-list-item.small.disabled {{data.currentOrg.github.oauthName()}} Settings`
`25`	`25`	`li.list-item.popover-list-item(`
`26`		`- ng-if = "data.currentOrg.isBillingVisible()"`
	`26`	`+ data-event-name = "Clicked to Open Billing Settings"`
`27`	`27`	`ng-click = "actions.openSettingsModal('billing')"`
	`28`	`+ ng-if = "data.currentOrg.isBillingVisible()"`
`28`	`29`	`)`
`29`	`30`	`svg.iconnables`
`30`	`31`	`use(`
`@@ -37,6 +38,7 @@`
`37`	`38`	`)`
`38`	`39`	`\| {{data.currentOrg.poppa.trialDaysRemaining() + ' days left'}}`
`39`	`40`	`li.list-item.popover-list-item(`
	`41`	`+ data-event-name = "Clicked to Open PR Bot Settings"`
`40`	`42`	`ng-click = "actions.openSettingsModal('githubIntegration')"`
`41`	`43`	`)`
`42`	`44`	`svg.iconnables`
`@@ -45,6 +47,7 @@`
`45`	`47`	`)`
`46`	`48`	`\| PR Bot`
`47`	`49`	`li.list-item.popover-list-item(`
	`50`	`+ data-event-name = "Clicked to Open Private Registry Settings"`
`48`	`51`	`ng-click = "actions.openSettingsModal('privateRegistry')"`
`49`	`52`	`ng-if = "$root.featureFlags.privateRegistry"`
`50`	`53`	`)`
`@@ -54,6 +57,7 @@`
`54`	`57`	`)`
`55`	`58`	`\| Private Registry`
`56`	`59`	`li.list-item.popover-list-item(`
	`60`	`+ data-event-name = "Clicked to Open Slack Integration Settings"`
`57`	`61`	`ng-click = "actions.openSettingsModal('slackIntegration')"`
`58`	`62`	`)`
`59`	`63`	`img.iconnables(`
`@@ -63,6 +67,7 @@`
`63`	`67`	`)`
`64`	`68`	`\| Slack Integration`
`65`	`69`	`li.list-item.popover-list-item(`
	`70`	`+ data-event-name = "Clicked to Open SSH Keys Settings"`
`66`	`71`	`ng-click = "actions.openSettingsModal('SSHKeys')"`
`67`	`72`	`ng-if = "$root.featureFlags.composeSSHKeys"`
`68`	`73`	`)`
`@@ -72,6 +77,7 @@`
`72`	`77`	`)`
`73`	`78`	`\| SSH Keys`
`74`	`79`	`li.list-item.popover-list-item(`
	`80`	`+ data-event-name = "Clicked to Open Teammates Settings"`
`75`	`81`	`ng-click = "actions.openSettingsModal('teamManagement')"`
`76`	`82`	`)`
`77`	`83`	`svg.iconnables`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ footer.modal-footer.clearfix`
`101`	`101`	`)`
`102`	`102`	`span(`
`103`	`103`	`ng-if = "$root.featureFlags.composeNewService && NCC.state.repo"`
`104`		`- ) {{$root.featureFlags.composeEditing ? 'Save Changes' : 'NCC.getNextStepText()'}}`
	`104`	`+ ) {{$root.featureFlags.composeEditing ? 'Save Changes' : NCC.getNextStepText()}}`
`105`	`105`	`span(`
`106`	`106`	`ng-if = "NCC.state.templateSource"`
`107`	`107`	`) Add Service`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ label`
`13`	`13`	`required`
`14`	`14`	`spellcheck = "false"`
`15`	`15`	`unique-validator = "NCC.state.namesForAllInstances"`
	`16`	`+ ng-disabled = "NCC.isSaving()"`
`16`	`17`	`)`
`17`	`18`	`svg.iconnables.icons-check(`
`18`	`19`	`ng-if = "NCC.nameForm.$valid"`