feat(crons/uptime): Move to insights top-level nav

evanpurkhiser · evanpurkhiser · commit 12f093012caa · 2025-05-28T19:55:14.000-04:00
diff --git a/static/app/routes.tsx b/static/app/routes.tsx
@@ -1728,11 +1728,6 @@ function buildRoutes() {
           )}
         />
       </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.UPTIME]}/`}>
-        <IndexRoute
-          component={make(() => import('sentry/views/insights/uptime/views/overview'))}
-        />
-      </Route>
       <Route path={`${MODULE_BASE_URLS[ModuleName.AI]}/`}>
         <IndexRoute
           component={make(
@@ -1748,11 +1743,6 @@ function buildRoutes() {
           )}
         />
       </Route>
-      <Route path={`${MODULE_BASE_URLS[ModuleName.CRONS]}/`}>
-        <IndexRoute
-          component={make(() => import('sentry/views/insights/crons/views/overview'))}
-        />
-      </Route>
       <Route path={`${MODULE_BASE_URLS[ModuleName.SESSIONS]}/`}>
         <IndexRoute
           component={make(() => import('sentry/views/insights/sessions/views/overview'))}
@@ -1811,6 +1801,16 @@ function buildRoutes() {
       <Route path="projects/" component={make(() => import('sentry/views/projects/'))}>
         {projectsChildRoutes}
       </Route>
+      <Route path="uptime/">
+        <IndexRoute
+          component={make(() => import('sentry/views/insights/uptime/views/overview'))}
+        />
+      </Route>
+      <Route path="crons/">
+        <IndexRoute
+          component={make(() => import('sentry/views/insights/crons/views/overview'))}
+        />
+      </Route>
     </Route>
   );
 
diff --git a/static/app/views/insights/common/utils/useModuleURL.tsx b/static/app/views/insights/common/utils/useModuleURL.tsx
@@ -4,7 +4,6 @@ import {BASE_URL as AGENTS_BASE_URL} from 'sentry/views/insights/agentMonitoring
 import {BASE_URL as RESOURCES_BASE_URL} from 'sentry/views/insights/browser/resources/settings';
 import {BASE_URL as VITALS_BASE_URL} from 'sentry/views/insights/browser/webVitals/settings';
 import {BASE_URL as CACHE_BASE_URL} from 'sentry/views/insights/cache/settings';
-import {BASE_URL as CRONS_BASE_URL} from 'sentry/views/insights/crons/settings';
 import {BASE_URL as DB_BASE_URL} from 'sentry/views/insights/database/settings';
 import {BASE_URL as HTTP_BASE_URL} from 'sentry/views/insights/http/settings';
 import {BASE_URL as AI_BASE_URL} from 'sentry/views/insights/llmMonitoring/settings';
@@ -22,7 +21,6 @@ import {getModuleView} from 'sentry/views/insights/pages/utils';
 import {BASE_URL as QUEUE_BASE_URL} from 'sentry/views/insights/queues/settings';
 import {BASE_URL as SESSIONS_BASE_URL} from 'sentry/views/insights/sessions/settings';
 import {ModuleName} from 'sentry/views/insights/types';
-import {BASE_URL as UPTIME_BASE_URL} from 'sentry/views/insights/uptime/settings';
 
 export const MODULE_BASE_URLS: Record<ModuleName, string> = {
   [ModuleName.DB]: DB_BASE_URL,
@@ -38,8 +36,6 @@ export const MODULE_BASE_URLS: Record<ModuleName, string> = {
   [ModuleName.MOBILE_UI]: MOBILE_UI_BASE_URL,
   [ModuleName.MOBILE_VITALS]: MOBILE_SCREENS_BASE_URL,
   [ModuleName.SCREEN_RENDERING]: SCREEN_RENDERING_BASE_URL,
-  [ModuleName.CRONS]: CRONS_BASE_URL,
-  [ModuleName.UPTIME]: UPTIME_BASE_URL,
   [ModuleName.SESSIONS]: SESSIONS_BASE_URL,
   [ModuleName.OTHER]: '',
 };
diff --git a/static/app/views/insights/crons/settings.ts b/static/app/views/insights/crons/settings.ts
@@ -3,7 +3,6 @@ import {t} from 'sentry/locale';
 export const MODULE_TITLE = t('Cron Monitors');
 export const DATA_TYPE = t('Cron Check-In');
 export const DATA_TYPE_PLURAL = t('Cron Check-Ins');
-export const BASE_URL = 'crons';
 
 export const MODULE_DESCRIPTION = t(
   'Scheduled monitors that check in on recurring jobs and tell you if they’re running on schedule, failing, or succeeding.'
diff --git a/static/app/views/insights/crons/views/overview.tsx b/static/app/views/insights/crons/views/overview.tsx
@@ -7,6 +7,7 @@ import {deleteProjectProcessingErrorByType} from 'sentry/actionCreators/monitors
 import GuideAnchor from 'sentry/components/assistant/guideAnchor';
 import {Button} from 'sentry/components/core/button';
 import {ButtonBar} from 'sentry/components/core/button/buttonBar';
+import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import HookOrDefault from 'sentry/components/hookOrDefault';
 import * as Layout from 'sentry/components/layouts/thirds';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
@@ -29,7 +30,6 @@ import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
-import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {
   CronsLandingPanel,
   isValidGuide,
@@ -51,8 +51,6 @@ import type {
   ProcessingErrorType,
 } from 'sentry/views/insights/crons/types';
 import {makeMonitorListQueryKey} from 'sentry/views/insights/crons/utils';
-import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
-import {ModuleName} from 'sentry/views/insights/types';
 
 const CronsListPageHeader = HookOrDefault({
   hookName: 'component:crons-list-page-header',
@@ -108,19 +106,19 @@ function CronsOverview() {
   return (
     <Fragment>
       <CronsListPageHeader organization={organization} />
-      <BackendHeader
-        headerTitle={
-          <Fragment>
+      <Layout.Header unified>
+        <Layout.HeaderContent>
+          <Layout.Title>
             <GuideAnchor target="crons_backend_insights">{MODULE_TITLE}</GuideAnchor>
             <PageHeadingQuestionTooltip
               docsUrl={MODULE_DOC_LINK}
               title={MODULE_DESCRIPTION}
             />
-          </Fragment>
-        }
-        module={ModuleName.CRONS}
-        headerActions={
+          </Layout.Title>
+        </Layout.HeaderContent>
+        <Layout.HeaderActions>
           <ButtonBar gap={1}>
+            <FeedbackWidgetButton />
             <Button
               icon={<IconList />}
               size="sm"
@@ -140,8 +138,8 @@ function CronsOverview() {
               </NewMonitorButton>
             )}
           </ButtonBar>
-        }
-      />
+        </Layout.HeaderActions>
+      </Layout.Header>
       <Layout.Body>
         <Layout.Main fullWidth>
           <Filters>
@@ -194,15 +192,7 @@ function CronsOverview() {
   );
 }
 
-function PageWithProviders() {
-  return (
-    <ModulePageProviders moduleName="crons" pageTitle={t('Overview')}>
-      <CronsOverview />
-    </ModulePageProviders>
-  );
-}
-
-export default PageWithProviders;
+export default CronsOverview;
 
 const Filters = styled('div')`
   display: flex;
