From be39e498d72d33b4e6987de86cf199be09f67622 Mon Sep 17 00:00:00 2001 From: Sukhamjot Singh Date: Sat, 19 Feb 2022 17:14:58 +0530 Subject: [PATCH] added trash box --- webui-src/app/mail/mail_resolver.js | 5 +++++ webui-src/app/mail/mail_trashbox.js | 27 +++++++++++++++++++++++++++ webui-src/app/mail/mail_util.js | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 webui-src/app/mail/mail_trashbox.js diff --git a/webui-src/app/mail/mail_resolver.js b/webui-src/app/mail/mail_resolver.js index 48fa716..0b5b4e7 100644 --- a/webui-src/app/mail/mail_resolver.js +++ b/webui-src/app/mail/mail_resolver.js @@ -10,6 +10,7 @@ const Messages = { sent: [], outbox: [], drafts: [], + trash: [], load() { rs.rsJsonApiRequest('/rsMsgs/getMessageSummaries', {}, (data) => { Messages.all = data.msgList; @@ -25,6 +26,9 @@ const Messages = { Messages.drafts = Messages.all.filter( (msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_DRAFTBOX ); + Messages.trash = Messages.all.filter( + (msg) => (msg.msgflags & util.RS_MSG_BOXMASK) === util.RS_MSG_TRASH + ); }); }, }; @@ -34,6 +38,7 @@ const sections = { outbox: require('mail/mail_outbox'), drafts: require('mail/mail_draftbox'), sent: require('mail/mail_sentbox'), + trash: require('mail/mail_trashbox'), }; const tagselect = { showval: 'Tags', diff --git a/webui-src/app/mail/mail_trashbox.js b/webui-src/app/mail/mail_trashbox.js new file mode 100644 index 0000000..b7e4fa2 --- /dev/null +++ b/webui-src/app/mail/mail_trashbox.js @@ -0,0 +1,27 @@ +const m = require('mithril'); +const util = require('mail/mail_util'); + +const Layout = () => { + return { + view: (v) => [ + m('.widget', [ + m('h3', 'Trash'), + m('hr'), + m( + util.Table, + m( + 'tbody', + v.attrs.list.map((msg) => + m(util.MessageSummary, { + details: msg, + category: 'trash', + }) + ) + ) + ), + ]), + ], + }; +}; + +module.exports = Layout; diff --git a/webui-src/app/mail/mail_util.js b/webui-src/app/mail/mail_util.js index 083d5d1..e9c4b64 100644 --- a/webui-src/app/mail/mail_util.js +++ b/webui-src/app/mail/mail_util.js @@ -7,7 +7,7 @@ const RS_MSG_INBOX = 0x00; const RS_MSG_SENTBOX = 0x01; const RS_MSG_OUTBOX = 0x03; const RS_MSG_DRAFTBOX = 0x05; - +const RS_MSG_TRASH = 0x000020; const RS_MSG_NEW = 0x10; const RS_MSG_UNREAD_BY_USER = 0x40; const RS_MSG_STAR = 0x200; @@ -217,4 +217,5 @@ module.exports = { RS_MSG_NEW, RS_MSG_UNREAD_BY_USER, RS_MSG_STAR, + RS_MSG_TRASH, };