Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable28] fix(shares): handle silent sending and input paste correctly #11123

Merged
merged 2 commits into from
Dec 5, 2023
Merged

[stable28] fix(shares): handle silent sending and input paste correctly #11123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78d70f
fix(shares): allow silent send of shares
Antreesy Dec 5, 2023
e413f99
fix(shares): attach pasted files to current upload if exists
Antreesy Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/components/NewMessage/NewMessage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@

<!-- Send buttons -->
<template v-else>
<NcActions v-if="!broadcast && !upload"
<NcActions v-if="!broadcast"
:container="container"
:force-menu="true">
force-menu>
<!-- Silent send -->
<NcActionButton :close-after-click="true"
<NcActionButton close-after-click
icon="icon-upload"
:name="t('spreed', 'Send without notification')"
@click="handleSubmit({ silent: true })">
Expand Down Expand Up @@ -512,7 +512,7 @@ export default {

if (this.$store.getters.getInitialisedUploads(this.$store.getters.currentUploadId).length) {
// If dialog contains files to upload, delegate sending
this.$emit('upload', this.text)
this.$emit('upload', { caption: this.text, options })
return
} else {
// Dismiss dialog, process as normal message sending otherwise
Expand Down Expand Up @@ -679,7 +679,7 @@ export default {
*/
async handleFiles(files, rename = false, isVoiceMessage = false) {
// Create a unique id for the upload operation
const uploadId = new Date().getTime()
const uploadId = this.$store.getters.currentUploadId ?? new Date().getTime()
// Uploads and shares the files
await this.$store.dispatch('initialiseUpload', { files, token: this.token, uploadId, rename, isVoiceMessage })
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/NewMessage/NewMessageUploadEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ export default {
this.$store.dispatch('discardUpload', this.currentUploadId)
},

handleUpload(caption) {
this.$store.dispatch('uploadFiles', { uploadId: this.currentUploadId, caption })
handleUpload({ caption, options }) {
this.$store.dispatch('uploadFiles', { uploadId: this.currentUploadId, caption, options })
},
/**
* Clicks the hidden file input when clicking the correspondent NcActionButton,
Expand Down
16 changes: 12 additions & 4 deletions src/store/fileUploadStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,9 @@ const actions = {
* @param {object} data the wrapping object
* @param {string} data.uploadId The unique uploadId
* @param {string} [data.caption] The text caption to the media
* @param {object} data.options The share options
*/
async uploadFiles({ commit, dispatch, state, getters }, { uploadId, caption }) {
async uploadFiles({ commit, dispatch, state, getters }, { uploadId, caption, options }) {
if (state.currentUploadId === uploadId) {
commit('setCurrentUploadId', undefined)
}
Expand Down Expand Up @@ -366,9 +367,16 @@ const actions = {
const performShare = async ([index, shareableFile]) => {
const path = shareableFile.sharePath
const temporaryMessage = shareableFile.temporaryMessage
const metadata = (caption && index === lastIndex)
? JSON.stringify({ messageType: temporaryMessage.messageType, caption })
: JSON.stringify({ messageType: temporaryMessage.messageType })

const rawMetadata = { messageType: temporaryMessage.messageType }
if (caption && index === lastIndex) {
Object.assign(rawMetadata, { caption })
}
if (options?.silent) {
Object.assign(rawMetadata, { silent: options.silent })
}
const metadata = JSON.stringify(rawMetadata)

try {
const token = temporaryMessage.token
dispatch('markFileAsSharing', { uploadId, index })
Expand Down
14 changes: 7 additions & 7 deletions src/store/fileUploadStore.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe('fileUploadStore', () => {
}
})

test('performs upload and sharing of single file', async () => {
test('performs silent upload and sharing of single file with caption', async () => {
const file = {
name: 'pngimage.png',
type: 'image/png',
Expand All @@ -159,7 +159,7 @@ describe('fileUploadStore', () => {
findUniquePath.mockResolvedValueOnce({ uniquePath: uniqueFileName, suffix: 1 })
shareFile.mockResolvedValue()

await store.dispatch('uploadFiles', { uploadId: 'upload-id1', caption: 'text-caption' })
await store.dispatch('uploadFiles', { uploadId: 'upload-id1', caption: 'text-caption', options: { silent: true } })

expect(findUniquePath).toHaveBeenCalledTimes(1)
expect(findUniquePath).toHaveBeenCalledWith(client, '/files/current-user', '/Talk/' + file.name, undefined)
Expand All @@ -168,13 +168,13 @@ describe('fileUploadStore', () => {
expect(client.putFileContents).toHaveBeenCalledWith(`/files/current-user${uniqueFileName}`, fileBuffer, expect.anything())

expect(shareFile).toHaveBeenCalledTimes(1)
expect(shareFile).toHaveBeenCalledWith(`/${uniqueFileName}`, 'XXTOKENXX', 'reference-id-1', '{"caption":"text-caption"}')
expect(shareFile).toHaveBeenCalledWith(`/${uniqueFileName}`, 'XXTOKENXX', 'reference-id-1', '{"caption":"text-caption","silent":true}')

expect(mockedActions.addTemporaryMessage).toHaveBeenCalledTimes(1)
expect(store.getters.currentUploadId).not.toBeDefined()
})

test('performs upload and sharing of multiple files', async () => {
test('performs upload and sharing of multiple files with caption', async () => {
const file1 = {
name: 'pngimage.png',
type: 'image/png',
Expand Down Expand Up @@ -208,7 +208,7 @@ describe('fileUploadStore', () => {
.mockResolvedValueOnce({ data: { ocs: { data: { id: '1' } } } })
.mockResolvedValueOnce({ data: { ocs: { data: { id: '2' } } } })

await store.dispatch('uploadFiles', { uploadId: 'upload-id1', caption: 'text-caption' })
await store.dispatch('uploadFiles', { uploadId: 'upload-id1', caption: 'text-caption', options: { silent: false } })

expect(findUniquePath).toHaveBeenCalledTimes(2)
expect(client.putFileContents).toHaveBeenCalledTimes(2)
Expand Down Expand Up @@ -251,7 +251,7 @@ describe('fileUploadStore', () => {
},
})

await store.dispatch('uploadFiles', { uploadId: 'upload-id1' })
await store.dispatch('uploadFiles', { uploadId: 'upload-id1', options: { silent: false } })

expect(client.putFileContents).toHaveBeenCalledTimes(1)
expect(shareFile).not.toHaveBeenCalled()
Expand Down Expand Up @@ -288,7 +288,7 @@ describe('fileUploadStore', () => {
},
})

await store.dispatch('uploadFiles', { uploadId: 'upload-id1' })
await store.dispatch('uploadFiles', { uploadId: 'upload-id1', options: { silent: false } })

expect(client.putFileContents).toHaveBeenCalledTimes(1)
expect(shareFile).toHaveBeenCalledTimes(1)
Expand Down
Loading