From 36b4434254dcb1d97d17d42411df2977e9d2c6d3 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Tue, 9 Aug 2022 18:11:23 +0200
Subject: [PATCH] fix(ui) - assist sort options store

---
 .../shared/LiveSessionList/LiveSessionList.tsx  | 17 ++++++++++-------
 frontend/app/duck/liveSearch.js                 |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
index f4bb1f45d..89aa0d9eb 100644
--- a/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
+++ b/frontend/app/components/shared/LiveSessionList/LiveSessionList.tsx
@@ -39,16 +39,19 @@ function LiveSessionList(props: Props) {
     var timeoutId: any;
     const { filters } = filter;
     const hasUserFilter = filters.map((i: any) => i.key).includes(KEYS.USERID);
-    const sortOptions = [{ label: 'Newest', value: 'timestamp' }].concat(metaList
-        .map((i: any) => ({
-            label: capitalize(i),
-            value: i,
-        })).toJS());
+    const sortOptions = [{ label: 'Newest', value: 'timestamp' }].concat(
+        metaList
+            .map((i: any) => ({
+                label: capitalize(i),
+                value: i,
+            }))
+            .toJS()
+    );
 
     useEffect(() => {
         if (metaListLoading) return;
         const _filter = { ...filter };
-        if (sortOptions[1]) {
+        if (sortOptions[1] && !filter.sort) {
             _filter.sort = sortOptions[1].value;
         }
         props.applyFilter(_filter);
@@ -139,7 +142,7 @@ function LiveSessionList(props: Props) {
                     </NoContent>
                 </Loader>
 
-                <div className={cn("w-full flex items-center justify-center py-6", { 'disabled' : loading})}>
+                <div className={cn('w-full flex items-center justify-center py-6', { disabled: loading })}>
                     <Pagination
                         page={currentPage}
                         totalPages={Math.ceil(total / PER_PAGE)}
diff --git a/frontend/app/duck/liveSearch.js b/frontend/app/duck/liveSearch.js
index ecb8a720e..7838a740a 100644
--- a/frontend/app/duck/liveSearch.js
+++ b/frontend/app/duck/liveSearch.js
@@ -20,7 +20,7 @@ const FETCH_SESSION_LIST = fetchListType(`${name}/FETCH_SESSION_LIST`);
 
 const initialState = Map({
 	list: List(),
-	instance: new Filter({ filters: [], sort: 'timestamp' }),
+	instance: new Filter({ filters: [], sort: '' }),
   filterSearchList: {},
   currentPage: 1,
 });