Skip to content

Adds filter button to graph search box #3686

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
merged 2 commits into from
Oct 21, 2024
Merged

Adds filter button to graph search box #3686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13df9d7
Adds filter button to graph search box
axosoft-ramint Oct 18, 2024
2a38eae
Remembers filter setting globally
axosoft-ramint Oct 21, 2024
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: 1 addition & 0 deletions src/constants.search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const searchOperationHelpRegex =

export interface SearchQuery {
query: string;
filter?: boolean;
matchAll?: boolean;
matchCase?: boolean;
matchRegex?: boolean;
Expand Down
1 change: 1 addition & 0 deletions src/webviews/apps/plus/graph/GraphWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,7 @@ export function GraphWrapper({
refMetadataById={refsMetadata}
rowsStats={rowsStats}
rowsStatsLoading={rowsStatsLoading}
searchMode={searchQuery?.filter ? 'filter' : 'normal'}
shaLength={graphConfig?.idLength}
shiftSelectMode="simple"
suppressNonRefRowTooltips
Expand Down
19 changes: 19 additions & 0 deletions src/webviews/apps/shared/components/search/search-input.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ export class GlSearchInput extends GlElement {
@property({ type: String }) label = 'Search';
@property({ type: String }) placeholder = 'Search...';
@property({ type: String }) value = '';
@property({ type: Boolean }) filter = false;
@property({ type: Boolean }) matchAll = false;
@property({ type: Boolean }) matchCase = false;
@property({ type: Boolean }) matchRegex = true;
Expand Down Expand Up @@ -380,6 +381,11 @@ export class GlSearchInput extends GlElement {
this.debouncedOnSearchChanged();
}

handleFilter(_e: Event) {
this.filter = !this.filter;
this.debouncedOnSearchChanged();
}

handleKeyup(_e: KeyboardEvent) {
this.updateHelpText();
}
Expand Down Expand Up @@ -423,6 +429,7 @@ export class GlSearchInput extends GlElement {
private onSearchChanged() {
const search: SearchQuery = {
query: this.value,
filter: this.filter,
matchAll: this.matchAll,
matchCase: this.matchCase,
matchRegex: this.matchRegex,
Expand Down Expand Up @@ -508,6 +515,18 @@ export class GlSearchInput extends GlElement {
</menu-item>
</div>
</gl-popover>
<gl-tooltip hoist placement="top" content="Filter Commits">
<button
class="action-button"
type="button"
role="checkbox"
aria-label="Filter Commits"
aria-checked="${this.filter}"
@click="${this.handleFilter}"
>
<code-icon icon="list-filter"></code-icon>
</button>
</gl-tooltip>
<div class="field">
<input
id="search"
Expand Down
Loading