Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include details from failed DataService.list #236

Merged
merged 1 commit into from
Oct 24, 2017
Merged

Include details from failed DataService.list #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions dist/origin-web-common-services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2384,7 +2384,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false);
var deferred = self._listDeferred(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)) {
return;
Expand All @@ -2407,7 +2412,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false);
var deferred = self._listDeferred(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)) {
return;
Expand Down
14 changes: 12 additions & 2 deletions dist/origin-web-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4408,7 +4408,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false);
var deferred = self._listDeferred(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)) {
return;
Expand All @@ -4431,7 +4436,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false);
var deferred = self._listDeferred(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)) {
return;
Expand Down
14 changes: 12 additions & 2 deletions dist/origin-web-common.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,12 @@ self._listOpComplete(key, resource, context, opts, data);
}).error(function(data, status, headers, config) {
self._listInFlight(key, !1);
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({
method:"GET",
Expand All @@ -1922,7 +1927,12 @@ self._listOpComplete(key, resource, context, opts, data);
}).error(function(data, status, headers, config) {
self._listInFlight(key, !1);
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) {
data.items || console.warn("List request for " + resource + " returned a null items array. This is an invalid API response.");
Expand Down
14 changes: 12 additions & 2 deletions src/services/dataService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false);
var deferred = self._listDeferred(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)) {
return;
Expand All @@ -1034,7 +1039,12 @@ DataService.prototype.createStream = function(resource, name, context, opts, isR
self._listInFlight(key, false);
var deferred = self._listDeferred(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)) {
return;
Expand Down