Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 22:06:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

add searchonly option to searh api

Browse Source
This commit is contained in:
Baris Usakli
2018-11-09 15:09:40 -05:00
parent 924417949c
commit 62787368c6
2 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/controllers/search.js
View File

@@ -20,6 +20,8 @@ searchController.search = function (req, res, next) {
}
var page = Math.max(1, parseInt(req.query.page, 10)) || 1;
const searchOnly = parseInt(req.query.searchOnly, 10) === 1;
async.waterfall([
function (next) {
privileges.global.can('search:content', req.uid, next);
@@ -53,33 +55,47 @@ searchController.search = function (req, res, next) {
};
async.parallel({
categories: async.apply(categories.buildForSelect, req.uid, 'read'),
categories: async.apply(buildCategories, req.uid, searchOnly),
search: async.apply(search.search, data),
}, next);
},
function (results) {
results.categories = results.categories.filter(function (category) {
return category && !category.link;
});
var searchData = results.search;
searchData.pagination = pagination.create(page, searchData.pageCount, req.query);
searchData.search_query = validator.escape(String(req.query.term || ''));
searchData.term = req.query.term;
if (searchOnly) {
return res.json(searchData);
}
results.categories = results.categories.filter(category => category && !category.link);
var categoriesData = [
{ value: 'all', text: '[[unread:all_categories]]' },
{ value: 'watched', text: '[[category:watched-categories]]' },
].concat(results.categories);
var searchData = results.search;
searchData.categories = categoriesData;
searchData.categoriesCount = Math.max(10, Math.min(20, categoriesData.length));
searchData.pagination = pagination.create(page, searchData.pageCount, req.query);
searchData.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[global:search]]' }]);
searchData.expandSearch = !req.query.term;
searchData.showAsPosts = !req.query.showAs || req.query.showAs === 'posts';
searchData.showAsTopics = req.query.showAs === 'topics';
searchData.title = '[[global:header.search]]';
searchData.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[global:search]]' }]);
searchData.expandSearch = !req.query.term;
searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || '';
searchData.search_query = validator.escape(String(req.query.term || ''));
searchData.term = req.query.term;
res.render('search', searchData);
},
], next);
};
function buildCategories(uid, searchOnly, callback) {
if (searchOnly) {
return setImmediate(callback, null, []);
}
categories.buildForSelect(uid, 'read', callback);
}

21
test/search.js
View File

@@ -227,4 +227,25 @@ describe('Search', function () {
},
], done);
});
it('should return json search data with no categories', function (done) {
var qs = '/api/search?term=cucumber&in=titlesposts&searchOnly=1';
privileges.global.give(['search:content'], 'guests', function (err) {
assert.ifError(err);
request({
url: nconf.get('url') + qs,
json: true,
}, function (err, response, body) {
assert.ifError(err);
assert(body);
assert(body.hasOwnProperty('matchCount'));
assert(body.hasOwnProperty('pagination'));
assert(body.hasOwnProperty('pageCount'));
assert(body.hasOwnProperty('posts'));
assert(!body.hasOwnProperty('categories'));
privileges.global.rescind(['search:content'], 'guests', done);
});
});
});
});