gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-30 04:58:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure searches on PRs also includes the branch name

Browse Source
This commit is contained in:
Caleb Owens 2024-02-15 20:44:45 +00:00 committed by Kiril Videlov
parent 4570a82256
commit 8f0c695465
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gitbutler-ui/src/lib/branches/types.ts
View File

@ -85,6 +85,19 @@ export class CombinedBranch {
} }
} }
get searchableIdentifiers() {
const identifiers = [];
if (this.vbranch) identifiers.push(this.vbranch.name);
if (this.pr) {
identifiers.push(this.pr.title);
identifiers.push(this.pr.targetBranch);
}
if (this.remoteBranch) identifiers.push(this.remoteBranch.displayName);
return identifiers.map((identifier) => identifier.toLowerCase());
}
currentState(): BranchState | undefined { currentState(): BranchState | undefined {
if (this.vbranch) return BranchState.VirtualBranch; if (this.vbranch) return BranchState.VirtualBranch;
if (this.pr) return BranchState.PR; if (this.pr) return BranchState.PR;

11
gitbutler-ui/src/lib/components/Branches.svelte
View File

@ -91,7 +91,16 @@
function filterByText(branches: CombinedBranch[], search: string | undefined) { function filterByText(branches: CombinedBranch[], search: string | undefined) {
if (search == undefined) return branches; if (search == undefined) return branches;
return branches.filter((b) => b.displayName.includes(search));
return branches.filter((b) => searchMatchesAnIdentifier(search, b.searchableIdentifiers));
}
function searchMatchesAnIdentifier(search: string, identifiers: string[]) {
for (const identifier of identifiers) {
if (identifier.includes(search.toLowerCase())) return true;
}
return false;
} }
function filterInactive(branches: CombinedBranch[]) { function filterInactive(branches: CombinedBranch[]) {