fix(Felamimail/SPAM):wrong ham strategy ui behavior

- noJunk keep selection after grid reload - fix ham strategy ui with multi selections - add response for Felamimail.processSpam method Change-Id: Ic8b6aca42ef30f65d958d7bdba40f9c0ef2a625b
tine20 · Aug 23, 2021 · c8f983d · c8f983d
1 parent c37e301
commit c8f983d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/tine20/Felamimail/Frontend/Json.php b/tine20/Felamimail/Frontend/Json.php
@@ -825,5 +825,9 @@ public function processSpam($messageId, $userRating)
         $message = Felamimail_Controller_Message::getInstance()->getCompleteMessage($messageId);
         $pipeLine = new Tinebase_BL_Pipe($rs, false);
         $pipeLine->execute($message);
+
+        return [
+            'status' => 'success'
+        ];
     }
 }
diff --git a/tine20/Felamimail/js/GridPanel.js b/tine20/Felamimail/js/GridPanel.js
@@ -1795,16 +1795,25 @@ Tine.Felamimail.GridPanel = Ext.extend(Tine.widgets.grid.GridPanel, {
                     targetFolder.set('cache_status', 'pending');
                     targetFolder.commit();
                 }
+
+                if (nextRecord) {
+                    sm.selectRecords([nextRecord]);
+                }
             }
 
-            if ('spam' === option && nextRecord) {
-                sm.selectRecords([nextRecord]);
+            if ('ham' === option ) {
+                sm.selectRecords(msgs.items, true);
             }
 
-            await Promise.allSettled(promises);
+            await Promise.allSettled(promises)
+                .then(() => {
+                    if ('spam' === option) {
+                        this.onAfterDelete(msgsIds);
+                    }
+
+                    this.doRefresh();
+            });
 
-            this.onAfterDelete(msgsIds);
-            this.doRefresh();
         } catch (e) {
             this.doRefresh();
         }