Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/components/AppSettingsMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,17 @@ export default {

mounted() {
this.sortOrder = this.mainStore.getPreference('sort-order', 'newest')
document.addEventListener.call(window, 'mailvelope', () => this.checkMailvelope())
window.addEventListener('mailvelope', this.checkMailvelope)
if (!this.mainStore.areTextBlocksFetched()) {
this.mainStore.fetchMyTextBlocks()
this.mainStore.fetchSharedTextBlocks()
}
},

beforeUnmount() {
window.removeEventListener('mailvelope', this.checkMailvelope)
},

updated() {
this.checkMailvelope()
},
Expand Down
14 changes: 10 additions & 4 deletions src/components/Envelope.vue
Original file line number Diff line number Diff line change
Expand Up @@ -803,14 +803,16 @@ export default {
|| (this.data.previewText && isPgpText(this.data.previewText)) // PGP/Mailvelope
},

envelopeAllTags() {
return this.mainStore.getEnvelopeTags(this.data.databaseId)
},

isImportant() {
return this.mainStore
.getEnvelopeTags(this.data.databaseId)
.some((tag) => tag.imapLabel === '$label1')
return this.envelopeAllTags.some((tag) => tag.imapLabel === '$label1')
},

tags() {
let tags = this.mainStore.getEnvelopeTags(this.data.databaseId).filter((tag) => tag.imapLabel && tag.imapLabel !== '$label1' && !(tag.displayName.toLowerCase() in hiddenTags))
let tags = this.envelopeAllTags.filter((tag) => tag.imapLabel && tag.imapLabel !== '$label1' && !(tag.displayName.toLowerCase() in hiddenTags))

// Don't show follow-up tag in unified mailbox as it has its own section at the top
if (this.mailbox.isUnified) {
Expand Down Expand Up @@ -993,6 +995,10 @@ export default {
window.addEventListener('resize', this.onWindowResize)
},

beforeUnmount() {
window.removeEventListener('resize', this.onWindowResize)
},

methods: {
translateTagDisplayName,
setSelected(value) {
Expand Down
18 changes: 7 additions & 11 deletions src/components/EnvelopeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export default {
return a.dateInt < b.dateInt ? -1 : 1
})
}
return [...this.envelopes]
return this.envelopes
},

selectMode() {
Expand All @@ -307,22 +307,18 @@ export default {
return this.selectedEnvelopes.some((env) => env.flags.seen === false)
},

selectedEnvelopeTags() {
return this.selectedEnvelopes.map((env) => this.mainStore.getEnvelopeTags(env.databaseId))
},

isAtLeastOneSelectedImportant() {
// returns true if at least one selected message is marked as important
return this.selectedEnvelopes.some((env) => {
return this.mainStore
.getEnvelopeTags(env.databaseId)
.some((tag) => tag.imapLabel === '$label1')
})
return this.selectedEnvelopeTags.some((tags) => tags.some((tag) => tag.imapLabel === '$label1'))
},

isAtLeastOneSelectedUnimportant() {
// returns true if at least one selected message is not marked as important
return this.selectedEnvelopes.some((env) => {
return !this.mainStore
.getEnvelopeTags(env.databaseId)
.some((tag) => tag.imapLabel === '$label1')
})
return this.selectedEnvelopeTags.some((tags) => !tags.some((tag) => tag.imapLabel === '$label1'))
},

isAtLeastOneSelectedJunk() {
Expand Down
Loading