From 498f8e8e21dc62836b130a8c5139bb2009a0ed25 Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Tue, 5 Nov 2019 16:39:46 +0200
Subject: [PATCH] ui/listings: Show errors when filtering

Errors were not shown properly because the data_columns grids were being
overwritten by redraw_list(). Call redraw_list() only if filtering was
succesful.
---
 ui/src/components/mail/listing/compact.rs     | 20 ++++++++-----------
 .../components/mail/listing/conversations.rs  | 14 +++++++------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ui/src/components/mail/listing/compact.rs b/ui/src/components/mail/listing/compact.rs
index 198010e5..1a6d381f 100644
--- a/ui/src/components/mail/listing/compact.rs
+++ b/ui/src/components/mail/listing/compact.rs
@@ -350,9 +350,12 @@ impl ListingTrait for CompactListing {
             return;
         }
 
+        self.order.clear();
+        self.selection.clear();
+        self.length = 0;
         self.filtered_selection.clear();
         self.filtered_order.clear();
-        self.filter_term.clear();
+        self.filter_term = filter_term.to_string();
         self.row_updates.clear();
         for v in self.selection.values_mut() {
             *v = false;
@@ -360,7 +363,7 @@ impl ListingTrait for CompactListing {
 
         let account = &context.accounts[self.cursor_pos.0];
         let folder_hash = account[self.cursor_pos.1].unwrap().folder.hash();
-        match account.search(filter_term, self.sort, folder_hash) {
+        match account.search(&self.filter_term, self.sort, folder_hash) {
             Ok(results) => {
                 let threads = &account.collection.threads[&folder_hash];
                 for env_hash in results {
@@ -396,16 +399,17 @@ impl ListingTrait for CompactListing {
                     self.data_columns.columns[0] =
                         CellBuffer::new_with_context(0, 0, Cell::with_char(' '), context);
                 }
+                self.redraw_list(context);
             }
             Err(e) => {
                 self.cursor_pos.2 = 0;
                 self.new_cursor_pos.2 = 0;
                 let message = format!(
                     "Encountered an error while searching for `{}`: {}.",
-                    filter_term, e
+                    &self.filter_term, e
                 );
                 log(
-                    format!("Failed to search for term {}: {}", filter_term, e),
+                    format!("Failed to search for term {}: {}", &self.filter_term, e),
                     ERROR,
                 );
                 self.data_columns.columns[0] =
@@ -421,8 +425,6 @@ impl ListingTrait for CompactListing {
                 );
             }
         }
-        self.filter_term = filter_term.to_string();
-        self.redraw_list(context);
     }
 
     fn set_movement(&mut self, mvm: PageMovement) {
@@ -618,12 +620,6 @@ impl CompactListing {
             self.order.insert(root_idx, idx);
             self.selection.insert(root_idx, false);
         }
-        let CompactListing {
-            ref mut selection,
-            ref order,
-            ..
-        } = self;
-        selection.retain(|e, _| order.contains_key(e));
 
         min_width.0 = self.length.saturating_sub(1).to_string().len();
 
diff --git a/ui/src/components/mail/listing/conversations.rs b/ui/src/components/mail/listing/conversations.rs
index 88ab1373..b11422d3 100644
--- a/ui/src/components/mail/listing/conversations.rs
+++ b/ui/src/components/mail/listing/conversations.rs
@@ -341,9 +341,12 @@ impl ListingTrait for ConversationsListing {
             return;
         }
 
+        self.order.clear();
+        self.selection.clear();
+        self.length = 0;
         self.filtered_selection.clear();
         self.filtered_order.clear();
-        self.filter_term.clear();
+        self.filter_term = filter_term.to_string();
         self.row_updates.clear();
         for v in self.selection.values_mut() {
             *v = false;
@@ -351,7 +354,7 @@ impl ListingTrait for ConversationsListing {
 
         let account = &context.accounts[self.cursor_pos.0];
         let folder_hash = account[self.cursor_pos.1].unwrap().folder.hash();
-        match account.search(filter_term, self.sort, folder_hash) {
+        match account.search(&self.filter_term, self.sort, folder_hash) {
             Ok(results) => {
                 let threads = &account.collection.threads[&folder_hash];
                 for env_hash in results {
@@ -387,16 +390,17 @@ impl ListingTrait for ConversationsListing {
                     self.content =
                         CellBuffer::new_with_context(0, 0, Cell::with_char(' '), context);
                 }
+                self.redraw_list(context);
             }
             Err(e) => {
                 self.cursor_pos.2 = 0;
                 self.new_cursor_pos.2 = 0;
                 let message = format!(
                     "Encountered an error while searching for `{}`: {}.",
-                    filter_term, e
+                    self.filter_term, e
                 );
                 log(
-                    format!("Failed to search for term {}: {}", filter_term, e),
+                    format!("Failed to search for term {}: {}", self.filter_term, e),
                     ERROR,
                 );
                 self.content =
@@ -412,8 +416,6 @@ impl ListingTrait for ConversationsListing {
                 );
             }
         }
-        self.filter_term = filter_term.to_string();
-        self.redraw_list(context);
     }
 
     fn set_movement(&mut self, mvm: PageMovement) {