From e6d4a209b9ab65adbacbeeb4de23781c137bdfcc Mon Sep 17 00:00:00 2001
From: MichaelSun48 <michael.sun@sentry.io>
Date: Tue, 3 Sep 2024 09:55:38 -0700
Subject: [PATCH] Replace hard coded pathname with useLocation

---
 static/app/views/issueList/customViewsHeader.tsx   | 14 ++++++++------
 .../groupSearchViewTabs/draggableTabBar.tsx        |  8 +++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/static/app/views/issueList/customViewsHeader.tsx b/static/app/views/issueList/customViewsHeader.tsx
index a22fc6569e79b1..5807d674b34f37 100644
--- a/static/app/views/issueList/customViewsHeader.tsx
+++ b/static/app/views/issueList/customViewsHeader.tsx
@@ -10,6 +10,7 @@ import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import type {Organization} from 'sentry/types/organization';
+import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useProjects from 'sentry/utils/useProjects';
 import {
@@ -84,10 +85,11 @@ function CustomViewsIssueListHeaderTabsContent({
   router,
   views,
 }: CustomViewsIssueListHeaderTabsContentProps) {
-  // Remove cursor and page when switching tabs
+  // TODO(msun): Possible replace navigate with useSearchParams() in the future?
   const navigate = useNavigate();
+  const location = useLocation();
 
-  // TODO: Replace this with useLocation
+  // TODO(msun): Use the location from useLocation instead of props router in the future
   const {cursor: _cursor, page: _page, ...queryParams} = router?.location.query;
   const {query, sort, viewId} = queryParams;
 
@@ -164,13 +166,13 @@ function CustomViewsIssueListHeaderTabsContent({
     // If no query, sort, or viewId is present, set the first tab as the selected tab, update query accordingly
     if (!query && !sort && !viewId) {
       navigate({
+        ...location,
         query: {
           ...queryParams,
           query: draggableTabs[0].query,
           sort: draggableTabs[0].querySort,
           viewId: draggableTabs[0].id,
         },
-        pathname: `/organizations/${organization.slug}/issues/`,
       });
       tabListState?.setSelectedKey(draggableTabs[0].key);
       return;
@@ -208,13 +210,13 @@ function CustomViewsIssueListHeaderTabsContent({
       }
       if (selectedTab && query === undefined) {
         navigate({
+          ...location,
           query: {
             ...queryParams,
             query: selectedTab.query,
             sort: selectedTab.querySort,
             viewId: selectedTab.id,
           },
-          pathname: `/organizations/${organization.slug}/issues/`,
         });
         tabListState?.setSelectedKey(selectedTab.key);
         return;
@@ -223,11 +225,11 @@ function CustomViewsIssueListHeaderTabsContent({
         // if a viewId does not exist, remove it from the query
         tabListState?.setSelectedKey('temporary-tab');
         navigate({
+          ...location,
           query: {
             ...queryParams,
             viewId: undefined,
           },
-          pathname: `/organizations/${organization.slug}/issues/`,
         });
         return;
       }
@@ -257,11 +259,11 @@ function CustomViewsIssueListHeaderTabsContent({
             }
           });
           navigate({
+            ...location,
             query: {
               ...queryParams,
               viewId: tab.id,
             },
-            pathname: `/organizations/${organization.slug}/issues/`,
           });
         }
         return tab;
diff --git a/static/app/views/issueList/groupSearchViewTabs/draggableTabBar.tsx b/static/app/views/issueList/groupSearchViewTabs/draggableTabBar.tsx
index ab27130fbd1728..f5aa12fa97e7b6 100644
--- a/static/app/views/issueList/groupSearchViewTabs/draggableTabBar.tsx
+++ b/static/app/views/issueList/groupSearchViewTabs/draggableTabBar.tsx
@@ -12,6 +12,7 @@ import {t} from 'sentry/locale';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import {defined} from 'sentry/utils';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
+import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {DraggableTabMenuButton} from 'sentry/views/issueList/groupSearchViewTabs/draggableTabMenuButton';
 import EditableTabTitle from 'sentry/views/issueList/groupSearchViewTabs/editableTabTitle';
@@ -104,6 +105,7 @@ export function DraggableTabBar({
   const [editingTabKey, setEditingTabKey] = useState<string | null>(null);
 
   const navigate = useNavigate();
+  const location = useLocation();
 
   const {cursor: _cursor, page: _page, ...queryParams} = router?.location?.query ?? {};
 
@@ -149,13 +151,13 @@ export function DraggableTabBar({
         })
       );
       navigate({
+        ...location,
         query: {
           ...queryParams,
           query: originalTab.query,
           sort: originalTab.querySort,
           ...(originalTab.id ? {viewId: originalTab.id} : {}),
         },
-        pathname: `/organizations/${orgSlug}/issues/`,
       });
       onDiscard?.();
     }
@@ -188,11 +190,11 @@ export function DraggableTabBar({
         ...tabs.slice(idx + 1),
       ];
       navigate({
+        ...location,
         query: {
           ...queryParams,
           viewId: tempId,
         },
-        pathname: `/organizations/${orgSlug}/issues/`,
       });
       setTabs(newTabs);
       tabListState?.setSelectedKey(tempId);
@@ -251,11 +253,11 @@ export function DraggableTabBar({
         },
       ];
       navigate({
+        ...location,
         query: {
           ...queryParams,
           viewId: tempId,
         },
-        pathname: `/organizations/${orgSlug}/issues/`,
       });
       setTabs(newTabs);
       tabListState?.setSelectedKey(tempId);