Merge pull request #1675 from mercihabam/fix-empty-state

fix(frontend): avoid showing empty state while other lists are still loading

Author: kroky

modules/core/js_modules/Hm_MessagesStore.js

@@ -110,16 +110,16 @@ class Hm_MessagesStore {
                 $('.total_unread_count').html(' '+this.rows.length+' ');
             }
 
-            this.sort();
-            this.saveToLocalStorage();
+                    this.sort();
+                    this.saveToLocalStorage();
 
             if (messagesReadyCB) {
                 messagesReadyCB(this);
             }
         };
 
-        this.fetch(hideLoadingState).forEach((req) => {
-            req.then((response) => {
+        await Promise.all(this.fetch(hideLoadingState).map((req) => {
+            return req.then((response) => {
                 pendingResponses.set(response.sourceId, response);
 
                 if (processingTimeout) {
@@ -128,10 +128,10 @@ class Hm_MessagesStore {
 
                 // Process after a short delay to allow batching
                 processingTimeout = setTimeout(processPendingResponses, 10);
-            }).catch((error) => {
+            }, (error) => {
                 console.error('Error loading messages from source:', error);
             });
-        });
+        }));
 
         return this;
     }

modules/core/js_modules/actions/search.js

@@ -1,8 +1,9 @@
-function performSearch(routeParams) {
+async function performSearch(routeParams) {
     if (routeParams.search_terms) {
         const messages = new Hm_MessagesStore('search', Hm_Utils.get_url_page_number(), `${routeParams.search_terms}_${routeParams.search_fld}_${routeParams.search_since}`, routeParams.sort);
-        messages.load(true, false, false, function() {
-            display_imap_mailbox(messages.rows, messages.list, messages);
+        await messages.load(true, false, false, function() {
+            display_imap_mailbox(messages.rows, messages.list, messages, false);
         });
+        Hm_Message_List.check_empty_list();
     }
 }

modules/imap/site.js

@@ -428,7 +428,7 @@ async function select_imap_folder(path, page = 1, reload, processInTheBackground
                 }
             });
         } else {
-            display_imap_mailbox(messages.rows, messages.list, messages);
+            display_imap_mailbox(messages.rows, messages.list, messages, false);
         }
 
         showPagination(messages.pages);
@@ -445,6 +445,8 @@ async function select_imap_folder(path, page = 1, reload, processInTheBackground
         });
     });
 
+    Hm_Message_List.check_empty_list();
+
     if (path === 'unread') {
         Hm_Message_List.set_unread_state();
     }
@@ -512,10 +514,14 @@ $(document).on('submit', '#imap_filter_form', async function(event) {
     }
 });
 
-var display_imap_mailbox = function(rows, id, store) {
+var display_imap_mailbox = function(rows, id, store, checkEmptyState = true) {
     Hm_Message_List.toggle_msg_controls();
     Hm_Message_List.update(rows, id, store);
-    Hm_Message_List.check_empty_list();
+
+    if (checkEmptyState) {
+        Hm_Message_List.check_empty_list();
+    }
+
     $('input[type=checkbox]').on("click", function(e) {
         Hm_Message_List.toggle_msg_controls();
     });