Skip to content

Commit c816261

Browse files
authored
styles(explore): Reorganization explore for tours (#89616)
The proposed parts to wrap the tours around isn't organized right. Move a few things around in preparation for it.
1 parent 93d7b73 commit c816261

File tree

1 file changed

+55
-53
lines changed

1 file changed

+55
-53
lines changed

static/app/views/explore/spans/spansTab.tsx

Lines changed: 55 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -236,41 +236,40 @@ export function SpansTabContentImpl({
236236

237237
return (
238238
<SearchQueryBuilderProvider {...eapSpanSearchQueryProviderProps}>
239-
<Body
240-
withToolbar={expanded}
241-
withHints={organization.features.includes('traces-schema-hints')}
242-
>
239+
<Body withToolbar={expanded}>
243240
<TopSection>
244-
<StyledPageFilterBar condensed>
245-
<ProjectPageFilter />
246-
<EnvironmentPageFilter />
247-
<DatePageFilter
248-
defaultPeriod={defaultPeriod}
249-
maxPickableDays={maxPickableDays}
250-
relativeOptions={({arbitraryOptions}) => ({
251-
...arbitraryOptions,
252-
...relativeOptions,
253-
})}
254-
/>
255-
</StyledPageFilterBar>
256-
<EAPSpanSearchQueryBuilder {...eapSpanSearchQueryBuilderProps} />
241+
<FilterSection>
242+
<StyledPageFilterBar condensed>
243+
<ProjectPageFilter />
244+
<EnvironmentPageFilter />
245+
<DatePageFilter
246+
defaultPeriod={defaultPeriod}
247+
maxPickableDays={maxPickableDays}
248+
relativeOptions={({arbitraryOptions}) => ({
249+
...arbitraryOptions,
250+
...relativeOptions,
251+
})}
252+
/>
253+
</StyledPageFilterBar>
254+
<EAPSpanSearchQueryBuilder {...eapSpanSearchQueryBuilderProps} />
255+
</FilterSection>
256+
<Feature features="organizations:traces-schema-hints">
257+
<SchemaHintsSection>
258+
<SchemaHintsList
259+
supportedAggregates={
260+
mode === Mode.SAMPLES ? [] : ALLOWED_EXPLORE_VISUALIZE_AGGREGATES
261+
}
262+
numberTags={numberTags}
263+
stringTags={stringTags}
264+
isLoading={numberTagsLoading || stringTagsLoading}
265+
exploreQuery={query}
266+
source={SchemaHintsSources.EXPLORE}
267+
tableColumns={fields}
268+
setPageParams={setExplorePageParams}
269+
/>
270+
</SchemaHintsSection>
271+
</Feature>
257272
</TopSection>
258-
<Feature features="organizations:traces-schema-hints">
259-
<SchemaHintsSection>
260-
<SchemaHintsList
261-
supportedAggregates={
262-
mode === Mode.SAMPLES ? [] : ALLOWED_EXPLORE_VISUALIZE_AGGREGATES
263-
}
264-
numberTags={numberTags}
265-
stringTags={stringTags}
266-
isLoading={numberTagsLoading || stringTagsLoading}
267-
exploreQuery={query}
268-
source={SchemaHintsSources.EXPLORE}
269-
tableColumns={fields}
270-
setPageParams={setExplorePageParams}
271-
/>
272-
</SchemaHintsSection>
273-
</Feature>
274273
<SideSection withToolbar={expanded}>
275274
<ExploreToolbar width={300} extras={toolbarExtras} />
276275
</SideSection>
@@ -336,18 +335,20 @@ function OnboardingContent(props: OnboardingContentProps) {
336335
return (
337336
<Layout.Body>
338337
<TopSection>
339-
<StyledPageFilterBar condensed>
340-
<ProjectPageFilter />
341-
<EnvironmentPageFilter />
342-
<DatePageFilter
343-
defaultPeriod={props.defaultPeriod}
344-
maxPickableDays={props.maxPickableDays}
345-
relativeOptions={({arbitraryOptions}) => ({
346-
...arbitraryOptions,
347-
...props.relativeOptions,
348-
})}
349-
/>
350-
</StyledPageFilterBar>
338+
<FilterSection>
339+
<StyledPageFilterBar condensed>
340+
<ProjectPageFilter />
341+
<EnvironmentPageFilter />
342+
<DatePageFilter
343+
defaultPeriod={props.defaultPeriod}
344+
maxPickableDays={props.maxPickableDays}
345+
relativeOptions={({arbitraryOptions}) => ({
346+
...arbitraryOptions,
347+
...props.relativeOptions,
348+
})}
349+
/>
350+
</StyledPageFilterBar>
351+
</FilterSection>
351352
</TopSection>
352353
<OnboardingContentSection>
353354
<Onboarding project={props.onboardingProject} organization={organization} />
@@ -383,32 +384,33 @@ function checkIsAllowedSelection(
383384
return selectedMinutes <= maxPickableMinutes;
384385
}
385386

386-
const Body = styled(Layout.Body)<{
387-
withHints: boolean;
388-
withToolbar: boolean;
389-
}>`
387+
const Body = styled(Layout.Body)<{withToolbar: boolean}>`
390388
@media (min-width: ${p => p.theme.breakpoints.medium}) {
391389
display: grid;
392390
${p =>
393391
p.withToolbar
394392
? `grid-template-columns: 300px minmax(100px, auto);`
395393
: `grid-template-columns: 0px minmax(100px, auto);`}
396-
grid-template-rows: auto ${p => (p.withHints ? 'auto 1fr' : '1fr')};
394+
grid-template-rows: auto 1fr;
397395
align-content: start;
398396
gap: ${space(2)} ${p => (p.withToolbar ? `${space(2)}` : '0px')};
399397
transition: 700ms;
400398
}
401399
`;
402400

403401
const TopSection = styled('div')`
402+
grid-column: 1/3;
403+
display: flex;
404+
flex-direction: column;
405+
gap: ${space(2)};
406+
`;
407+
408+
const FilterSection = styled('div')`
404409
display: grid;
405410
gap: ${space(2)};
406-
grid-column: 1/3;
407-
margin-bottom: ${space(2)};
408411
409412
@media (min-width: ${p => p.theme.breakpoints.medium}) {
410413
grid-template-columns: minmax(300px, auto) 1fr;
411-
margin-bottom: 0;
412414
}
413415
`;
414416

0 commit comments

Comments
 (0)