mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22422 from nextcloud/fix/unified-search-pagination 

Add the missing cursor parameter to unified search requests
This commit is contained in:
Joas Schilling 2020-08-26 10:15:12 +02:00 committed by GitHub
parent 00459adfa2 97a1784065
commit 2056510214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/dist/unified-search.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/unified-search.js.map vendored
View File

File diff suppressed because one or more lines are too long

11
core/src/services/UnifiedSearchService.js
View File

@ -53,8 +53,15 @@ export async function getTypes() {
*
* @param {string} type the type to search
* @param {string} query the search
* @param {int|string|undefined} cursor the offset for paginated searches
* @returns {Promise}
*/
export function search(type, query) {
return axios.get(generateUrl(`/search/providers/${type}/search?term=${query}`))
export function search(type, query, cursor) {
return axios.get(generateUrl(`/search/providers/${type}/search?term=${query}`), {
params: {
cursor,
// Sending which location we're currently at
from: window.location.pathname.replace('/index.php', '') + window.location.search,
}
})
}

2
core/src/views/UnifiedSearch.vue
View File

@ -338,7 +338,7 @@ export default {
this.$set(this.loading, type, true)
if (this.cursors[type]) {
const request = await search(type, this.query)
const request = await search(type, this.query, this.cursors[type])
// Save cursor if any
if (request.data.cursor) {