Skip to content

Commit 7416527

Browse files
fix(layout): revert profiling container approach
Profiling sub-pages individually manage Layout.Page (some with custom styling like hiding the footer), so the container-level approach causes double-wrapping. Restore Layout.Page on individual pages instead.
1 parent 77fa247 commit 7416527

3 files changed

Lines changed: 23 additions & 20 deletions

File tree

static/app/views/profiling/differentialFlamegraph.tsx

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {vec2} from 'gl-matrix';
66

77
import {addErrorMessage} from 'sentry/actionCreators/indicator';
88
import Feature from 'sentry/components/acl/feature';
9+
import * as Layout from 'sentry/components/layouts/thirds';
910
import {usePageFilters} from 'sentry/components/pageFilters/usePageFilters';
1011
import {DifferentialFlamegraphLayout} from 'sentry/components/profiling/flamegraph/differentialFlamegraphLayout';
1112
import {FlamegraphContextMenu} from 'sentry/components/profiling/flamegraph/flamegraphContextMenu';
@@ -356,18 +357,20 @@ const DifferentialFlamegraphContainer = styled('div')`
356357

357358
function DifferentialFlamegraphWithProviders() {
358359
return (
359-
<FlamegraphThemeProvider>
360-
<FlamegraphStateProvider
361-
initialState={{
362-
preferences: {
363-
sorting: 'alphabetical',
364-
view: 'top down',
365-
},
366-
}}
367-
>
368-
<DifferentialFlamegraphView />
369-
</FlamegraphStateProvider>
370-
</FlamegraphThemeProvider>
360+
<Layout.Page>
361+
<FlamegraphThemeProvider>
362+
<FlamegraphStateProvider
363+
initialState={{
364+
preferences: {
365+
sorting: 'alphabetical',
366+
view: 'top down',
367+
},
368+
}}
369+
>
370+
<DifferentialFlamegraphView />
371+
</FlamegraphStateProvider>
372+
</FlamegraphThemeProvider>
373+
</Layout.Page>
371374
);
372375
}
373376

static/app/views/profiling/index.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ function ProfilingContainer() {
4040
)}
4141
>
4242
<NoProjectMessage organization={organization}>
43-
<Layout.Page>
44-
<Outlet />
45-
</Layout.Page>
43+
<Outlet />
4644
</NoProjectMessage>
4745
</Feature>
4846
);

static/app/views/profiling/profileSummary/index.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,12 @@ const ProfileDigestLabel = styled('span')`
781781

782782
export default function ProfileSummaryPageToggle() {
783783
return (
784-
<ProfileSummaryContainer data-test-id="profile-summary-redesign">
785-
<ErrorBoundary>
786-
<ProfileSummaryPage />
787-
</ErrorBoundary>
788-
</ProfileSummaryContainer>
784+
<Layout.Page>
785+
<ProfileSummaryContainer data-test-id="profile-summary-redesign">
786+
<ErrorBoundary>
787+
<ProfileSummaryPage />
788+
</ErrorBoundary>
789+
</ProfileSummaryContainer>
790+
</Layout.Page>
789791
);
790792
}

0 commit comments

Comments
 (0)