From f4f0e5275ebf4313f1b7a9515c00b3558efe7734 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Thu, 12 Dec 2024 18:37:40 +0100
Subject: [PATCH] ui fixes

---
 src/routes/options-flow/+page.svelte          | 24 ++++++++-----------
 .../options-flow/workers/filterWorker.ts      |  1 -
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/routes/options-flow/+page.svelte b/src/routes/options-flow/+page.svelte
index ab8faf64..50e1e372 100644
--- a/src/routes/options-flow/+page.svelte
+++ b/src/routes/options-flow/+page.svelte
@@ -506,7 +506,7 @@ function sendMessage(message) {
     */
 
       socket.addEventListener("message", (event) => {
-        previousVolume = displayCallVolume + displayPutVolume || 0;
+        const totalVolume = displayCallVolume + displayPutVolume;
         if (mode === true) {
           try {
             newData = JSON.parse(event.data) ?? [];
@@ -515,17 +515,16 @@ function sendMessage(message) {
                 item.dte = daysLeft(item?.date_expiration);
               });
 
-              calculateStats(newData);
+              //calculateStats(newData);
               //console.log(previousVolume);
               if (
                 newData?.length > rawData?.length &&
-                previousVolume !== displayCallVolume + displayPutVolume
+                previousVolume !== totalVolume
               ) {
-                //console.log(previousVolume,displayCallVolume + displayPutVolume,);
+                //console.log(previousVolume,totalVolume,);
                 rawData = newData;
                 displayedData = rawData;
 
-                newData = [];
                 if (
                   !muted &&
                   ruleOfList?.length === 0 &&
@@ -536,10 +535,6 @@ function sendMessage(message) {
               }
             }
 
-            if (ruleOfList?.length !== 0 || filterQuery?.length !== 0) {
-              shouldLoadWorker.set(true);
-            }
-
             /*
           if (previousCallVolume !== displayCallVolume && !muted && audio) {
             audio?.play();
@@ -548,6 +543,8 @@ function sendMessage(message) {
           } catch (e) {
             console.error("Error processing WebSocket message:", e);
           }
+          newData = [];
+          previousVolume = totalVolume;
         }
       });
 
@@ -601,6 +598,10 @@ function sendMessage(message) {
     if (filterQuery?.length > 0) {
       shouldLoadWorker.set(true);
     }
+    if (ruleOfList?.length !== 0) {
+      shouldLoadWorker.set(true);
+      console.log("initial filter");
+    }
 
     displayRules = allRows?.filter((row) =>
       ruleOfList?.some((rule) => rule?.name === row?.rule),
@@ -625,11 +626,6 @@ function sendMessage(message) {
       }
     });
 
-    if (ruleOfList?.length !== 0) {
-      shouldLoadWorker.set(true);
-      console.log("initial filter");
-    }
-
     isLoaded = true;
   });
 
diff --git a/src/routes/options-flow/workers/filterWorker.ts b/src/routes/options-flow/workers/filterWorker.ts
index eb37b9b7..993145ae 100644
--- a/src/routes/options-flow/workers/filterWorker.ts
+++ b/src/routes/options-flow/workers/filterWorker.ts
@@ -288,7 +288,6 @@ onmessage = async (event: MessageEvent) => {
   // Filter the data
   let filteredData = await filterRawData(rawData, ruleOfList, filterQuery);
   
-  console.log(ruleOfList)
   filteredData = Array.from(
     new Map(filteredData?.map((item) => [item?.id, item]))?.values()
   );