Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

typeahead: Drop duplicated single-string triage_raw.

Aadyot1fb94c564cea3
diff --git a/web/src/settings_playgrounds.ts b/web/src/settings_playgrounds.ts
index 8934b9fac04..46417264e77 100644
--- a/web/src/settings_playgrounds.ts
+++ b/web/src/settings_playgrounds.ts
@@ -192,7 +192,7 @@ function build_page(): void {
exact_matches,
begins_with_case_sensitive_matches,
begins_with_case_insensitive_matches,
- } = typeahead.triage_raw_with_multiple_items(q, items, (item) => [
+ } = typeahead.triage_raw(q, items, (item) => [
item,
...realm_playground.get_aliases_for_pretty_name(item),
]);
diff --git a/web/src/typeahead.ts b/web/src/typeahead.ts
index 374fe304313..06ac256f06d 100644
--- a/web/src/typeahead.ts
+++ b/web/src/typeahead.ts
@@ -253,59 +253,10 @@ export function get_emoji_matcher(query: string): (emoji: EmojiSuggestion) => bo
// from BEFORE_MENTION_ALLOWED_REGEX in zerver/lib/mention.py later.
export const word_boundary_chars = " _/-";
-export function triage_raw_with_multiple_items<T>(
- query: string,
- objs: T[],
- get_items: (x: T) => string[],
-): {
- exact_matches: T[];
- begins_with_case_sensitive_matches: T[];
- begins_with_case_insensitive_matches: T[];
- word_boundary_matches: T[];
- no_matches: T[];
-} {
- const exact_matches = [];
- const begins_with_case_sensitive_matches = [];
- const begins_with_case_insensitive_matches = [];
- const word_boundary_matches = [];
- const no_matches = [];
- const lower_query = query ? query.toLowerCase() : "";
-
- const word_boundary_match_regex = new RegExp(
- `[${word_boundary_chars}]${_.escapeRegExp(lower_query)}`,
- );
-
- for (const obj of objs) {
- const items = get_items(obj);
-
- const lower_items = items.map((item) => item.toLowerCase());
-
- if (lower_items.includes(lower_query)) {
- exact_matches.push(obj);
- } else if (items.some((item) => item.startsWith(query))) {
- begins_with_case_sensitive_matches.push(obj);
- } else if (lower_items.some((item) => item.startsWith(lower_query))) {
- begins_with_case_insensitive_matches.push(obj);
- } else if (lower_items.some((item) => word_boundary_match_regex.test(item))) {
- word_boundary_matches.push(obj);
- } else {
- no_matches.push(obj);
- }
- }
-
- return {
- exact_matches,
- begins_with_case_sensitive_matches,
- begins_with_case_insensitive_matches,
- word_boundary_matches,
- no_matches,
- };
-}
-
export function triage_raw<T>(
query: string,
objs: T[],
- get_item: (x: T) => string,
+ get_items: (x: T) => string[],
): {
exact_matches: T[];
begins_with_case_sensitive_matches: T[];
@@ -331,19 +282,22 @@ export function triage_raw<T>(
const no_matches = [];
const lower_query = query ? query.toLowerCase() : "";
+ const word_boundary_match_regex = new RegExp(
+ `[${word_boundary_chars}]${_.escapeRegExp(lower_query)}`,
+ );
+
for (const obj of objs) {
- const item = get_item(obj);
- const lower_item = item.toLowerCase();
+ const items = get_items(obj);
- if (lower_item === lower_query) {
+ const lower_items = items.map((item) => item.toLowerCase());
+
+ if (lower_items.includes(lower_query)) {
exact_matches.push(obj);
- } else if (item.startsWith(query)) {
+ } else if (items.some((item) => item.startsWith(query))) {
begins_with_case_sensitive_matches.push(obj);
- } else if (lower_item.startsWith(lower_query)) {
+ } else if (lower_items.some((item) => item.startsWith(lower_query))) {
begins_with_case_insensitive_matches.push(obj);
- } else if (
- new RegExp(`[${word_boundary_chars}]${_.escapeRegExp(lower_query)}`).test(lower_item)
- ) {
+ } else if (lower_items.some((item) => word_boundary_match_regex.test(item))) {
word_boundary_matches.push(obj);
} else {
no_matches.push(obj);
@@ -371,7 +325,7 @@ export function triage<T>(
begins_with_case_insensitive_matches,
word_boundary_matches,
no_matches,
- } = triage_raw(query, objs, get_item);
+ } = triage_raw(query, objs, (x) => [get_item(x)]);
if (sorting_comparator) {
const beginning_matches_sorted = [
diff --git a/web/src/typeahead_helper.ts b/web/src/typeahead_helper.ts
index 5051692cd9d..8d537e7ce03 100644
--- a/web/src/typeahead_helper.ts
+++ b/web/src/typeahead_helper.ts
@@ -541,7 +541,7 @@ const get_user_matches_with_quality = <UserType extends UserOrMentionPillData |
ok_users: () => UserType[];
worst_users: () => UserType[];
} => {
- const users_name_results = typeahead.triage_raw(query, users, (p) => p.user.full_name);
+ const users_name_results = typeahead.triage_raw(query, users, (p) => [p.user.full_name]);
const users_name_good_matches = [
...users_name_results.exact_matches,
...users_name_results.begins_with_case_sensitive_matches,
@@ -549,11 +549,9 @@ const get_user_matches_with_quality = <UserType extends UserOrMentionPillData |
];
const users_name_okay_matches = [...users_name_results.word_boundary_matches];
- const email_results = typeahead.triage_raw(
- query,
- users_name_results.no_matches,
- (p) => p.user.email,
- );
+ const email_results = typeahead.triage_raw(query, users_name_results.no_matches, (p) => [
+ p.user.email,
+ ]);
const email_good_matches = [
...email_results.exact_matches,
...email_results.begins_with_case_sensitive_matches,
@@ -610,7 +608,7 @@ export let sort_recipients = <UserType extends UserOrMentionPillData | UserPillD
worst_users: worst_bots,
} = get_user_matches_with_quality(bots, query, sort_relevance);
- const groups_results = typeahead.triage_raw_with_multiple_items(query, groups, (g) => {
+ const groups_results = typeahead.triage_raw(query, groups, (g) => {
if (g.name === "role:members") {
return [
user_groups.get_display_group_name(g.name),
@@ -824,13 +822,11 @@ export const sort_users_and_groups_options = ({
return objs;
}
- const users_name_results = typeahead.triage_raw(query, users, (p) => p.user.full_name);
- const email_results = typeahead.triage_raw(
- query,
- users_name_results.no_matches,
- (p) => p.user.email,
- );
- const groups_results = typeahead.triage_raw_with_multiple_items(query, groups, (g) => {
+ const users_name_results = typeahead.triage_raw(query, users, (p) => [p.user.full_name]);
+ const email_results = typeahead.triage_raw(query, users_name_results.no_matches, (p) => [
+ p.user.email,
+ ]);
+ const groups_results = typeahead.triage_raw(query, groups, (g) => {
if (g.name === "role:members") {
return [
user_groups.get_display_group_name(g.name),