liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: tags input normalization

Browse Source
This commit is contained in:
NGPixel
2020-04-09 21:56:24 -04:00
parent 488ec4a3af
commit 77548c8778
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/graph/resolvers/page.js
View File

@@ -110,7 +110,7 @@ module.exports = {
}
}
if (args.tags && args.tags.length > 0) {
queryBuilder.whereIn('tags.tag', args.tags)
queryBuilder.whereIn('tags.tag', args.tags.map(t => _.trim(t).toLowerCase()))
}
const orderDir = args.orderByDirection === 'DESC' ? 'desc' : 'asc'
switch (args.orderBy) {
@@ -177,14 +177,15 @@ module.exports = {
* SEARCH TAGS
*/
async searchTags (obj, args, context, info) {
const query = _.trim(args.query)
const results = await WIKI.models.tags.query()
.column('tag')
.where(builder => {
builder.andWhere(builderSub => {
if (WIKI.config.db.type === 'postgres') {
builderSub.where('tag', 'ILIKE', `%${args.query}%`)
builderSub.where('tag', 'ILIKE', `%${query}%`)
} else {
builderSub.where('tag', 'LIKE', `%${args.query}%`)
builderSub.where('tag', 'LIKE', `%${query}%`)
}
})
})
@@ -400,8 +401,8 @@ module.exports = {
const affectedRows = await WIKI.models.tags.query()
.findById(args.id)
.patch({
tag: args.tag,
title: args.title
tag: _.trim(args.tag).toLowerCase(),
title: _.trim(args.title)
})
if (affectedRows < 1) {
throw new Error('This tag does not exist.')