From 093bd4128b08dbc00aae4513a13c859d62094613 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Tue, 27 Feb 2018 19:55:03 -0800
Subject: [PATCH] Move jobs polling from jobs to jobs.index

It's only necessary for the list view, not the entire route hierarchy
---
 ui/app/adapters/watchable.js |  5 -----
 ui/app/routes/jobs.js        | 10 ----------
 ui/app/routes/jobs/index.js  | 13 +++++++++++++
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ui/app/adapters/watchable.js b/ui/app/adapters/watchable.js
index b61442fe5..5b71a5e3f 100644
--- a/ui/app/adapters/watchable.js
+++ b/ui/app/adapters/watchable.js
@@ -41,11 +41,6 @@ export default ApplicationAdapter.extend({
 
     return this.ajax(url, 'GET', {
       data: params,
-    }).catch(error => {
-      if (error instanceof AbortError) {
-        return [];
-      }
-      throw error;
     });
   },
 
diff --git a/ui/app/routes/jobs.js b/ui/app/routes/jobs.js
index 181bcb182..745e326e2 100644
--- a/ui/app/routes/jobs.js
+++ b/ui/app/routes/jobs.js
@@ -3,7 +3,6 @@ import Route from '@ember/routing/route';
 import { run } from '@ember/runloop';
 import WithForbiddenState from 'nomad-ui/mixins/with-forbidden-state';
 import notifyForbidden from 'nomad-ui/utils/notify-forbidden';
-import { watchAll } from 'nomad-ui/utils/properties/watch';
 
 export default Route.extend(WithForbiddenState, {
   system: service(),
@@ -36,18 +35,9 @@ export default Route.extend(WithForbiddenState, {
 
   setupController(controller) {
     this.syncToController(controller);
-
-    controller.set('modelWatch', this.get('watch').perform());
     return this._super(...arguments);
   },
 
-  deactivate() {
-    this.get('watch').cancelAll();
-    this._super(...arguments);
-  },
-
-  watch: watchAll('job'),
-
   actions: {
     refreshRoute() {
       this.refresh();
diff --git a/ui/app/routes/jobs/index.js b/ui/app/routes/jobs/index.js
index 0a8317fea..b17a6a38c 100644
--- a/ui/app/routes/jobs/index.js
+++ b/ui/app/routes/jobs/index.js
@@ -1,6 +1,19 @@
 import Route from '@ember/routing/route';
+import { watchAll } from 'nomad-ui/utils/properties/watch';
 
 export default Route.extend({
+  setupController(controller) {
+    controller.set('modelWatch', this.get('watch').perform());
+    return this._super(...arguments);
+  },
+
+  deactivate() {
+    this.get('watch').cancelAll();
+    this._super(...arguments);
+  },
+
+  watch: watchAll('job'),
+
   actions: {
     refreshRoute() {
       return true;