Merge pull request #324 from dhingrak/fix-404Errors-gracefully

Fix - NotFound errors gracefully

Author: hayley-jean

src/css/main.css

@@ -477,12 +477,6 @@ kbd {
   border-radius: 12px;
   border: 1px solid black; }
 
-.subscription-active {
-  background: lime; }
-
-.behind-notcatchingup {
-  background: red; }
-
 .toast-container-modal {
   width: 100%;
   height: 100%;

src/js/modules/competing/controllers/SubscriptionsViewParkedMessagesCtrl.js

@@ -1,6 +1,15 @@
 define(['./_module'], function (app) {
 
     'use strict';
+	
+	function checkErrorStatus(error, $scope, msg) {
+		if (error.statusCode === 404 || error.statusCode === 410) {
+			// Setting the entries array to empty because the stream does not exist 
+			$scope.entries = [];
+		} else {
+			msg.failure('Failed to read parked messages: ' + error.message);
+		}
+	}
 
     return app.controller('SubscriptionsViewParkedMessagesCtrl', [
 		'$scope', '$stateParams', 'CompetingService', 'poller', 'MessageService',
@@ -20,7 +29,7 @@ define(['./_module'], function (app) {
 						$scope.entries = []
 					}
 				}, function(error){
-					msg.failure('Failed to read parked messages: ' + error.message);
+					checkErrorStatus(error, $scope, msg);
 				});
 
 			$scope.pageForward = function(entries){
@@ -32,7 +41,7 @@ define(['./_module'], function (app) {
 						if(data!==undefined && data["entries"]!==undefined && data["entries"].length > 0)
 							$scope.entries = data["entries"];
 					}, function(error){
-						msg.failure('Failed to read parked messages: ' + error.message);
+						checkErrorStatus(error, $scope, msg);
 					});
 				}
 			};
@@ -63,7 +72,7 @@ define(['./_module'], function (app) {
 
 			});
 			firstPagePoll.promise.catch(function (error) {
-				msg.failure('Failed to read parked messages: ' + error.message);
+				checkErrorStatus(error, $scope, msg);
 				firstPagePoll.stop(); 
 			});
 
@@ -79,7 +88,7 @@ define(['./_module'], function (app) {
 							$scope.entries = data["entries"];
 						}
 					}, function(error){
-						msg.failure('Failed to read parked messages: ' + error.message);
+						checkErrorStatus(error, $scope, msg);
 					});
 				}
 			};
@@ -92,7 +101,7 @@ define(['./_module'], function (app) {
 						$scope.entries = data["entries"];
 					}
 				}, function(error){
-					msg.failure('Failed to read parked messages: ' + error.message);
+					checkErrorStatus(error, $scope, msg);
 				});
 
 				firstPagePoll.start();

src/js/modules/competing/templates/templates.js

@@ -19,7 +19,7 @@ <h2 class="page-title">View Parked Messages - {{streamId}}::{{groupName}}</h2>
 	<thead>
 		<tr><th>Event #</th><th>Name</th><th>Type</th><th>Created Date</th><th></th></tr>
 	</thead>
-	<tbody ng-repeat="event in entries track by event.positionEventNumber"> 
+	<tbody ng-repeat="event in entries track by event.positionEventNumber">
 		<tr ng-class="{ 'invalid': !event.streamId }"> 
 			<td>{{ event.positionEventNumber }}</td> 
 			<td>{{ event.title }}</td><td>{{ event.eventType }}</td> 
@@ -40,4 +40,12 @@ <h2 class="page-title">View Parked Messages - {{streamId}}::{{groupName}}</h2>
 			</td>
 		</tr>
 	</tbody>
+
+	<tbody ng-if="entries.length < 1">
+	<tr>
+		<td colspan="5">
+			<em>No parked events for subscription {{streamId}}::{{groupName}}
+		</td>
+	</tr>
+	</tbody>
 </table>

src/js/modules/competing/views/subscriptions.item.viewparkedmessages.tpl.html

@@ -17,7 +17,11 @@ define(['./_module'], function (app) {
 
 			atom.start($stateParams)
 			.then(null, function (error) {
-				msg.failure('Failed to read events for stream \''+$scope.streamId+'\': ' + error.message);
+				if (error.statusCode === 404 || error.statusCode === 410) {
+					$scope.entries = []
+				} else {
+					msg.failure('Failed to read events for stream \''+$scope.streamId+'\': ' + error.message);
+				}
 			}, function (data) {
 				$scope.$parent.headOfStream = data.headOfStream;	
 				$scope.$broadcast('add-link-header', findSelf(data.links));

src/js/modules/streams/controllers/StreamsItemEventsCtrl.js

@@ -54,7 +54,7 @@ module.run(['$templateCache', function($templateCache) {
     '{{ event.metaData }}					\n' +
     '					</pre></div><div ng-if=event.isLinkMetaData><strong>Link metadata</strong><pre>\n' +
     '{{ event.linkMetaData }}					\n' +
-    '					</pre></div></td></tr></tbody><tbody ng-hide=streams><tr><td colspan=5><em>No events for current path: {{ $stateParams | json }}</em></td></tr></tbody></table>');
+    '					</pre></div></td></tr></tbody><tbody ng-if="streams.length < 1"><tr><td colspan=5><em>No events for stream: {{ streamId }}</em></td></tr></tbody></table>');
 }]);
 })();
 

src/js/modules/streams/templates/templates.js

@@ -49,10 +49,10 @@
 			</td>
 		</tr>
 	</tbody>
-	<tbody ng-hide="streams">
+	<tbody ng-if="streams.length < 1">
 		<tr>
 			<td colspan="5">
-				<em>No events for current path: {{ $stateParams | json }}
+				<em>No events for stream: {{ streamId }}
 			</td>
 		</tr>
 	</tbody>