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

feat: link autocomplete + insert link modal (markdown)

Browse Source
This commit is contained in:
NGPixel
2020-04-11 00:19:23 -04:00
parent 245104c6ae
commit 76ade8df53
4 changed files with 134 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/search/db/engine.js
View File

@@ -34,9 +34,11 @@ module.exports = {
if (WIKI.config.db.type === 'postgres') {
builderSub.where('title', 'ILIKE', `%${q}%`)
builderSub.orWhere('description', 'ILIKE', `%${q}%`)
builderSub.orWhere('path', 'ILIKE', `%${q.toLowerCase()}%`)
} else {
builderSub.where('title', 'LIKE', `%${q}%`)
builderSub.orWhere('description', 'LIKE', `%${q}%`)
builderSub.orWhere('path', 'LIKE', `%${q.toLowerCase()}%`)
}
})
})

22
server/modules/search/postgres/engine.js
View File

@@ -60,12 +60,26 @@ module.exports = {
async query(q, opts) {
try {
let suggestions = []
const results = await WIKI.models.knex.raw(`
let qry = `
SELECT id, path, locale, title, description
FROM "pagesVector", to_tsquery(?,?) query
WHERE query @@ "tokens"
ORDER BY ts_rank(tokens, query) DESC
`, [this.config.dictLanguage, tsquery(q)])
WHERE (query @@ "tokens" OR path ILIKE ?)
`
let qryEnd = `ORDER BY ts_rank(tokens, query) DESC`
let qryParams = [this.config.dictLanguage, tsquery(q), `%${q.toLowerCase()}%`]
if (opts.locale) {
qry = `${qry} AND locale = ?`
qryParams.push(opts.locale)
}
if (opts.path) {
qry = `${qry} AND path ILIKE ?`
qryParams.push(`%${opts.path}`)
}
const results = await WIKI.models.knex.raw(`
${qry}
${qryEnd}
`, qryParams)
if (results.rows.length < 5) {
const suggestResults = await WIKI.models.knex.raw(`SELECT word, word <-> ? AS rank FROM "pagesWords" WHERE similarity(word, ?) > 0.2 ORDER BY rank LIMIT 5;`, [q, q])
suggestions = suggestResults.rows.map(r => r.word)