From bfb2543c057a2209cf1440c38d1df4739ce9da0a Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Fri, 24 Feb 2023 20:00:34 -0500
Subject: [PATCH] Remember selected callsign when changing filter

---
 gui/preload-chat.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/gui/preload-chat.js b/gui/preload-chat.js
index df3ceb3a..9d0ed3ad 100644
--- a/gui/preload-chat.js
+++ b/gui/preload-chat.js
@@ -761,7 +761,8 @@ update_chat = function (obj) {
   if (!document.getElementById("chat-" + dxcallsign + "-list")) {
     // increment callsign counter
     callsign_counter++;
-    if (callsign_counter == 1) {
+    dxcallsigns.add(dxcallsign);
+    if ((callsign_counter == 1 && selected_callsign=="") || selected_callsign == dxcallsign ) {
       var callsign_selected = "active show";
       //document.getElementById('chatModuleDxCall').value = dxcallsign;
       selected_callsign = dxcallsign;
@@ -1481,14 +1482,14 @@ function createUserIndex() {
     });
 }
 
-function updateAllChat(clear) {
+async function updateAllChat(clear) {
   if (clear == true) {
     filetype = "";
     file = "";
     filename = "";
     callsign_counter = 0;
-    selected_callsign = "";
-    dxcallsigns = new Set();
+    //selected_callsign = "";
+    dxcallsigns.clear();
     document.getElementById("list-tab").innerHTML = "";
     document.getElementById("nav-tabContent").innerHTML = "";
     //document.getElementById("list-tab").childNodes.remove();
@@ -1496,14 +1497,14 @@ function updateAllChat(clear) {
   }
   //Ensure we create an index before running db.find
   //We can't rely on the default index existing before we get here...... :'(
-  db.createIndex({
+  await db.createIndex({
     index: {
       fields: [{ timestamp: "asc" }],
     },
   })
-    .then(function (result) {
+    .then(async function (result) {
       // handle result
-      db.find({
+      await db.find({
         selector: {
           $and: [{ timestamp: { $exists: true } }, { $or: chatFilter }],
           //$or: chatFilter
@@ -1536,4 +1537,12 @@ function updateAllChat(clear) {
     .catch(function (err) {
       console.log(err);
     });
+    if (clear == true && dxcallsigns.has(selected_callsign) == false) {
+      //Selected call sign is not visible, reset to first call sign
+      let tmp = dxcallsigns.entries().next().value[0];
+      selected_callsign=tmp;
+      document.getElementById("chat-" + tmp + "-list").classList.add("active","show");
+      document.getElementById("chat-" + tmp ).classList.add("active","show");
+      scrollMessagesToBottom();
+    }
 }