Drop Remote.request() aAbortActions parameter

This commit is contained in:
the-djmaze 2022-09-02 09:56:31 +02:00
parent bae103257c
commit afd65c809d
6 changed files with 15 additions and 31 deletions

View file

@ -249,7 +249,7 @@ messagesMoveHelper = (fromFolderFullName, toFolderFullName, uidsForMove) => {
isSpam = sSpamFolder === toFolderFullName,
isHam = !isSpam && sSpamFolder === fromFolderFullName && getFolderInboxName() === toFolderFullName;
Remote.request('MessageMove',
Remote.abort('MessageList').request('MessageMove',
moveOrDeleteResponseHelper,
{
FromFolder: fromFolderFullName,
@ -257,23 +257,17 @@ messagesMoveHelper = (fromFolderFullName, toFolderFullName, uidsForMove) => {
Uids: uidsForMove.join(','),
MarkAsRead: (isSpam || FolderUserStore.trashFolder() === toFolderFullName) ? 1 : 0,
Learning: isSpam ? 'SPAM' : isHam ? 'HAM' : ''
},
null,
'',
['MessageList']
}
);
},
messagesDeleteHelper = (sFromFolderFullName, aUidForRemove) => {
Remote.request('MessageDelete',
Remote.abort('MessageList').request('MessageDelete',
moveOrDeleteResponseHelper,
{
Folder: sFromFolderFullName,
Uids: aUidForRemove.join(',')
},
null,
'',
['MessageList']
}
);
},

View file

@ -123,16 +123,13 @@ export class AbstractFetchRemote
* @param {Object=} oParameters
* @param {?number=} iTimeout
* @param {string=} sGetAdd = ''
* @param {Array=} aAbortActions = []
*/
request(sAction, fCallback, params, iTimeout, sGetAdd, abortActions) {
params = params || {};
const start = Date.now();
if (sAction && abortActions) {
abortActions.forEach(actionToAbort => abort(actionToAbort));
}
abortActions && console.error('abortActions is obsolete');
fetchJSON(sAction, pString(sGetAdd),
params,

View file

@ -51,12 +51,12 @@ class RemoteUserFetch extends AbstractFetchRemote {
params = {};
}
bSilent || this.abort('MessageList');
this.request('MessageList',
fCallback,
params,
60000, // 60 seconds before aborting
sGetAdd,
bSilent ? [] : ['MessageList']
sGetAdd
);
}
@ -71,7 +71,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
iUid = pInt(iUid);
if (getFolderFromCacheList(sFolderFullName) && 0 < iUid) {
this.request('Message',
this.abort('Message').request('Message',
fCallback,
{},
null,
@ -83,8 +83,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
iUid,
AppUserStore.threadsAllowed() && SettingsUserStore.useThreads() ? 1 : 0,
SettingsGet('AccountHash')
]),
['Message']
])
);
return true;

View file

@ -59,7 +59,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
requestHelper(packageToRequest, install) {
return (iError, data) => {
PackageAdminStore.forEach(item => {
if (packageToRequest && item?.loading() && packageToRequest.file === item.file) {
if (packageToRequest && item?.loading?.() && packageToRequest.file === item.file) {
packageToRequest.loading(false);
item.loading(false);
}
@ -109,7 +109,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
let disable = plugin.enabled();
plugin.enabled(!disable);
Remote.request('AdminPluginDisable',
(iError, data) => {
(iError, data) => {
if (iError) {
plugin.enabled(disable);
this.packagesError(

View file

@ -758,7 +758,7 @@ export class ComposePopupView extends AbstractViewPopup {
// getAutocomplete
emailsSource(value, fResponse) {
Remote.request('Suggestions',
Remote.abort('Suggestions').request('Suggestions',
(iError, data) => {
if (!iError && isArray(data.Result)) {
fResponse(
@ -772,10 +772,7 @@ export class ComposePopupView extends AbstractViewPopup {
{
Query: value
// ,Page: 1
},
null,
'',
['Suggestions']
}
);
}

View file

@ -403,7 +403,7 @@ export class ContactsPopupView extends AbstractViewPopup {
}
ContactUserStore.loading(true);
Remote.request('Contacts',
Remote.abort('Contacts').request('Contacts',
(iError, data) => {
let count = 0,
list = [];
@ -429,10 +429,7 @@ export class ContactsPopupView extends AbstractViewPopup {
Offset: offset,
Limit: CONTACTS_PER_PAGE,
Search: this.search()
},
null,
'',
['Contacts']
}
);
}