Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: category filter on post queue (#8710)

Browse Source 
* feat: category filter on post queue

category filter module

* feat: add spec
This commit is contained in:
Barış Soner Uşaklı
2020-10-02 16:35:20 -04:00
committed by GitHub
parent f14b49457c
commit 5d9a868142
6 changed files with 137 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/controllers/helpers.js
View File

@@ -214,15 +214,15 @@ helpers.buildTitle = function (pageTitle) {
helpers.getCategories = async function (set, uid, privilege, selectedCid) {
const cids = await categories.getCidsByPrivilege(set, uid, privilege);
return await getCategoryData(cids, uid, selectedCid);
return await getCategoryData(cids, uid, selectedCid, privilege);
};
helpers.getCategoriesByStates = async function (uid, selectedCid, states) {
helpers.getCategoriesByStates = async function (uid, selectedCid, states, privilege = 'topics:read') {
const cids = await categories.getAllCidsFromSet('categories:cid');
return await getCategoryData(cids, uid, selectedCid, states);
return await getCategoryData(cids, uid, selectedCid, states, privilege);
};
async function getCategoryData(cids, uid, selectedCid, states) {
async function getCategoryData(cids, uid, selectedCid, states, privilege) {
if (selectedCid && !Array.isArray(selectedCid)) {
selectedCid = [selectedCid];
}
@@ -230,7 +230,7 @@ async function getCategoryData(cids, uid, selectedCid, states) {
states = states || [categories.watchStates.watching, categories.watchStates.notwatching];
const [allowed, watchState, categoryData, isAdmin] = await Promise.all([
privileges.categories.isUserAllowedTo('topics:read', cids, uid),
privileges.categories.isUserAllowedTo(privilege, cids, uid),
categories.getWatchState(cids, uid),
categories.getCategoriesData(cids),
user.isAdministrator(uid),
@@ -246,6 +246,11 @@ async function getCategoryData(cids, uid, selectedCid, states) {
const hasVisibleChildren = checkVisibleChildren(c, cidToAllowed, cidToWatchState, states);
const isCategoryVisible = c && cidToAllowed[c.cid] && !c.link && !c.disabled && states.includes(cidToWatchState[c.cid]);
const shouldBeRemoved = !hasVisibleChildren && !isCategoryVisible;
const shouldBeDisaplayedAsDisabled = hasVisibleChildren && !isCategoryVisible;
if (shouldBeDisaplayedAsDisabled) {
c.disabledClass = true;
}
if (shouldBeRemoved && c && c.parent && c.parent.cid && cidToCategory[c.parent.cid]) {
cidToCategory[c.parent.cid].children = cidToCategory[c.parent.cid].children.filter(child => child.cid !== c.cid);
@@ -254,7 +259,7 @@ async function getCategoryData(cids, uid, selectedCid, states) {
return c && !shouldBeRemoved;
});
const categoriesData = categories.buildForSelectCategories(visibleCategories);
const categoriesData = categories.buildForSelectCategories(visibleCategories, ['disabledClass']);
let selectedCategory = [];
const selectedCids = [];