Skip to content

Commit

Permalink
refactor(SharingInput): Remove unused addShare
Browse files Browse the repository at this point in the history
The new sharing flow since NC27 requires that users open the sharing details tab and

customize their share before creating it.

In #39472 the work of `addShare` was handed down to

`openSharingDetails` that opens the sharing details tab for the user to customize and manually

creat their share.

Signed-off-by: fenn-cs <[email protected]>
  • Loading branch information
Fenn-CS committed Jul 12, 2024
1 parent 3b11104 commit ada08ed
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 82 deletions.
76 changes: 0 additions & 76 deletions apps/files_sharing/src/components/SharingInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ import debounce from 'debounce'
import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import Config from '../services/ConfigService.js'
import GeneratePassword from '../utils/GeneratePassword.js'
import Share from '../models/Share.js'
import ShareRequests from '../mixins/ShareRequests.js'
import ShareTypes from '../mixins/ShareTypes.js'
Expand Down Expand Up @@ -463,81 +462,6 @@ export default {
...this.shareTypeToIcon(result.value.shareType),
}
},
/**
* Process the new share request
*
* @param {object} value the multiselect option
*/
async addShare(value) {
// Clear the displayed selection
this.value = null
if (value.lookup) {
await this.getSuggestions(this.query, true)
this.$nextTick(() => {
// open the dropdown again
this.$refs.select.$children[0].open = true
})
return true
}
// handle externalResults from OCA.Sharing.ShareSearch
if (value.handler) {
const share = await value.handler(this)
this.$emit('add:share', new Share(share))
return true
}
this.loading = true
console.debug('Adding a new share from the input for', value)
try {
let password = null
if (this.config.enforcePasswordForPublicLink
&& value.shareType === this.SHARE_TYPES.SHARE_TYPE_EMAIL) {
password = await GeneratePassword()
}
const path = (this.fileInfo.path + '/' + this.fileInfo.name).replace('//', '/')
const share = await this.createShare({
path,
shareType: value.shareType,
shareWith: value.shareWith,
password,
permissions: this.fileInfo.sharePermissions & OC.getCapabilities().files_sharing.default_permissions,
attributes: JSON.stringify(this.fileInfo.shareAttributes),
})
// If we had a password, we need to show it to the user as it was generated
if (password) {
share.newPassword = password
// Wait for the newly added share
const component = await new Promise(resolve => {
this.$emit('add:share', share, resolve)
})
// open the menu on the
// freshly created share component
component.open = true
} else {
// Else we just add it normally
this.$emit('add:share', share)
}
await this.getRecommendations()
} catch (error) {
this.$nextTick(() => {
// open the dropdown again on error
this.$refs.select.$children[0].open = true
})
this.query = value.shareWith
console.error('Error while adding new share', error)
} finally {
this.loading = false
}
},
},
}
</script>
Expand Down
6 changes: 0 additions & 6 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@ import ShareRequests from '../mixins/ShareRequests.js'
import ShareTypes from '../mixins/ShareTypes.js'
import SharesMixin from '../mixins/SharesMixin.js'
import { subscribe } from '@nextcloud/event-bus'
import {
ATOMIC_PERMISSIONS,
BUNDLED_PERMISSIONS,
Expand Down Expand Up @@ -654,7 +652,6 @@ export default {
mounted() {
this.$refs.quickPermissions?.querySelector('input:checked')?.focus()
subscribe('files_sharing:external:add-share', this.handleExistingShareFromExternalSource)
},
methods: {
Expand Down Expand Up @@ -916,9 +913,6 @@ export default {
return null // Or a default icon component if needed
}
},
handleExistingShareFromExternalSource(share) {
logger.info('Existing share from external source/app', { share })
},
},
}
</script>
Expand Down

0 comments on commit ada08ed

Please sign in to comment.