From cc500ae4835373067745a22588169e6620c0297e Mon Sep 17 00:00:00 2001
From: Elizabet Oliveira <elizabet.oliveira@clickhouse.com>
Date: Fri, 15 May 2026 12:55:31 +0100
Subject: [PATCH] Migrate Service Map to PageLayout.

Uses shared sticky header with source, sampling, and time controls without
a duplicate title for top-level navigation.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .changeset/page-migrate-service-map.md |   5 +
 packages/app/src/DBServiceMapPage.tsx  | 202 +++++++++++++------------
 2 files changed, 109 insertions(+), 98 deletions(-)
 create mode 100644 .changeset/page-migrate-service-map.md

diff --git a/.changeset/page-migrate-service-map.md b/.changeset/page-migrate-service-map.md
new file mode 100644
index 0000000000..21019c4b57
--- /dev/null
+++ b/.changeset/page-migrate-service-map.md
@@ -0,0 +1,5 @@
+---
+'@hyperdx/app': patch
+---
+
+chore: migrate Service Map to shared `PageLayout` with a sticky toolbar (source, sampling, time range) and no duplicate page title.
diff --git a/packages/app/src/DBServiceMapPage.tsx b/packages/app/src/DBServiceMapPage.tsx
index b9d209410f..211a376652 100644
--- a/packages/app/src/DBServiceMapPage.tsx
+++ b/packages/app/src/DBServiceMapPage.tsx
@@ -4,10 +4,11 @@ import Head from 'next/head';
 import { parseAsInteger, useQueryState } from 'nuqs';
 import { useForm, useWatch } from 'react-hook-form';
 import { SourceKind, TTraceSource } from '@hyperdx/common-utils/dist/types';
-import { Box, Button, Group, Modal, Slider, Text } from '@mantine/core';
+import { Button, Group, Modal, Slider, Text } from '@mantine/core';
 import { IconConnection } from '@tabler/icons-react';
 
 import EmptyState from '@/components/EmptyState';
+import { PageLayout } from '@/components/PageLayout';
 import { IS_LOCAL_MODE } from '@/config';
 import { withAppNav } from '@/layout';
 
@@ -114,113 +115,118 @@ function DBServiceMapPage() {
     [brandName],
   );
 
