From e1e82bcac6b5ccadfcc87f49c833d96b19ab70b0 Mon Sep 17 00:00:00 2001 From: Azri Kahar <42867097+azrikahar@users.noreply.github.com> Date: Thu, 25 Nov 2021 23:48:53 +0800 Subject: [PATCH] fix roles aggregation query to fit all db vendors (#10050) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix roles aggregation query to fit all db vendors * Small opinionated style tweak 🧹 Co-authored-by: rijkvanzanten --- app/src/modules/settings/routes/roles/collection.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/modules/settings/routes/roles/collection.vue b/app/src/modules/settings/routes/roles/collection.vue index 1abfcf37ef..e15987b463 100644 --- a/app/src/modules/settings/routes/roles/collection.vue +++ b/app/src/modules/settings/routes/roles/collection.vue @@ -132,8 +132,15 @@ export default defineComponent({ const response = await api.get(`/roles`, { params: { limit: -1, - fields: 'id,name,description,icon,users.role', - deep: { users: { _aggregate: { count: 'id' } } }, + fields: ['id', 'name', 'description', 'icon', 'users'], + deep: { + users: { + _aggregate: { count: 'id' }, + _groupBy: ['role'], + _sort: 'role', + _limit: -1, + }, + }, sort: 'name', }, });