Skip to content

[Code] New SearchPage layout #45821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rylnd merged 18 commits into from
Sep 17, 2019
Merged

[Code] New SearchPage layout #45821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f807a1c
Remove now-unused ScopeTabs component
rylnd Sep 13, 2019
8108692
Remove unused style
rylnd Sep 13, 2019
371f9b7
Use consistent block names in our BEM classes
rylnd Sep 13, 2019
bfde2c5
Move the Search bar above both the sidebar and main content
rylnd Sep 13, 2019
6b63f3d
Align the search dropdown's RHS with the search sidebar
rylnd Sep 13, 2019
2837d47
Remove erroneous width rule
rylnd Sep 13, 2019
cceef95
Copy: Search Filter -> Advanced Filter
rylnd Sep 13, 2019
c4b001b
Space out badge with margin, not nbsp
rylnd Sep 13, 2019
85c1c70
Fix alignment of Filters flyout badge
rylnd Sep 16, 2019
d961e8f
Adjust layout of Search filter sidebar
rylnd Sep 16, 2019
8b5948c
Fix newline errors
rylnd Sep 16, 2019
f10453f
Update snapshots following markup changes
rylnd Sep 16, 2019
fc9f527
Less hacky way of indenting facet buttons
rylnd Sep 16, 2019
ae22cbb
Swap hardcoded rem values for equivalent eui vars
rylnd Sep 16, 2019
0f2e2f6
One more eui var replacement
rylnd Sep 16, 2019
643c0ba
Remove unused import
rylnd Sep 17, 2019
2086eac
Remove unused translations
rylnd Sep 17, 2019
f27d4c8
Merge branch 'master' into new-search-layout
rylnd Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion x-pack/legacy/plugins/code/public/components/main/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@
margin: 0 $euiSize;
border-radius: $euiSizeXS;
cursor: pointer;
width: calc(100% - $euiSizeXL);

&:hover {
background: $euiFocusBackgroundColor;
Expand Down
70 changes: 16 additions & 54 deletions ...plugins/code/public/components/query_bar/components/__snapshots__/query_bar.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions x-pack/legacy/plugins/code/public/components/query_bar/components/options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,18 @@ export class SearchOptions extends Component<Props, State> {
>
<EuiFlyoutHeader>
<EuiTitle size="s">
<h2 id="flyoutSmallTitle" className="">
<EuiNotificationBadge size="m" className="code-notification-badge">
<EuiFlexGroup id="flyoutSmallTitle" alignItems="center" gutterSize="none">
<EuiNotificationBadge size="m" className="codeQueryBar__filter-badge">
{repoScope.length}
</EuiNotificationBadge>
<EuiTextColor color="secondary" className="code-flyout-title">
<EuiTextColor color="secondary">
<FormattedMessage
id="xpack.code.searchBar.searchFilterTitle"
defaultMessage=" {filterCount, plural, one {Search Filter} other {Search Filters}} "
defaultMessage="{filterCount, plural, one {Advanced Filter} other {Advanced Filters}}"
values={{ filterCount: repoScope.length }}
/>
</EuiTextColor>
</h2>
</EuiFlexGroup>
</EuiTitle>
</EuiFlyoutHeader>
<EuiFlyoutBody>
Expand Down Expand Up @@ -196,13 +196,13 @@ export class SearchOptions extends Component<Props, State> {
<div>
<div className="kuiLocalSearchAssistedInput__assistance">
<EuiButtonEmpty size="xs" onClick={this.toggleOptionsFlyout}>
<EuiNotificationBadge size="m" className="code-notification-badge">
<EuiNotificationBadge size="m" className="codeQueryBar__filter-badge">
{repoScope.length}
</EuiNotificationBadge>
<EuiTextColor color="secondary">
<FormattedMessage
id="xpack.code.searchBar.searchFilterTitle"
defaultMessage=" {filterCount, plural, one {Search Filter} other {Search Filters}} "
defaultMessage="{filterCount, plural, one {Advanced Filter} other {Advanced Filters}}"
values={{ filterCount: repoScope.length }}
/>
</EuiTextColor>
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/code/public/components/query_bar/components/query_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ export class CodeQueryBar extends Component<Props, State> {
: '';
return (
<EuiFlexGroup responsive={false} gutterSize="none">
<EuiFlexItem grow={false}>
<EuiFlexItem className="codeQueryBar__scope" grow={false}>
<ScopeSelector scope={this.props.searchScope} onScopeChanged={this.onScopeChange} />
</EuiFlexItem>
<EuiFlexItem>
Expand All @@ -455,7 +455,7 @@ export class CodeQueryBar extends Component<Props, State> {
<div className="kuiLocalSearch" role="search">
<div className="kuiLocalSearchAssistedInput">
<EuiFieldText
className="kuiLocalSearchAssistedInput__input codeSearchBar__input"
className="kuiLocalSearchAssistedInput__input codeQueryBar__input"
placeholder={SearchScopePlaceholderText[this.props.searchScope]}
value={this.state.query}
onKeyDown={this.onKeyDown}
Expand Down
2 changes: 0 additions & 2 deletions x-pack/legacy/plugins/code/public/components/query_bar/components/scope_selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import React, { Component } from 'react';

import { SearchScope } from '../../../../model';
import { SearchScopeText } from '../../../common/types';
import { pxToRem } from '../../../style/variables';

interface Props {
scope: SearchScope;
Expand Down Expand Up @@ -57,7 +56,6 @@ export class ScopeSelector extends Component<Props> {
public render() {
return (
<EuiSuperSelect
style={{ width: pxToRem(200) }}
options={this.scopeOptions}
valueOfSelected={this.props.scope}
onChange={this.props.onScopeChanged}
Expand Down
67 changes: 0 additions & 67 deletions x-pack/legacy/plugins/code/public/components/search_page/scope_tabs.tsx
View file
Open in desktop

This file was deleted.

Loading