diff --git a/apps/files/src/components/TransferOwnershipDialogue.vue b/apps/files/src/components/TransferOwnershipDialogue.vue index 7bc27e88ecf2f..f0025d69ee13e 100644 --- a/apps/files/src/components/TransferOwnershipDialogue.vue +++ b/apps/files/src/components/TransferOwnershipDialogue.vue @@ -162,7 +162,7 @@ export default { this.loadingUsers = true try { - const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { + const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', { params: { format: 'json', itemType: 'file', @@ -172,10 +172,6 @@ export default { }, }) - if (response.data.ocs.meta.statuscode !== 100) { - logger.error('Error fetching suggestions', { response }) - } - this.userSuggestions = {} response.data.ocs.data.exact.users.concat(response.data.ocs.data.users).forEach(user => { Vue.set(this.userSuggestions, user.value.shareWith, { diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue index e2d6eef03fc9c..93295d6742b45 100644 --- a/apps/files_sharing/src/components/SharingInput.vue +++ b/apps/files_sharing/src/components/SharingInput.vue @@ -194,19 +194,20 @@ export default { shareType.push(this.SHARE_TYPES.SHARE_TYPE_EMAIL) } - const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { - params: { - format: 'json', - itemType: this.fileInfo.type === 'dir' ? 'folder' : 'file', - search, - lookup, - perPage: this.config.maxAutocompleteResults, - shareType, - }, - }) - - if (request.data.ocs.meta.statuscode !== 100) { - console.error('Error fetching suggestions', request) + let request = null + try { + request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', { + params: { + format: 'json', + itemType: this.fileInfo.type === 'dir' ? 'folder' : 'file', + search, + lookup, + perPage: this.config.maxAutocompleteResults, + shareType, + }, + }) + } catch (error) { + console.error('Error fetching suggestions', error) return } @@ -283,24 +284,25 @@ export default { async getRecommendations() { this.loading = true - const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees_recommended', { - params: { - format: 'json', - itemType: this.fileInfo.type, - }, - }) - - if (request.data.ocs.meta.statuscode !== 100) { - console.error('Error fetching recommendations', request) + let request = null + try { + request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees_recommended', { + params: { + format: 'json', + itemType: this.fileInfo.type, + }, + }) + } catch (error) { + console.error('Error fetching recommendations', error) return } + // Add external results from the OCA.Sharing.ShareSearch api const externalResults = this.externalResults.filter(result => !result.condition || result.condition(this)) - const exact = request.data.ocs.data.exact - // flatten array of arrays - const rawRecommendations = Object.values(exact).reduce((arr, elem) => arr.concat(elem), []) + const rawRecommendations = Object.values(request.data.ocs.data.exact) + .reduce((arr, elem) => arr.concat(elem), []) // remove invalid data and format to user-select layout this.recommendations = this.filterOutExistingShares(rawRecommendations)