diff --git a/static/app/views/insights/pages/backend/settings.ts b/static/app/views/insights/pages/backend/settings.ts
@@ -13,8 +13,6 @@ export const MODULES = [
   ModuleName.HTTP,
   ModuleName.CACHE,
   ModuleName.QUEUE,
-  ModuleName.CRONS,
-  ModuleName.UPTIME,
 ];
 
 export const OVERVIEW_PAGE_ALLOWED_OPS = ['http.server'];
diff --git a/static/app/views/insights/pages/frontend/settings.ts b/static/app/views/insights/pages/frontend/settings.ts
@@ -34,7 +34,6 @@ export const MODULES = [
   ModuleName.HTTP,
   ModuleName.RESOURCE,
   ModuleName.SESSIONS,
-  ModuleName.UPTIME,
 ];
 
 // Mirrors `FRONTEND` in src/sentry/utils/platform_categories.py, except shared platforms are removed
diff --git a/static/app/views/insights/types.tsx b/static/app/views/insights/types.tsx
@@ -16,8 +16,6 @@ export enum ModuleName {
   MOBILE_UI = 'mobile-ui',
   MOBILE_VITALS = 'mobile-vitals',
   SCREEN_RENDERING = 'screen-rendering',
-  CRONS = 'crons',
-  UPTIME = 'uptime',
   SESSIONS = 'sessions',
   OTHER = 'other',
 }
diff --git a/static/app/views/insights/uptime/views/overview.tsx b/static/app/views/insights/uptime/views/overview.tsx
@@ -6,6 +6,7 @@ import {hasEveryAccess} from 'sentry/components/acl/access';
 import {ButtonBar} from 'sentry/components/core/button/buttonBar';
 import {LinkButton} from 'sentry/components/core/button/linkButton';
 import EmptyMessage from 'sentry/components/emptyMessage';
+import FeedbackWidgetButton from 'sentry/components/feedback/widget/feedbackWidgetButton';
 import * as Layout from 'sentry/components/layouts/thirds';
 import Link from 'sentry/components/links/link';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
@@ -31,14 +32,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import useProjects from 'sentry/utils/useProjects';
 import {makeAlertsPathname} from 'sentry/views/alerts/pathnames';
 import type {UptimeRule} from 'sentry/views/alerts/rules/uptime/types';
-import {ModulePageProviders} from 'sentry/views/insights/common/components/modulePageProviders';
 import {OwnerFilter} from 'sentry/views/insights/crons/components/ownerFilter';
