Commit d63f7782 by Samuel Padgett

Include details from failed DataService.list

The promise returned from DataService.list did not include the HTTP
status code and other information. Return the same object and properties
as `$http`.
parent e10e4063
...@@ -2384,7 +2384,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -2384,7 +2384,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false); self._listInFlight(key, false);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key]; delete self._listDeferredMap[key];
deferred.reject(data, status, headers, config); deferred.reject({
data: data,
status: status,
headers: headers,
config: config
});
if (!_.get(opts, 'errorNotification', true)) { if (!_.get(opts, 'errorNotification', true)) {
return; return;
...@@ -2407,7 +2412,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -2407,7 +2412,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false); self._listInFlight(key, false);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key]; delete self._listDeferredMap[key];
deferred.reject(data, status, headers, config); deferred.reject({
data: data,
status: status,
headers: headers,
config: config
});
if (!_.get(opts, 'errorNotification', true)) { if (!_.get(opts, 'errorNotification', true)) {
return; return;
......
...@@ -4408,7 +4408,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -4408,7 +4408,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false); self._listInFlight(key, false);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key]; delete self._listDeferredMap[key];
deferred.reject(data, status, headers, config); deferred.reject({
data: data,
status: status,
headers: headers,
config: config
});
if (!_.get(opts, 'errorNotification', true)) { if (!_.get(opts, 'errorNotification', true)) {
return; return;
...@@ -4431,7 +4436,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -4431,7 +4436,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false); self._listInFlight(key, false);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key]; delete self._listDeferredMap[key];
deferred.reject(data, status, headers, config); deferred.reject({
data: data,
status: status,
headers: headers,
config: config
});
if (!_.get(opts, 'errorNotification', true)) { if (!_.get(opts, 'errorNotification', true)) {
return; return;
......
...@@ -1910,7 +1910,12 @@ self._listOpComplete(key, resource, context, opts, data); ...@@ -1910,7 +1910,12 @@ self._listOpComplete(key, resource, context, opts, data);
}).error(function(data, status, headers, config) { }).error(function(data, status, headers, config) {
self._listInFlight(key, !1); self._listInFlight(key, !1);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key], deferred.reject(data, status, headers, config), _.get(opts, "errorNotification", !0) && showRequestError("Failed to list " + resource, status); delete self._listDeferredMap[key], deferred.reject({
data:data,
status:status,
headers:headers,
config:config
}), _.get(opts, "errorNotification", !0) && showRequestError("Failed to list " + resource, status);
}); });
}) :$http({ }) :$http({
method:"GET", method:"GET",
...@@ -1922,7 +1927,12 @@ self._listOpComplete(key, resource, context, opts, data); ...@@ -1922,7 +1927,12 @@ self._listOpComplete(key, resource, context, opts, data);
}).error(function(data, status, headers, config) { }).error(function(data, status, headers, config) {
self._listInFlight(key, !1); self._listInFlight(key, !1);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key], deferred.reject(data, status, headers, config), _.get(opts, "errorNotification", !0) && showRequestError("Failed to list " + resource, status); delete self._listDeferredMap[key], deferred.reject({
data:data,
status:status,
headers:headers,
config:config
}), _.get(opts, "errorNotification", !0) && showRequestError("Failed to list " + resource, status);
}); });
}, DataService.prototype._listOpComplete = function(key, resource, context, opts, data) { }, DataService.prototype._listOpComplete = function(key, resource, context, opts, data) {
data.items || console.warn("List request for " + resource + " returned a null items array. This is an invalid API response."); data.items || console.warn("List request for " + resource + " returned a null items array. This is an invalid API response.");
......
...@@ -1011,7 +1011,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -1011,7 +1011,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false); self._listInFlight(key, false);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key]; delete self._listDeferredMap[key];
deferred.reject(data, status, headers, config); deferred.reject({
data: data,
status: status,
headers: headers,
config: config
});
if (!_.get(opts, 'errorNotification', true)) { if (!_.get(opts, 'errorNotification', true)) {
return; return;
...@@ -1034,7 +1039,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR ...@@ -1034,7 +1039,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false); self._listInFlight(key, false);
var deferred = self._listDeferred(key); var deferred = self._listDeferred(key);
delete self._listDeferredMap[key]; delete self._listDeferredMap[key];
deferred.reject(data, status, headers, config); deferred.reject({
data: data,
status: status,
headers: headers,
config: config
});
if (!_.get(opts, 'errorNotification', true)) { if (!_.get(opts, 'errorNotification', true)) {
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment