extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-15 02:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change egw.accounts() to always return a Promise

Browse Source
This commit is contained in:
nathan
2022-12-15 10:22:19 -07:00
parent fa1cfe3664
commit e756962f86
5 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/js/jsapi/egw_global.d.ts vendored
View File

@ -549,9 +549,10 @@ declare interface IegwGlobal
* The list is filtered by type, one of 'accounts','groups','both', 'owngroups'
*
* @param {string} type
* @returns {array}
* @returns {Promise}
*/
accounts(type : "accounts"|"groups"|"both"|"owngroups") : object[];
accounts(type : "accounts" | "groups" | "both" | "owngroups") : Promise<{ value : string, label : string, icon? : string }[]>
/**
* Get account-infos for given numerical _account_ids
*
@ -561,7 +562,7 @@ declare interface IegwGlobal
* @param {function} _callback
* @param {object} _context
*/
accountData(_account_ids : number|number[], _field : string, _resolve_groups : boolean,
accountData(_account_ids : number | number[], _field : string, _resolve_groups : boolean,
_callback : Function, _context : object) : void;
/**
* Set account data. This one can be called from the server to pre-fill the cache.

50
api/js/jsapi/egw_user.js
View File

@ -42,6 +42,9 @@ egw.extend('user', egw.MODULE_GLOBAL, function()
let accountData = {};
let resolveGroup = {};
// Hold in-progress request to avoid making more
let request = null;
return {
/**
* Set data of current user
@ -50,7 +53,7 @@ egw.extend('user', egw.MODULE_GLOBAL, function()
* @param {boolean} _need_clone _data need to be cloned, as it is from different window context
* and therefore will be inaccessible in IE, after that window is closed
*/
set_user: function(_data, _need_clone)
set_user: function (_data, _need_clone)
{
userData = _need_clone ? jQuery.extend(true, {}, _data) : _data;
},
@ -88,39 +91,44 @@ egw.extend('user', egw.MODULE_GLOBAL, function()
* Get a list of accounts the user has access to
* The list is filtered by type, one of 'accounts','groups','both', 'owngroups'
*
* Currently the list is queried once synchronous from the server by the first et2_selectAccount.
*
* @param {string} type
* @param {bool} async true: return Promise
* @returns {Array|Promise}
* @returns {Promise<{value:string,label:string,icon?:string}[]>}
*/
accounts: function(type, async)
accounts: function (type)
{
if (typeof type === 'undefined') type = 'accounts';
if (typeof type === 'undefined')
{
type = 'accounts';
}
if(jQuery.isEmptyObject(accountStore))
if (request !== null)
{
return request.then(() =>
{
debugger;
return this.accounts(type)
});
}
if (jQuery.isEmptyObject(accountStore))
{
const cache_it = data =>
{
let types = ["accounts", "groups", "owngroups"];
for(let t of types)
for (let t of types)
{
if(typeof data[t] === "object")
if (typeof data[t] === "object")
{
accountStore[t] = jQuery.extend(true, [], data[t]||[]);
accountStore[t] = jQuery.extend(true, [], data[t] || []);
}
}
}
if (async)
request = egw.request("EGroupware\\Api\\Framework::ajax_user_list", []).then(_data =>
{
return egw.request("EGroupware\\Api\\Framework::ajax_user_list",[]).then(_data =>
{
cache_it(_data);
return this.accounts(type);
});
}
// Synchronous
egw.json("EGroupware\\Api\\Framework::ajax_user_list",[], cache_it, this, false).sendRequest(false);
cache_it(_data);
request = null;
return this.accounts(type);
});
return request;
}
let result = [];
if (type === 'both')
@ -131,7 +139,7 @@ egw.extend('user', egw.MODULE_GLOBAL, function()
{
result = [].concat(accountStore[type]);
}
return async ? Promise.resolve(result) : result;
return Promise.resolve(result);
},
/**