From 4aba24a9764c3f2a23f5decbbb2829d0f44258ec Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Wed, 6 Aug 2014 23:39:09 +0300
Subject: [PATCH] Add promise support to QueryResult.

---
 rd_ui/app/scripts/services/resources.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js
index 983a0b805..da9adc281 100644
--- a/rd_ui/app/scripts/services/resources.js
+++ b/rd_ui/app/scripts/services/resources.js
@@ -1,5 +1,5 @@
 (function () {
-  var QueryResult = function ($resource, $timeout) {
+  var QueryResult = function ($resource, $timeout, $q) {
     var QueryResultResource = $resource('/api/query_results/:id', {id: '@id'}, {'post': {'method': 'POST'}});
     var Job = $resource('/api/jobs/:id', {id: '@id'});
 
@@ -32,6 +32,7 @@
           }
         });
 
+        this.deferred.resolve(this);
       } else if (this.job.status == 3) {
         this.status = "processing";
       } else {
@@ -40,6 +41,7 @@
     }
 
     function QueryResult(props) {
+      this.deferred = $q.defer();
       this.job = {};
       this.query_result = {};
       this.status = "waiting";
@@ -349,6 +351,10 @@
       });
 
       return queryResult;
+    };
+
+    QueryResult.prototype.toPromise = function() {
+      return this.deferred.promise;
     }
 
     QueryResult.get = function (data_source_id, query, ttl) {
@@ -404,9 +410,15 @@
       return this.queryResult;
     };
 
+    Query.prototype.getQueryResultPromise = function() {
+      return this.getQueryResult().toPromise();
+    }
+
     return Query;
   };
 
+
+
   var DataSource = function ($resource) {
     var DataSourceResource = $resource('/api/data_sources/:id', {id: '@id'}, {'get': {'method': 'GET', 'cache': true, 'isArray': true}});
 
@@ -435,7 +447,7 @@
   }
 
   angular.module('redash.services')
-      .factory('QueryResult', ['$resource', '$timeout', QueryResult])
+      .factory('QueryResult', ['$resource', '$timeout', '$q', QueryResult])
       .factory('Query', ['$resource', 'QueryResult', 'DataSource', Query])
       .factory('DataSource', ['$resource', DataSource])
       .factory('Widget', ['$resource', 'Query', Widget]);