Remove useRouter usages from organization stats team insights

Author: shashjar

static/app/views/organizationStats/teamInsights/controls.tsx

@@ -15,11 +15,12 @@ import {
 import {getArbitraryRelativePeriod} from 'sentry/components/timeRangeSelector/utils';
 import {t} from 'sentry/locale';
 import type {DateString} from 'sentry/types/core';
-import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
 import type {TeamWithProjects} from 'sentry/types/project';
 import {uniq} from 'sentry/utils/array/uniq';
 import {isActiveSuperuser} from 'sentry/utils/isActiveSuperuser';
 import {localStorageWrapper} from 'sentry/utils/localStorage';
+import {useLocation} from 'sentry/utils/useLocation';
+import {useNavigate} from 'sentry/utils/useNavigate';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {useProjects} from 'sentry/utils/useProjects';
 
@@ -48,19 +49,19 @@ const PAGE_QUERY_PARAMS = [
   'environment',
 ];
 
-type Props = Pick<RouteComponentProps, 'router' | 'location'> & {
+type Props = {
   currentEnvironment?: string;
   currentTeam?: TeamWithProjects;
   showEnvironment?: boolean;
 };
 
 export function TeamStatsControls({
-  location,
-  router,
   currentTeam,
   currentEnvironment,
   showEnvironment,
 }: Props) {
+  const location = useLocation();
+  const navigate = useNavigate();
   const {projects} = useProjects({
     slugs: currentTeam?.projects?.map(project => project.slug) ?? [],
   });
@@ -125,7 +126,7 @@ export function TeamStatsControls({
       },
     };
 
-    router.push(nextLocation);
+    navigate(nextLocation);
 
     return nextLocation;
   }

static/app/views/organizationStats/teamInsights/health.tsx

@@ -12,7 +12,6 @@ import {decodeScalar} from 'sentry/utils/queryString';
 import {useRouteAnalyticsEventNames} from 'sentry/utils/routeAnalytics/useRouteAnalyticsEventNames';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
-import {useRouter} from 'sentry/utils/useRouter';
 import {useUserTeams} from 'sentry/utils/useUserTeams';
 import {StatsHeader as Header} from 'sentry/views/organizationStats/header';
 
@@ -25,7 +24,6 @@ import {TeamStability} from './teamStability';
 import {dataDatetime} from './utils';
 
 export default function TeamStatsHealth() {
-  const router = useRouter();
   const location = useLocation();
   const organization = useOrganization();
   const {teams, isLoading, isError} = useUserTeams();
@@ -64,11 +62,7 @@ export default function TeamStatsHealth() {
       <Header organization={organization} activeTab="health" />
 
       <div>
-        <TeamStatsControls
-          location={location}
-          router={router}
-          currentTeam={currentTeam}
-        />
+        <TeamStatsControls currentTeam={currentTeam} />
 
         {isLoading && <LoadingIndicator />}
         {!isLoading && (

static/app/views/organizationStats/teamInsights/issues.tsx

@@ -11,7 +11,6 @@ import {localStorageWrapper} from 'sentry/utils/localStorage';
 import {useRouteAnalyticsEventNames} from 'sentry/utils/routeAnalytics/useRouteAnalyticsEventNames';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
-import {useRouter} from 'sentry/utils/useRouter';
 import {useUserTeams} from 'sentry/utils/useUserTeams';
 import {StatsHeader as Header} from 'sentry/views/organizationStats/header';
 
@@ -26,7 +25,6 @@ import {dataDatetime} from './utils';
 export default function TeamStatsIssues() {
   const organization = useOrganization();
   const location = useLocation();
-  const router = useRouter();
   const {teams, isLoading, isError} = useUserTeams();
 
   useRouteAnalyticsEventNames('team_insights.viewed', 'Team Insights: Viewed');
@@ -66,8 +64,6 @@ export default function TeamStatsIssues() {
       <div>
         <TeamStatsControls
           showEnvironment
-          location={location}
-          router={router}
           currentTeam={currentTeam}
           currentEnvironment={environment}
         />