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

Merge pull request #26466 from nextcloud/fix/ocs-api-v2

This commit is contained in:
John Molakvoæ 2021-05-26 08:59:43 +02:00 committed by GitHub
parent accfe5b82d f1f8fa1e99
commit 903b99bd93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/js/dist/personal-settings.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files/js/dist/personal-settings.js.map vendored
View File

File diff suppressed because one or more lines are too long

6
apps/files/src/components/TransferOwnershipDialogue.vue
View File

@ -162,7 +162,7 @@ export default {
this.loadingUsers = true this.loadingUsers = true
try { 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: { params: {
format: 'json', format: 'json',
itemType: 'file', itemType: 'file',
@ -172,10 +172,6 @@ export default {
}, },
}) })
if (response.data.ocs.meta.statuscode !== 100) {
logger.error('Error fetching suggestions', { response })
}
this.userSuggestions = {} this.userSuggestions = {}
response.data.ocs.data.exact.users.concat(response.data.ocs.data.users).forEach(user => { response.data.ocs.data.exact.users.concat(response.data.ocs.data.users).forEach(user => {
Vue.set(this.userSuggestions, user.value.shareWith, { Vue.set(this.userSuggestions, user.value.shareWith, {

4
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

24
apps/files_sharing/src/components/SharingInput.vue
View File

@ -197,7 +197,9 @@ export default {
shareType.push(this.SHARE_TYPES.SHARE_TYPE_EMAIL) shareType.push(this.SHARE_TYPES.SHARE_TYPE_EMAIL)
} }
const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { let request = null
try {
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees', {
params: { params: {
format: 'json', format: 'json',
itemType: this.fileInfo.type === 'dir' ? 'folder' : 'file', itemType: this.fileInfo.type === 'dir' ? 'folder' : 'file',
@ -207,9 +209,8 @@ export default {
shareType, shareType,
}, },
}) })
} catch (error) {
if (request.data.ocs.meta.statuscode !== 100) { console.error('Error fetching suggestions', error)
console.error('Error fetching suggestions', request)
return return
} }
@ -287,24 +288,25 @@ export default {
async getRecommendations() { async getRecommendations() {
this.loading = true this.loading = true
const request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees_recommended', { let request = null
try {
request = await axios.get(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'sharees_recommended', {
params: { params: {
format: 'json', format: 'json',
itemType: this.fileInfo.type, itemType: this.fileInfo.type,
}, },
}) })
} catch (error) {
if (request.data.ocs.meta.statuscode !== 100) { console.error('Error fetching recommendations', error)
console.error('Error fetching recommendations', request)
return return
} }
// Add external results from the OCA.Sharing.ShareSearch api
const externalResults = this.externalResults.filter(result => !result.condition || result.condition(this)) const externalResults = this.externalResults.filter(result => !result.condition || result.condition(this))
const exact = request.data.ocs.data.exact
// flatten array of arrays // 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 // remove invalid data and format to user-select layout
this.recommendations = this.filterOutExistingShares(rawRecommendations) this.recommendations = this.filterOutExistingShares(rawRecommendations)