From 8605584fbc61f6f09e44da5b1dfafd12a30cd689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 24 Nov 2024 11:58:35 -0500 Subject: [PATCH] fix: spec, dont show registered-users, verified-users, unverified-users in manage groups --- public/openapi/read/groups.yaml | 1 + public/src/admin/manage/groups.js | 1 + src/controllers/groups.js | 1 + src/groups/search.js | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/public/openapi/read/groups.yaml b/public/openapi/read/groups.yaml index dfb6e16c68..576321bebc 100644 --- a/public/openapi/read/groups.yaml +++ b/public/openapi/read/groups.yaml @@ -105,5 +105,6 @@ get: type: string title: type: string + - $ref: ../components/schemas/Pagination.yaml#/Pagination - $ref: ../components/schemas/Breadcrumbs.yaml#/Breadcrumbs - $ref: ../components/schemas/CommonProps.yaml#/CommonProps \ No newline at end of file diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js index bc9fbf5f39..ba3d11f258 100644 --- a/public/src/admin/manage/groups.js +++ b/public/src/admin/manage/groups.js @@ -91,6 +91,7 @@ define('admin/manage/groups', [ query: queryEl.val(), sort: 'date', hideEphemeralGroups: true, + excludeGroups: ['registered-users', 'verified-users', 'unverified-users'], }).then(renderSearchResults) .catch(alerts.error); } diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 4e9a65f433..76c1b00f97 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -42,6 +42,7 @@ async function getGroups(req, sort, page) { filterHidden: filterHidden, showMembers: req.query.showMembers === 'true', hideEphemeralGroups: req.query.hideEphemeralGroups === 'true', + excludeGroups: Array.isArray(req.query.excludeGroups) ? req.query.excludeGroups : [], }); const pageCount = Math.ceil(groupData.length / resultsPerPage); diff --git a/src/groups/search.js b/src/groups/search.js index 3e0dfd2def..21f0b9aa1f 100644 --- a/src/groups/search.js +++ b/src/groups/search.js @@ -14,7 +14,9 @@ module.exports = function (Groups) { groupNames = Groups.ephemeralGroups.concat(groupNames); } groupNames = groupNames.filter( - name => name.toLowerCase().includes(query) && name !== Groups.BANNED_USERS // hide banned-users in searches + name => name.toLowerCase().includes(query) && + name !== Groups.BANNED_USERS && // hide banned-users in searches + !options.excludeGroups.includes(name) ); groupNames = groupNames.slice(0, 100);