MOBILE-2915 core: Fix Uncaught promise error if request fails
parent
92d6d09b8f
commit
2f56db4511
|
@ -582,7 +582,7 @@ export class CoreSite {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const promise = this.getFromCache(method, data, preSets, false, originalData).catch(() => {
|
let promise = this.getFromCache(method, data, preSets, false, originalData).catch(() => {
|
||||||
// Do not pass those options to the core WS factory.
|
// Do not pass those options to the core WS factory.
|
||||||
return this.wsProvider.call(method, data, wsPreSets).then((response) => {
|
return this.wsProvider.call(method, data, wsPreSets).then((response) => {
|
||||||
if (preSets.saveToCache) {
|
if (preSets.saveToCache) {
|
||||||
|
@ -688,8 +688,9 @@ export class CoreSite {
|
||||||
});
|
});
|
||||||
|
|
||||||
this.ongoingRequests[cacheId] = promise;
|
this.ongoingRequests[cacheId] = promise;
|
||||||
|
|
||||||
// Clear ongoing request after setting the promise (just in case it's already resolved).
|
// Clear ongoing request after setting the promise (just in case it's already resolved).
|
||||||
promise.finally(() => {
|
promise = promise.finally(() => {
|
||||||
// Make sure we don't clear the promise of a newer request that ignores the cache.
|
// Make sure we don't clear the promise of a newer request that ignores the cache.
|
||||||
if (this.ongoingRequests[cacheId] === promise) {
|
if (this.ongoingRequests[cacheId] === promise) {
|
||||||
delete this.ongoingRequests[cacheId];
|
delete this.ongoingRequests[cacheId];
|
||||||
|
|
Loading…
Reference in New Issue