diff --git a/static/app/views/insights/pages/conversations/layout.tsx b/static/app/views/insights/pages/conversations/layout.tsx index 30020aca1eae4a..9df28e8b02b4b9 100644 --- a/static/app/views/insights/pages/conversations/layout.tsx +++ b/static/app/views/insights/pages/conversations/layout.tsx @@ -1,6 +1,6 @@ -import {Fragment} from 'react'; import {Outlet, useMatches} from 'react-router-dom'; +import * as Layout from 'sentry/components/layouts/thirds'; import {ConversationsPageHeader} from 'sentry/views/insights/pages/conversations/conversationsPageHeader'; import {ModuleName} from 'sentry/views/insights/types'; @@ -8,12 +8,12 @@ function ConversationsLayout() { const handle = useMatches().at(-1)?.handle as {module?: ModuleName} | undefined; return ( - + {handle && 'module' in handle ? ( ) : null} - + ); } diff --git a/static/app/views/profiling/continuousProfileFlamegraph.tsx b/static/app/views/profiling/continuousProfileFlamegraph.tsx index 96f3fde4aae9a7..0aaa232b60861e 100644 --- a/static/app/views/profiling/continuousProfileFlamegraph.tsx +++ b/static/app/views/profiling/continuousProfileFlamegraph.tsx @@ -4,7 +4,6 @@ import * as qs from 'query-string'; import {Stack} from '@sentry/scraps/layout'; -import * as Layout from 'sentry/components/layouts/thirds'; import {LoadingIndicator} from 'sentry/components/loadingIndicator'; import {ContinuousFlamegraph} from 'sentry/components/profiling/flamegraph/continuousFlamegraph'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; @@ -104,27 +103,25 @@ export default function ContinuousProfileFlamegraphWrapper() { title={t('Profiling \u2014 Flamechart')} orgSlug={organization.slug} > - - - - - - - - {profiles.type === 'loading' ? ( - - - - ) : null} - - - - - - + + + + + + + {profiles.type === 'loading' ? ( + + + + ) : null} + + + + + ); } @@ -159,9 +156,3 @@ const FlamegraphContainer = styled('div')` flex-direction: column; flex: 1 1 100%; `; - -const LayoutPageWithHiddenFooter = styled(Layout.Page)` - ~ footer { - display: none; - } -`; diff --git a/static/app/views/profiling/continuousProfileProvider.tsx b/static/app/views/profiling/continuousProfileProvider.tsx index d19eee233ec8a3..bbd1aec47844e8 100644 --- a/static/app/views/profiling/continuousProfileProvider.tsx +++ b/static/app/views/profiling/continuousProfileProvider.tsx @@ -9,6 +9,7 @@ import {decodeScalar} from 'sentry/utils/queryString'; import {useLocation} from 'sentry/utils/useLocation'; import {useOrganization} from 'sentry/utils/useOrganization'; import {useParams} from 'sentry/utils/useParams'; +import {LayoutPageWithHiddenFooter} from 'sentry/views/profiling/layoutPageWithHiddenFooter'; import {ContinuousProfileProvider, ProfileTransactionContext} from './profilesProvider'; @@ -65,12 +66,14 @@ export default function ProfileAndTransactionProvider(): React.ReactElement { setProfile={setProfile} > - - + + + + ); diff --git a/static/app/views/profiling/differentialFlamegraph.tsx b/static/app/views/profiling/differentialFlamegraph.tsx index d0d5a91d143383..3d704d0e81bd63 100644 --- a/static/app/views/profiling/differentialFlamegraph.tsx +++ b/static/app/views/profiling/differentialFlamegraph.tsx @@ -40,6 +40,7 @@ import {FlamegraphRenderer2D} from 'sentry/utils/profiling/renderers/flamegraphR import {FlamegraphRendererWebGL} from 'sentry/utils/profiling/renderers/flamegraphRendererWebGL'; import {Rect} from 'sentry/utils/profiling/speedscope'; import {useLocation} from 'sentry/utils/useLocation'; +import {LayoutPageWithHiddenFooter} from 'sentry/views/profiling/layoutPageWithHiddenFooter'; import {LOADING_PROFILE_GROUP} from 'sentry/views/profiling/profileGroupProvider'; const PROFILE_TYPE = 'differential aggregate flamegraph' as const; @@ -348,26 +349,24 @@ const DifferentialFlamegraphContainer = styled('div')` display: flex; flex-direction: column; flex: 1; - - ~ footer { - display: none; - } `; function DifferentialFlamegraphWithProviders() { return ( - - - - - + + + + + + + ); } diff --git a/static/app/views/profiling/layoutPageWithHiddenFooter.tsx b/static/app/views/profiling/layoutPageWithHiddenFooter.tsx new file mode 100644 index 00000000000000..ff8ace1842eae0 --- /dev/null +++ b/static/app/views/profiling/layoutPageWithHiddenFooter.tsx @@ -0,0 +1,12 @@ +import styled from '@emotion/styled'; + +import * as Layout from 'sentry/components/layouts/thirds'; + +// The footer component is a sibling of this div. +// Remove it so the flamegraph can take up the +// entire screen. +export const LayoutPageWithHiddenFooter = styled(Layout.Page)` + ~ footer { + display: none; + } +`; diff --git a/static/app/views/profiling/profileFlamechart.tsx b/static/app/views/profiling/profileFlamechart.tsx index 4ed950e7e986fb..6c43383b1d6380 100644 --- a/static/app/views/profiling/profileFlamechart.tsx +++ b/static/app/views/profiling/profileFlamechart.tsx @@ -4,7 +4,6 @@ import * as qs from 'query-string'; import {Stack} from '@sentry/scraps/layout'; -import * as Layout from 'sentry/components/layouts/thirds'; import {LoadingIndicator} from 'sentry/components/loadingIndicator'; import {Flamegraph} from 'sentry/components/profiling/flamegraph/flamegraph'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; @@ -105,27 +104,25 @@ export default function ProfileFlamegraphWrapper() { title={t('Profiling \u2014 Flamechart')} orgSlug={organization.slug} > - - - - - - - - {profiles.type === 'loading' || profiledTransaction.type === 'loading' ? ( - - - - ) : null} - - - - - - + + + + + + + {profiles.type === 'loading' || profiledTransaction.type === 'loading' ? ( + + + + ) : null} + + + + + ); } @@ -160,9 +157,3 @@ const FlamegraphContainer = styled('div')` flex-direction: column; flex: 1 1 100%; `; - -const LayoutPageWithHiddenFooter = styled(Layout.Page)` - ~ footer { - display: none; - } -`; diff --git a/static/app/views/profiling/profileSummary/index.tsx b/static/app/views/profiling/profileSummary/index.tsx index 1e56955c2e3f31..d4137d3717c93d 100644 --- a/static/app/views/profiling/profileSummary/index.tsx +++ b/static/app/views/profiling/profileSummary/index.tsx @@ -67,6 +67,7 @@ import { useFlamegraph, } from 'sentry/views/profiling/flamegraphProvider'; import {ProfilesSummaryChart} from 'sentry/views/profiling/landing/profilesSummaryChart'; +import {LayoutPageWithHiddenFooter} from 'sentry/views/profiling/layoutPageWithHiddenFooter'; import {ProfileGroupProvider} from 'sentry/views/profiling/profileGroupProvider'; import {ProfilesTable} from 'sentry/views/profiling/profileSummary/profilesTable'; @@ -636,15 +637,6 @@ const ProfileSummaryContainer = styled('div')` display: flex; flex-direction: column; flex: 1 1 100%; - - /* - * The footer component is a sibling of this div. - * Remove it so the flamegraph can take up the - * entire screen. - */ - ~ footer { - display: none; - } `; const PROFILE_DIGEST_FIELDS = [ @@ -781,10 +773,12 @@ const ProfileDigestLabel = styled('span')` export default function ProfileSummaryPageToggle() { return ( - - - - - + + + + + + + ); } diff --git a/static/app/views/profiling/transactionProfileProvider.tsx b/static/app/views/profiling/transactionProfileProvider.tsx index f7fb3553b06802..34a810413dc3ff 100644 --- a/static/app/views/profiling/transactionProfileProvider.tsx +++ b/static/app/views/profiling/transactionProfileProvider.tsx @@ -8,6 +8,7 @@ import {isSchema, isSentrySampledProfile} from 'sentry/utils/profiling/guards/pr import {useSentryEvent} from 'sentry/utils/profiling/hooks/useSentryEvent'; import {useOrganization} from 'sentry/utils/useOrganization'; import {useParams} from 'sentry/utils/useParams'; +import {LayoutPageWithHiddenFooter} from 'sentry/views/profiling/layoutPageWithHiddenFooter'; import {ProfileTransactionContext, TransactionProfileProvider} from './profilesProvider'; @@ -46,14 +47,16 @@ export default function ProfileAndTransactionProvider(): React.ReactElement { setProfile={setProfile} > - - + + + + ); diff --git a/static/app/views/projectInstall/newProject.tsx b/static/app/views/projectInstall/newProject.tsx index 57ccb755247948..19c5ea0d47685a 100644 --- a/static/app/views/projectInstall/newProject.tsx +++ b/static/app/views/projectInstall/newProject.tsx @@ -1,5 +1,6 @@ import styled from '@emotion/styled'; +import * as Layout from 'sentry/components/layouts/thirds'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; import {CreateProject} from './createProject'; @@ -7,13 +8,15 @@ import {CreateProject} from './createProject'; function NewProject() { return ( - -
- - - -
-
+ + +
+ + + +
+
+
); }