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

fix(frontend): remove deleted message from store #1444

Closed
wants to merge 1 commit into from
Closed

fix(frontend): remove deleted message from store #1444

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
26 changes: 5 additions & 21 deletions modules/imap/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,15 @@ var imap_delete_message = function(state, supplied_uid, supplied_detail) {
{'name': 'imap_msg_uid', 'value': uid},
{'name': 'imap_server_id', 'value': detail.server_id},
{'name': 'folder', 'value': detail.folder}],
function(res) {
async function(res) {
if (!res.imap_delete_error) {
if (Hm_Utils.get_from_global('msg_uid', false)) {
return;
}
var msg_cache_key = 'imap_'+detail.server_id+'_'+getMessageUidParam()+'_'+detail.folder;
remove_from_cached_imap_pages(msg_cache_key);
const store = new Hm_MessagesStore(getListPathParam(), Hm_Utils.get_url_page_number());
await store.load(false, true);
store.removeRow(getMessageUidParam());

var nlink = $('.nlink');
if (nlink.length && Hm_Utils.get_from_global('auto_advance_email_enabled')) {
Hm_Utils.redirect(nlink.attr('href'));
Expand Down Expand Up @@ -363,24 +365,6 @@ var fetch_cached_imap_page = function() {
return [ page, links ];
}

var remove_from_cached_imap_pages = function(msg_cache_key) {
var keys = ['imap_'+Hm_Utils.get_url_page_number()+'_'+getListPathParam()];
if (hm_list_parent()) {
keys.push('imap_'+Hm_Utils.get_url_page_number()+'_'+hm_list_parent());
if (['combined_inbox', 'unread', 'flagged', 'advanced_search', 'search', 'sent'].includes(hm_list_parent())) {
keys.push('formatted_'+hm_list_parent());
}
}
keys.forEach(function(key) {
var data = Hm_Utils.get_from_local_storage(key);
if (data) {
var page_data = $('<div></div>').append(data);
page_data.find('.'+msg_cache_key).remove();
Hm_Utils.save_to_local_storage(key, page_data.html());
}
});
}

async function select_imap_folder(path, page = 1,reload, processInTheBackground = false, abortController = null) {
const messages = new Hm_MessagesStore(path, page, null, abortController);
await messages.load(reload, processInTheBackground).then(() => {
Expand Down
Loading