Skip to content

feat: ability to cancel a draft #13284

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

Open
madbob wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −17
Open

feat: ability to cancel a draft #13284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions src/components/Composer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,31 +283,32 @@
@upload="$emit('upload-attachment', $event, getMessageData())" />
<div class="composer-actions-right composer-actions">
<div class="composer-actions--primary-actions">
<p class="composer-actions-draft-status">
<span v-if="savingDraft" class="draft-status">{{ t('mail', 'Saving draft …') }}</span>
<span v-else-if="!canSaveDraft" class="draft-status">{{ t('mail', 'Error saving draft') }}</span>
<span v-else-if="draftSaved" class="draft-status">{{ t('mail', 'Draft saved') }}</span>
</p>
<ButtonVue
v-if="!savingDraft && !canSaveDraft"
v-if="!canSaveDraft"
class="button"
type="tertiary"
:disabled="savingDraft"
:aria-label="t('mail', 'Save draft')"
@click="saveDraft">
<template #icon>
<Download :size="20" :title="t('mail', 'Save draft')" />
</template>
</ButtonVue>
<ButtonVue
v-if="!savingDraft && draftSaved"
class="button"
type="tertiary"
:disabled="savingDraft"
:aria-label="t('mail', 'Discard & close draft')"
@click="$emit('discard-draft')">
<template #icon>
<Delete :size="20" :title="t('mail', 'Discard & close draft')" />
</template>
</ButtonVue>
<p class="composer-actions-draft-status">
<span v-if="savingDraft" class="draft-status">{{ t('mail', 'Saving draft …') }}</span>
<span v-else-if="!canSaveDraft" class="draft-status">{{ t('mail', 'Error saving draft') }}</span>
<span v-else-if="draftSaved" class="draft-status">{{ t('mail', 'Draft saved') }}</span>
</p>
</div>
<div class="composer-actions--secondary-actions">
<ButtonVue
Expand Down Expand Up @@ -1981,10 +1982,6 @@ export default {
flex-shrink: 0;
}

.composer-actions-draft-status {
padding-inline-start: 10px;
}

:deep(.vs__selected-options .vs__dropdown-toggle .vs--multiple ){
width: 100%;
}
Expand All @@ -2000,6 +1997,7 @@ export default {
}
.composer-actions--primary-actions {
padding-inline-end: 5px;
flex-direction: row-reverse;
}
}

Expand Down
29 changes: 23 additions & 6 deletions src/components/NewMessageModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,21 +562,38 @@ export default {
},

async discardDraft() {
let id = await this.draftsPromise
const isOutbox = this.composerMessage.type === 'outbox'
let id = null
let isOutbox = false
let isRemote = false

isOutbox = this.composerMessage.type === 'outbox'
if (isOutbox) {
id = this.composerMessage.data.id
} else {
// composerMessage.data.id refers to the local copy of the
// draft; if it doesn't exists, there is not a local copy and
// must intervene on the message stored on remote server
isRemote = (this.composerData.id === undefined && this.composerData.draftId !== undefined)
if (isRemote) {
id = this.composerData.draftId
} else {
id = await this.draftsPromise
}
}

// It's safe to stop the session and ultimately destroy this component as only data
// local this this function is accessed afterwards
await this.mainStore.stopComposerSession()

try {
if (isOutbox) {
await this.outboxStore.deleteMessage({ id })
} else {
deleteDraft(id)
if (id !== undefined) {
if (isOutbox) {
await this.outboxStore.deleteMessage({ id })
} else if (isRemote) {
this.mainStore.deleteMessage({ id })
} else {
deleteDraft(id)
}
}
showSuccess(t('mail', 'Message discarded'))
} catch (error) {
Expand Down
Loading