Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Centralize current Folder checks to prevent bugs (which there were)

Browse source
This commit is contained in:
the-djmaze 2022-09-07 23:39:46 +02:00
parent 0c90875b61
commit f451af2188
5 changed files with 46 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dev/Stores/User/Messagelist.js
View file

@ -6,6 +6,7 @@ import { MessageSetAction } from 'Common/EnumsUser';
import { $htmlCL } from 'Common/Globals';
import { arrayLength, pInt, pString } from 'Common/Utils';
import { addObservablesTo, addComputablesTo } from 'External/ko';
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import {
getFolderInboxName,
@ -45,6 +46,7 @@ addObservablesTo(MessagelistUserStore, {
page: 1,
pageBeforeThread: 1,
error: '',
// Folder: '',
endHash: '',
endThreadUid: 0,
@ -68,6 +70,28 @@ addComputablesTo(MessagelistUserStore, {
return value;
},
isArchiveFolder: () => FolderUserStore.archiveFolder() === MessagelistUserStore().Folder,
isDraftFolder: () => FolderUserStore.draftsFolder() === MessagelistUserStore().Folder,
isSentFolder: () => FolderUserStore.sentFolder() === MessagelistUserStore().Folder,
isSpamFolder: () => FolderUserStore.spamFolder() === MessagelistUserStore().Folder,
isTrashFolder: () => FolderUserStore.trashFolder() === MessagelistUserStore().Folder,
archiveAllowed: () => ![UNUSED_OPTION_VALUE, MessagelistUserStore().Folder].includes(FolderUserStore.archiveFolder())
&& !MessagelistUserStore.isDraftFolder(),
spamAllowed: () => !(UNUSED_OPTION_VALUE === FolderUserStore.spamFolder()
// | MessagelistUserStore.isArchiveFolder()
| MessagelistUserStore.isSentFolder()
| MessagelistUserStore.isDraftFolder()),
isSpamAllowed: () => MessagelistUserStore.spamAllowed() && !MessagelistUserStore.isSpamFolder(),
isUnSpamAllowed: () => MessagelistUserStore.spamAllowed() && MessagelistUserStore.isSpamFolder(),
pageCount: () => Math.max(1, Math.ceil(MessagelistUserStore.count() / SettingsUserStore.messagesPerPage())),
mainSearch: {