From 1662f76d76ad6a9bf9faaaacac94a9eef78a235e Mon Sep 17 00:00:00 2001
From: PintoGideon <gideonpinto123@gmail.com>
Date: Thu, 15 Feb 2024 15:17:19 -0500
Subject: [PATCH] Providing a better experience of the context switching
 between public and private feeds when a user sign's in and out

---
 src/components/Feeds/FeedListView.tsx | 5 ++---
 src/components/Feeds/FeedView.tsx     | 4 ++--
 src/components/Wrapper/Sidebar.tsx    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/Feeds/FeedListView.tsx b/src/components/Feeds/FeedListView.tsx
index a2d2880f3..0c7f90b62 100644
--- a/src/components/Feeds/FeedListView.tsx
+++ b/src/components/Feeds/FeedListView.tsx
@@ -139,10 +139,9 @@ const TableSelectable: React.FunctionComponent = () => {
   }, [dispatch]);
 
   React.useEffect(() => {
-    if (!type) {
-      const feedType = isLoggedIn ? "private" : "public";
+    if (!type || (!isLoggedIn && type === "private")) {
       navigate(
-        `/feeds?search=${search}&searchType=${searchType}&page=${page}&perPage=${perPage}&type=${feedType}`,
+        `/feeds?search=${search}&searchType=${searchType}&page=${page}&perPage=${perPage}&type=public`,
       );
     }
   }, [isLoggedIn, navigate, perPage, page, searchType, search, type]);
diff --git a/src/components/Feeds/FeedView.tsx b/src/components/Feeds/FeedView.tsx
index 726285288..26d5c096e 100644
--- a/src/components/Feeds/FeedView.tsx
+++ b/src/components/Feeds/FeedView.tsx
@@ -75,10 +75,10 @@ export default function FeedView() {
   });
 
   React.useEffect(() => {
-    if (!type) {
+    if (!type || (type === "private" && !isLoggedIn)) {
       navigate("/feeds?type=public");
     }
-  }, [type, navigate]);
+  }, [type, navigate, isLoggedIn]);
 
   React.useEffect(() => {
     const feed: Feed | undefined = privateFeed || publicFeed;
diff --git a/src/components/Wrapper/Sidebar.tsx b/src/components/Wrapper/Sidebar.tsx
index dcdf8127f..687fc5fb0 100644
--- a/src/components/Wrapper/Sidebar.tsx
+++ b/src/components/Wrapper/Sidebar.tsx
@@ -137,7 +137,7 @@ const AnonSidebarImpl: React.FC<AllProps> = ({
             itemId="analyses"
             isActive={sidebarActiveItem === "analyses"}
           >
-            <Link to="/feeds">New and Existing Analyses</Link>
+            <Link to="/feeds?type=public">New and Existing Analyses</Link>
           </NavItem>
           <NavItem itemId="catalog" isActive={sidebarActiveItem === "catalog"}>
             <Link to="/catalog">Plugins</Link>