+  const sourceSelect = source ? (
+    <SourceSelectControlled
+      control={control}
+      name="source"
+      size="xs"
+      allowedSourceKinds={[SourceKind.Trace]}
+      sourceSchemaPreview={
+        <SourceSchemaPreview source={source} variant="text" />
+      }
+    />
+  ) : null;
+
+  const headerActions = (
+    <Group gap="sm" wrap="nowrap">
+      <Text bg="inherit" size="sm">
+        Sampling {samplingLabel}
+      </Text>
+      <div style={{ minWidth: '200px' }}>
+        <Slider
+          label={null}
+          min={0}
+          max={SAMPLING_FACTORS.length - 1}
+          value={SAMPLING_FACTORS.findIndex(
+            factor => factor.value === samplingFactor,
+          )}
+          onChange={v => setSamplingFactor(SAMPLING_FACTORS[v].value)}
+          showLabelOnHover={false}
+        />
+      </div>
+      <TimePicker
+        inputValue={displayedTimeInputValue}
+        setInputValue={setDisplayedTimeInputValue}
+        onSearch={onSearch}
+      />
+    </Group>
+  );
+
   if (!isLoading && !hasTraceSources) {
     return (
-      <Box
-        p="sm"
-        className="bg-body"
-        style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}
-      >
+      <>
         {head}
-        <Text size="xl" mb="md">
-          Service Map
-        </Text>
-        {IS_LOCAL_MODE && (
-          <Modal
-            size="xl"
-            opened={isCreateSourceModalOpen}
-            onClose={() => setIsCreateSourceModalOpen(false)}
-            title="Configure New Trace Source"
-          >
-            <TableSourceForm
-              isNew
-              defaultName="My Trace Source"
-              onCreate={() => setIsCreateSourceModalOpen(false)}
-            />
-          </Modal>
-        )}
-        <EmptyState
-          style={{ flex: 1 }}
-          icon={<IconConnection size={32} />}
-          title="No trace sources configured"
-          description="The Service Map visualizes relationships between your services using trace data. Configure a trace source to get started."
-          maw={600}
-        >
-          {IS_LOCAL_MODE ? (
-            <Button
-              variant="primary"
-              size="sm"
-              mt="sm"
-              onClick={() => setIsCreateSourceModalOpen(true)}
-            >
-              Create Trace Source
-            </Button>
-          ) : (
-            <Button
-              component="a"
-              href="/team"
-              variant="primary"
-              size="sm"
-              mt="sm"
-            >
-              Go to Team Settings
-            </Button>
-          )}
-        </EmptyState>
-      </Box>
+        <PageLayout
+          data-testid="service-map-page"
+          fillViewport
+          content={
+            <>
+              {IS_LOCAL_MODE && (
+                <Modal
+                  size="xl"
+                  opened={isCreateSourceModalOpen}
+                  onClose={() => setIsCreateSourceModalOpen(false)}
+                  title="Configure New Trace Source"
+                >
+                  <TableSourceForm
+                    isNew
+                    defaultName="My Trace Source"
+                    onCreate={() => setIsCreateSourceModalOpen(false)}
+                  />
+                </Modal>
+              )}
+              <EmptyState
+                style={{ flex: 1, margin: 'var(--mantine-spacing-sm)' }}
+                icon={<IconConnection size={32} />}
+                title="No trace sources configured"
+                description="The Service Map visualizes relationships between your services using trace data. Configure a trace source to get started."
+                maw={600}
+              >
+                {IS_LOCAL_MODE ? (
+                  <Button
+                    variant="primary"
+                    size="sm"
+                    mt="sm"
+                    onClick={() => setIsCreateSourceModalOpen(true)}
+                  >
+                    Create Trace Source
+                  </Button>
+                ) : (
+                  <Button
+                    component="a"
+                    href="/team"
+                    variant="primary"
+                    size="sm"
+                    mt="sm"
+                  >
+                    Go to Team Settings
+                  </Button>
+                )}
+              </EmptyState>
+            </>
+          }
+        />
+      </>
     );
   }
 
   return source ? (
-    <Box
-      data-testid="service-map-page"
-      p="sm"
-      className="bg-body"
-      style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}
-    >
+    <>
       {head}
-      <Group mb="md" justify="space-between">
-        <Group>
-          <Text size="xl">Service Map</Text>
-          <SourceSelectControlled
-            control={control}
-            name="source"
-            size="xs"
-            allowedSourceKinds={[SourceKind.Trace]}
-            sourceSchemaPreview={
-              <SourceSchemaPreview source={source} variant="text" />
-            }
-          />
-        </Group>
-        <Group justify="flex-end">
-          <Text bg="inherit" size="sm">
-            Sampling {samplingLabel}
-          </Text>
-          <div style={{ minWidth: '200px' }}>
-            <Slider
-              label={null}
-              min={0}
-              max={SAMPLING_FACTORS.length - 1}
-              value={SAMPLING_FACTORS.findIndex(
-                factor => factor.value === samplingFactor,
-              )}
-              onChange={v => setSamplingFactor(SAMPLING_FACTORS[v].value)}
-              showLabelOnHover={false}
-            />
-          </div>
-          <TimePicker
-            inputValue={displayedTimeInputValue}
-            setInputValue={setDisplayedTimeInputValue}
-            onSearch={onSearch}
+      <PageLayout
+        data-testid="service-map-page"
+        leading={sourceSelect}
+        actions={headerActions}
+        fillViewport
+        content={
+          <ServiceMap
+            traceTableSource={source}
+            dateRange={searchedTimeRange}
+            samplingFactor={samplingFactor}
           />
-        </Group>
-      </Group>
-      <ServiceMap
-        traceTableSource={source}
-        dateRange={searchedTimeRange}
-        samplingFactor={samplingFactor}
+        }
       />
-    </Box>
+    </>
   ) : null;
 }