Merge pull request #1915 from CodeNow/SAN-5460-add-hang-tight

Add new watcher for hang-tight message
CodeNow · Nov 28, 2016 · edd5546 · edd5546
2 parents 7007387 + 3d6a6e1
commit edd5546
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/client/controllers/controllerInstance.js b/client/controllers/controllerInstance.js
@@ -29,7 +29,6 @@ function ControllerInstance(
   pageName,
   setLastInstance
 ) {
-
   var CIS = this;
   CIS.isInGuide = ahaGuide.isInGuide;
   var dataInstance = $scope.dataInstance = {
@@ -39,7 +38,9 @@ function ControllerInstance(
     actions: {}
   };
   var data = dataInstance.data;
-  $scope.$storage = $localStorage;
+  $scope.$storage = $localStorage.$default({
+     hasSeenHangTightMessage: false
+  });
   loading('main', true);
 
   data.openItems = new OpenItems();
@@ -59,7 +60,7 @@ function ControllerInstance(
     // product team - track visits to instance page & referrer
     eventTracking.visitedState();
     return $q.all({
-      instance: fetchInstances({ name: $stateParams.instanceName }, true),
+      instance: fetchCurrentInstance(),
       settings: fetchSettings()
     })
       .then(function (results) {
@@ -78,6 +79,8 @@ function ControllerInstance(
         var instance = results.instance;
         data.instance = instance;
 
+        checkForEnablingHangTightMessage(instance);
+
         // Check that current commit is not already building
         var currentCommit = keypather.get(instance, 'attrs.contextVersion.appCodeVersions[0].commit');
         getCommitForCurrentlyBuildingBuild(instance)
@@ -201,11 +204,26 @@ function ControllerInstance(
         data.openItems.removeAllButBuildLogs();
         break;
     }
+    if (!isBuildingOrStarting(status) && data.showHangTightMessage) {
+      data.showHangTightMessage = false;
+    }
     $timeout(function () {
       favico.setInstanceState(keypather.get($scope, 'dataInstance.data.instance'));
     });
   });
 
+  function checkForEnablingHangTightMessage (instance) {
+    // Only show message if user hasn't:
+    // 1. Seen message before
+    if ($scope.$storage.hasSeenHangTightMessage) { return; }
+    // 2. Is looking at a repo instance
+    if (!keypather.get(instance, 'contextVersion.getMainAppCodeVersion()')) { return; }
+    // 3. Container is currently building or starting
+    if (!isBuildingOrStarting(instance.status())) { return; }
+    $scope.$storage.hasSeenHangTightMessage = true;
+    data.showHangTightMessage = true;
+  }
+
   if (ahaGuide.isInGuide()) {
     if (keypather.get(instancesByPod, 'models.length')) {
       if (instancesByPod.models.some(function (instance) {
@@ -218,4 +236,12 @@ function ControllerInstance(
       }
     }
   }
+
+  function fetchCurrentInstance () {
+    return fetchInstances({ name: $stateParams.instanceName }, true);
+  }
+
+  function isBuildingOrStarting (status) {
+    return ['building', 'starting'].indexOf(status) !== -1;
+  }
 }
diff --git a/client/directives/components/notifications/viewNotifications.jade b/client/directives/components/notifications/viewNotifications.jade
@@ -9,6 +9,6 @@
 )
 
 .grid-block(
-  ng-if = "$root.featureFlags.demoMultiTierBuilding"
+  ng-if = "dataInstance.data.showHangTightMessage && $root.featureFlags.demoMultiTierBuilding"
   ng-include = "'firstBuildNotificationView'"
 )
diff --git a/client/services/ahaGuideService.js b/client/services/ahaGuideService.js
@@ -12,6 +12,7 @@ var STEPS = {
 };
 
 function ahaGuide(
+  $localStorage,
   $rootScope,
   currentOrg,
   eventTracking,
@@ -25,6 +26,7 @@ function ahaGuide(
   var instances = [];
   var hasRunnabot = false;
   var ahaModalController;
+  var $storage = $localStorage.$default({});
   function refreshInstances() {
     return fetchInstancesByPod()
       .then(function (fetchedInstances) {
@@ -341,6 +343,7 @@ function ahaGuide(
       }
     })
       .then(function (updatedOrg) {
+        delete $storage.hasSeenHangTightMessage;
         updateCurrentOrg(updatedOrg);
       });
   }

diff --git a/client/templates/viewInstance.jade b/client/templates/viewInstance.jade
@@ -26,7 +26,7 @@
       ng-class = "{\
         'green': dataInstance.data.showUpdatedMessage,\
         'orange': dataInstance.data.showUpdatingMessage || dataInstance.data.instance.isMigrating(),\
-        'white': $root.featureFlags.demoMultiTierBuilding\
+        'white': $root.featureFlags.demoMultiTierBuilding && dataInstance.data.showHangTightMessage\
       }"
       ng-if = "(dataInstance.data.showUpdatingMessage || dataInstance.data.showUpdatedMessage) || dataInstance.data.instance.isMigrating() || $root.featureFlags.demoMultiTierBuilding"
       ng-include = "'viewNotifications'"

diff --git a/test/unit/controllers/controllerInstance.unit.js b/test/unit/controllers/controllerInstance.unit.js
@@ -69,7 +69,9 @@ describe('controllerInstance'.bold.underline.blue, function () {
           ADD_FIRST_BRANCH: 123
         }
       });
-      $provide.value('instancesByPod', {});
+      $provide.value('instancesByPod', {
+        models: []
+      });
       $provide.value('favico', mockFavico);
       $provide.factory('fetchUser', function ($q) {
         return function () {