From b50688d6f9ea8f5a5538290cab8c8d99a9249906 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Fri, 3 Feb 2023 16:21:10 +0100
Subject: [PATCH] fix(ui) - search url sourceOperator sending undefined

---
 .../SessionSearchQueryParamHandler.tsx        | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/frontend/app/components/shared/SessionSearchQueryParamHandler/SessionSearchQueryParamHandler.tsx b/frontend/app/components/shared/SessionSearchQueryParamHandler/SessionSearchQueryParamHandler.tsx
index b34513052..1951b00a4 100644
--- a/frontend/app/components/shared/SessionSearchQueryParamHandler/SessionSearchQueryParamHandler.tsx
+++ b/frontend/app/components/shared/SessionSearchQueryParamHandler/SessionSearchQueryParamHandler.tsx
@@ -53,35 +53,29 @@ const SessionSearchQueryParamHandler = React.memo((props: Props) => {
       const filters: any = [];
       entires.forEach((item: any) => {
         if (!item.key || !item.value) { return }
-        const filter: any = {}
+        let filter: any = {}
         const filterKey = getFilterKeyTypeByKey(item.key);
         const tmp = item.value.split('^');
         const valueArr = tmp[0].split('|');
         const operator = valueArr.shift();
         const sourceArr = tmp[1] ? tmp[1].split('|') : [];
-        const sourceOperator = decodeURI(sourceArr.shift());
-        
+        const sourceOperator = sourceArr.shift();
 
         if (filterKey) {
           filter.type = filterKey;
           filter.key = filterKey;
-          filter.value = valueArr;
-          filter.operator = operator;
-          filter.source = sourceArr;
-          filter.sourceOperator = sourceOperator;
-          filters.push(filter);
         } else {
-          const _filter = _filters[item.key];
-          
-          if (!!_filter) {
-            _filter.type = _filter.key;
-            _filter.key = _filter.key;
-            _filter.value = valueArr;
-            _filter.operator = operator;
-            _filter.source = sourceArr;
-            filter.sourceOperator = sourceOperator;
+          filter = _filters[item.key];
+          if (!!filter) {
+            filter.type = filter.key;
+            filter.key = filter.key;
           }
         }
+        filter.value = valueArr;
+        filter.operator = operator;
+        filter.source = sourceArr;
+        filter.sourceOperator = !!sourceOperator ? decodeURI(sourceOperator) : null;
+        filters.push(filter);
       });
       const f = Filter({ filters })
       props.applyFilter(f);