Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 03:01:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Categories refactor (#9257)

Browse Source 
* feat: wip categories pagination

* feat: add subCategoriesPerPage setting

* feat: add load more sub categories button to category page

* fix: openapi spec

* feat: show sub categories left on category page

hide button when no more categories left

* breaking: rename categories to allCategories on /search

categories contains the search results

* fix: spec

* refactor: remove cidsPerPage

* fix: tests

* feat: use component for subcategories

* fix: prevent negative subCategoriesLeft

* feat: new category filter/search WIP

* feat: remove categories from /tag

* fix: dont load all categories when showing move modal

* feat: allow adding custom categories to list

* breaking: dont load entire category tree on post queue

removed unused code
add hooks to filter/selector
add options to filter/selector

* feat: make selector modal work again

* feat: replace old search module

* fix: topic move selector

* feat: dont load all categories on create category modal

* fix: fix more categorySelectors

* feat: dont load entire category tree on group details page

* feat: dont load all categories on home page and user settings page

* feat: add pagination to /user/:userslug/categories

* fix: update schemas

* fix: more tests

* fix: test

* feat: flags page, dont return entire category tree

* fix: flag test

* feat: categories manage page

dont load all categories
allow changing root category
clear caches properly

* fix: spec

* feat: admins&mods page

dont load all categories

* fix: spec

* fix: dont load all children when opening dropdown

* fix: on search results dont return all children

* refactor: pass all options, rename options.cids to options.selectedCids

* fix: #9266

* fix: index 0

* fix: spec

* feat: #9265, add setObjectBulk

* refactor: shoter updateOrder

* feat: selectors on categories/category

* fix: tests and search filter

* fix: category update test

* feat: pagination on acp categories page

show order in set order modal

* fix: allow drag&drop on pages > 1 in /admin/manage/categories

* fix: teasers for deep nested categories

fix sub category display on /category page

* fix: spec

* refactor: use eslint-disable-next-line

* refactor: shorter
This commit is contained in:
Barış Soner Uşaklı
2021-02-07 15:09:52 -05:00
committed by GitHub
parent 2cfab3678e
commit 47299ea587
76 changed files with 1088 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/categories/recentreplies.js
View File

@@ -91,25 +91,27 @@ module.exports = function (Categories) {
};
async function getTopics(tids, uid) {
const topicData = await topics.getTopicsFields(tids, ['tid', 'mainPid', 'slug', 'title', 'teaserPid', 'cid', 'postcount']);
const topicData = await topics.getTopicsFields(
tids,
['tid', 'mainPid', 'slug', 'title', 'teaserPid', 'cid', 'postcount']
);
topicData.forEach(function (topic) {
if (topic) {
topic.teaserPid = topic.teaserPid || topic.mainPid;
}
});
var cids = _.uniq(topicData.map(topic => topic && topic.cid).filter(cid => parseInt(cid, 10)));
const [categoryData, teasers] = await Promise.all([
Categories.getCategoriesFields(cids, ['cid', 'parentCid']),
const cids = _.uniq(topicData.map(t => t && t.cid).filter(cid => parseInt(cid, 10)));
const getToRoot = async () => await Promise.all(cids.map(Categories.getParentCids));
const [toRoot, teasers] = await Promise.all([
getToRoot(),
topics.getTeasers(topicData, uid),
]);
var parentCids = {};
categoryData.forEach(function (category) {
parentCids[category.cid] = category.parentCid;
});
const cidToRoot = _.zipObject(cids, toRoot);
teasers.forEach(function (teaser, index) {
if (teaser) {
teaser.cid = topicData[index].cid;
teaser.parentCid = parseInt(parentCids[teaser.cid], 10) || 0;
teaser.parentCids = cidToRoot[teaser.cid];
teaser.tid = undefined;
teaser.uid = undefined;
teaser.topic = {
@@ -124,11 +126,12 @@ module.exports = function (Categories) {
function assignTopicsToCategories(categories, topics) {
categories.forEach(function (category) {
if (category) {
category.posts = topics.filter(topic => topic.cid && (topic.cid === category.cid || topic.parentCid === category.cid))
category.posts = topics.filter(t => t.cid && (t.cid === category.cid || t.parentCids.includes(category.cid)))
.sort((a, b) => b.pid - a.pid)
.slice(0, parseInt(category.numRecentReplies, 10));
}
});
topics.forEach((t) => { t.parentCids = undefined; });
}
function bubbleUpChildrenPosts(categoryData) {
@@ -137,7 +140,8 @@ module.exports = function (Categories) {
if (category.posts.length) {
return;
}
var posts = [];
const posts = [];
getPostsRecursive(category, posts);
posts.sort((a, b) => b.pid - a.pid);
@@ -150,15 +154,12 @@ module.exports = function (Categories) {
function getPostsRecursive(category, posts) {
if (Array.isArray(category.posts)) {
category.posts.forEach(function (p) {
posts.push(p);
});
category.posts.forEach(p => posts.push(p));
}
category.children.forEach(function (child) {
getPostsRecursive(child, posts);
});
category.children.forEach(child => getPostsRecursive(child, posts));
}
// terrible name, should be topics.moveTopicPosts
Categories.moveRecentReplies = async function (tid, oldCid, cid) {
await updatePostCount(tid, oldCid, cid);