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

View file

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

View file

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

View file

@ -59,7 +59,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
requestHelper(packageToRequest, install) { requestHelper(packageToRequest, install) {
return (iError, data) => { return (iError, data) => {
PackageAdminStore.forEach(item => { PackageAdminStore.forEach(item => {
if (packageToRequest && item?.loading() && packageToRequest.file === item.file) { if (packageToRequest && item?.loading?.() && packageToRequest.file === item.file) {
packageToRequest.loading(false); packageToRequest.loading(false);
item.loading(false); item.loading(false);
} }

View file

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

View file

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