fix(): if there was a connection error, do not replace with cached da…

…ta (COMPASS-73)

src/app/alarms/AlarmsController.js

@@ -182,7 +182,7 @@
 			} else if (Errors.hasError('alarmSeverities')) {
 				$scope.error = Errors.get('alarmSeverities');
 			} else {
-				delete $scope.error;
+				$scope.error = false;
 			}
 		};
 
@@ -307,7 +307,9 @@
 			if (!$scope.refreshing.alarmSeverities) {
 				setRefreshing('alarmSeverities', true);
 				getCached('alarmSeverities').then(function(severities) {
-					$scope.legend = severities;
+					if ($scope.error === false) {
+						$scope.legend = severities;
+					}
 				}).catch(function(err) {
 					/*
 					$ionicLoading.show({
@@ -333,7 +335,9 @@
 			if (!$scope.refreshing.alarms) {
 				setRefreshing('alarms', true);
 				getCached('alarms', Alarm).then(function(alarms) {
-					updateView('alarms', alarms);
+					if ($scope.error === false) {
+						updateView('alarms', alarms);
+					}
 				}).catch(function(err) {
 					/*
 					$ionicLoading.show({

src/app/dashboard/DashboardController.js

@@ -241,6 +241,13 @@
 				$scope.refreshWaiting--;
 			}
 
+			if ($scope.lastResultGood.outages === false && update.cached) {
+				// we're in an error state, and this is a cached result, don't do anything
+				resetOutages();
+				return;
+			}
+			$scope.lastResultGood.outages = update.success;
+
 			if (update.success) {
 				$scope.donuts.outages = update.contents;
 				$scope.donuts.outages.options = angular.copy(flotOptions);
@@ -269,6 +276,12 @@
 				$scope.refreshWaiting--;
 			}
 
+			if ($scope.lastResultGood.alarms === false && update.cached) {
+				// we're in an error state, and this is a cached result, don't do anything
+				resetAlarms();
+			}
+			$scope.lastResultGood.alarms = update.success;
+
 			if (update.success) {
 				$scope.donuts.alarms = update.contents;
 				$scope.donuts.alarms.options = angular.copy(flotOptions);
@@ -292,6 +305,13 @@
 				$scope.refreshWaiting--;
 			}
 
+			if ($scope.lastResultGood.availability === false && update.cached) {
+				// we're in an error state, and this is a cached result, don't do anything
+				resetAvailability();
+				return;
+			}
+			$scope.lastResultGood.availability = update.success;
+
 			if (update.success) {
 				$scope.availability = update.contents;
 				for (var i=0, len=$scope.availability.length, section; i < len; i++) {
@@ -324,6 +344,13 @@
 				$scope.refreshWaiting--;
 			}
 
+			if ($scope.lastResultGood.favorites === false && update.cached) {
+				// we're in an error state, and this is a cached result, don't do anything
+				resetFavorites();
+				return;
+			}
+			$scope.lastResultGood.favorites = update.success;
+
 			if (update.success) {
 				if ($scope.currentGraphSlide >= update.contents.favorites.length) {
 					// "current" graph is now higher than the number of graphs we have
@@ -344,7 +371,7 @@
 			}
 		});
 
-
+		$scope.lastResultGood = {};
 		$scope.refreshing = false;
 		$scope.refreshWaiting = 0;
 		var refreshTimeout;

src/app/nodes/NodesController.js

@@ -57,7 +57,9 @@
 
 		$scope.updateSearch = function(searchFor, pullToRefresh) {
 			Cache.get('nodes-list-'+searchFor).then(function(nodes, Node) {
-				$scope.nodes = nodes;
+				if ($scope.error === false) {
+					$scope.nodes = nodes;
+				}
 			});
 
 			if (!pullToRefresh) {

src/app/nodes/ResourcesController.js

@@ -55,8 +55,10 @@
 			$log.info('NodeResources.refresh: refreshing: ' + $scope.nodeId);
 			if ($scope.nodeId) {
 				Cache.get('node-resources-' + $scope.nodeId).then(function(ret) {
-					$scope.resourceLabel = ret.resourceLabel;
-					$scope.resources = ret.resources;
+					if ($scope.error === false) {
+						$scope.resourceLabel = ret.resourceLabel;
+						$scope.resources = ret.resources;
+					}
 				}).catch(function() {
 					$scope.loading = true;
 				});
@@ -65,11 +67,13 @@
 					var children = ret.children;
 					children.sort(sortResources);
 					$scope.resources = ResourceService.withDividers(children);
+					$scope.error = false;
 					return Cache.set('node-resources-' + $scope.nodeId, {
 						resourceLabel: $scope.resourceLabel,
 						resources: $scope.resources
 					});
 				}, function(err) {
+					$scope.error = true;
 					$log.error('NodeResources.refresh: failed: ' + angular.toJson(err));
 					return $q.reject(err);
 				}).finally(function() {