From 46b7efb1c6013fe695dd9c65ba892adb92e3c7d0 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Mon, 19 Jan 2015 03:50:56 -0500
Subject: [PATCH] 4831: Simplify promise use.

---
 apps/backstage/app/component.arv-api-status.js | 10 ++++++----
 apps/backstage/node_modules/arvados/client.js  | 15 ++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/backstage/app/component.arv-api-status.js b/apps/backstage/app/component.arv-api-status.js
index 64e8d64a9c..0dff644486 100644
--- a/apps/backstage/app/component.arv-api-status.js
+++ b/apps/backstage/app/component.arv-api-status.js
@@ -15,11 +15,13 @@ function ArvApiStatusComponent(connection) {
                 vm.refresh();
             vm.dirty = false;
         };
+        vm.keepServices = m.prop();
+        vm.nodes = m.prop();
         vm.refresh = function() {
-            vm.nodes = vm.connection.api(
-                'Node', 'list', {});
-            vm.keepServices = vm.connection.api(
-                'KeepService', 'list', {});
+            vm.connection.api(
+                'KeepService', 'list', {}).then(vm.keepServices);
+            vm.connection.api(
+                'Node', 'list', {}).then(vm.nodes);
         };
         vm.logout = function() {
             vm.connection.token(undefined);
diff --git a/apps/backstage/node_modules/arvados/client.js b/apps/backstage/node_modules/arvados/client.js
index 380384d60b..935cd3e36f 100644
--- a/apps/backstage/node_modules/arvados/client.js
+++ b/apps/backstage/node_modules/arvados/client.js
@@ -93,17 +93,10 @@ function ArvadosConnection(apiPrefix) {
     // modelClass: 'Collection', 'Node', etc.
     // action: 'get', 'list', 'update', etc.
     // params: {uuid:'foo',filters:[],...}
-    // deferred (optional): deferred object for response. If not
-    // supplied, a new one is created.
-    function api(modelClass, action, params, deferred) {
-        deferred = deferred || m.deferred();
-        connection.ready.then(function() {
-            connection[modelClass][action](params).
-                then(updateStore).
-                then(deferred.resolve, deferred.reject).
-                then(m.redraw);
-        }, deferred.reject);
-        return deferred.promise;
+    function api(modelClass, action, params) {
+        return connection.ready.then(function() {
+            return connection[modelClass][action](params);
+        }).then(updateStore);
     }
 
     // Private instance variables
-- 
2.30.2