feat(nav): Move stats to settings

static/app/components/nav/primary.tsx

@@ -21,7 +21,6 @@ import {
   IconQuestion,
   IconSearch,
   IconSettings,
-  IconStats,
 } from 'sentry/icons';
 import {t} from 'sentry/locale';
 import ConfigStore from 'sentry/stores/configStore';
@@ -226,16 +225,7 @@ export function PrimaryNavigationItems() {
         </SidebarMenu>
 
         <SidebarLink
-          to={`/${prefix}/stats/`}
-          analyticsKey="stats"
-          linkProps={!includeFooterLabels ? {'aria-label': t('Stats')} : undefined}
-        >
-          <IconStats />
-          {includeFooterLabels && <span>{t('Stats')}</span>}
-        </SidebarLink>
-
-        <SidebarLink
-          to={`/${prefix}/settings/`}
+          to={`/${prefix}/settings/${organization.slug}/`}
           activeTo={`/${prefix}/settings/`}
           analyticsKey="settings"
           linkProps={!includeFooterLabels ? {'aria-label': t('Settings')} : undefined}

static/app/routes.tsx

@@ -33,6 +33,7 @@ import {IssueNavigation} from 'sentry/views/issues/navigation';
 import OrganizationContainer from 'sentry/views/organizationContainer';
 import OrganizationLayout from 'sentry/views/organizationLayout';
 import OrganizationRoot from 'sentry/views/organizationRoot';
+import {OrganizationStatsWrapper} from 'sentry/views/organizationStats/organizationStatsWrapper';
 import ProjectEventRedirect from 'sentry/views/projectEventRedirect';
 import redirectDeprecatedProjectRoute from 'sentry/views/projects/redirectDeprecatedProjectRoute';
 import RouteNotFound from 'sentry/views/routeNotFound';
@@ -695,6 +696,39 @@ function buildRoutes() {
     </Route>
   );
 
+  const statsChildRoutes = (
+    <Fragment>
+      <IndexRoute component={make(() => import('sentry/views/organizationStats'))} />
+      <Route
+        component={make(() => import('sentry/views/organizationStats/teamInsights'))}
+      >
+        <Route
+          path="issues/"
+          component={make(
+            () => import('sentry/views/organizationStats/teamInsights/issues')
+          )}
+        />
+        <Route
+          path="health/"
+          component={make(
+            () => import('sentry/views/organizationStats/teamInsights/health')
+          )}
+        />
+      </Route>
+    </Fragment>
+  );
+  const statsRoutes = (
+    <Fragment>
+      <Route path="/stats/" withOrgPath component={OrganizationStatsWrapper}>
+        {statsChildRoutes}
+      </Route>
+      <Redirect
+        from="/organizations/:orgId/stats/team/"
+        to="/organizations/:orgId/stats/issues/"
+      />
+    </Fragment>
+  );
+
   const orgSettingsRoutes = (
     <Route
       component={make(
@@ -998,6 +1032,9 @@ function buildRoutes() {
           )}
         />
       </Route>
+      <Route path="stats/" name={t('Stats')}>
+        {statsChildRoutes}
+      </Route>
     </Route>
   );
 
@@ -1485,34 +1522,6 @@ function buildRoutes() {
     </Fragment>
   );
 
-  const statsRoutes = (
-    <Fragment>
-      <Route path="/stats/" withOrgPath>
-        <IndexRoute component={make(() => import('sentry/views/organizationStats'))} />
-        <Route
-          component={make(() => import('sentry/views/organizationStats/teamInsights'))}
-        >
-          <Route
-            path="issues/"
-            component={make(
-              () => import('sentry/views/organizationStats/teamInsights/issues')
-            )}
-          />
-          <Route
-            path="health/"
-            component={make(
-              () => import('sentry/views/organizationStats/teamInsights/health')
-            )}
-          />
-        </Route>
-      </Route>
-      <Redirect
-        from="/organizations/:orgId/stats/team/"
-        to="/organizations/:orgId/stats/issues/"
-      />
-    </Fragment>
-  );
-
   const discoverChildRoutes = (
     <Fragment>
       <IndexRedirect to="queries/" />

static/app/views/organizationStats/organizationStatsWrapper.tsx

@@ -0,0 +1,21 @@
+import {useRedirectNavV2Routes} from 'sentry/components/nav/useRedirectNavV2Routes';
+import Redirect from 'sentry/components/redirect';
+
+type OrganizationStatsWrapperProps = {
+  children: React.ReactNode;
+};
+
+// Wraps all routes under /stats/ to redirect to /settings/stats/
+// Can be removed once navigation-sidebar-v2 is fully launched
+export function OrganizationStatsWrapper({children}: OrganizationStatsWrapperProps) {
+  const redirectPath = useRedirectNavV2Routes({
+    oldPathPrefix: '/stats/',
+    newPathPrefix: '/settings/stats/',
+  });
+
+  if (redirectPath) {
+    return <Redirect to={redirectPath} />;
+  }
+
+  return children;
+}

static/app/views/settings/organization/navigationConfiguration.tsx

@@ -126,6 +126,14 @@ const organizationNavigation: NavigationSection[] = [
         show: ({organization}) =>
           !!organization && organization.features.includes('feature-flag-ui'),
       },
+      {
+        path: `${organizationSettingsPathPrefix}/stats/`,
+        title: t('Stats & Usage'),
+        description: t('View organization stats and usage'),
+        id: 'stats',
+        show: ({organization}) =>
+          organization?.features.includes('navigation-sidebar-v2') ?? false,
+      },
     ],
   },
   {