fix(core): catch exceptions on server group source when pipeline 404s (…

…#4275)
spinnaker · Oct 17, 2017 · dabbafb · dabbafb
1 parent 85ad05a
commit dabbafb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/scripts/modules/core/src/diffs/viewChangesLink.component.ts b/app/scripts/modules/core/src/diffs/viewChangesLink.component.ts
@@ -97,7 +97,8 @@ class ViewChangesLinkController implements IController {
       // if the stage is still running, and we haven't found commits or changes, reload it on the next refresh cycle
       this.executionLoaded = stage.status !== 'RUNNING' || this.changesAvailable;
 
-    }).finally(() => this.loadingExecution = false);
+    }).catch(() => {})
+      .finally(() => this.loadingExecution = false);
   }
 
   public $onInit(): void {

diff --git a/app/scripts/modules/core/src/entityTag/entitySource.component.ts b/app/scripts/modules/core/src/entityTag/entitySource.component.ts
@@ -31,9 +31,9 @@ class EntitySourceCtrl implements IController {
       this.executionType = 'Pipeline';
       this.loadingExecution = true;
       this.executionService.getExecution(this.metadata.value.executionId).then(
-        (execution: IExecution) => this.execution = execution,
-        () => this.executionNotFound = true
-      ).finally(() => this.loadingExecution = false);
+        (execution: IExecution) => this.execution = execution
+      ).catch(() => this.executionNotFound = true)
+      .finally(() => this.loadingExecution = false);
     }
   }