-import {BackendHeader} from 'sentry/views/insights/pages/backend/backendPageHeader';
-import {BACKEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/backend/settings';
-import {FrontendHeader} from 'sentry/views/insights/pages/frontend/frontendPageHeader';
-import {FRONTEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/frontend/settings';
-import {useDomainViewFilters} from 'sentry/views/insights/pages/useFilters';
-import {ModuleName} from 'sentry/views/insights/types';
 import {OverviewTimeline} from 'sentry/views/insights/uptime/components/overviewTimeline';
 import {
   MODULE_DESCRIPTION,
@@ -52,7 +46,6 @@ export default function UptimeOverview() {
   const location = useLocation();
   const project = decodeList(location.query?.project);
   const {projects} = useProjects();
-  const {view = ''} = useDomainViewFilters();
 
   function makeQueryKey() {
     const {query, environment, owner, cursor, sort, asc} = location.query;
@@ -101,40 +94,37 @@ export default function UptimeOverview() {
     {settingsLink: <Link to={`/settings/${organization.slug}`} />}
   );
 
-  const headerProps = {
-    module: ModuleName.UPTIME,
-    headerTitle: (
-      <Fragment>
-        {MODULE_TITLE}
-        <PageHeadingQuestionTooltip
-          docsUrl={MODULE_DOC_LINK}
-          title={MODULE_DESCRIPTION}
-        />
-      </Fragment>
-    ),
-    headerActions: (
-      <ButtonBar gap={1}>
-        <LinkButton
-          size="sm"
-          priority="primary"
-          to={makeAlertsPathname({
-            path: `/new/uptime/`,
-            organization,
-          })}
-          icon={<IconAdd isCircled />}
-          disabled={!canCreateAlert}
-          title={canCreateAlert ? undefined : permissionTooltipText}
-        >
-          {t('Add Uptime Monitor')}
-        </LinkButton>
-      </ButtonBar>
-    ),
-  };
-
   return (
-    <ModulePageProviders moduleName="uptime" pageTitle={t('Overview')}>
-      {view === FRONTEND_LANDING_SUB_PATH && <FrontendHeader {...headerProps} />}
-      {view === BACKEND_LANDING_SUB_PATH && <BackendHeader {...headerProps} />}
+    <Fragment>
+      <Layout.Header unified>
+        <Layout.HeaderContent>
+          <Layout.Title>
+            {MODULE_TITLE}
+            <PageHeadingQuestionTooltip
+              docsUrl={MODULE_DOC_LINK}
+              title={MODULE_DESCRIPTION}
+            />
+          </Layout.Title>
+        </Layout.HeaderContent>
+        <Layout.HeaderActions>
+          <ButtonBar gap={1}>
+            <FeedbackWidgetButton />
+            <LinkButton
+              size="sm"
+              priority="primary"
+              to={makeAlertsPathname({
+                path: `/new/uptime/`,
+                organization,
+              })}
+              icon={<IconAdd isCircled />}
+              disabled={!canCreateAlert}
+              title={canCreateAlert ? undefined : permissionTooltipText}
+            >
+              {t('Add Uptime Monitor')}
+            </LinkButton>
+          </ButtonBar>
+        </Layout.HeaderActions>
+      </Layout.Header>
       <Layout.Body>
         <Layout.Main fullWidth>
           <Filters>
@@ -190,7 +180,7 @@ export default function UptimeOverview() {
           )}
         </Layout.Main>
       </Layout.Body>
-    </ModulePageProviders>
+    </Fragment>
   );
 }
 
diff --git a/static/app/views/nav/secondary/sections/insights/insightsSecondaryNav.tsx b/static/app/views/nav/secondary/sections/insights/insightsSecondaryNav.tsx
@@ -116,6 +116,17 @@ export function InsightsSecondaryNav() {
             </SecondaryNav.Item>
           </AgentInsightsFeature>
         </SecondaryNav.Section>
+        <SecondaryNav.Section id="insights-monitors">
+          <SecondaryNav.Item
+            to={`${baseUrl}/uptime/`}
+            analyticsItemName="insights_uptime"
+          >
+            {t('Uptime')}
+          </SecondaryNav.Item>
+          <SecondaryNav.Item to={`${baseUrl}/crons/`} analyticsItemName="insights_crons">
+            {t('Crons')}
+          </SecondaryNav.Item>
+        </SecondaryNav.Section>
         <SecondaryNav.Section id="insights-projects-all">
           <SecondaryNav.Item
             to={`${baseUrl}/projects/`}

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ export enum ModuleName {`
`16`	`16`	`MOBILE_UI = 'mobile-ui',`
`17`	`17`	`MOBILE_VITALS = 'mobile-vitals',`
`18`	`18`	`SCREEN_RENDERING = 'screen-rendering',`
`19`		`- CRONS = 'crons',`
`20`		`- UPTIME = 'uptime',`
`21`	`19`	`SESSIONS = 'sessions',`
`22`	`20`	`OTHER = 'other',`
`23`	`21`	`}`