From c4e58160cf32a0964da47cf1965cfdd00d9c805d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 30 Oct 2019 12:47:01 -0400 Subject: [PATCH] fix: #8003, check children recursively --- src/controllers/helpers.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index 9a5877e0b4..4240ecb637 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -238,7 +238,7 @@ async function getCategoryData(cids, uid, selectedCid, states) { const cidToWatchState = _.zipObject(cids, watchState); const visibleCategories = categoryData.filter(function (c) { - const hasVisibleChildren = c && Array.isArray(c.children) && c.children.some(c => c && cidToAllowed[c.cid] && states.includes(cidToWatchState[c.cid])); + 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; @@ -281,6 +281,15 @@ async function getCategoryData(cids, uid, selectedCid, states) { }; } +function checkVisibleChildren(c, cidToAllowed, cidToWatchState, states) { + if (!c || !Array.isArray(c.children)) { + return false; + } + return c.children.some(c => c && ( + (cidToAllowed[c.cid] && states.includes(cidToWatchState[c.cid])) || checkVisibleChildren(c, cidToAllowed, cidToWatchState, states) + )); +} + helpers.getHomePageRoutes = async function (uid) { let cids = await categories.getAllCidsFromSet('categories:cid'); cids = await privileges.categories.filterCids('find', cids, uid);