Improve how column meta is handled by the email stores.

This fixes meta counts not switching back after searching and adds loading icons when searching.
Oxygem · May 1, 2019 · 50efe92 · 50efe92
1 parent 25cfc9c
commit 50efe92
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 12 deletions.
diff --git a/kanmail/client/emails/base.js b/kanmail/client/emails/base.js
@@ -5,7 +5,11 @@ import { messageThreader } from 'threading.js';
 
 import requestStore from 'stores/request.js';
 
-import { getColumnStore, getColumnStoreKeys } from 'stores/columns.js';
+import {
+    getColumnStore,
+    getColumnStoreKeys,
+    getColumnMetaStore,
+ } from 'stores/columns.js';
 
 
 export default class BaseEmails {
@@ -17,11 +21,10 @@ export default class BaseEmails {
 
     constructor() {
         this.active = false;
-
         this.folderLocks = {};
 
-        // Map of account/messageId -> email message object
-        this.emails = {};
+        // Initialise emails/meta objects
+        this.reset()
 
         // Map of acocunt/folder/uid -> email message object
         this.accountFolderUidToEmail = {};
@@ -44,7 +47,18 @@ export default class BaseEmails {
     */
 
     reset() {
+        // Map of account/messageId -> email message object
         this.emails = {};
+        // Map of folder -> account -> meta
+        this.meta = {};
+    }
+
+    setMetaForAccountFolder(accountKey, folderName, meta) {
+        if (!this.meta[folderName]) {
+            this.meta[folderName] = {};
+        }
+
+        this.meta[folderName][accountKey] = meta;
     }
 
     addEmailsToAccountFolder(accountKey, folderName, emails) {
@@ -305,6 +319,7 @@ export default class BaseEmails {
 
         _.each(getColumnStoreKeys(), columnName => {
             const store = getColumnStore(columnName);
+            const metaStore = getColumnMetaStore(columnName);
 
             let threads = folderEmails[columnName] || [];
             threads = _.orderBy(threads, emails => {
@@ -319,7 +334,12 @@ export default class BaseEmails {
                 || _.includes(ALIAS_FOLDERS, columnName)
             );
 
+            // Push to the column and meta stores
             store.setThreads(threads, forceUpdate);
+            _.each(
+                this.meta[columnName],
+                (meta, accountKey) => metaStore.setAccountMeta(accountKey, meta),
+            );
         });
 
         const renderTaken = (performance.now() - renderStart).toFixed(2);

diff --git a/kanmail/client/emails/main.js b/kanmail/client/emails/main.js
@@ -43,6 +43,8 @@ class MainEmails extends BaseEmails {
             `Sync emails in ${accountKey}/${folderName}`,
             url, query,
         ).then(data => {
+            this.setMetaForAccountFolder(accountKey, folderName, data.meta);
+
             let changed = false;
 
             if (data.deleted_uids.length > 0) {
@@ -66,8 +68,6 @@ class MainEmails extends BaseEmails {
             }
 
             if (changed || options.forceProcess) {
-                const columnMetaStore = getColumnMetaStore(folderName);
-                columnMetaStore.setMeta(accountKey, data.meta);
                 this.processEmailChanges();
             }
         });
@@ -101,6 +101,8 @@ class MainEmails extends BaseEmails {
             `/api/emails/${accountKey}/${folderName}`,
             query,
         ).then(data => {
+            this.setMetaForAccountFolder(accountKey, folderName, data.meta);
+
             let changed = false;
 
             if (data.emails.length >= 0) {
@@ -114,8 +116,6 @@ class MainEmails extends BaseEmails {
             }
 
             if (changed || options.forceProcess) {
-                const columnMetaStore = getColumnMetaStore(folderName);
-                columnMetaStore.setMeta(accountKey, data.meta);
                 this.processEmailChanges();
             }
         });

diff --git a/kanmail/client/emails/search.js b/kanmail/client/emails/search.js
@@ -30,14 +30,19 @@ class SearchEmails extends BaseEmails {
     }
 
     getFolderEmails = (folderName, options={}) => {
+        const columnMetaStore = getColumnMetaStore(folderName);
+        columnMetaStore.setLoading(true);
+
         const requests = [];
 
         // For each account, search for matching emails
         _.each(_.keys(settingsStore.props.accounts), accountKey => {
             requests.push(this.searchEmails(accountKey, folderName, options))
         });
 
-        return Promise.all(requests);
+        return Promise.all(requests)
+            .then(() => columnMetaStore.setLoading(false))
+            .catch(() => columnMetaStore.setLoading(false));
     }
 
     searchEmails(accountKey, folderName, options={}) {
@@ -49,8 +54,7 @@ class SearchEmails extends BaseEmails {
             `Fetch emails from ${accountKey}/${folderName}`,
             url, query,
         ).then(data => {
-            const columnMetaStore = getColumnMetaStore(folderName);
-            columnMetaStore.setMeta(accountKey, data.meta);
+            this.setMetaForAccountFolder(accountKey, folderName, data.meta);
 
             let changed = false;
 

diff --git a/kanmail/client/stores/columns.js b/kanmail/client/stores/columns.js
@@ -18,7 +18,7 @@ class ColumnMetaStore extends BaseStore {
         };
     }
 
-    setMeta(accountKey, meta) {
+    setAccountMeta(accountKey, meta) {
         this.props.counts[accountKey] = meta.count;
         // const counts = _.reduce(meta, (memo, data, accountKey) => {
         //     memo[accountKey] = data.count;