bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-10 05:30:01 +00:00
Code Issues Releases Wiki Activity

Improve match type UX

Browse Source
This commit is contained in:
Matt Gibson
2025-03-13 18:30:53 -07:00
parent ac544c4b31
commit 078856e304
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/common/src/vault/search/parse.ts
View File

@@ -1,6 +1,6 @@
import { Parser, Grammar } from "nearley";
import { UriMatchStrategy } from "../../models/domain/domain-service";
import { UriMatchStrategy, UriMatchStrategySetting } from "../../models/domain/domain-service";
import { Utils } from "../../platform/misc/utils";
import { CardLinkedId, CipherType, FieldType, LinkedIdType, LoginLinkedId } from "../enums";
import { CipherView } from "../models/view/cipher.view";
@@ -349,16 +349,13 @@ function handleNode(node: AstNode): ProcessInstructions {
};
} else if (isWebsiteMatchFilter(node)) {
const websiteTest = termToRegexTest(node.website);
const matchTest = fieldNameToRegexTest(node.matchType);
const matchTypes = Object.keys(UriMatchStrategy)
.filter((key) => matchTest.test(key))
.map((key) => UriMatchStrategy[key as keyof typeof UriMatchStrategy]);
const matchTest = termToRegexTest(node.matchType);
return {
filter: (context) => ({
...context,
ciphers: context.ciphers.filter((cipher) =>
cipher?.login?.uris?.some(
(uri) => matchTypes.includes(uri.match) && websiteTest.test(uri.uri),
(uri) => matchHostMatchType(uri.match, matchTest) && websiteTest.test(uri.uri),
),
),
}),
@@ -375,6 +372,21 @@ function handleNode(node: AstNode): ProcessInstructions {
}
}
function matchHostMatchType(
cipherVal: UriMatchStrategySetting | null,
queryMatch: RegExp,
): boolean {
if (queryMatch.test("default")) {
// default match type is stored as null
return cipherVal == null;
}
const matchTypes = Object.keys(UriMatchStrategy)
.filter((key) => queryMatch.test(key))
.map((key) => UriMatchStrategy[key as keyof typeof UriMatchStrategy]);
return cipherVal != null && matchTypes.includes(cipherVal);
}
/**
* Match a string against an enum value. The matching string is sent in twice to match the enum in both directions,
* number -> string and string -> number.